zigbee-herdsman-converters 15.0.73 → 15.0.75

package/devices/bosch.js

@@ -227,6 +227,21 @@ const fzLocal = {
             return result;
         },
     },
+    bosch_ignore_dst: {
+        cluster: 'genTime',
+        type: 'read',
+        convert: async (model, msg, publish, options, meta) => {
+            if (msg.data.includes('dstStart', 'dstEnd', 'dstShift')) {
+                const response = {
+                    'dstStart': {attribute: 0x0003, status: herdsman.Zcl.Status.SUCCESS, value: 0x00},
+                    'dstEnd': {attribute: 0x0004, status: herdsman.Zcl.Status.SUCCESS, value: 0x00},
+                    'dstShift': {attribute: 0x0005, status: herdsman.Zcl.Status.SUCCESS, value: 0x00},
+                };
+
+                await msg.endpoint.readResponse(msg.cluster, msg.meta.zclTransactionSequenceNumber, response);
+            }
+        },
+    },
     bosch_thermostat: {
         cluster: 'hvacThermostat',
         type: ['attributeReport', 'readResponse'],
@@ -421,7 +436,13 @@ const definition = [
         vendor: 'Bosch',
         description: 'Radiator thermostat II',
         ota: ota.zigbeeOTA,
-        fromZigbee: [fz.thermostat, fz.battery, fzLocal.bosch_thermostat, fzLocal.bosch_userInterface],
+        fromZigbee: [
+            fz.thermostat,
+            fz.battery,
+            fzLocal.bosch_ignore_dst,
+            fzLocal.bosch_thermostat,
+            fzLocal.bosch_userInterface,
+        ],
         toZigbee: [
             tz.thermostat_occupied_heating_setpoint,
             tz.thermostat_local_temperature_calibration,
@@ -482,7 +503,7 @@ const definition = [
                 maximumReportInterval: constants.repInterval.HOUR,
                 reportableChange: 1,
             }], boschManufacturer);
-            // report boost as it's disabled by thermostat after some time
+            // report boost as it's disabled by thermostat after 5 minutes
             await endpoint.configureReporting('hvacThermostat', [{
                 attribute: {ID: 0x4043, type: herdsman.Zcl.DataType.enum8},
                 minimumReportInterval: 0,

package/devices/heiman.js

@@ -787,4 +787,19 @@ module.exports = [
         },
         exposes: [e.co2(), e.battery(), e.humidity(), e.temperature()],
     },
+    {
+        zigbeeModel: ['RouteLight-EF-3.0'],
+        model: 'HS2RNL',
+        vendor: 'HEIMAN',
+        description: 'Smart repeater & night light',
+        fromZigbee: [fz.on_off, fz.battery],
+        toZigbee: [tz.on_off],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg', 'genOnOff', 'genLevelCtrl']);
+            await reporting.onOff(endpoint); // switch the night light on/off
+            await reporting.batteryPercentageRemaining(endpoint); // internal backup battery in case of power outage
+        },
+        exposes: [e.switch(), e.battery()],
+    },
 ];

package/devices/ikea.js

@@ -245,6 +245,71 @@ const ikea = {
                 }
             },
         },
+        ikea_dots_click_v1: {
+            // For remotes with firmware 1.0.012 (20211214)
+            cluster: 64639,
+            type: 'raw',
+            convert: (model, msg, publish, options, meta) => {
+                if (!Buffer.isBuffer(msg.data)) return;
+                let action;
+                const button = msg.data[5];
+                switch (msg.data[6]) {
+                case 1: action = 'initial_press'; break;
+                case 2: action = 'double_press'; break;
+                case 3: action = 'long_press'; break;
+                }
+
+                return {action: `dots_${button}_${action}`};
+            },
+        },
+        ikea_dots_click_v2: {
+            // For remotes with firmware 1.0.32 (20221219)
+            cluster: 'heimanSpecificScenes',
+            type: 'raw',
+            convert: (model, msg, publish, options, meta) => {
+                if (!Buffer.isBuffer(msg.data)) return;
+                let button;
+                let action;
+                switch (msg.endpoint.ID) {
+                case 2: button = '1'; break; // 1 dot
+                case 3: button = '2'; break; // 2 dot
+                }
+                switch (msg.data[4]) {
+                case 1: action = 'initial_press'; break;
+                case 2: action = 'long_press'; break;
+                case 3: action = 'short_release'; break;
+                case 4: action = 'long_release'; break;
+                case 6: action = 'double_press'; break;
+                }
+
+                return {action: `dots_${button}_${action}`};
+            },
+        },
+        ikea_volume_click: {
+            cluster: 'genLevelCtrl',
+            type: 'commandMoveWithOnOff',
+            convert: (model, msg, publish, options, meta) => {
+                const direction = msg.data.movemode === 1 ? 'down' : 'up';
+                return {action: `volume_${direction}`};
+            },
+        },
+        ikea_volume_hold: {
+            cluster: 'genLevelCtrl',
+            type: 'commandMove',
+            convert: (model, msg, publish, options, meta) => {
+                const direction = msg.data.movemode === 1 ? 'down_hold' : 'up_hold';
+                return {action: `volume_${direction}`};
+            },
+        },
+        ikea_track_click: {
+            cluster: 'genLevelCtrl',
+            type: 'commandStep',
+            convert: (model, msg, publish, options, meta) => {
+                if (utils.hasAlreadyProcessedMessage(msg, model)) return;
+                const direction = msg.data.stepmode === 1 ? 'previous' : 'next';
+                return {action: `track_${direction}`};
+            },
+        },
     },
     tz: {
         air_purifier_fan_mode: {
@@ -1073,4 +1138,31 @@ module.exports = [
             }]);
         },
     },
+    {
+        zigbeeModel: ['SYMFONISK sound remote gen2'],
+        model: 'E2123',
+        vendor: 'IKEA',
+        description: 'SYMFONISK sound remote gen2',
+        fromZigbee: [ikea.fz.battery, fz.legacy.E1744_play_pause, ikea.fz.ikea_track_click, ikea.fz.ikea_volume_click,
+            ikea.fz.ikea_volume_hold, ikea.fz.ikea_dots_click_v1, ikea.fz.ikea_dots_click_v2],
+        exposes: [e.battery().withAccess(ea.STATE_GET), e.action(['toggle', 'track_previous', 'track_next', 'volume_up',
+            'volume_down', 'volume_up_hold', 'volume_down_hold', 'dots_1_initial_press', 'dots_2_initial_press',
+            'dots_1_long_press', 'dots_2_long_press', 'dots_1_short_release', 'dots_2_short_release', 'dots_1_long_release',
+            'dots_2_long_release', 'dots_1_double_press', 'dots_2_double_press'])],
+        toZigbee: [tz.battery_percentage_remaining],
+        ota: ota.zigbeeOTA,
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint1 = device.getEndpoint(1);
+            const endpoint2 = device.getEndpoint(2);
+            const endpoint3 = device.getEndpoint(3);
+            await reporting.bind(endpoint1, coordinatorEndpoint, ['genOnOff', 'genLevelCtrl', 'genPollCtrl']);
+            if (endpoint2) {
+                await reporting.bind(endpoint2, coordinatorEndpoint, ['heimanSpecificScenes']);
+            }
+            if (endpoint3) {
+                await reporting.bind(endpoint3, coordinatorEndpoint, ['heimanSpecificScenes']);
+            }
+            await reporting.batteryVoltage(endpoint1);
+        },
+    },
 ];

package/devices/innr.js

@@ -44,6 +44,7 @@ module.exports = [
         description: 'Smart round ceiling lamp comfort',
         extend: extend.light_onoff_brightness_colortemp({colorTempRange: [200, 454]}),
         meta: {turnsOffAtBrightness1: true},
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['FL 140 C'],
@@ -76,6 +77,7 @@ module.exports = [
         description: 'B22 filament bulb dimmable',
         extend: extend.light_onoff_brightness(),
         meta: {turnsOffAtBrightness1: true},
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['OGL 130 C'],
@@ -125,6 +127,7 @@ module.exports = [
         description: 'E14 bulb RGBW',
         extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 555], supportsHS: true}),
         meta: {enhancedHue: false, applyRedFix: true, turnsOffAtBrightness1: true},
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['RB 265'],
@@ -141,6 +144,7 @@ module.exports = [
         description: 'B22 (Bayonet) bulb, dimmable',
         extend: extend.light_onoff_brightness(),
         meta: {turnsOffAtBrightness1: true},
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['RB 266'],
@@ -149,6 +153,7 @@ module.exports = [
         description: 'E27 bulb',
         extend: extend.light_onoff_brightness(),
         meta: {turnsOffAtBrightness1: true},
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['RF 265'],
@@ -157,6 +162,7 @@ module.exports = [
         description: 'E27 bulb filament clear',
         extend: extend.light_onoff_brightness(),
         meta: {turnsOffAtBrightness1: true},
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['BF 265'],
@@ -165,6 +171,7 @@ module.exports = [
         description: 'B22 bulb filament clear',
         extend: extend.light_onoff_brightness(),
         meta: {turnsOffAtBrightness1: true},
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['RB 278 T'],
@@ -181,6 +188,7 @@ module.exports = [
         description: 'Smart bulb tunable white E27',
         extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 555]}),
         meta: {applyRedFix: true, turnsOffAtBrightness1: true},
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['RB 285 C'],
@@ -197,6 +205,7 @@ module.exports = [
         description: 'E27 bulb RGBW',
         extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 555], supportsHS: true}),
         meta: {applyRedFix: true, turnsOffAtBrightness1: true},
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['BY 285 C'],
@@ -213,6 +222,7 @@ module.exports = [
         description: 'B22 bulb RGBW',
         extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 555], supportsHS: true}),
         meta: {applyRedFix: true, turnsOffAtBrightness1: true},
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['RB 165'],
@@ -293,6 +303,7 @@ module.exports = [
         description: 'GU10 Spot',
         extend: extend.light_onoff_brightness(),
         meta: {turnsOffAtBrightness1: true},
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['RS 227 T'],
@@ -301,6 +312,7 @@ module.exports = [
         description: 'GU10 spot 420 lm, dimmable, white spectrum',
         extend: extend.light_onoff_brightness_colortemp({colorTempRange: [200, 454]}),
         meta: {turnsOffAtBrightness1: true},
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['RS 128 T'],
@@ -325,6 +337,7 @@ module.exports = [
         description: 'GU10 spot 350 lm, dimmable, white spectrum',
         extend: extend.light_onoff_brightness_colortemp({colorTempRange: [200, 454]}),
         meta: {applyRedFix: true, turnsOffAtBrightness1: true},
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['RS 230 C'],
@@ -334,6 +347,7 @@ module.exports = [
         extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 555], supportsHS: true}),
         exposes: [e.light_brightness_colortemp_color()],
         meta: {enhancedHue: false, applyRedFix: true, turnsOffAtBrightness1: true},
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['RB 145'],
@@ -350,6 +364,7 @@ module.exports = [
         description: 'E14 candle',
         extend: extend.light_onoff_brightness(),
         meta: {turnsOffAtBrightness1: true},
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['RB 248 T'],
@@ -358,6 +373,7 @@ module.exports = [
         description: 'E14 candle with white spectrum',
         extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 555]}),
         meta: {applyRedFix: true, turnsOffAtBrightness1: true},
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['RB 249 T'],
@@ -366,6 +382,7 @@ module.exports = [
         description: 'E14 candle, dimmable with, color temp',
         extend: extend.light_onoff_brightness_colortemp({colorTempRange: [200, 454]}),
         meta: {turnsOffAtBrightness1: true},
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['RB 148 T'],
@@ -382,6 +399,7 @@ module.exports = [
         description: 'E27 filament bulb dimmable',
         extend: extend.light_onoff_brightness(),
         meta: {turnsOffAtBrightness1: true},
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['RF 263'],
@@ -390,6 +408,7 @@ module.exports = [
         description: 'E27 filament bulb dimmable',
         extend: extend.light_onoff_brightness(),
         meta: {turnsOffAtBrightness1: true},
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['RF 264'],
@@ -398,6 +417,7 @@ module.exports = [
         description: 'E27 filament bulb dimmable',
         extend: extend.light_onoff_brightness(),
         meta: {turnsOffAtBrightness1: true},
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['BY 165', 'BY 265'],
@@ -518,6 +538,7 @@ module.exports = [
         description: 'E26 bulb RGBW',
         extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 555], supportsHS: true}),
         meta: {applyRedFix: true, turnsOffAtBrightness1: true},
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['SP 120'],
@@ -574,6 +595,7 @@ module.exports = [
         vendor: 'Innr',
         description: 'Smart plug',
         extend: extend.switch(),
+        ota: ota.zigbeeOTA,
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);

package/devices/tuya.js

@@ -353,7 +353,7 @@ const fzLocal = {
                 result['max_brightness'] = utils.mapNumberRange(msg.data['64516'], 0, 1000, 1, 255);
             }
             if (msg.data.hasOwnProperty('61440')) {
-                result['brightness'] = utils.mapNumberRange(msg.data['61440'], 0, 1000, 0, 254);
+                result['brightness'] = utils.mapNumberRange(msg.data['61440'], 0, 1000, 0, 255);
             }
             return result;
         },
@@ -1092,6 +1092,7 @@ module.exports = [
             {modelID: 'TS0202', manufacturerName: '_TZ3000_mmtwjmaq'},
             {modelID: 'TS0202', manufacturerName: '_TYZB01_zwvaj5wy'},
             {modelID: 'TS0202', manufacturerName: '_TZ3000_bsvqrxru'},
+            {modelID: 'TS0202', manufacturerName: '_TZ3000_wrgn6xrz'},
             {modelID: 'TS0202', manufacturerName: '_TYZB01_tv3wxhcz'},
             {modelID: 'TS0202', manufacturerName: '_TYZB01_rwb0hxtf'},
             {modelID: 'TS0202', manufacturerName: '_TYZB01_hqbdru35'},
@@ -1986,7 +1987,7 @@ module.exports = [
         },
     },
     {
-        fingerprint: [{modelID: 'TS0001', manufacturerName: '_TZ3000_tqlv4ug4'}, {modelID: 'TS0001', manufacturerName: '_TZ3000_gjrubzje'}],
+        fingerprint: tuya.fingerprint('TS0001', ['_TZ3000_tqlv4ug4', '_TZ3000_gjrubzje', '_TZ3000_tygpxwqa']),
         model: 'TS0001_switch_module',
         vendor: 'TuYa',
         description: '1 gang switch module',

package/lib/tuya.js

@@ -1621,7 +1621,7 @@ const tuyaTz = {
     datapoints: {
         key: [
             'temperature_unit', 'temperature_calibration', 'humidity_calibration', 'alarm_switch',
-            'state', 'brightness', 'min_brightness', 'max_brightness', 'power_on_behavior',
+            'state', 'brightness', 'min_brightness', 'max_brightness', 'power_on_behavior', 'position',
             'countdown', 'light_type', 'silence', 'self_test', 'child_lock', 'open_window', 'open_window_temperature', 'frost_protection',
             'system_mode', 'heating_stop', 'current_heating_setpoint', 'local_temperature_calibration', 'preset', 'boost_timeset_countdown',
             'holiday_start_stop', 'holiday_temperature', 'comfort_temperature', 'eco_temperature', 'working_day',

package/package.json

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