zigbee-herdsman-converters 15.0.45 → 15.0.47

package/devices/bosch.js

@@ -522,6 +522,22 @@ const definition = [
             exposes.enum('heartbeat', ea.ALL, Object.keys(stateOffOn)).withDescription('Enable/disable heartbeat'),
         ],
     },
+    {
+        zigbeeModel: ['RFPR-ZB-SH-EU'],
+        model: 'RFPR-ZB-SH-EU',
+        vendor: 'Bosch',
+        description: 'Wireless motion detector',
+        fromZigbee: [fz.temperature, fz.battery, fz.ias_occupancy_alarm_1],
+        toZigbee: [],
+        meta: {battery: {voltageToPercentage: '3V_2500'}},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['msTemperatureMeasurement', 'genPowerCfg']);
+            await reporting.temperature(endpoint);
+            await reporting.batteryVoltage(endpoint);
+        },
+        exposes: [e.temperature(), e.battery(), e.occupancy(), e.battery_low(), e.tamper()],
+    },
     {
         zigbeeModel: ['RBSH-SP-ZB-EU'],
         model: 'BSP-FZ2',

package/devices/candeo.js

@@ -6,7 +6,7 @@ const e = exposes.presets;
 
 module.exports = [
     {
-        zigbeeModel: ['HK-DIM-A'],
+        zigbeeModel: ['HK-DIM-A', 'Candeo Zigbee Dimmer'],
         model: 'HK-DIM-A',
         vendor: 'Candeo',
         description: 'Zigbee LED dimmer smart switch',

package/devices/centralite.js

@@ -129,7 +129,7 @@ module.exports = [
                 // For some this fails so set manually
                 // https://github.com/Koenkk/zigbee2mqtt/issues/3575
                 endpoint.saveClusterAttributeKeyValue('haElectricalMeasurement', {
-                    acCurrentDivisor: 1000, acCurrentMultiplier: 1, powerMultiplier: 1, powerDivisor: 10});
+                    acCurrentDivisor: 1000, acCurrentMultiplier: 1, acPowerMultiplier: 1, acPowerDivisor: 10});
             }
             await reporting.rmsVoltage(endpoint, {change: 2}); // Voltage reports in V
             await reporting.rmsCurrent(endpoint, {change: 10}); // Current reports in mA

package/devices/danalock.js

@@ -2,6 +2,7 @@ const exposes = require('../lib/exposes');
 const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/legacy').fromZigbee};
 const tz = require('../converters/toZigbee');
 const reporting = require('../lib/reporting');
+const ota = require('../lib/ota');
 const e = exposes.presets;
 
 module.exports = [
@@ -13,6 +14,7 @@ module.exports = [
         fromZigbee: [fz.lock, fz.lock_operation_event, fz.battery, fz.lock_programming_event, fz.lock_pin_code_response],
         toZigbee: [tz.lock, tz.pincode_lock, tz.lock_userstatus],
         meta: {pinCodeCount: 20},
+        ota: ota.zigbeeOTA,
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['closuresDoorLock', 'genPowerCfg']);

package/devices/ikea.js

@@ -12,7 +12,7 @@ const e = exposes.presets;
 const ea = exposes.access;
 const herdsman = require('zigbee-herdsman');
 const {
-    calibrateAndPrecisionRoundOptions, postfixWithEndpointName, getMetaValue,
+    calibrateAndPrecisionRoundOptions, postfixWithEndpointName, getMetaValue, precisionRound,
 } = require('../lib/utils');
 
 const bulbOnEvent = async (type, data, device, options, state) => {
@@ -72,39 +72,6 @@ const configureRemote = async (device, coordinatorEndpoint, logger) => {
     await reporting.batteryPercentageRemaining(endpoint);
 };
 
-const fzLocal = {
-    // The STYRBAR sends an on +- 500ms after the arrow release. We don't want to send the ON action in this case.
-    // https://github.com/Koenkk/zigbee2mqtt/issues/13335
-    STYRBAR_on: {
-        cluster: 'genOnOff',
-        type: 'commandOn',
-        convert: (model, msg, publish, options, meta) => {
-            if (utils.hasAlreadyProcessedMessage(msg, model)) return;
-            const arrowReleaseAgo = Date.now() - globalStore.getValue(msg.endpoint, 'arrow_release', 0);
-            if (arrowReleaseAgo > 700) {
-                return {action: 'on'};
-            }
-        },
-    },
-    STYRBAR_arrow_release: {
-        cluster: 'genScenes',
-        type: 'commandTradfriArrowRelease',
-        options: [exposes.options.legacy()],
-        convert: (model, msg, publish, options, meta) => {
-            if (utils.hasAlreadyProcessedMessage(msg, model)) return;
-            globalStore.putValue(msg.endpoint, 'arrow_release', Date.now());
-            const direction = globalStore.getValue(msg.endpoint, 'direction');
-            if (direction) {
-                globalStore.clearValue(msg.endpoint, 'direction');
-                const duration = msg.data.value / 1000;
-                const result = {action: `arrow_${direction}_release`, duration, action_duration: duration};
-                if (!utils.isLegacyEnabled(options)) delete result.duration;
-                return result;
-            }
-        },
-    },
-};
-
 const tradfriExtend = {
     light_onoff_brightness: (options = {}) => ({
         ...extend.light_onoff_brightness(options),
@@ -214,6 +181,61 @@ const ikea = {
                 return state;
             },
         },
+        remote_battery: {
+            cluster: 'genPowerCfg',
+            type: ['attributeReport', 'readResponse'],
+            convert: (model, msg, publish, options, meta) => {
+                const payload = {};
+                if (msg.data.hasOwnProperty('batteryPercentageRemaining')) {
+                    // Some devices do not comply to the ZCL and report a
+                    // batteryPercentageRemaining of 100 when the battery is full (should be 200).
+                    //
+                    // IKEA corrected this on newer remote fw version, but many people are still
+                    // 2.2.010 which is the last version supporting group bindings. We try to be
+                    // smart and pick the correct one for IKEA remotes.
+                    let dontDividePercentage = false;
+                    let percentage = msg.data['batteryPercentageRemaining'];
+                    const fwVer = meta.device.softwareBuildID.split('.');
+                    if ((fwVer[0] < 2) || (fwVer[0] == 2 && fwVer[1] <= 3)) {
+                        dontDividePercentage = true;
+                    }
+                    percentage = dontDividePercentage ? percentage : percentage / 2;
+                    payload.battery = precisionRound(percentage, 2);
+                }
+
+                return payload;
+            },
+        },
+        // The STYRBAR sends an on +- 500ms after the arrow release. We don't want to send the ON action in this case.
+        // https://github.com/Koenkk/zigbee2mqtt/issues/13335
+        styrbar_on: {
+            cluster: 'genOnOff',
+            type: 'commandOn',
+            convert: (model, msg, publish, options, meta) => {
+                if (utils.hasAlreadyProcessedMessage(msg, model)) return;
+                const arrowReleaseAgo = Date.now() - globalStore.getValue(msg.endpoint, 'arrow_release', 0);
+                if (arrowReleaseAgo > 700) {
+                    return {action: 'on'};
+                }
+            },
+        },
+        styrbar_arrow_release: {
+            cluster: 'genScenes',
+            type: 'commandTradfriArrowRelease',
+            options: [exposes.options.legacy()],
+            convert: (model, msg, publish, options, meta) => {
+                if (utils.hasAlreadyProcessedMessage(msg, model)) return;
+                globalStore.putValue(msg.endpoint, 'arrow_release', Date.now());
+                const direction = globalStore.getValue(msg.endpoint, 'direction');
+                if (direction) {
+                    globalStore.clearValue(msg.endpoint, 'direction');
+                    const duration = msg.data.value / 1000;
+                    const result = {action: `arrow_${direction}_release`, duration, action_duration: duration};
+                    if (!utils.isLegacyEnabled(options)) delete result.duration;
+                    return result;
+                }
+            },
+        },
     },
     tz: {
         air_purifier_fan_mode: {
@@ -623,12 +645,12 @@ module.exports = [
         model: 'E1524/E1810',
         description: 'TRADFRI remote control',
         vendor: 'IKEA',
-        fromZigbee: [fz.battery, fz.E1524_E1810_toggle, fz.E1524_E1810_levelctrl, fz.ikea_arrow_click, fz.ikea_arrow_hold,
+        fromZigbee: [ikea.fz.remote_battery, fz.E1524_E1810_toggle, fz.E1524_E1810_levelctrl, fz.ikea_arrow_click, fz.ikea_arrow_hold,
             fz.ikea_arrow_release],
-        exposes: [e.battery(), e.action(['arrow_left_click', 'arrow_left_hold', 'arrow_left_release', 'arrow_right_click',
-            'arrow_right_hold', 'arrow_right_release', 'brightness_down_click', 'brightness_down_hold', 'brightness_down_release',
-            'brightness_up_click', 'brightness_up_hold', 'brightness_up_release', 'toggle'])],
-        toZigbee: [],
+        exposes: [e.battery().withAccess(ea.STATE_GET), e.action(['arrow_left_click', 'arrow_left_hold', 'arrow_left_release',
+            'arrow_right_click', 'arrow_right_hold', 'arrow_right_release', 'brightness_down_click', 'brightness_down_hold',
+            'brightness_down_release', 'brightness_up_click', 'brightness_up_hold', 'brightness_up_release', 'toggle'])],
+        toZigbee: [tz.battery_percentage_remaining],
         ota: ota.tradfri,
         // dontDividePercentage: true not needed with latest firmware
         // https://github.com/Koenkk/zigbee2mqtt/issues/16412
@@ -639,14 +661,13 @@ module.exports = [
         model: 'E2001/E2002',
         vendor: 'IKEA',
         description: 'STYRBAR remote control',
-        fromZigbee: [fz.battery, fzLocal.STYRBAR_on, fz.command_off, fz.command_move, fz.command_stop, fz.ikea_arrow_click,
-            fz.ikea_arrow_hold, fzLocal.STYRBAR_arrow_release],
-        exposes: [e.battery(), e.action(['on', 'off', 'brightness_move_up', 'brightness_move_down',
+        fromZigbee: [ikea.fz.remote_battery, ikea.fz.styrbar_on, fz.command_off, fz.command_move, fz.command_stop, fz.ikea_arrow_click,
+            fz.ikea_arrow_hold, ikea.fz.styrbar_arrow_release],
+        exposes: [e.battery().withAccess(ea.STATE_GET), e.action(['on', 'off', 'brightness_move_up', 'brightness_move_down',
             'brightness_stop', 'arrow_left_click', 'arrow_right_click', 'arrow_left_hold',
             'arrow_right_hold', 'arrow_left_release', 'arrow_right_release'])],
-        toZigbee: [],
+        toZigbee: [tz.battery_percentage_remaining],
         ota: ota.tradfri,
-        meta: {battery: {dontDividePercentage: true}},
         configure: async (device, coordinatorEndpoint, logger) => {
             // Binding genOnOff is not required to make device send events.
             const endpoint = device.getEndpoint(1);
@@ -659,12 +680,16 @@ module.exports = [
         model: 'E1743',
         vendor: 'IKEA',
         description: 'TRADFRI ON/OFF switch',
-        fromZigbee: [fz.command_on, fz.legacy.genOnOff_cmdOn, fz.command_off, fz.legacy.genOnOff_cmdOff, fz.command_move, fz.battery,
-            fz.legacy.E1743_brightness_up, fz.legacy.E1743_brightness_down, fz.command_stop, fz.legacy.E1743_brightness_stop],
-        exposes: [e.battery(), e.action(['on', 'off', 'brightness_move_down', 'brightness_move_up', 'brightness_stop'])],
-        toZigbee: [],
+        fromZigbee: [fz.command_on, fz.legacy.genOnOff_cmdOn, fz.command_off, fz.legacy.genOnOff_cmdOff, fz.command_move,
+            ikea.fz.remote_battery, fz.legacy.E1743_brightness_up, fz.legacy.E1743_brightness_down, fz.command_stop,
+            fz.legacy.E1743_brightness_stop],
+        exposes: [
+            e.battery().withAccess(ea.STATE_GET),
+            e.action(['on', 'off', 'brightness_move_down', 'brightness_move_up', 'brightness_stop']),
+        ],
+        toZigbee: [tz.battery_percentage_remaining],
         ota: ota.tradfri,
-        meta: {disableActionGroup: true, battery: {dontDividePercentage: true}},
+        meta: {disableActionGroup: true},
         configure: configureRemote,
     },
     {
@@ -672,11 +697,11 @@ module.exports = [
         model: 'E1841',
         vendor: 'IKEA',
         description: 'KNYCKLAN open/close remote water valve',
-        fromZigbee: [fz.command_on, fz.command_off, fz.battery],
-        exposes: [e.battery(), e.action(['on', 'off'])],
-        toZigbee: [],
+        fromZigbee: [fz.command_on, fz.command_off, ikea.fz.remote_battery],
+        exposes: [e.battery().withAccess(ea.STATE_GET), e.action(['on', 'off'])],
+        toZigbee: [tz.battery_percentage_remaining],
         ota: ota.tradfri,
-        meta: {disableActionGroup: true, battery: {dontDividePercentage: true}},
+        meta: {disableActionGroup: true},
         configure: configureRemote,
     },
     {
@@ -699,11 +724,11 @@ module.exports = [
         model: 'E1812',
         vendor: 'IKEA',
         description: 'TRADFRI shortcut button',
-        fromZigbee: [fz.command_on, fz.command_off, fz.command_move, fz.command_stop, fz.battery],
-        exposes: [e.battery(), e.action(['on', 'off', 'brightness_move_up', 'brightness_stop'])],
-        toZigbee: [],
+        fromZigbee: [fz.command_on, fz.command_off, fz.command_move, fz.command_stop, ikea.fz.remote_battery],
+        exposes: [e.battery().withAccess(ea.STATE_GET), e.action(['on', 'off', 'brightness_move_up', 'brightness_stop'])],
+        toZigbee: [tz.battery_percentage_remaining],
         ota: ota.tradfri,
-        meta: {disableActionGroup: true, battery: {dontDividePercentage: true}},
+        meta: {disableActionGroup: true},
         configure: async (device, coordinatorEndpoint, logger) => {
             // Binding genOnOff is not required to make device send events.
             const endpoint = device.getEndpoint(1);
@@ -838,11 +863,10 @@ module.exports = [
         model: 'E1766',
         vendor: 'IKEA',
         description: 'TRADFRI open/close remote',
-        fromZigbee: [fz.battery, fz.command_cover_close, fz.legacy.cover_close, fz.command_cover_open, fz.legacy.cover_open,
+        fromZigbee: [ikea.fz.remote_battery, fz.command_cover_close, fz.legacy.cover_close, fz.command_cover_open, fz.legacy.cover_open,
             fz.command_cover_stop, fz.legacy.cover_stop],
-        exposes: [e.battery(), e.action(['close', 'open', 'stop'])],
-        toZigbee: [],
-        meta: {battery: {dontDividePercentage: true}},
+        exposes: [e.battery().withAccess(ea.STATE_GET), e.action(['close', 'open', 'stop'])],
+        toZigbee: [tz.battery_percentage_remaining],
         ota: ota.tradfri,
         configure: configureRemote,
     },
@@ -979,6 +1003,13 @@ module.exports = [
         description: 'STOFTMOLN ceiling/wall lamp 24 warm light dimmable',
         extend: tradfriExtend.light_onoff_brightness(),
     },
+    {
+        zigbeeModel: ['STOFTMOLN ceiling/wall lamp WW10'],
+        model: 'T2105',
+        vendor: 'IKEA',
+        description: 'STOFTMOLN ceiling/wall lamp 10 warm light dimmable',
+        extend: tradfriExtend.light_onoff_brightness(),
+    },
     {
         zigbeeModel: ['TRADFRIbulbPAR38WS900lm'],
         model: 'LED2006R9',

package/devices/legrand.js

@@ -28,6 +28,22 @@ const tzLocal = {
 };
 
 module.exports = [
+    {
+        zigbeeModel: [' Pocket remote\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000'+
+            '\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000'],
+        model: '067755',
+        vendor: 'Legrand',
+        description: 'Wireless and batteryless 4 scenes control',
+        fromZigbee: [fz.identify, fz.battery, fz.command_recall],
+        exposes: [e.battery(), e.action(['identify', 'recall_1_1'])],
+        toZigbee: [],
+        meta: {multiEndpoint: true, battery: {voltageToPercentage: '3V_2500'}, publishDuplicateTransaction: true},
+        onEvent: readInitialBatteryState,
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg', 'genOnOff', 'genLevelCtrl']);
+        },
+    },
     {
         zigbeeModel: [' Dry contact\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000'+
             '\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000'],

package/devices/philips.js

@@ -3044,4 +3044,11 @@ module.exports = [
         description: 'Hue Gradient light tube compact',
         extend: philips.extend.light_onoff_brightness_colortemp_color_gradient({colorTempRange: [153, 500]}),
     },
+    {
+        zigbeeModel: ['929003055701'],
+        model: '929003055701',
+        vendor: 'Philips',
+        description: 'Hue White Ambiance Devote',
+        extend: philips.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+    },
 ];

package/devices/salus_controls.js

@@ -43,6 +43,24 @@ module.exports = [
         },
         ota: ota.salus,
     },
+    {
+        zigbeeModel: ['SX885ZB'],
+        model: 'SX885ZB',
+        vendor: 'Salus Controls',
+        description: 'miniSmartPlug',
+        fromZigbee: [fz.on_off, fz.metering],
+        toZigbee: [tz.on_off],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(9);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'seMetering']);
+            await reporting.onOff(endpoint);
+            await reporting.instantaneousDemand(endpoint, {min: 5, change: 10});
+            await reporting.currentSummDelivered(endpoint, {min: 5, change: [0, 10]});
+            await endpoint.read('seMetering', ['multiplier', 'divisor']);
+        },
+        ota: ota.salus,
+        exposes: [e.switch(), e.power(), e.energy()],
+    },
     {
         zigbeeModel: ['SR600'],
         model: 'SR600',

package/devices/tuya.js

@@ -899,7 +899,7 @@ module.exports = [
         ],
         meta: {
             tuyaDatapoints: [
-                [1, 'gas', tuya.valueConverterBasic.lookup({true: tuya.enum(0), false: tuya.enum(1)})],
+                [1, 'gas', tuya.valueConverter.trueFalseEnum0],
                 [2, 'gas_value', tuya.valueConverter.divideBy10],
                 [6, 'alarm_ringtone', tuya.valueConverterBasic.lookup({'1': 0, '2': 1, '3': 2, '4': 3, '5': 4})],
                 [7, 'alarm_time', tuya.valueConverter.raw],
@@ -2177,7 +2177,6 @@ module.exports = [
             {modelID: 'TS0601', manufacturerName: '_TZE200_8whxpsiw'}, // EVOLVEO
             {modelID: 'TS0601', manufacturerName: '_TZE200_xby0s3ta'}, // Sandy Beach HY367
             {modelID: 'TS0601', manufacturerName: '_TZE200_7fqkphoq'}, // AFINTEK
-            {modelID: 'TS0601', manufacturerName: '_TZE200_gd4rvykv'}, // Sanico
         ],
         model: 'TS0601_thermostat',
         vendor: 'TuYa',
@@ -2372,6 +2371,7 @@ module.exports = [
         fingerprint: tuya.fingerprint('TS0601', [
             '_TZE200_bvu2wnxz', /* model: 'ME167', vendor: 'Avatto' */
             '_TZE200_6rdj8dzm', /* model: 'ME167', vendor: 'Avatto' */
+            '_TZE200_gd4rvykv', // Sanico
         ]),
         model: 'TS0601_thermostat_3',
         vendor: 'TuYa',
@@ -2541,7 +2541,13 @@ module.exports = [
         zigbeeModel: ['TS0121'],
         model: 'TS0121_plug',
         description: '10A UK or 16A EU smart plug',
-        whiteLabel: [{vendor: 'BlitzWolf', model: 'BW-SHP13'}],
+        whiteLabel: [
+            {vendor: 'BlitzWolf', model: 'BW-SHP13'},
+            {vendor: 'Connecte', model: '4500990'},
+            {vendor: 'Connecte', model: '4500991'},
+            {vendor: 'Connecte', model: '4500992'},
+            {vendor: 'Connecte', model: '4500993'},
+        ],
         vendor: 'TuYa',
         fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, fz.ignore_basic_report, tuya.fz.power_outage_memory,
             tuya.fz.indicator_mode],
@@ -2558,6 +2564,9 @@ module.exports = [
                 await reporting.currentSummDelivered(endpoint);
             } catch (error) {/* fails for some https://github.com/Koenkk/zigbee2mqtt/issues/11179 */}
             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.
@@ -2809,6 +2818,55 @@ module.exports = [
             ],
         },
     },
+    {
+        fingerprint: tuya.fingerprint('TS0601', ['_TZE200_rhblgy0z']),
+        model: 'TS0601_din_3',
+        vendor: 'TuYa',
+        description: 'Zigbee DIN energy meter',
+        fromZigbee: [tuya.fz.datapoints],
+        toZigbee: [tuya.tz.datapoints],
+        configure: tuya.configureMagicPacket,
+        whiteLabel: [{vendor: 'XOCA', model: 'DAC2161C'}],
+        exposes: [tuya.exposes.switch(), e.energy(), e.produced_energy(), e.power(), e.voltage(), e.current(),
+            exposes.enum('fault', ea.STATE, ['clear', 'over_current_threshold', 'over_power_threshold',
+                'over_voltage threshold', 'wrong_frequency_threshold']).withDescription('Fault status of the device (clear = nothing)'),
+            exposes.enum('threshold_1', ea.STATE, ['not_set', 'over_current_threshold', 'over_voltage_threshold'])
+                .withDescription('State of threshold_1'),
+            exposes.binary('threshold_1_protection', ea.STATE, 'ON', 'OFF')
+                .withDescription('OFF - alarm only, ON - relay will be off when threshold reached'),
+            exposes.numeric('threshold_1_value', ea.STATE)
+                .withDescription('Can be in Volt or Ampere depending on threshold setting. Setup the value on the device'),
+            exposes.enum('threshold_2', ea.STATE, ['not_set', 'over_current_threshold', 'over_voltage_threshold'])
+                .withDescription('State of threshold_2'),
+            exposes.binary('threshold_2_protection', ea.STATE, 'ON', 'OFF')
+                .withDescription('OFF - alarm only, ON - relay will be off when threshold reached'),
+            exposes.numeric('threshold_2_value', ea.STATE)
+                .withDescription('Setup value on the device'),
+            exposes.binary('clear_fault', ea.STATE_SET, 'ON', 'OFF')
+                .withDescription('Turn ON to clear last the fault'),
+            exposes.text('meter_id', ea.STATE).withDescription('Meter ID (ID of device)'),
+        ],
+        meta: {
+            tuyaDatapoints: [
+                [1, 'energy', tuya.valueConverter.divideBy100],
+                [2, 'produced_energy', tuya.valueConverter.divideBy100],
+                [3, null, null], // Monthly, but sends data only after request
+                [4, null, null], // Dayly, but sends data only after request
+                [6, null, tuya.valueConverter.phaseVariant2], // voltage and current
+                [10, 'fault', tuya.valueConverterBasic.lookup({'clear': 0, 'over_current_threshold': 1,
+                    'over_power_threshold': 2, 'over_voltage_threshold': 4, 'wrong_frequency_threshold': 8})],
+                [11, null, null], // Frozen - strange function, in native app - nothing is clear
+                [16, 'state', tuya.valueConverter.onOff],
+                [17, null, tuya.valueConverter.threshold], // It's settable, but can't write converter
+                [18, 'meter_id', tuya.valueConverter.raw],
+                [20, 'clear_fault', tuya.valueConverter.onOff], // Clear fault
+                [21, null, null], // Forward Energy T1 - don't know what this
+                [22, null, null], // Forward Energy T2 - don't know what this
+                [23, null, null], // Forward Energy T3 - don't know what this
+                [24, null, null], // Forward Energy T4 - don't know what this
+            ],
+        },
+    },
     {
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_byzdayie'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_fsb6zw01'},

package/devices/zemismart.js

@@ -77,7 +77,7 @@ module.exports = [
         },
     },
     {
-        fingerprint: [{modelID: 'TS0003', manufacturerName: '_TZ3000_vjhcenzo'}],
+        fingerprint: [{modelID: 'TS0003', manufacturerName: '_TZ3000_vjhcenzo'}, {modelID: 'TS0003', manufacturerName: '_TZ3000_f09j9qjb'}],
         model: 'TB25',
         vendor: 'Zemismart',
         description: 'Smart light switch and socket - 2 gang with neutral wire',

package/lib/tuya.js

@@ -1233,6 +1233,7 @@ 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}),
     lightType: valueConverterBasic.lookup({'led': 0, 'incandescent': 1, 'halogen': 2}),
@@ -1614,7 +1615,7 @@ const tuyaTz = {
             'week_schedule_programming', 'online', 'holiday_mode_date', 'schedule', 'schedule_monday', 'schedule_tuesday',
             'schedule_wednesday', 'schedule_thursday', 'schedule_friday', 'schedule_saturday', 'schedule_sunday', 'clear_fault',
             'scale_protection', 'error', 'radar_scene', 'radar_sensitivity', 'tumble_alarm_time', 'tumble_switch', 'fall_sensitivity',
-            'min_temperature', 'max_temperature', 'window_detection', 'boost_heating',
+            'min_temperature', 'max_temperature', 'window_detection', 'boost_heating', 'alarm_ringtone', 'alarm_time',
         ],
         convertSet: async (entity, key, value, meta) => {
             // A set converter is only called once; therefore we need to loop

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "15.0.45",
+  "version": "15.0.47",
   "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.90"
+    "zigbee-herdsman": "^0.14.92"
   },
   "devDependencies": {
     "eslint": "*",