zigbee-herdsman-converters 15.0.10 → 15.0.12

package/converters/toZigbee.js

@@ -369,8 +369,16 @@ const converters = {
     warning_simple: {
         key: ['alarm'],
         convertSet: async (entity, key, value, meta) => {
-            const alarmState = (value === 'OFF' ? 0 : 1);
-            const info = (3 << 6) + ((alarmState) << 2);
+            const alarmState = (value === 'alarm' || value === 'OFF' ? 0 : 1);
+
+            let info;
+            // For Develco SMSZB-120, introduced change in fw 4.0.5, tested backward with 4.0.4
+            if (['SMSZB-120'].includes(meta.mapped.model)) {
+                info = ((alarmState) << 7) + ((alarmState) << 6);
+            } else {
+                info = (3 << 6) + ((alarmState) << 2);
+            }
+
             await entity.command(
                 'ssIasWd',
                 'startWarning',

package/devices/fantem.js

@@ -49,7 +49,6 @@ module.exports = [
     {
         fingerprint: [{modelID: 'TS0202', manufacturerName: '_TZ3210_rxqls8v0'},
             {modelID: 'TS0202', manufacturerName: '_TZ3210_zmy9hjay'},
-            {modelID: 'TS0202', manufacturerName: '_TZ3000_6ygjfyll'},
             {modelID: 'TS0202', manufacturerName: '_TZ3210_wuhzzfqg'}],
         model: 'ZB003-X',
         vendor: 'Fantem',

package/devices/innr.js

@@ -8,6 +8,21 @@ const ea = exposes.access;
 const ota = require('../lib/ota');
 
 module.exports = [
+    {
+        zigbeeModel: ['RC 210'],
+        model: 'RC 210',
+        vendor: 'Innr',
+        description: 'Remote control',
+        fromZigbee: [fz.command_on, fz.command_off, fz.command_move, fz.command_stop, fz.command_move_to_level,
+            fz.command_move_to_color_temp],
+        toZigbee: [],
+        exposes: [e.action(['on', 'off', 'brightness_move_up', 'brightness_move_down', 'brightness_stop', 'brightness_move_to_level',
+            'color_temperature_move'])],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const ep = device.getEndpoint(1);
+            await reporting.bind(ep, coordinatorEndpoint, ['genBasic', 'genOnOff', 'genLevelCtrl', 'lightingColorCtrl']);
+        },
+    },
     {
         zigbeeModel: ['RC 250'],
         model: 'RC 250',

package/devices/namron.js

@@ -305,6 +305,7 @@ module.exports = [
         description: 'Zigbee 4 channel remote control',
         fromZigbee: [fz.command_on, fz.command_off, fz.battery, fz.command_move, fz.command_stop, fz.command_recall],
         toZigbee: [],
+        ota: ota.zigbeeOTA,
         exposes: [e.battery(), e.action([
             'on_l1', 'off_l1', 'brightness_move_up_l1', 'brightness_move_down_l1', 'brightness_stop_l1',
             'on_l2', 'off_l2', 'brightness_move_up_l2', 'brightness_move_down_l2', 'brightness_stop_l2',
@@ -725,4 +726,12 @@ module.exports = [
             await reporting.bind(endpoint, coordinatorEndpoint, binds);
         },
     },
+    {
+        zigbeeModel: ['3802968'],
+        model: '3802968',
+        vendor: 'Namron',
+        description: 'LED Filament Flex 5W CCT E27 Clear',
+        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 555]}),
+        meta: {turnsOffAtBrightness1: true},
+    },
 ];

package/devices/philips.js

@@ -75,7 +75,7 @@ const hueExtend = {
         return result;
     },
     light_onoff_brightness_colortemp_color_gradient: (options={}) => {
-        options = {supportsHS: true, disableEffect: true, noConfigure: true, ...options};
+        options = {supportsHS: true, disableEffect: true, noConfigure: true, extraEffects: [], ...options};
         const result = extendDontUse.light_onoff_brightness_colortemp_color({supportsHS: true, ...options});
         result['ota'] = ota.zigbeeOTA;
         result['meta'] = {turnsOffAtBrightness1: true};
@@ -100,8 +100,9 @@ const hueExtend = {
                 .withDescription('List of RGB HEX colors'),
             exposes.enum('effect', ea.SET, [
                 'blink', 'breathe', 'okay', 'channel_change',
-                'candle', 'fireplace', 'colorloop',
+                'candle', 'fireplace', 'colorloop', 'sunrise',
                 'finish_effect', 'stop_effect', 'stop_hue_effect',
+                ...options.extraEffects,
             ]),
         ]);
         return result;
@@ -190,6 +191,8 @@ const hueEffects = {
     'candle': '21000101',
     'fireplace': '21000102',
     'colorloop': '21000103',
+    'sunrise': '21000109',
+    'sparkle': '2100010a',
     'stop_hue_effect': '200000',
 };
 
@@ -1220,21 +1223,21 @@ module.exports = [
         model: '9290022166',
         vendor: 'Philips',
         description: 'Hue white and color ambiance E26/E27',
-        extend: hueExtend.light_onoff_brightness_colortemp_color(),
+        extend: hueExtend.light_onoff_brightness_colortemp_color({disableHueEffects: false, colorTempRange: [153, 500]}),
     },
     {
         zigbeeModel: ['LCA004'],
         model: '9290024896',
         vendor: 'Philips',
         description: 'Hue white and color ambiance E27',
-        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        extend: hueExtend.light_onoff_brightness_colortemp_color({disableHueEffects: false, colorTempRange: [153, 500]}),
     },
     {
         zigbeeModel: ['LCA006'],
         model: '9290024689',
         vendor: 'Philips',
         description: 'Hue white and color ambiance B22 1100lm',
-        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        extend: hueExtend.light_onoff_brightness_colortemp_color({disableHueEffects: false, colorTempRange: [153, 500]}),
     },
     {
         zigbeeModel: ['LCA008'],
@@ -1250,7 +1253,7 @@ module.exports = [
         model: '9290024717',
         vendor: 'Philips',
         description: 'Hue white and color ambiance E26/A19 1600lm',
-        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        extend: hueExtend.light_onoff_brightness_colortemp_color({disableHueEffects: false, colorTempRange: [153, 500]}),
     },
     {
         zigbeeModel: ['LCT001', 'LCT007', 'LCT010', 'LCT012', 'LCT014', 'LCT015', 'LCT016', 'LCT021'],
@@ -1924,6 +1927,13 @@ module.exports = [
         description: 'Hue Gradient Signe floor lamp (black)',
         extend: hueExtend.light_onoff_brightness_colortemp_color_gradient({colorTempRange: [153, 500]}),
     },
+    {
+        zigbeeModel: ['915005987501'],
+        model: '915005987501',
+        vendor: 'Philips',
+        description: 'Hue Gradient Signe floor lamp (white)',
+        extend: hueExtend.light_onoff_brightness_colortemp_color_gradient({colorTempRange: [153, 500]}),
+    },
     {
         zigbeeModel: ['LCT020'],
         model: '4080148P7',
@@ -2809,7 +2819,7 @@ module.exports = [
         model: '9290024687',
         vendor: 'Philips',
         description: 'Hue White and Color Ambiance A19 1100 lumen',
-        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        extend: hueExtend.light_onoff_brightness_colortemp_color({disableHueEffects: false, colorTempRange: [153, 500]}),
     },
     {
         zigbeeModel: ['RDM002'],
@@ -2848,7 +2858,7 @@ module.exports = [
         model: '9290022266A',
         vendor: 'Philips',
         description: 'Hue White and color ambiance A19 800 lumen',
-        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        extend: hueExtend.light_onoff_brightness_colortemp_color({disableHueEffects: false, colorTempRange: [153, 500]}),
     },
     {
         zigbeeModel: ['LWE003'],
@@ -3205,7 +3215,7 @@ module.exports = [
         model: '929003535301',
         vendor: 'Philips',
         description: 'Hue Festavia gradient light string 250',
-        extend: hueExtend.light_onoff_brightness_colortemp_color_gradient({colorTempRange: [153, 500]}),
+        extend: hueExtend.light_onoff_brightness_colortemp_color_gradient({colorTempRange: [153, 500], extraEffects: ['sparkle']}),
     },
     {
         zigbeeModel: ['915005987101'],

package/devices/sinope.js

@@ -584,7 +584,7 @@ module.exports = [
                 'genBasic', 'genIdentify', 'genGroups', 'hvacThermostat', 'hvacUserInterfaceCfg',
                 'msTemperatureMeasurement', 'haElectricalMeasurement', 'seMetering',
                 'manuSpecificSinope'];
-            await reporting.bind(endpoint, coordinatorEndpoint, binds);
+            await reporting.bind(endpoint, coordinatorEndpoint, binds); // This G2 version has limited memory space
             const thermostatDate = new Date();
             const thermostatTimeSec = thermostatDate.getTime() / 1000;
             const thermostatTimezoneOffsetSec = thermostatDate.getTimezoneOffset() * 60;
@@ -607,6 +607,9 @@ module.exports = [
             await reporting.activePower(endpoint, {min: 10, max: 305, change: 1}); // divider 1: 1W
             await reporting.rmsCurrent(endpoint, {min: 10, max: 306, change: 100}); // divider 1000: 0.1Arms
             await reporting.rmsVoltage(endpoint, {min: 10, max: 307, change: 5}); // divider 10: 0.5Vrms
+
+            // Disable default reporting (not used by Sinope)
+            await reporting.thermostatRunningState(endpoint, {min: 1, max: 0xFFFF});
             try {
                 await reporting.thermostatUnoccupiedHeatingSetpoint(endpoint);
             } catch (error) {/* Do nothing */}

package/devices/tuya.js

@@ -1144,7 +1144,7 @@ module.exports = [
         configure: tuya.configureMagicPacket,
     },
     {
-        fingerprint: tuya.fingerprint('TS0202', ['_TZ3000_mcxw5ehu', '_TZ3040_6ygjfyll']),
+        fingerprint: tuya.fingerprint('TS0202', ['_TZ3000_mcxw5ehu', '_TZ3000_6ygjfyll', '_TZ3040_6ygjfyll']),
         model: 'IH012-RT01',
         vendor: 'TuYa',
         description: 'Motion sensor',
@@ -1668,7 +1668,6 @@ module.exports = [
             {modelID: 'TS0201', manufacturerName: '_TZ3000_6uzkisv2'},
             {modelID: 'TS0201', manufacturerName: '_TZ3000_xr3htd96'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_9yapgbuv'},
-            {modelID: 'TS0601', manufacturerName: '_TZE200_yjjdcqsq'},
         ],
         model: 'WSD500A',
         vendor: 'TuYa',
@@ -1697,6 +1696,24 @@ module.exports = [
         toZigbee: [],
         exposes: [e.battery(), e.temperature(), e.humidity(), e.battery_voltage()],
     },
+    {
+        fingerprint: tuya.fingerprint('TS0601', ['_TZE200_yjjdcqsq']),
+        model: 'ZTH01',
+        vendor: 'TuYa',
+        description: 'Temperature and humidity sensor',
+        fromZigbee: [tuya.fz.datapoints, tuya.fz.gateway_connection_status],
+        toZigbee: [tuya.tz.datapoints],
+        configure: tuya.configureMagicPacket,
+        exposes: [e.temperature(), e.humidity(), tuya.exposes.batteryState(), e.battery_low()],
+        meta: {
+            tuyaDatapoints: [
+                [1, 'temperature', tuya.valueConverter.divideBy10],
+                [2, 'humidity', tuya.valueConverter.raw],
+                [3, 'battery_state', tuya.valueConverter.batteryState],
+                // [9, 'temperature_unit', tuya.valueConverter.raw], This DP is not properly supported by the device
+            ],
+        },
+    },
     {
         fingerprint: [{modelID: 'TS011F', manufacturerName: '_TZ3000_3zofvcaa'}],
         model: 'TS011F_2_gang_2_usb_wall',

package/lib/philips.js

@@ -30,6 +30,17 @@ const decodeScaledGradientToRGB = (p) => {
 const COLOR_MODE_GRADIENT = '4b01';
 const COLOR_MODE_COLOR_XY = '0b00';
 const COLOR_MODE_COLOR_TEMP = '0f00';
+const COLOR_MODE_EFFECT = 'ab00';
+const COLOR_MODE_BRIGHTNESS = '0300';
+
+const knownEffects = {
+    '0180': 'candle',
+    '0280': 'fireplace',
+    '0380': 'colorloop',
+    '0980': 'sunrise',
+    '0a80': 'sparkle',
+};
+
 
 // decoder for manuSpecificPhilips2.state
 function decodeGradientColors(input, opts) {
@@ -60,6 +71,20 @@ function decodeGradientColors(input, opts) {
     //     01 - on/off (2)
     //       04 - brightness (2)
     //         60b09c4e - color (8) (xLow, xHigh, yLow, yHigh)
+    //
+    // Effect mode (ab00)
+    // Example: ab000153df7e446a0180
+    // ab00 - mode (4)
+    //     01 - on/off (2)
+    //       53 - brightness (2)
+    //         df7e446a - XY Color (8)
+    //                 0180 - effect (4)
+    //
+    // On/off/brightness mode (0003) – For devices that only support on/off and brightness
+    // Example: 030001b2
+    // 0300 - mode (4)
+    //     01 - on/off (2)
+    //       b2 - brightness (2)
 
     // Device color mode
     const mode = input.slice(0, 4);
@@ -112,7 +137,7 @@ function decodeGradientColors(input, opts) {
             brightness,
             on,
         };
-    } else if (mode === COLOR_MODE_COLOR_XY) {
+    } else if (mode === COLOR_MODE_COLOR_XY || mode === COLOR_MODE_EFFECT) {
         // XY Color mode
         const xLow = parseInt(input.slice(0, 2), 16);
         input = input.slice(2);
@@ -123,15 +148,26 @@ function decodeGradientColors(input, opts) {
         const yLow = parseInt(input.slice(0, 2), 16) << 8;
         input = input.slice(2);
 
-        const x = xHigh | xLow;
-        const y = yHigh | yLow;
 
+        const x = Math.round((xHigh | xLow) / 65535 * 10000) / 10000;
+        const y = Math.round((yHigh | yLow) / 65535 * 10000) / 10000;
+
+        if (mode === COLOR_MODE_COLOR_XY) {
+            return {
+                color_mode: 'xy',
+                x, y,
+                brightness, on,
+            };
+        }
+
+        // Effect mode
+        const effect = input.slice(0, 4);
+        const name = knownEffects[effect] || `unknown_${effect}`;
         return {
             color_mode: 'xy',
-            x: Math.round(x / 65535 * 10000) / 10000,
-            y: Math.round(y / 65535 * 10000) / 10000,
-            brightness,
-            on,
+            x, y,
+            brightness, on,
+            name,
         };
     } else if (mode === COLOR_MODE_COLOR_TEMP) {
         // Color temperature mode
@@ -148,6 +184,11 @@ function decodeGradientColors(input, opts) {
             brightness,
             on,
         };
+    } else if (mode === COLOR_MODE_BRIGHTNESS) {
+        return {
+            brightness,
+            on,
+        };
     }
 
     // Unknown mode

package/package.json

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