npm - zigbee-herdsman-converters - Versions diffs - 14.0.671 → 14.0.673 - Mend

zigbee-herdsman-converters 14.0.671 → 14.0.673

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/converters/fromZigbee.js +1 -12
package/devices/dawon_dns.js +42 -13
package/devices/ledvance.js +8 -0
package/devices/legrand.js +0 -1
package/devices/m/303/274ller_licht.js +16 -0
package/devices/philips.js +4 -4
package/devices/schneider_electric.js +12 -0
package/devices/shinasystem.js +32 -0
package/devices/sinope.js +112 -55
package/devices/third_reality.js +2 -0
package/devices/tuya.js +2 -1
package/devices/xiaomi.js +1 -0
package/package.json +1 -1

package/converters/fromZigbee.js CHANGED Viewed

@@ -2973,7 +2973,7 @@ const converters = {
         convert: (model, msg, publish, options, meta) => {
             const stateHeader = Buffer.from([122, 209]);
             if (msg.data.indexOf(stateHeader) === 0) {
-                if (msg.data[10] === 5) {
+                if (msg.data[10] === 5 || msg.data[10] === 2) {
                     const status = msg.data[14];
                     return {
                         state_left: status === 1 ? 'ON' : 'OFF',
@@ -8120,17 +8120,6 @@ const converters = {
             }
         },
     },
-    dawon_card_holder: {
-        cluster: 'ssIasZone',
-        type: 'commandStatusChangeNotification',
-        convert: (model, msg, publish, options, meta) => {
-            const zoneStatus = msg.data.zonestatus;
-            return {
-                card: (zoneStatus & 1) > 0,
-                battery_low: (zoneStatus & 1<<3) > 0,
-            };
-        },
-    },
     tuya_light_wz5: {
         cluster: 'manuSpecificTuya',
         type: ['commandDataResponse', 'commandDataReport'],

package/devices/dawon_dns.js CHANGED Viewed

@@ -6,6 +6,30 @@ const extend = require('../lib/extend');
 const e = exposes.presets;
 const ea = exposes.access;
+const fzLocal = {
+    dawon_card_holder: {
+        cluster: 'ssIasZone',
+        type: 'commandStatusChangeNotification',
+        convert: (model, msg, publish, options, meta) => {
+            const zoneStatus = msg.data.zonestatus;
+            return {
+                card: (zoneStatus & 1) > 0,
+                battery_low: (zoneStatus & 1<<3) > 0,
+            };
+        },
+    },
+};
+const tzLocal = {
+    dawon_card_holder: {
+        key: ['card'],
+        convertGet: async (entity, key, meta) => {
+            await entity.read('ssIasZone', ['zoneState']);
+        },
+    },
+};
 module.exports = [
     {
         zigbeeModel: ['PM-C140-ZB'],
@@ -13,15 +37,16 @@ module.exports = [
         vendor: 'Dawon DNS',
         description: 'IOT remote control smart buried-type outlet',
         fromZigbee: [fz.on_off, fz.metering],
-        toZigbee: [tz.on_off],
+        toZigbee: [tz.on_off, tz.metering_power, tz.currentsummdelivered],
         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);
+            await reporting.currentSummDelivered(endpoint, {min: 10, max: 3600, change: 5});
         },
-        exposes: [e.switch(), e.power(), e.energy()],
+        exposes: [e.switch(), e.power().withAccess(ea.STATE_GET), e.energy().withAccess(ea.STATE_GET)],
     },
     {
         zigbeeModel: ['PM-B530-ZB'],
@@ -29,15 +54,16 @@ module.exports = [
         vendor: 'Dawon DNS',
         description: 'IOT smart plug 16A',
         fromZigbee: [fz.on_off, fz.metering],
-        toZigbee: [tz.on_off],
+        toZigbee: [tz.on_off, tz.metering_power, tz.currentsummdelivered],
         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);
+            await reporting.currentSummDelivered(endpoint, {min: 10, max: 3600, change: 5});
         },
-        exposes: [e.switch(), e.power(), e.energy()],
+        exposes: [e.switch(), e.power().withAccess(ea.STATE_GET), e.energy().withAccess(ea.STATE_GET)],
     },
     {
         zigbeeModel: ['PM-B540-ZB'],
@@ -45,13 +71,14 @@ module.exports = [
         vendor: 'Dawon DNS',
         description: 'IOT smart plug 16A',
         fromZigbee: [fz.device_temperature, fz.on_off, fz.metering],
-        toZigbee: [tz.on_off],
+        toZigbee: [tz.on_off, tz.metering_power, tz.currentsummdelivered],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'seMetering', 'genDeviceTempCfg']);
             await reporting.onOff(endpoint);
             await reporting.readMeteringMultiplierDivisor(endpoint);
             await reporting.instantaneousDemand(endpoint);
+            await reporting.currentSummDelivered(endpoint, {min: 10, max: 3600, change: 5});
             await reporting.deviceTemperature(endpoint);
             // some firmware is not defined powersource
             if (device.powerSource === 'Unknown') {
@@ -59,7 +86,7 @@ module.exports = [
                 device.save();
             }
         },
-        exposes: [e.device_temperature(), e.switch(), e.power(), e.energy()],
+        exposes: [e.device_temperature(), e.switch(), e.power().withAccess(ea.STATE_GET), e.energy().withAccess(ea.STATE_GET)],
     },
     {
         zigbeeModel: ['PM-B430-ZB'],
@@ -248,15 +275,16 @@ module.exports = [
         vendor: 'Dawon DNS',
         description: 'IOT remote control smart buried-type 16A outlet',
         fromZigbee: [fz.on_off, fz.metering],
-        toZigbee: [tz.on_off],
+        toZigbee: [tz.on_off, tz.metering_power, tz.currentsummdelivered],
         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);
+            await reporting.currentSummDelivered(endpoint, {min: 10, max: 3600, change: 5});
         },
-        exposes: [e.switch(), e.power(), e.energy()],
+        exposes: [e.switch(), e.power().withAccess(ea.STATE_GET), e.energy().withAccess(ea.STATE_GET)],
     },
     {
         zigbeeModel: ['SG-V100-ZB'],
@@ -278,8 +306,8 @@ module.exports = [
         model: 'KB-HD100-ZB',
         vendor: 'Dawon DNS',
         description: 'IOT Card holder',
-        fromZigbee: [fz.dawon_card_holder],
-        toZigbee: [],
+        fromZigbee: [fzLocal.dawon_card_holder],
+        toZigbee: [tzLocal.dawon_card_holder],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['ssIasZone']);
@@ -287,7 +315,7 @@ module.exports = [
                 attribute: 'zoneState', minimumReportInterval: 0, maximumReportInterval: 3600, reportableChange: 0}];
             await endpoint.configureReporting('ssIasZone', payload);
         },
-        exposes: [exposes.binary('card', ea.STATE, true, false)
+        exposes: [exposes.binary('card', ea.STATE, true, false).withAccess(ea.STATE_GET)
             .withDescription('Indicates if the card is inserted (= true) or not (= false)'), e.battery_low()],
     },
     {
@@ -296,14 +324,15 @@ module.exports = [
         vendor: 'Dawon DNS',
         description: 'IOT smart plug 16A',
         fromZigbee: [fz.on_off, fz.metering],
-        toZigbee: [tz.on_off],
+        toZigbee: [tz.on_off, tz.metering_power, tz.currentsummdelivered],
         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);
+            await reporting.currentSummDelivered(endpoint, {min: 10, max: 3600, change: 5});
         },
-        exposes: [e.switch(), e.power(), e.energy()],
+        exposes: [e.switch(), e.power().withAccess(ea.STATE_GET), e.energy().withAccess(ea.STATE_GET)],
     },
 ];

package/devices/ledvance.js CHANGED Viewed

@@ -162,6 +162,14 @@ module.exports = [
         extend: extend.ledvance.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}),
         ota: ota.ledvance,
     },
+    {
+        zigbeeModel: ['A60 TW T'],
+        model: '4058075729001',
+        vendor: 'LEDVANCE',
+        description: 'SMART+ CL A60 E27 Tunable white',
+        extend: extend.ledvance.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}),
+        ota: ota.ledvance,
+    },
     {
         zigbeeModel: ['CLA60 RGBW JP'],
         model: 'SMARTZBA60RGBW',

package/devices/legrand.js CHANGED Viewed

@@ -132,7 +132,6 @@ module.exports = [
             // support binary report on moving state (supposed)
             fz.legrand_binary_input_moving, fz.cover_position_tilt],
         toZigbee: [tz.cover_state, tz.cover_position_tilt, tz.legrand_identify, tz.legrand_settingEnableLedInDark],
-        meta: {coverInverted: true},
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genBinaryInput', 'closuresWindowCovering', 'genIdentify']);

package/devices/m/303/274ller_licht.js CHANGED Viewed

@@ -200,4 +200,20 @@ module.exports = [
         extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 555]}),
         toZigbee: extend.light_onoff_brightness_colortemp().toZigbee.concat([tz.tint_scene]),
     },
+    {
+        fingerprint: [{manufacturerName: 'MLI', modelID: 'Candle white+color'}],
+        model: '45730',
+        vendor: 'Müller Licht',
+        description: 'Tint candle E14 white+color',
+        extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 555]}),
+        toZigbee: extend.light_onoff_brightness_colortemp_color().toZigbee.concat([tz.tint_scene]),
+    },
+    {
+        fingerprint: [{manufacturerName: 'MLI', modelID: 'Bulb white+color'}],
+        model: '45728',
+        vendor: 'Müller Licht',
+        description: 'Tint bulb E27 white+color',
+        extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 555]}),
+        toZigbee: extend.light_onoff_brightness_colortemp_color().toZigbee.concat([tz.tint_scene]),
+    },
 ];

package/devices/philips.js CHANGED Viewed

@@ -2359,10 +2359,10 @@ module.exports = [
     },
     {
         zigbeeModel: ['LLM001'],
-        model: '7121131PU',
+        model: '7121131PU/7120031PH/7120131PH/7120231PU',
         vendor: 'Philips',
-        description: 'Hue Beyond white and color ambiance suspension light',
-        extend: hueExtend.light_onoff_brightness_colortemp_color(),
+        description: 'Hue Beyond white and color ambiance suspension/ceiling/table lamp',
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
     {
         zigbeeModel: ['5041131P9', '5041148P9'],
@@ -2918,7 +2918,7 @@ module.exports = [
         zigbeeModel: ['LCX012'],
         model: '929003535301',
         vendor: 'Philips',
-        description: 'Hue Festivia gradient light string 250',
+        description: 'Hue Festavia gradient light string 250',
         extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
 ];

package/devices/schneider_electric.js CHANGED Viewed

@@ -464,6 +464,18 @@ module.exports = [
             await reporting.currentPositionLiftPercentage(endpoint);
         },
     },
+    {
+        zigbeeModel: ['1GANG/SWITCH/1'],
+        model: 'MEG5161-0000',
+        vendor: 'Schneider Electric',
+        description: 'Merten PlusLink relay insert with Merten Wiser system M push button (1fold)',
+        extend: extend.switch(),
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(endpoint);
+        },
+    },
     {
         zigbeeModel: ['LK Switch'],
         model: '545D6514',

package/devices/shinasystem.js CHANGED Viewed

@@ -70,8 +70,12 @@ const tzLocal = {
             case 'counting_freeze':
                 if (value.toLowerCase() === 'on') {
                     payload = {'presentValue': 82};
+                    await endpoint.write('genAnalogInput', payload);
+                    return {state: {counting_freeze: 'ON'}};
                 } else if (value.toLowerCase() === 'off') {
                     payload = {'presentValue': 84};
+                    await endpoint.write('genAnalogInput', payload);
+                    return {state: {counting_freeze: 'OFF'}};
                 }
                 break;
             case 'tof_init':
@@ -80,44 +84,72 @@ const tzLocal = {
             case 'led_state':
                 if (value === 'enable') {
                     payload = {'presentValue': 86};
+                    await endpoint.write('genAnalogInput', payload);
+                    return {state: {led_state: 'enable'}};
                 } else if (value === 'disable') {
                     payload = {'presentValue': 87};
+                    await endpoint.write('genAnalogInput', payload);
+                    return {state: {led_state: 'disable'}};
                 }
                 break;
             case 'rf_state':
                 if (value === 'enable') {
                     payload = {'presentValue': 88};
+                    await endpoint.write('genAnalogInput', payload);
+                    return {state: {rf_state: 'enable'}};
                 } else if (value === 'disable') {
                     payload = {'presentValue': 89};
+                    await endpoint.write('genAnalogInput', payload);
+                    return {state: {rf_state: 'disable'}};
                 }
                 break;
             case 'transaction':
                 if (value === '0ms') {
                     payload = {'presentValue': 90};
+                    await endpoint.write('genAnalogInput', payload);
+                    return {state: {transaction: '0ms'}};
                 } else if (value === '200ms') {
                     payload = {'presentValue': 91};
+                    await endpoint.write('genAnalogInput', payload);
+                    return {state: {transaction: '200ms'}};
                 } else if (value === '400ms') {
                     payload = {'presentValue': 92};
+                    await endpoint.write('genAnalogInput', payload);
+                    return {state: {transaction: '400ms'}};
                 } else if (value === '600ms') {
                     payload = {'presentValue': 93};
+                    await endpoint.write('genAnalogInput', payload);
+                    return {state: {transaction: '600ms'}};
                 } else if (value === '800ms') {
                     payload = {'presentValue': 94};
+                    await endpoint.write('genAnalogInput', payload);
+                    return {state: {transaction: '800ms'}};
                 } else if (value === '1,000ms') {
                     payload = {'presentValue': 95};
+                    await endpoint.write('genAnalogInput', payload);
+                    return {state: {transaction: '1,000ms'}};
                 }
                 break;
             case 'fast_in':
                 if (value === 'enable') {
                     payload = {'presentValue': 96};
+                    await endpoint.write('genAnalogInput', payload);
+                    return {state: {fast_in: 'enable'}};
                 } else if (value === 'disable') {
                     payload = {'presentValue': 97};
+                    await endpoint.write('genAnalogInput', payload);
+                    return {state: {fast_in: 'disable'}};
                 }
                 break;
             case 'fast_out':
                 if (value === 'enable') {
                     payload = {'presentValue': 98};
+                    await endpoint.write('genAnalogInput', payload);
+                    return {state: {fast_out: 'enable'}};
                 } else if (value === 'disable') {
                     payload = {'presentValue': 99};
+                    await endpoint.write('genAnalogInput', payload);
+                    return {state: {fast_out: 'disable'}};
                 }
                 break;
             }

package/devices/sinope.js CHANGED Viewed

@@ -14,21 +14,32 @@ module.exports = [
         vendor: 'Sinopé',
         description: 'Zigbee line volt thermostat',
         meta: {thermostat: {dontMapPIHeatingDemand: true}},
-        fromZigbee: [fz.legacy.sinope_thermostat_att_report, fz.legacy.hvac_user_interface, fz.electrical_measurement, fz.metering,
+        fromZigbee: [
+            fz.legacy.sinope_thermostat_att_report, fz.legacy.hvac_user_interface, fz.electrical_measurement, fz.metering,
             fz.ignore_temperature_report, fz.legacy.sinope_thermostat_state, fz.sinope_thermostat],
-        toZigbee: [tz.thermostat_local_temperature, tz.thermostat_occupied_heating_setpoint, tz.thermostat_unoccupied_heating_setpoint,
+        toZigbee: [
+            tz.thermostat_local_temperature, tz.thermostat_occupied_heating_setpoint, tz.thermostat_unoccupied_heating_setpoint,
             tz.thermostat_temperature_display_mode, tz.thermostat_keypad_lockout, tz.thermostat_system_mode, tz.thermostat_running_state,
             tz.sinope_thermostat_occupancy, tz.sinope_thermostat_backlight_autodim_param, tz.sinope_thermostat_time,
             tz.sinope_thermostat_enable_outdoor_temperature, tz.sinope_thermostat_outdoor_temperature, tz.sinope_time_format],
-        exposes: [e.local_temperature(), e.keypad_lockout(), e.power(), e.current(), e.voltage(), e.energy(),
-            exposes.climate().withSetpoint('occupied_heating_setpoint', 5, 30, 0.5).withLocalTemperature()
-                .withSystemMode(['off', 'heat']).withRunningState(['idle', 'heat']).withPiHeatingDemand(),
-            exposes.enum('thermostat_occupancy', ea.SET, ['unoccupied', 'occupied']).withDescription('Occupancy state of the thermostat'),
-            exposes.enum('backlight_auto_dim', ea.SET, ['on demand', 'sensing']).withDescription('Control backlight dimming behavior')],
+        exposes: [
+            exposes.climate()
+                .withSetpoint('occupied_heating_setpoint', 5, 30, 0.5)
+                .withSetpoint('unoccupied_heating_setpoint', 5, 30, 0.5)
+                .withLocalTemperature()
+                .withSystemMode(['off', 'heat']).withRunningState(['idle', 'heat'])
+                .withPiHeatingDemand(),
+            exposes.enum('thermostat_occupancy', ea.SET, ['unoccupied', 'occupied'])
+                .withDescription('Occupancy state of the thermostat'),
+            exposes.enum('backlight_auto_dim', ea.SET, ['on demand', 'sensing'])
+                .withDescription('Control backlight dimming behavior'),
+            e.keypad_lockout(), e.energy(), e.power(), e.current(), e.voltage()],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
-            const binds = ['genBasic', 'genIdentify', 'genGroups', 'hvacThermostat', 'hvacUserInterfaceCfg', 'msTemperatureMeasurement',
-                'haElectricalMeasurement', 'seMetering', 'manuSpecificSinope'];
+            const binds = [
+                'genBasic', 'genIdentify', 'genGroups', 'hvacThermostat', 'hvacUserInterfaceCfg',
+                'msTemperatureMeasurement', 'haElectricalMeasurement', 'seMetering',
+                'manuSpecificSinope'];
             await reporting.bind(endpoint, coordinatorEndpoint, binds);
             await reporting.thermostatTemperature(endpoint);
             await reporting.thermostatPIHeatingDemand(endpoint);
@@ -61,8 +72,8 @@ module.exports = [
             // Disable default reporting
             await reporting.temperature(endpoint, {min: 1, max: 0xFFFF});
-            await endpoint.configureReporting('msTemperatureMeasurement', [{
-                attribute: 'tolerance', minimumReportInterval: 1, maximumReportInterval: 0xFFFF, reportableChange: 1}]);
+            await endpoint.configureReporting('msTemperatureMeasurement', [
+                {attribute: 'tolerance', minimumReportInterval: 1, maximumReportInterval: 0xFFFF, reportableChange: 1}]);
         },
     },
     {
@@ -71,21 +82,32 @@ module.exports = [
         vendor: 'Sinopé',
         description: 'Zigbee line volt thermostat',
         meta: {thermostat: {dontMapPIHeatingDemand: true}},
-        fromZigbee: [fz.legacy.sinope_thermostat_att_report, fz.legacy.hvac_user_interface, fz.electrical_measurement, fz.metering,
+        fromZigbee: [
+            fz.legacy.sinope_thermostat_att_report, fz.legacy.hvac_user_interface, fz.electrical_measurement, fz.metering,
             fz.ignore_temperature_report, fz.legacy.sinope_thermostat_state, fz.sinope_thermostat],
-        toZigbee: [tz.thermostat_local_temperature, tz.thermostat_occupied_heating_setpoint, tz.thermostat_unoccupied_heating_setpoint,
+        toZigbee: [
+            tz.thermostat_local_temperature, tz.thermostat_occupied_heating_setpoint, tz.thermostat_unoccupied_heating_setpoint,
             tz.thermostat_temperature_display_mode, tz.thermostat_keypad_lockout, tz.thermostat_system_mode, tz.thermostat_running_state,
             tz.sinope_thermostat_occupancy, tz.sinope_thermostat_backlight_autodim_param, tz.sinope_thermostat_time,
             tz.sinope_thermostat_enable_outdoor_temperature, tz.sinope_thermostat_outdoor_temperature, tz.sinope_time_format],
-        exposes: [e.local_temperature(), e.keypad_lockout(), e.power(), e.current(), e.voltage(), e.energy(),
-            exposes.climate().withSetpoint('occupied_heating_setpoint', 5, 30, 0.5).withLocalTemperature()
-                .withSystemMode(['off', 'heat']).withRunningState(['idle', 'heat']).withPiHeatingDemand(),
-            exposes.enum('thermostat_occupancy', ea.SET, ['unoccupied', 'occupied']).withDescription('Occupancy state of the thermostat'),
-            exposes.enum('backlight_auto_dim', ea.SET, ['on demand', 'sensing']).withDescription('Control backlight dimming behavior')],
+        exposes: [
+            exposes.climate()
+                .withSetpoint('occupied_heating_setpoint', 5, 30, 0.5)
+                .withSetpoint('unoccupied_heating_setpoint', 5, 30, 0.5)
+                .withLocalTemperature()
+                .withSystemMode(['off', 'heat']).withRunningState(['idle', 'heat'])
+                .withPiHeatingDemand(),
+            exposes.enum('thermostat_occupancy', ea.SET, ['unoccupied', 'occupied'])
+                .withDescription('Occupancy state of the thermostat'),
+            exposes.enum('backlight_auto_dim', ea.SET, ['on demand', 'sensing'])
+                .withDescription('Control backlight dimming behavior'),
+            e.keypad_lockout(), e.energy(), e.power(), e.current(), e.voltage()],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
-            const binds = ['genBasic', 'genIdentify', 'genGroups', 'hvacThermostat', 'hvacUserInterfaceCfg', 'msTemperatureMeasurement',
-                'haElectricalMeasurement', 'seMetering', 'manuSpecificSinope'];
+            const binds = [
+                'genBasic', 'genIdentify', 'genGroups', 'hvacThermostat', 'hvacUserInterfaceCfg',
+                'msTemperatureMeasurement', 'haElectricalMeasurement', 'seMetering',
+                'manuSpecificSinope'];
             await reporting.bind(endpoint, coordinatorEndpoint, binds);
             await reporting.thermostatTemperature(endpoint);
             await reporting.thermostatPIHeatingDemand(endpoint);
@@ -101,6 +123,12 @@ module.exports = [
                 await reporting.instantaneousDemand(endpoint, {min: 10, max: 304, change: 1});
             } catch (error) {/* Do nothing*/}
+            await reporting.readMeteringMultiplierDivisor(endpoint);
+            await reporting.currentSummDelivered(endpoint, {min: 10, max: 303, change: [1, 1]});
+            try {
+                await reporting.instantaneousDemand(endpoint, {min: 10, max: 304, change: 1});
+            } catch (error) {/* Do nothing*/}
             await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
             try {
                 await reporting.activePower(endpoint, {min: 10, max: 305, change: 1});
@@ -112,16 +140,10 @@ module.exports = [
                 await reporting.rmsVoltage(endpoint, {min: 10, max: 307, change: 5}); // divider 10: 0.5Vrms
             } catch (error) {/* Do nothing*/}
-            try {
-                await reporting.thermostatKeypadLockMode(endpoint);
-            } catch (error) {
-                // Not all support this: https://github.com/Koenkk/zigbee2mqtt/issues/3760
-            }
             // Disable default reporting
             await reporting.temperature(endpoint, {min: 1, max: 0xFFFF});
-            await endpoint.configureReporting('msTemperatureMeasurement', [{
-                attribute: 'tolerance', minimumReportInterval: 1, maximumReportInterval: 0xFFFF, reportableChange: 1}]);
+            await endpoint.configureReporting('msTemperatureMeasurement', [
+                {attribute: 'tolerance', minimumReportInterval: 1, maximumReportInterval: 0xFFFF, reportableChange: 1}]);
         },
     },
     {
@@ -130,21 +152,30 @@ module.exports = [
         vendor: 'Sinopé',
         description: 'Zigbee smart floor heating thermostat',
         meta: {thermostat: {dontMapPIHeatingDemand: true}},
-        fromZigbee: [fz.legacy.sinope_thermostat_att_report, fz.legacy.hvac_user_interface, fz.electrical_measurement,
+        fromZigbee: [
+            fz.legacy.sinope_thermostat_att_report, fz.legacy.hvac_user_interface, fz.electrical_measurement,
             fz.ignore_temperature_report, fz.legacy.sinope_thermostat_state, fz.sinope_TH1300ZB_specific],
-        toZigbee: [tz.thermostat_local_temperature, tz.thermostat_occupied_heating_setpoint, tz.thermostat_unoccupied_heating_setpoint,
+        toZigbee: [
+            tz.thermostat_local_temperature, tz.thermostat_occupied_heating_setpoint, tz.thermostat_unoccupied_heating_setpoint,
             tz.thermostat_temperature_display_mode, tz.thermostat_keypad_lockout, tz.thermostat_system_mode, tz.thermostat_running_state,
             tz.sinope_thermostat_occupancy, tz.sinope_thermostat_backlight_autodim_param, tz.sinope_thermostat_time,
             tz.sinope_thermostat_enable_outdoor_temperature, tz.sinope_thermostat_outdoor_temperature, tz.sinope_floor_control_mode,
             tz.sinope_ambiant_max_heat_setpoint, tz.sinope_floor_min_heat_setpoint, tz.sinope_floor_max_heat_setpoint,
             tz.sinope_temperature_sensor, tz.sinope_time_format],
-        exposes: [e.local_temperature(), e.keypad_lockout(), e.power(), e.current(), e.voltage(),
-            exposes.climate().withSetpoint('occupied_heating_setpoint', 7, 30, 0.5).withLocalTemperature()
-                .withSystemMode(['off', 'auto', 'heat']).withRunningState(['idle', 'heat']).withPiHeatingDemand(),
-            exposes.enum('backlight_auto_dim', ea.SET, ['on demand', 'sensing']).withDescription('Control backlight dimming behavior')],
+        exposes: [
+            exposes.climate()
+                .withSetpoint('occupied_heating_setpoint', 7, 30, 0.5)
+                .withLocalTemperature()
+                .withSystemMode(['off', 'auto', 'heat'])
+                .withRunningState(['idle', 'heat'])
+                .withPiHeatingDemand(),
+            exposes.enum('backlight_auto_dim', ea.SET, ['on demand', 'sensing'])
+                .withDescription('Control backlight dimming behavior'),
+            e.keypad_lockout(), e.power(), e.current(), e.voltage()],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
-            const binds = ['genBasic', 'genIdentify', 'genGroups', 'hvacThermostat', 'hvacUserInterfaceCfg',
+            const binds = [
+                'genBasic', 'genIdentify', 'genGroups', 'hvacThermostat', 'hvacUserInterfaceCfg',
                 'haElectricalMeasurement', 'msTemperatureMeasurement', 'manuSpecificSinope'];
             await reporting.bind(endpoint, coordinatorEndpoint, binds);
             await reporting.thermostatTemperature(endpoint);
@@ -156,7 +187,7 @@ module.exports = [
             } catch (error) {/* Not all support this */}
             try {
-                await endpoint.read('haElectricalMeasurement', ['acPowerMultiplier', 'acPowerDivisor']);
+                await endpoint.read('haElectricalMeasurement', ['acPowerMultiplier']);
                 await reporting.activePower(endpoint, {min: 10, max: 305, change: 1}); // divider 1: 1W
             } catch (error) {
                 endpoint.saveClusterAttributeKeyValue('haElectricalMeasurement', {'acPowerMultiplier': 1, 'acPowerDivisor': 1});
@@ -178,8 +209,8 @@ module.exports = [
             await endpoint.configureReporting('manuSpecificSinope', [{attribute: 'GFCiStatus', minimumReportInterval: 1,
                 maximumReportInterval: constants.repInterval.HOUR, reportableChange: 1}]);
-            await endpoint.configureReporting('manuSpecificSinope', [{attribute: 'floorLimitStatus',
-                minimumReportInterval: 1, maximumReportInterval: constants.repInterval.HOUR, reportableChange: 1}]);
+            await endpoint.configureReporting('manuSpecificSinope', [{attribute: 'floorLimitStatus', minimumReportInterval: 1,
+                maximumReportInterval: constants.repInterval.HOUR, reportableChange: 1}]);
             await reporting.temperature(endpoint, {min: 1, max: 0xFFFF}); // disable reporting
         },
     },
@@ -189,17 +220,27 @@ module.exports = [
         vendor: 'Sinopé',
         description: 'Zigbee low volt thermostat',
         meta: {thermostat: {dontMapPIHeatingDemand: true}},
-        fromZigbee: [fz.legacy.sinope_thermostat_att_report, fz.legacy.sinope_thermostat_state],
-        toZigbee: [tz.thermostat_local_temperature, tz.thermostat_occupied_heating_setpoint, tz.thermostat_temperature_display_mode,
+        fromZigbee: [
+            fz.legacy.sinope_thermostat_att_report, fz.legacy.sinope_thermostat_state],
+        toZigbee: [
+            tz.thermostat_local_temperature, tz.thermostat_occupied_heating_setpoint, tz.thermostat_temperature_display_mode,
             tz.thermostat_keypad_lockout, tz.thermostat_system_mode, tz.thermostat_running_state,
             tz.sinope_thermostat_backlight_autodim_param, tz.sinope_thermostat_time, tz.sinope_thermostat_enable_outdoor_temperature,
             tz.sinope_thermostat_outdoor_temperature],
-        exposes: [exposes.climate().withSetpoint('occupied_heating_setpoint', 7, 30, 1).withLocalTemperature()
-            .withSystemMode(['off', 'auto', 'heat']).withRunningState(['idle', 'heat']).withPiHeatingDemand(), exposes.enum(
-            'backlight_auto_dim', ea.SET, ['on demand', 'sensing']).withDescription('Control backlight dimming behavior')],
+        exposes: [
+            exposes.climate()
+                .withSetpoint('occupied_heating_setpoint', 7, 30, 1)
+                .withLocalTemperature()
+                .withSystemMode(['off', 'auto', 'heat'])
+                .withRunningState(['idle', 'heat'])
+                .withPiHeatingDemand(),
+            exposes.enum('backlight_auto_dim', ea.SET, ['on demand', 'sensing'])
+                .withDescription('Control backlight dimming behavior')],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
-            const binds = ['genBasic', 'genIdentify', 'genGroups', 'hvacThermostat', 'hvacUserInterfaceCfg', 'msTemperatureMeasurement'];
+            const binds = [
+                'genBasic', 'genIdentify', 'genGroups', 'hvacThermostat',
+                'hvacUserInterfaceCfg', 'msTemperatureMeasurement'];
             await reporting.bind(endpoint, coordinatorEndpoint, binds);
             await reporting.thermostatTemperature(endpoint);
             await reporting.thermostatOccupiedHeatingSetpoint(endpoint);
@@ -215,17 +256,27 @@ module.exports = [
         model: 'TH1500ZB',
         vendor: 'Sinopé',
         description: 'Zigbee dual pole line volt thermostat',
-        fromZigbee: [fz.legacy.thermostat_att_report],
-        toZigbee: [tz.thermostat_local_temperature, tz.thermostat_occupied_heating_setpoint, tz.thermostat_unoccupied_heating_setpoint,
+        fromZigbee: [
+            fz.legacy.thermostat_att_report],
+        toZigbee: [
+            tz.thermostat_local_temperature, tz.thermostat_occupied_heating_setpoint, tz.thermostat_unoccupied_heating_setpoint,
             tz.thermostat_temperature_display_mode, tz.thermostat_keypad_lockout, tz.thermostat_system_mode, tz.thermostat_running_state,
             tz.sinope_thermostat_occupancy, tz.sinope_thermostat_backlight_autodim_param, tz.sinope_thermostat_time,
             tz.sinope_thermostat_enable_outdoor_temperature, tz.sinope_thermostat_outdoor_temperature],
-        exposes: [exposes.climate().withSetpoint('occupied_heating_setpoint', 7, 30, 1).withLocalTemperature()
-            .withSystemMode(['off', 'auto', 'heat']).withRunningState(['idle', 'heat']).withPiHeatingDemand(), exposes.enum(
-            'backlight_auto_dim', ea.SET, ['on demand', 'sensing']).withDescription('Control backlight dimming behavior')],
+        exposes: [
+            exposes.climate()
+                .withSetpoint('occupied_heating_setpoint', 7, 30, 1)
+                .withLocalTemperature()
+                .withSystemMode(['off', 'auto', 'heat'])
+                .withRunningState(['idle', 'heat'])
+                .withPiHeatingDemand(),
+            exposes.enum('backlight_auto_dim', ea.SET, ['on demand', 'sensing'])
+                .withDescription('Control backlight dimming behavior')],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
-            const binds = ['genBasic', 'genIdentify', 'genGroups', 'hvacThermostat', 'hvacUserInterfaceCfg', 'msTemperatureMeasurement'];
+            const binds = [
+                'genBasic', 'genIdentify', 'genGroups',
+                'hvacThermostat', 'hvacUserInterfaceCfg', 'msTemperatureMeasurement'];
             await reporting.bind(endpoint, coordinatorEndpoint, binds);
             await reporting.thermostatTemperature(endpoint);
             await reporting.thermostatOccupiedHeatingSetpoint(endpoint);
@@ -304,15 +355,21 @@ module.exports = [
         model: 'SP2600ZB',
         vendor: 'Sinopé',
         description: 'Zigbee smart plug',
-        fromZigbee: [fz.on_off, fz.electrical_measurement],
+        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering],
         toZigbee: [tz.on_off],
-        exposes: [e.switch(), e.power()],
+        exposes: [e.switch(), e.power(), e.current(), e.voltage(), e.ac_frequency(), e.energy()],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
-            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement']);
-            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
+            const binds = ['genBasic', 'genIdentify', 'genOnOff', 'haElectricalMeasurement', 'seMetering'];
+            await reporting.bind(endpoint, coordinatorEndpoint, binds);
+            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint, {readFrequencyAttrs: true});
             await reporting.onOff(endpoint);
-            await reporting.activePower(endpoint, {min: 10, change: 1});
+            await reporting.activePower(endpoint, {min: 10, change: 1}); // divider 10 : 0.1W
+            await reporting.rmsCurrent(endpoint, {min: 10, change: 10}); // divider 100: 0.1Arms
+            await reporting.rmsVoltage(endpoint, {min: 10, change: 10}); // divider 100: 0.1Vrms
+            await reporting.acFrequency(endpoint, {min: 10, change: 100}); // divider 100: 1Hz
+            await endpoint.read('haElectricalMeasurement', ['acFrequency']); // get a first read
+            await reporting.currentSummDelivered(endpoint, {min: 10, max: 307, change: [1, 1]});
         },
     },
     {

package/devices/third_reality.js CHANGED Viewed

@@ -3,6 +3,7 @@ const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/lega
 const tz = require('../converters/toZigbee');
 const reporting = require('../lib/reporting');
 const extend = require('../lib/extend');
+const ota = require('../lib/ota');
 const e = exposes.presets;
 module.exports = [
@@ -60,6 +61,7 @@ module.exports = [
         fromZigbee: [fz.ias_water_leak_alarm_1, fz.battery],
         meta: {battery: {dontDividePercentage: true}},
         toZigbee: [],
+        ota: ota.zigbeeOTA,
         exposes: [e.water_leak(), e.battery_low(), e.battery(), e.battery_voltage()],
         configure: async (device, coordinatorEndpoint, logger) => {
             device.powerSource = 'Battery';

package/devices/tuya.js CHANGED Viewed

@@ -1504,6 +1504,7 @@ module.exports = [
             {modelID: 'TS0201', manufacturerName: '_TZ3000_fllyghyj'},
             {modelID: 'TS0201', manufacturerName: '_TZ3000_yd2e749y'},
             {modelID: 'TS0201', manufacturerName: '_TZ3000_6uzkisv2'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_9yapgbuv'},
         ],
         model: 'WSD500A',
         vendor: 'TuYa',
@@ -1985,7 +1986,7 @@ module.exports = [
                     'to the desired temperature. If you want TRV to properly regulate the temperature you need to use mode `auto` ' +
                     'instead setting the desired temperature.')
                 .withLocalTemperatureCalibration(-9, 9, 1, ea.STATE_SET)
-                .withPreset(['schedule', 'manual', 'boost', 'complex', 'comfort', 'eco'])
+                .withPreset(['schedule', 'manual', 'boost', 'complex', 'comfort', 'eco', 'away'])
                 .withRunningState(['idle', 'heat'], ea.STATE),
             e.auto_lock(), e.away_mode(), e.away_preset_days(), e.boost_time(), e.comfort_temperature(), e.eco_temperature(), e.force(),
             e.max_temperature(), e.min_temperature(), e.away_preset_temperature(),

package/devices/xiaomi.js CHANGED Viewed

@@ -2604,6 +2604,7 @@ module.exports = [
             exposes.numeric('portion_weight', ea.STATE_SET).withValueMin(1).withValueMax(20).withDescription('Portion weight')
                 .withUnit('g'),
         ],
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['lumi.remote.acn007'],

package/package.json CHANGED Viewed

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