zigbee-herdsman-converters 15.0.74 → 15.0.76

package/devices/bosch.js

@@ -48,6 +48,26 @@ const displayOrientation = {
 
 // Radiator Thermostat II
 const tzLocal = {
+    bwa1: {
+        key: ['alarm_on_motion', 'test'],
+        convertSet: async (entity, key, value, meta) => {
+            if (key === 'alarm_on_motion') {
+                value = value.toUpperCase();
+                const index = stateOffOn[value];
+                await entity.write(0xFCAC, {0x0003: {value: index, type: 0x10}}, boschManufacturer);
+                return {state: {alarm_on_motion: value}};
+            }
+        },
+        convertGet: async (entity, key, meta) => {
+            switch (key) {
+            case 'alarm_on_motion':
+                await entity.read(0xFCAC, [0x0003], boschManufacturer);
+                break;
+            default: // Unknown key
+                throw new Error(`Unhandled key toZigbee.bosch_twinguard.convertGet ${key}`);
+            }
+        },
+    },
     bosch_thermostat: {
         key: ['window_open', 'boost', 'system_mode', 'pi_heating_demand'],
         convertSet: async (entity, key, value, meta) => {
@@ -212,6 +232,19 @@ const tzLocal = {
 
 
 const fzLocal = {
+    bwa1_alarm_on_motion: {
+        cluster: '64684',
+        type: ['attributeReport', 'readResponse'],
+        options: [],
+        convert: (model, msg, publish, options, meta) => {
+            const result = {};
+            const data = msg.data;
+            if (data.hasOwnProperty(0x0003)) {
+                result.alarm_on_motion = (Object.keys(stateOffOn)[msg.data[0x0003]]);
+            }
+            return result;
+        },
+    },
     bosch_contact: {
         cluster: 'ssIasZone',
         type: 'commandStatusChangeNotification',
@@ -396,6 +429,46 @@ const fzLocal = {
 };
 
 const definition = [
+    {
+        zigbeeModel: ['RBSH-WS-ZB-EU'],
+        model: 'BWA-1',
+        vendor: 'Bosch',
+        description: 'Zigbee smart water leak detector',
+        fromZigbee: [fz.ias_water_leak_alarm_1, fz.battery, fzLocal.bwa1_alarm_on_motion],
+        toZigbee: [tzLocal.bwa1],
+        meta: {battery: {voltageToPercentage: '3V_2500'}},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg', '64684']);
+            await reporting.batteryPercentageRemaining(endpoint);
+            await reporting.batteryVoltage(endpoint);
+            await endpoint.configureReporting(0xFCAC, [{
+                attribute: {ID: 0x0003, type: herdsman.Zcl.DataType.bool},
+                minimumReportInterval: 0,
+                maximumReportInterval: constants.repInterval.HOUR,
+                reportableChange: 1,
+            }], boschManufacturer);
+        },
+        exposes: [
+            e.water_leak(), e.battery(), e.tamper(),
+            exposes.binary('alarm_on_motion', ea.ALL, 'ON', 'OFF').withDescription('Enable/Disable sound alarm on motion'),
+        ],
+    },
+    {
+        zigbeeModel: ['RBSH-SD-ZB-EU'],
+        model: 'BSD-2',
+        vendor: 'Bosch',
+        description: 'Smoke alarm detector',
+        fromZigbee: [fz.battery, fz.ias_smoke_alarm_1],
+        toZigbee: [],
+        meta: {},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg', 64684]);
+            await reporting.batteryPercentageRemaining(endpoint);
+        },
+        exposes: [e.smoke(), e.battery(), e.battery_low(), e.test()],
+    },
     {
         zigbeeModel: ['RFDL-ZB', 'RFDL-ZB-EU', 'RFDL-ZB-H', 'RFDL-ZB-K', 'RFDL-ZB-CHI', 'RFDL-ZB-MS', 'RFDL-ZB-ES', 'RFPR-ZB',
             'RFPR-ZB-EU', 'RFPR-ZB-CHI', 'RFPR-ZB-ES', 'RFPR-ZB-MS'],

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/namron.js

@@ -757,4 +757,18 @@ module.exports = [
             await reporting.activePower(endpoint);
         },
     },
+    {
+        zigbeeModel: ['4512747'],
+        model: '4512747',
+        vendor: 'Namron',
+        description: 'Curtain motor controller',
+        fromZigbee: [fz.cover_position_tilt],
+        toZigbee: [tz.cover_state, tz.cover_position_tilt],
+        exposes: [e.cover_position()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['closuresWindowCovering']);
+            await reporting.currentPositionLiftPercentage(endpoint);
+        },
+    },
 ];

package/devices/nue_3a.js

@@ -122,6 +122,25 @@ module.exports = [
             await reporting.bind(device.getEndpoint(3), coordinatorEndpoint, ['genOnOff']);
         },
     },
+    {
+        zigbeeModel: ['LXN-4S27LX1.0'],
+        model: 'HGZB-4S',
+        vendor: 'Nue / 3A',
+        description: 'Smart light switch - 4 gang v2.0',
+        extend: extend.switch(),
+        exposes: [
+            e.switch().withEndpoint('l1'), e.switch().withEndpoint('l2'), e.switch().withEndpoint('l3'), e.switch().withEndpoint('l4')],
+        endpoint: (device) => {
+            return {'l1': 1, 'l2': 2, 'l3': 3, 'l4': 4};
+        },
+        meta: {multiEndpoint: true},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
+            await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff']);
+            await reporting.bind(device.getEndpoint(3), coordinatorEndpoint, ['genOnOff']);
+            await reporting.bind(device.getEndpoint(4), coordinatorEndpoint, ['genOnOff']);
+        },
+    },
     {
         zigbeeModel: ['FB56+ZSW1IKJ1.7', 'FB56+ZSW1IKJ2.5', 'FB56+ZSW1IKJ2.7'],
         model: 'HGZB-043',

package/devices/owon.js

@@ -105,6 +105,24 @@ module.exports = [
                 change: [10, 10]}); // divider 1000: 0,01kWh
         },
     },
+    {
+        zigbeeModel: ['WSP403-E'],
+        model: 'WSP403',
+        vendor: 'OWON',
+        description: 'Smart plug',
+        fromZigbee: [fz.on_off, fz.metering],
+        toZigbee: [tz.on_off],
+        exposes: [e.switch(), e.power(), e.energy()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'seMetering']);
+            await reporting.onOff(endpoint);
+            await reporting.readMeteringMultiplierDivisor(endpoint);
+            await reporting.instantaneousDemand(endpoint, {min: 5, max: constants.repInterval.MINUTES_5, change: 2}); // divider 1000: 2W
+            await reporting.currentSummDelivered(endpoint, {min: 5, max: constants.repInterval.MINUTES_5,
+                change: [10, 10]}); // divider 1000: 0,01kWh
+        },
+    },
     {
         zigbeeModel: ['WSP404'],
         model: 'WSP404',

package/devices/schneider_electric.js

@@ -279,7 +279,7 @@ module.exports = [
         model: 'CCT5011-0001/CCT5011-0002/MEG5011-0001',
         vendor: 'Schneider Electric',
         description: 'Micro module switch',
-        extend: extend.switch(),
+        extend: extend.switch({disablePowerOnBehavior: true}),
         whiteLabel: [{vendor: 'Elko', model: 'EKO07144'}],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);

package/devices/tuya.js

@@ -1987,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',
@@ -3372,6 +3372,7 @@ module.exports = [
             {modelID: 'TS0210', manufacturerName: '_TYZB01_kulduhbj'},
             {modelID: 'TS0210', manufacturerName: '_TYZB01_cc3jzhlj'},
             {modelID: 'TS0210', manufacturerName: '_TZ3000_bmfw9ykl'},
+            {modelID: 'TS0210', manufacturerName: '_TYZB01_geigpsy4'},
             {modelID: 'TS0210', manufacturerName: '_TZ3000_fkxmyics'}],
         model: 'TS0210',
         vendor: 'TuYa',

package/devices/viessmann.js

@@ -24,6 +24,7 @@ module.exports = [
             exposes.binary('window_open_force', ea.ALL, true, false)
                 .withDescription('Manually set window_open, ~1 minute to take affect.'),
             e.keypad_lockout(),
+            e.battery(),
         ],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);

package/devices/woox.js

@@ -160,10 +160,11 @@ module.exports = [
         vendor: 'Woox',
         description: 'Smart siren',
         fromZigbee: [fz.battery, fz.ts0216_siren, fz.ias_alarm_only_alarm_1, fz.power_source],
-        toZigbee: [tz.warning, tz.ts0216_volume],
+        toZigbee: [tz.warning, tz.ts0216_volume, tz.ts0216_duration],
         exposes: [e.battery(), e.battery_voltage(), e.warning(), exposes.binary('alarm', ea.STATE, true, false),
             exposes.binary('ac_connected', ea.STATE, true, false).withDescription('Is the device plugged in'),
-            exposes.numeric('volume', ea.ALL).withValueMin(0).withValueMax(100).withDescription('Volume of siren')],
+            exposes.numeric('volume', ea.ALL).withValueMin(0).withValueMax(100).withDescription('Volume of siren'),
+            exposes.numeric('duration', ea.ALL).withValueMin(0).withValueMax(3600).withDescription('Duration of siren')],
         meta: {disableDefaultResponse: true},
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "15.0.74",
+  "version": "15.0.76",
   "description": "Collection of device converters to be used with zigbee-herdsman",
   "main": "index.js",
   "files": [
@@ -38,7 +38,7 @@
     "buffer-crc32": "^0.2.13",
     "https-proxy-agent": "^5.0.1",
     "tar-stream": "^3.0.0",
-    "zigbee-herdsman": "^0.14.99"
+    "zigbee-herdsman": "^0.14.100"
   },
   "devDependencies": {
     "eslint": "*",