zigbee-herdsman-converters 15.0.60 → 15.0.61

package/converters/fromZigbee.js

@@ -158,7 +158,7 @@ const converters = {
             const days = [];
             for (let i = 0; i < 8; i++) {
                 if ((msg.data['dayofweek'] & 1<<i) > 0) {
-                    days.push(constants.dayOfWeek[i]);
+                    days.push(constants.thermostatDayOfWeek[i]);
                 }
             }
 
@@ -412,7 +412,7 @@ const converters = {
         cluster: 'pm25Measurement',
         type: ['attributeReport', 'readResponse'],
         convert: (model, msg, publish, options, meta) => {
-            if (msg.data['measuredValue']) {
+            if (msg.data.hasOwnProperty('measuredValue')) {
                 return {pm25: msg.data['measuredValue']};
             }
         },
@@ -2191,7 +2191,7 @@ const converters = {
                 return {
                     // Same as in hvacThermostat:getWeeklyScheduleRsp hvacThermostat:setWeeklySchedule cluster format
                     weekly_schedule: {
-                        days: [constants.dayOfWeek[dayOfWeek]],
+                        days: [constants.thermostatDayOfWeek[dayOfWeek]],
                         transitions: dataToTransitions(value, maxTransitions, dataOffset),
                     },
                 };
@@ -3533,8 +3533,8 @@ const converters = {
             }
             if (msg.data.hasOwnProperty('danfossDayOfWeek')) {
                 result[postfixWithEndpointName('day_of_week', msg, model, meta)] =
-                    constants.dayOfWeek.hasOwnProperty(msg.data['danfossDayOfWeek']) ?
-                        constants.dayOfWeek[msg.data['danfossDayOfWeek']] :
+                    constants.thermostatDayOfWeek.hasOwnProperty(msg.data['danfossDayOfWeek']) ?
+                        constants.thermostatDayOfWeek[msg.data['danfossDayOfWeek']] :
                         msg.data['danfossDayOfWeek'];
             }
             if (msg.data.hasOwnProperty('danfossTriggerTime')) {

package/converters/toZigbee.js

@@ -1227,13 +1227,49 @@ const converters = {
                 mode: value.mode,
                 transitions: value.transitions,
             };
+
+
+            // map array of desired modes to bitmask
+            if (typeof payload.dayofweek === 'string') payload.dayofweek = [payload.dayofweek];
+            if (Array.isArray(payload.dayofweek)) {
+                let mode = 0;
+                for (let m of payload.mode) {
+                    // lookup mode bit
+                    m = utils.getKey(constants.thermostatScheduleMode, m.toLowerCase(), m, Number);
+                    mode |= (1 << m);
+                }
+                payload.mode = mode;
+            }
+
+            // map array of days to desired dayofweek bitmask
+            if (typeof payload.dayofweek === 'string') payload.dayofweek = [payload.dayofweek];
+            if (Array.isArray(payload.dayofweek)) {
+                let dayofweek = 0;
+                for (let d of payload.dayofweek) {
+                    // lookup dayofweek bit
+                    d = utils.getKey(constants.thermostatDayOfWeek, d.toLowerCase(), d, Number);
+                    dayofweek |= (1 << d);
+                }
+                payload.dayofweek = dayofweek;
+            }
+
             for (const elem of payload['transitions']) {
-                if (typeof elem['heatSetpoint'] == 'number') {
+                if (typeof elem['heatSetpoint'] === 'number') {
                     elem['heatSetpoint'] = Math.round(elem['heatSetpoint'] * 100);
                 }
-                if (typeof elem['coolSetpoint'] == 'number') {
+                if (typeof elem['coolSetpoint'] === 'number') {
                     elem['coolSetpoint'] = Math.round(elem['coolSetpoint'] * 100);
                 }
+
+                // accept 24h time notation (e.g. 19:30)
+                if (typeof elem['transitionTime'] === 'string') {
+                    const time = elem['transitionTime'].split(':');
+                    if ((time.length != 2) || isNaN(time[0]) || isNaN(time[1])) {
+                        meta.logger.warn(`weekly_schedule: expected 24h time notation (e.g. 19:30) but got '${elem['transitionTime']}'!`);
+                    } else {
+                        elem['transitionTime'] = ((parseInt(time[0]) * 60) + parseInt(time[1]));
+                    }
+                }
             }
             await entity.command('hvacThermostat', 'setWeeklySchedule', payload, utils.getOptions(meta.mapped, entity));
         },
@@ -2904,7 +2940,7 @@ const converters = {
     danfoss_day_of_week: {
         key: ['day_of_week'],
         convertSet: async (entity, key, value, meta) => {
-            const payload = {'danfossDayOfWeek': utils.getKey(constants.dayOfWeek, value, undefined, Number)};
+            const payload = {'danfossDayOfWeek': utils.getKey(constants.thermostatDayOfWeek, value, undefined, Number)};
             await entity.write('hvacThermostat', payload, manufacturerOptions.danfoss);
             return {readAfterWriteTime: 200, state: {'day_of_week': value}};
         },

package/devices/develco.js

@@ -135,22 +135,28 @@ const develco = {
             type: ['attributeReport', 'readResponse'],
             options: [exposes.options.precision('voc'), exposes.options.calibration('voc')],
             convert: (model, msg, publish, options, meta) => {
-                const voc = parseFloat(msg.data['measuredValue']);
+                // from Sensirion_Gas_Sensors_SGP3x_TVOC_Concept.pdf
+                // "The mean molar mass of this mixture is 110 g/mol and hence,
+                // 1 ppb TVOC corresponds to 4.5 μg/m3."
+                const vocPpb = parseFloat(msg.data['measuredValue']);
+                const voc = vocPpb * 4.5;
                 const vocProperty = utils.postfixWithEndpointName('voc', msg, model, meta);
 
+                // from aqszb-110-technical-manual-air-quality-sensor-04-08-20.pdf page 6, section 2.2 voc
+                // this contains a ppb to level mapping table.
                 let airQuality;
                 const airQualityProperty = utils.postfixWithEndpointName('air_quality', msg, model, meta);
-                if (voc <= 65) {
+                if (vocPpb <= 65) {
                     airQuality = 'excellent';
-                } else if (voc <= 220) {
+                } else if (vocPpb <= 220) {
                     airQuality = 'good';
-                } else if (voc <= 660) {
+                } else if (vocPpb <= 660) {
                     airQuality = 'moderate';
-                } else if (voc <= 2200) {
+                } else if (vocPpb <= 2200) {
                     airQuality = 'poor';
-                } else if (voc <= 5500) {
+                } else if (vocPpb <= 5500) {
                     airQuality = 'unhealthy';
-                } else if (voc > 5500) {
+                } else if (vocPpb > 5500) {
                     airQuality = 'out_of_range';
                 } else {
                     airQuality = 'unknown';

package/devices/ikea.js

@@ -181,6 +181,15 @@ const ikea = {
                 return state;
             },
         },
+        ikea_voc_index: {
+            cluster: 'msIkeaVocIndexMeasurement',
+            type: ['attributeReport', 'readResponse'],
+            convert: (model, msg, publish, options, meta) => {
+                if (msg.data.hasOwnProperty('measuredValue')) {
+                    return {voc_index: msg.data['measuredValue']};
+                }
+            },
+        },
         battery: {
             cluster: 'genPowerCfg',
             type: ['attributeReport', 'readResponse'],
@@ -428,10 +437,10 @@ module.exports = [
         extend: tradfriExtend.light_onoff_brightness_colortemp(),
     },
     {
-        zigbeeModel: ['TRADFRI bulb E14 WS globe 470lm'],
+        zigbeeModel: ['TRADFRI bulb E14 WS globe 470lm', 'TRADFRI bulb E12 WS globe 450lm'],
         model: 'LED2101G4',
         vendor: 'IKEA',
-        description: 'TRADFRI bulb E14 WS globe 470lm, dimmable, white spectrum, opal white',
+        description: 'TRADFRI bulb E12/E14 WS globe 450/470 lumen, dimmable, white spectrum, opal white',
         extend: tradfriExtend.light_onoff_brightness_colortemp(),
     },
     {
@@ -1032,13 +1041,13 @@ module.exports = [
         model: 'E2112',
         vendor: 'IKEA',
         description: 'Vindstyrka air quality and humidity sensor',
-        fromZigbee: [fz.temperature, fz.humidity, fz.pm25],
+        fromZigbee: [fz.temperature, fz.humidity, fz.pm25, ikea.fz.ikea_voc_index],
         toZigbee: [],
-        exposes: [e.temperature(), e.humidity(), e.pm25()],
+        exposes: [e.temperature(), e.humidity(), e.pm25(), e.voc_index().withDescription('Sensirion VOC index')],
         configure: async (device, coordinatorEndpoint, logger) => {
             const ep = device.getEndpoint(1);
             await reporting.bind(ep, coordinatorEndpoint,
-                ['msTemperatureMeasurement', 'msRelativeHumidity', 'pm25Measurement']);
+                ['msTemperatureMeasurement', 'msRelativeHumidity', 'pm25Measurement', 'msIkeaVocIndexMeasurement']);
             await ep.configureReporting('msTemperatureMeasurement', [{
                 attribute: 'measuredValue',
                 minimumReportInterval: 60, maximumReportInterval: 120,
@@ -1051,6 +1060,10 @@ module.exports = [
                 attribute: 'measuredValueIkea',
                 minimumReportInterval: 60, maximumReportInterval: 120, reportableChange: 2,
             }]);
+            await ep.configureReporting('msIkeaVocIndexMeasurement', [{
+                attribute: 'measuredValue',
+                minimumReportInterval: 60, maximumReportInterval: 120,
+            }]);
         },
     },
 ];

package/devices/lifecontrol.js

@@ -87,6 +87,6 @@ module.exports = [
         fromZigbee: [fz.lifecontrolVoc, fz.battery],
         toZigbee: [],
         meta: {battery: {dontDividePercentage: true}},
-        exposes: [e.temperature(), e.humidity(), e.voc(), e.eco2(), e.battery()],
+        exposes: [e.temperature(), e.humidity(), e.voc().withUnit('ppb'), e.eco2(), e.battery()],
     },
 ];

package/devices/osram.js

@@ -412,7 +412,7 @@ module.exports = [
         model: '4062172044776_1',
         vendor: 'OSRAM',
         description: 'Zigbee 3.0 DALI CONV LI dimmer for DALI-based luminaires (only one device)',
-        extend: extend.ledvance.light_onoff_brightness(),
+        extend: extend.ledvance.light_onoff_brightness({disablePowerOnBehavior: true}),
         ota: ota.zigbeeOTA,
     },
     {
@@ -425,7 +425,7 @@ module.exports = [
             fz.command_toggle, fz.command_move, fz.command_stop],
         extend: extend.ledvance.light_onoff_brightness({noConfigure: true}),
         exposes: [e.action(['toggle', 'brightness_move_up', 'brightness_move_down', 'brightness_stop']),
-            ...extend.ledvance.light_onoff_brightness({noConfigure: true}).exposes],
+            ...extend.ledvance.light_onoff_brightness({noConfigure: true, disablePowerOnBehavior: true}).exposes],
         ota: ota.zigbeeOTA,
         configure: async (device, coordinatorEndpoint, logger) => {
             await reporting.bind(device.getEndpoint(10), coordinatorEndpoint, ['genLevelCtrl', 'genOnOff']);

package/devices/salus_controls.js

@@ -108,19 +108,19 @@ module.exports = [
         zigbeeModel: [
             'SS909ZB',
             'PS600',
-            'PS600\u0000\u0000 �\u0001 ��\u0000\u0000\t\u0001@\u0011�u\u0000\u0000\u0018&\n\u0005\u0000B',
-            'PS600\u0000\u0000 �\u0001 ��\u0000\u0000\t\u0001@\u0011�u\u0000\u0000\u0018\u0006\n\u0005\u0000',
-            'PS600\u0000\u0000 �\u0001 ��\u0000\u0000\t\u0001@\u0011�u\u0000\u0000\u0018\u0006\n\u0005\u0000B',
         ],
         model: 'PS600',
         vendor: 'Salus Controls',
         description: 'Pipe temperature sensor',
-        fromZigbee: [fz.temperature],
+        fromZigbee: [fz.temperature, fz.battery],
         toZigbee: [],
-        exposes: [e.temperature()],
+        meta: {battery: {voltageToPercentage: '3V_2500'}},
+        exposes: [e.battery(), e.temperature()],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(9);
-            await reporting.bind(endpoint, coordinatorEndpoint, ['msTemperatureMeasurement']);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['msTemperatureMeasurement', 'genPowerCfg']);
+            await reporting.temperature(endpoint);
+            await reporting.batteryVoltage(endpoint);
         },
         ota: ota.salus,
     },

package/devices/stelpro.js

@@ -64,7 +64,7 @@ module.exports = [
             tz.stelpro_thermostat_outdoor_temperature],
         exposes: [e.local_temperature(), e.keypad_lockout(),
             exposes.climate().withSetpoint('occupied_heating_setpoint', 5, 30, 0.5).withLocalTemperature()
-                .withSystemMode(['off', 'auto', 'heat']).withRunningState(['idle', 'heat'])],
+                .withSystemMode(['off', 'auto', 'heat']).withRunningState(['idle', 'heat']).withPiHeatingDemand()],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(25);
             const binds = ['genBasic', 'genIdentify', 'genGroups', 'hvacThermostat', 'hvacUserInterfaceCfg', 'msTemperatureMeasurement'];

package/devices/tuya.js

@@ -2552,7 +2552,7 @@ module.exports = [
                         },
                     },
                 ],
-                [1, 'system_mode', tuya.valueConverterBasic.lookup({'auto': tuya.enum(1), 'off': tuya.enum(2), 'on': tuya.enum(3)})],
+                [1, 'system_mode', tuya.valueConverterBasic.lookup({'auto': tuya.enum(1), 'off': tuya.enum(2), 'heat': tuya.enum(3)})],
                 [1, 'preset', tuya.valueConverterBasic.lookup(
                     {'auto': tuya.enum(0), 'manual': tuya.enum(1), 'off': tuya.enum(2), 'on': tuya.enum(3)})],
                 [2, 'current_heating_setpoint', tuya.valueConverter.divideBy10],
@@ -2604,11 +2604,12 @@ module.exports = [
             });
             try {
                 await reporting.currentSummDelivered(endpoint);
-            } catch (error) {/* fails for some https://github.com/Koenkk/zigbee2mqtt/issues/11179 */}
+                await reporting.rmsVoltage(endpoint, {change: 5});
+                await reporting.rmsCurrent(endpoint, {change: 50});
+                await reporting.activePower(endpoint, {change: 10});
+            } catch (error) {/* fails for some https://github.com/Koenkk/zigbee2mqtt/issues/11179
+                                and https://github.com/Koenkk/zigbee2mqtt/issues/16864 */}
             await endpoint.read('genOnOff', ['onOff', 'moesStartUpOnOff', 'tuyaBacklightMode']);
-            await reporting.rmsVoltage(endpoint, {change: 5});
-            await reporting.rmsCurrent(endpoint, {change: 50});
-            await reporting.activePower(endpoint, {change: 10});
         },
         options: [exposes.options.measurement_poll_interval()],
         // This device doesn't support reporting correctly.
@@ -3571,7 +3572,7 @@ module.exports = [
             tuyaDatapoints: [
                 [1, 'presence', tuya.valueConverter.trueFalse1],
                 [2, 'radar_sensitivity', tuya.valueConverter.raw],
-                [102, 'occupancy', tuya.valueConverter.trueFalse2],
+                [102, 'occupancy', tuya.valueConverter.trueFalse1],
                 [103, 'illuminance_lux', tuya.valueConverter.raw],
                 [105, 'tumble_switch', tuya.valueConverter.plus1],
                 [106, 'tumble_alarm_time', tuya.valueConverter.raw],

package/devices/xiaomi.js

@@ -2769,7 +2769,7 @@ module.exports = [
         fromZigbee: [fz.xiaomi_tvoc, fz.battery, fz.temperature, fz.humidity, fz.aqara_opple],
         toZigbee: [tzLocal.VOCKQJK11LM_display_unit],
         meta: {battery: {voltageToPercentage: '3V_2850_3000'}},
-        exposes: [e.temperature(), e.humidity(), e.voc(), e.device_temperature(), e.battery(), e.battery_voltage(),
+        exposes: [e.temperature(), e.humidity(), e.voc().withUnit('ppb'), e.device_temperature(), e.battery(), e.battery_voltage(),
             exposes.enum('display_unit', ea.ALL, ['mgm3_celsius', 'ppb_celsius', 'mgm3_fahrenheit', 'ppb_fahrenheit'])
                 .withDescription('Units to show on the display')],
         configure: async (device, coordinatorEndpoint, logger) => {
@@ -2908,6 +2908,7 @@ module.exports = [
         toZigbee: [],
         meta: {battery: {voltageToPercentage: '3V_2850_3000'}},
         exposes: [e.contact(), e.battery(), e.battery_voltage()],
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['lumi.plug.sacn02'],

package/lib/constants.js

@@ -45,7 +45,7 @@ const thermostatRunningMode= {
     4: 'heat',
 };
 
-const dayOfWeek = {
+const thermostatDayOfWeek = {
     0: 'sunday',
     1: 'monday',
     2: 'tuesday',
@@ -83,6 +83,11 @@ const thermostatAcLouverPositions = {
     5: 'three_quarters_open',
 };
 
+const thermostatScheduleMode = {
+    0: 'heat',
+    1: 'cool',
+};
+
 const fanMode = {
     'off': 0,
     'low': 1,
@@ -284,7 +289,8 @@ module.exports = {
     thermostatRunningStates,
     thermostatRunningMode,
     thermostatAcLouverPositions,
-    dayOfWeek,
+    thermostatScheduleMode,
+    thermostatDayOfWeek,
     fanMode,
     temperatureDisplayMode,
     danfossAdaptionRunControl,

package/lib/exposes.js

@@ -642,7 +642,8 @@ module.exports = {
         valve_state: () => new Binary('valve_state', access.STATE, 'OPEN', 'CLOSED').withDescription('Valve state if open or closed'),
         valve_detection: () => new Switch().withState('valve_detection', true).setAccess('state', access.STATE_SET),
         vibration: () => new Binary('vibration', access.STATE, true, false).withDescription('Indicates whether the device detected vibration'),
-        voc: () => new Numeric('voc', access.STATE).withUnit('ppb').withDescription('Measured VOC value'),
+        voc: () => new Numeric('voc', access.STATE).withUnit('µg/m³').withDescription('Measured VOC value'),
+        voc_index: () => new Numeric('voc_index', access.STATE).withDescription('VOC index'),
         voltage: () => new Numeric('voltage', access.STATE).withUnit('V').withDescription('Measured electrical potential value'),
         voltage_phase_b: () => new Numeric('voltage_phase_b', access.STATE).withUnit('V').withDescription('Measured electrical potential value on phase B'),
         voltage_phase_c: () => new Numeric('voltage_phase_c', access.STATE).withUnit('V').withDescription('Measured electrical potential value on phase C'),

package/lib/tuya.js

@@ -1232,7 +1232,6 @@ const valueConverterBasic = {
 const valueConverter = {
     trueFalse0: valueConverterBasic.trueFalse(0),
     trueFalse1: valueConverterBasic.trueFalse(1),
-    trueFalse2: valueConverterBasic.trueFalse(2),
     trueFalseEnum0: valueConverterBasic.trueFalse(new Enum(0)),
     onOff: valueConverterBasic.lookup({'ON': true, 'OFF': false}),
     powerOnBehavior: valueConverterBasic.lookup({'off': 0, 'on': 1, 'previous': 2}),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "15.0.60",
+  "version": "15.0.61",
   "description": "Collection of device converters to be used with zigbee-herdsman",
   "main": "index.js",
   "files": [