Bitron-Video Wall Thermostat support (base functions) #134

Chrischi- · 2018-11-18T08:56:34Z

Base functions added

fromZigbee.js

local temperature
running state
occupied heating setpoint
battery voltage
battery alarm state

toZigbee.js

set heating setpoint
set temperature calibration

rebase

The thermostat suits underfloor and traditional heating systems which can be activated thanks of a relay contact.

sebastianheierhoff · 2018-11-27T20:02:59Z

Seems as if we're implementing the same functionality (see #132) for different devices. Maybe it would make sense to join forces?

Chrischi- · 2018-11-28T12:32:02Z

Maybe it would make sense to join forces?

@sebastianheierhoff
absolutely

sebastianheierhoff · 2018-11-28T12:34:20Z

Maybe it would make sense to join forces?

@sebastianheierhoff
absolutely

We will definitely need the devices.js entry for both Bitron and ecozy, but I feel that the converters should be more or less identical.

sebastianheierhoff · 2018-11-28T12:36:30Z

My fork has a working occupiedHeatingSetpoint (https://github.com/sebastianheierhoff/zigbee-shepherd-converters/tree/dev)

Chrischi- · 2018-11-28T12:39:42Z

Let's have a look at the converters.

    bitron_genPowerCfg_attReport: {
        cid: 'genPowerCfg',
        type: 'attReport',
        convert: (model, msg, publish, options) => {
            const battery = {max: 3200, min: 2500};
            const voltage = msg.data.data['batteryVoltage'] * 100;
            return {
                battery: toPercentage(voltage, battery.min, battery.max),
                voltage: voltage,
            };
        },
    },
    bitron_hvacThermostat_attReport: {
        cid: 'hvacThermostat',
        type: 'attReport',
        convert: (model, msg, publish, options) => {
            const deviceID = msg.endpoints[0].device.ieeeAddr;
            if (!store[deviceID]) {
                store[deviceID] = {localTemp: null};
                store[deviceID] = {occupiedHeatingSetpoint: null};
                store[deviceID] = {runningState: null};
            }
            if (typeof msg.data.data.localTemp == 'number') {
                store[deviceID].localTemp = msg.data.data.localTemp;
            }
            if ( typeof msg.data.data.occupiedHeatingSetpoint == 'number') {
                store[deviceID].occupiedHeatingSetpoint = msg.data.data.occupiedHeatingSetpoint;
            }
            if (typeof msg.data.data.runningState == 'number') {
                store[deviceID].runningState = msg.data.data.runningState;
            }
            return {
                localTemp: precisionRound(store[deviceID].localTemp, 2)/100,
                occupiedHeatingSetpoint: precisionRound(store[deviceID].occupiedHeatingSetpoint, 2)/100,
                runningState: store[deviceID].runningState === 1 ? 'ON' : 'OFF',
                batteryAlarmState: msg.data.data.batteryAlarmState === 1 ? 'ON' : 'OFF',
            };
        },
    },
    bitron_hvacThermostat_devChange: {
        cid: 'hvacThermostat',
        type: 'devChange',
        convert: (model, msg, publish, options) => {
            const deviceID = msg.endpoints[0].device.ieeeAddr;
            if (!store[deviceID]) {
                store[deviceID] = {localTemp: null};
                store[deviceID] = {occupiedHeatingSetpoint: null};
                store[deviceID] = {runningState: null};
            }
            if (typeof msg.data.data.localTemp == 'number') {
                store[deviceID].localTemp = msg.data.data.localTemp;
            }
            if (typeof msg.data.data.occupiedHeatingSetpoint == 'number') {
                store[deviceID].occupiedHeatingSetpoint = msg.data.data.occupiedHeatingSetpoint;
            }
            if (typeof msg.data.data.runningState == 'number') {
                store[deviceID].runningState = msg.data.data.runningState;
            }
            return {
                localTemp: precisionRound(store[deviceID].localTemp, 2)/100,
                occupiedHeatingSetpoint: precisionRound(store[deviceID].occupiedHeatingSetpoint, 2)/100,
                runningState: store[deviceID].runningState === 1 ? 'ON' : 'OFF',
                batteryAlarmState: msg.data.data.batteryAlarmState === 1 ? 'ON' : 'OFF',
            };
        },
},

Chrischi- · 2018-11-28T12:46:37Z

@sebastianheierhoff

is there a reason why you're doing this?

if (!msg.data.data.occupiedHeatingSetpoint == null || !msg.data.data.occupiedHeatingSetpoint == '') {

this would be my solution

typeof msg.data.data.occupiedHeatingSetpoint == 'number'

sebastianheierhoff · 2018-11-28T13:30:03Z

@sebastianheierhoff

is there a reason why you're doing this?

if (!msg.data.data.occupiedHeatingSetpoint == null || !msg.data.data.occupiedHeatingSetpoint == '') {

this would be my solution

typeof msg.data.data.occupiedHeatingSetpoint == 'number'

Not really. This is actually taken from the initial PR (#41) by @tb-killa

sebastianheierhoff · 2018-11-28T13:31:04Z

Let's have a look at the converters.

    bitron_genPowerCfg_attReport: {
        cid: 'genPowerCfg',
        type: 'attReport',
        convert: (model, msg, publish, options) => {
            const battery = {max: 3200, min: 2500};
            const voltage = msg.data.data['batteryVoltage'] * 100;
            return {
                battery: toPercentage(voltage, battery.min, battery.max),
                voltage: voltage,
            };
        },
    },
    bitron_hvacThermostat_attReport: {
        cid: 'hvacThermostat',
        type: 'attReport',
        convert: (model, msg, publish, options) => {
            const deviceID = msg.endpoints[0].device.ieeeAddr;
            if (!store[deviceID]) {
                store[deviceID] = {localTemp: null};
                store[deviceID] = {occupiedHeatingSetpoint: null};
                store[deviceID] = {runningState: null};
            }
            if (typeof msg.data.data.localTemp == 'number') {
                store[deviceID].localTemp = msg.data.data.localTemp;
            }
            if ( typeof msg.data.data.occupiedHeatingSetpoint == 'number') {
                store[deviceID].occupiedHeatingSetpoint = msg.data.data.occupiedHeatingSetpoint;
            }
            if (typeof msg.data.data.runningState == 'number') {
                store[deviceID].runningState = msg.data.data.runningState;
            }
            return {
                localTemp: precisionRound(store[deviceID].localTemp, 2)/100,
                occupiedHeatingSetpoint: precisionRound(store[deviceID].occupiedHeatingSetpoint, 2)/100,
                runningState: store[deviceID].runningState === 1 ? 'ON' : 'OFF',
                batteryAlarmState: msg.data.data.batteryAlarmState === 1 ? 'ON' : 'OFF',
            };
        },
    },
    bitron_hvacThermostat_devChange: {
        cid: 'hvacThermostat',
        type: 'devChange',
        convert: (model, msg, publish, options) => {
            const deviceID = msg.endpoints[0].device.ieeeAddr;
            if (!store[deviceID]) {
                store[deviceID] = {localTemp: null};
                store[deviceID] = {occupiedHeatingSetpoint: null};
                store[deviceID] = {runningState: null};
            }
            if (typeof msg.data.data.localTemp == 'number') {
                store[deviceID].localTemp = msg.data.data.localTemp;
            }
            if (typeof msg.data.data.occupiedHeatingSetpoint == 'number') {
                store[deviceID].occupiedHeatingSetpoint = msg.data.data.occupiedHeatingSetpoint;
            }
            if (typeof msg.data.data.runningState == 'number') {
                store[deviceID].runningState = msg.data.data.runningState;
            }
            return {
                localTemp: precisionRound(store[deviceID].localTemp, 2)/100,
                occupiedHeatingSetpoint: precisionRound(store[deviceID].occupiedHeatingSetpoint, 2)/100,
                runningState: store[deviceID].runningState === 1 ? 'ON' : 'OFF',
                batteryAlarmState: msg.data.data.batteryAlarmState === 1 ? 'ON' : 'OFF',
            };
        },
},

Looks pretty similiar to me, except for "runningState" and "batteryAlarmState".

Chrischi- · 2018-11-28T13:44:31Z

Yeah, I tried to get everything into one handler.

I don't know exactly if the Bitron thermostats send values like:

setpointChangeSource
setpointChangeAmount
setpointChangeSourceTimeStamp

Chrischi- · 2018-11-28T13:47:28Z

here is my toZigbee.js

    thermostat_setHeatingSetpoint: {
        key: 'setHeatingSetpoint',
        attr: [],
        convert: (value, message, type) => {
            const cid = 'hvacThermostat';
            const attrId = 0x12;

            if (type === 'set') {
                return {
                    cid: cid,
                    type: 'foundation',
                    cmd: 'write',
                    zclData: {
                        attrId: attrId, // occupiedHeatingSetpoint
                        dataType: 0x29, // dataType int16
                        attrData: (Math.round((value * 2).toFixed(1))/2).toFixed(1) * 100,
                    },
                };
            }
        },
    },
    thermostat_setTemperatureCalibration: {
        key: 'setTemperatureCalibration',
        attr: [],
        convert: (value, message, type) => {
            const cid = 'hvacThermostat';
            const attrId = 0x10;

            if (type === 'set') {
                return {
                    cid: cid,
                    type: 'foundation',
                    cmd: 'write',
                    zclData: {
                        attrId: attrId, // localTemperatureCalibration 0x10
                        dataType: 0x28, // dataType int8
                        attrData: Math.round(value * 10),
                    },
                };
            }
        },
},

zclData array + cmdType fixed

Rebase

Chrischi- · 2019-01-05T21:21:32Z

will make a new pull request tomorrow.

made some adjustments that matches the ecozy PR from @sebastianheierhoff

Chrischi- added 7 commits November 18, 2018 09:25

Merge pull request #1 from Koenkk/master

dbc67fa

rebase

Bitron Video Thermostat added

0750e72

The thermostat suits underfloor and traditional heating systems which can be activated thanks of a relay contact.

Bitron-Video Thermostat added

0b9f08f

Bitron-Video Thermostat added

51a8ed8

Update devices.js

603bf40

Update fromZigbee.js

e4f6f9c

Update toZigbee.js

917936f

Chrischi- changed the title ~~Bitron-Video Wall Thermostat support added~~ Bitron-Video Wall Thermostat support (base functions) Nov 18, 2018

Chrischi- added 3 commits November 18, 2018 10:10

Update devices.js

3c2775e

Update devices.js

b51aacc

Update devices.js

eab645a

Update toZigbee.js

caddb26

zclData array + cmdType fixed

Koenkk force-pushed the master branch from bbec656 to 5a0d475 Compare December 6, 2018 19:54

Chrischi- added 3 commits December 20, 2018 17:10

Update toZigbee.js

16d9359

Update toZigbee.js

86f993b

Merge pull request #2 from Koenkk/master

70c4a93

Rebase

Chrischi- closed this Jan 6, 2019

Chrischi- mentioned this pull request Jan 6, 2019

Bitron-Video Wall Thermostat #199

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bitron-Video Wall Thermostat support (base functions) #134

Bitron-Video Wall Thermostat support (base functions) #134

Chrischi- commented Nov 18, 2018

sebastianheierhoff commented Nov 27, 2018

Chrischi- commented Nov 28, 2018 •

edited

Loading

sebastianheierhoff commented Nov 28, 2018

sebastianheierhoff commented Nov 28, 2018

Chrischi- commented Nov 28, 2018

Chrischi- commented Nov 28, 2018

sebastianheierhoff commented Nov 28, 2018

sebastianheierhoff commented Nov 28, 2018

Chrischi- commented Nov 28, 2018

Chrischi- commented Nov 28, 2018

Chrischi- commented Jan 5, 2019

Bitron-Video Wall Thermostat support (base functions) #134

Bitron-Video Wall Thermostat support (base functions) #134

Conversation

Chrischi- commented Nov 18, 2018

sebastianheierhoff commented Nov 27, 2018

Chrischi- commented Nov 28, 2018 • edited Loading

sebastianheierhoff commented Nov 28, 2018

sebastianheierhoff commented Nov 28, 2018

Chrischi- commented Nov 28, 2018

Chrischi- commented Nov 28, 2018

sebastianheierhoff commented Nov 28, 2018

sebastianheierhoff commented Nov 28, 2018

Chrischi- commented Nov 28, 2018

Chrischi- commented Nov 28, 2018

Chrischi- commented Jan 5, 2019

Chrischi- commented Nov 28, 2018 •

edited

Loading