zigbee-herdsman-converters 20.16.0 → 20.16.1

package/devices/sinope.js

@@ -628,14 +628,8 @@ const definitions = [
         model: 'TH1123ZB',
         vendor: 'Sinopé',
         description: 'Zigbee line volt thermostat',
-        fromZigbee: [
-            fzLocal.thermostat,
-            fzLocal.sinope,
-            legacy.fz.hvac_user_interface,
-            fromZigbee_1.default.electrical_measurement,
-            fromZigbee_1.default.metering,
-            fromZigbee_1.default.ignore_temperature_report,
-        ],
+        extend: [(0, modernExtend_1.electricityMeter)()],
+        fromZigbee: [fzLocal.thermostat, fzLocal.sinope, legacy.fz.hvac_user_interface, fromZigbee_1.default.ignore_temperature_report],
         toZigbee: [
             toZigbee_1.default.thermostat_local_temperature,
             toZigbee_1.default.thermostat_occupied_heating_setpoint,
@@ -652,7 +646,6 @@ const definitions = [
             tzLocal.outdoor_temperature_timeout,
             tzLocal.thermostat_occupancy,
             tzLocal.main_cycle_output,
-            toZigbee_1.default.electrical_measurement_power,
         ],
         exposes: [
             e
@@ -694,10 +687,6 @@ const definitions = [
             e.enum('backlight_auto_dim', ea.ALL, ['on_demand', 'sensing']).withDescription('Control backlight dimming behavior'),
             e.enum('keypad_lockout', ea.ALL, ['unlock', 'lock1']).withDescription('Enables or disables the device’s buttons'),
             e.enum('main_cycle_output', ea.ALL, ['15_sec', '15_min']).withDescription('The length of the control cycle: 15_sec=normal 15_min=fan'),
-            e.power().withAccess(ea.STATE_GET),
-            e.current(),
-            e.voltage(),
-            e.energy(),
         ],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
@@ -708,8 +697,6 @@ const definitions = [
                 'hvacThermostat',
                 'hvacUserInterfaceCfg',
                 'msTemperatureMeasurement',
-                'haElectricalMeasurement',
-                'seMetering',
                 'manuSpecificSinope',
             ];
             await reporting.bind(endpoint, coordinatorEndpoint, binds);
@@ -731,18 +718,6 @@ const definitions = [
             catch {
                 /* Not all support this */
             }
-            await reporting.readMeteringMultiplierDivisor(endpoint);
-            await reporting.currentSummDelivered(endpoint, { min: 10, max: 303, change: [1, 1] });
-            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
-            try {
-                await endpoint.read('haElectricalMeasurement', ['acPowerMultiplier', 'acPowerDivisor']);
-                await reporting.activePower(endpoint, { min: 10, max: 305, change: 1 }); // divider 1: 1W
-            }
-            catch {
-                endpoint.saveClusterAttributeKeyValue('haElectricalMeasurement', { acPowerMultiplier: 1, acPowerDivisor: 1 });
-            }
-            await reporting.rmsCurrent(endpoint, { min: 10, max: 306, change: 100 }); // divider 1000: 0.1Arms
-            await reporting.rmsVoltage(endpoint, { min: 10, max: 307, change: 5 }); // divider 10: 0.5Vrms
         },
     },
     {
@@ -750,14 +725,8 @@ const definitions = [
         model: 'TH1124ZB',
         vendor: 'Sinopé',
         description: 'Zigbee line volt thermostat',
-        fromZigbee: [
-            fzLocal.thermostat,
-            fzLocal.sinope,
-            legacy.fz.hvac_user_interface,
-            fromZigbee_1.default.electrical_measurement,
-            fromZigbee_1.default.metering,
-            fromZigbee_1.default.ignore_temperature_report,
-        ],
+        extend: [(0, modernExtend_1.electricityMeter)()],
+        fromZigbee: [fzLocal.thermostat, fzLocal.sinope, legacy.fz.hvac_user_interface, fromZigbee_1.default.ignore_temperature_report],
         toZigbee: [
             toZigbee_1.default.thermostat_local_temperature,
             toZigbee_1.default.thermostat_occupied_heating_setpoint,
@@ -774,7 +743,6 @@ const definitions = [
             tzLocal.outdoor_temperature_timeout,
             tzLocal.thermostat_occupancy,
             tzLocal.main_cycle_output,
-            toZigbee_1.default.electrical_measurement_power,
         ],
         exposes: [
             e
@@ -816,10 +784,6 @@ const definitions = [
             e.enum('backlight_auto_dim', ea.ALL, ['on_demand', 'sensing']).withDescription('Control backlight dimming behavior'),
             e.enum('keypad_lockout', ea.ALL, ['unlock', 'lock1']).withDescription('Enables or disables the device’s buttons'),
             e.enum('main_cycle_output', ea.ALL, ['15_sec', '15_min']).withDescription('The length of the control cycle: 15_sec=normal 15_min=fan'),
-            e.power().withAccess(ea.STATE_GET),
-            e.current(),
-            e.voltage(),
-            e.energy(),
         ],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
@@ -830,8 +794,6 @@ const definitions = [
                 'hvacThermostat',
                 'hvacUserInterfaceCfg',
                 'msTemperatureMeasurement',
-                'haElectricalMeasurement',
-                'seMetering',
                 'manuSpecificSinope',
             ];
             await reporting.bind(endpoint, coordinatorEndpoint, binds);
@@ -853,18 +815,6 @@ const definitions = [
             catch {
                 /* Not all support this */
             }
-            await reporting.readMeteringMultiplierDivisor(endpoint);
-            await reporting.currentSummDelivered(endpoint, { min: 10, max: 303, change: [1, 1] });
-            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
-            try {
-                await endpoint.read('haElectricalMeasurement', ['acPowerMultiplier', 'acPowerDivisor']);
-                await reporting.activePower(endpoint, { min: 10, max: 305, change: 1 }); // divider 1: 1W
-            }
-            catch {
-                endpoint.saveClusterAttributeKeyValue('haElectricalMeasurement', { acPowerMultiplier: 1, acPowerDivisor: 1 });
-            }
-            await reporting.rmsCurrent(endpoint, { min: 10, max: 306, change: 100 }); // divider 1000: 0.1Arms
-            await reporting.rmsVoltage(endpoint, { min: 10, max: 307, change: 5 }); // divider 10: 0.5Vrms
         },
     },
     {
@@ -872,14 +822,8 @@ const definitions = [
         model: 'TH1123ZB-G2',
         vendor: 'Sinopé',
         description: 'Zigbee line volt thermostat',
-        fromZigbee: [
-            fzLocal.thermostat,
-            fzLocal.sinope,
-            legacy.fz.hvac_user_interface,
-            fromZigbee_1.default.electrical_measurement,
-            fromZigbee_1.default.metering,
-            fromZigbee_1.default.ignore_temperature_report,
-        ],
+        extend: [(0, modernExtend_1.electricityMeter)()],
+        fromZigbee: [fzLocal.thermostat, fzLocal.sinope, legacy.fz.hvac_user_interface, fromZigbee_1.default.ignore_temperature_report],
         toZigbee: [
             toZigbee_1.default.thermostat_local_temperature,
             toZigbee_1.default.thermostat_occupied_heating_setpoint,
@@ -896,7 +840,6 @@ const definitions = [
             tzLocal.outdoor_temperature_timeout,
             tzLocal.thermostat_occupancy,
             tzLocal.main_cycle_output,
-            toZigbee_1.default.electrical_measurement_power,
         ],
         exposes: [
             e
@@ -938,10 +881,6 @@ const definitions = [
             e.enum('backlight_auto_dim', ea.ALL, ['on_demand', 'sensing']).withDescription('Control backlight dimming behavior'),
             e.enum('keypad_lockout', ea.ALL, ['unlock', 'lock1']).withDescription('Enables or disables the device’s buttons'),
             e.enum('main_cycle_output', ea.ALL, ['15_sec', '15_min']).withDescription('The length of the control cycle: 15_sec=normal 15_min=fan'),
-            e.power().withAccess(ea.STATE_GET),
-            e.current(),
-            e.voltage(),
-            e.energy(),
         ],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
@@ -952,8 +891,6 @@ const definitions = [
                 'hvacThermostat',
                 'hvacUserInterfaceCfg',
                 'msTemperatureMeasurement',
-                'haElectricalMeasurement',
-                'seMetering',
                 'manuSpecificSinope',
             ];
             await reporting.bind(endpoint, coordinatorEndpoint, binds); // This G2 version has limited memory space
@@ -976,12 +913,6 @@ const definitions = [
                     reportableChange: 1,
                 },
             ]);
-            await reporting.readMeteringMultiplierDivisor(endpoint);
-            await reporting.currentSummDelivered(endpoint, { min: 10, max: 303, change: [1, 1] });
-            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
-            await reporting.activePower(endpoint, { min: 10, max: 305, change: 1 }); // divider 1: 1W
-            await reporting.rmsCurrent(endpoint, { min: 10, max: 306, change: 100 }); // divider 1000: 0.1Arms
-            await reporting.rmsVoltage(endpoint, { min: 10, max: 307, change: 5 }); // divider 10: 0.5Vrms
             // Disable default reporting (not used by Sinope)
             await reporting.thermostatRunningState(endpoint, { min: 1, max: 0xffff });
             try {
@@ -997,14 +928,8 @@ const definitions = [
         model: 'TH1124ZB-G2',
         vendor: 'Sinopé',
         description: 'Zigbee line volt thermostat',
-        fromZigbee: [
-            fzLocal.thermostat,
-            fzLocal.sinope,
-            legacy.fz.hvac_user_interface,
-            fromZigbee_1.default.electrical_measurement,
-            fromZigbee_1.default.metering,
-            fromZigbee_1.default.ignore_temperature_report,
-        ],
+        extend: [(0, modernExtend_1.electricityMeter)()],
+        fromZigbee: [fzLocal.thermostat, fzLocal.sinope, legacy.fz.hvac_user_interface, fromZigbee_1.default.ignore_temperature_report],
         toZigbee: [
             toZigbee_1.default.thermostat_local_temperature,
             toZigbee_1.default.thermostat_occupied_heating_setpoint,
@@ -1021,7 +946,6 @@ const definitions = [
             tzLocal.outdoor_temperature_timeout,
             tzLocal.thermostat_occupancy,
             tzLocal.main_cycle_output,
-            toZigbee_1.default.electrical_measurement_power,
         ],
         exposes: [
             e
@@ -1063,10 +987,6 @@ const definitions = [
             e.enum('backlight_auto_dim', ea.ALL, ['on_demand', 'sensing']).withDescription('Control backlight dimming behavior'),
             e.enum('keypad_lockout', ea.ALL, ['unlock', 'lock1']).withDescription('Enables or disables the device’s buttons'),
             e.enum('main_cycle_output', ea.ALL, ['15_sec', '15_min']).withDescription('The length of the control cycle: 15_sec=normal 15_min=fan'),
-            e.power().withAccess(ea.STATE_GET),
-            e.current(),
-            e.voltage(),
-            e.energy(),
         ],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
@@ -1077,8 +997,6 @@ const definitions = [
                 'hvacThermostat',
                 'hvacUserInterfaceCfg',
                 'msTemperatureMeasurement',
-                'haElectricalMeasurement',
-                'seMetering',
                 'manuSpecificSinope',
             ];
             await reporting.bind(endpoint, coordinatorEndpoint, binds); // This G2 version has limited memory space
@@ -1101,12 +1019,6 @@ const definitions = [
                     reportableChange: 1,
                 },
             ]);
-            await reporting.readMeteringMultiplierDivisor(endpoint);
-            await reporting.currentSummDelivered(endpoint, { min: 10, max: 303, change: [1, 1] });
-            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
-            await reporting.activePower(endpoint, { min: 10, max: 305, change: 1 }); // divider 1: 1W
-            await reporting.rmsCurrent(endpoint, { min: 10, max: 306, change: 100 }); // divider 1000: 0.1Arms
-            await reporting.rmsVoltage(endpoint, { min: 10, max: 307, change: 5 }); // divider 10: 0.5Vrms
             // Disable default reporting (not used by Sinope)
             await reporting.thermostatRunningState(endpoint, { min: 1, max: 0xffff });
             try {
@@ -1125,14 +1037,8 @@ const definitions = [
         whiteLabel: [
             { model: 'TH1320ZB-04', vendor: 'Sinopé', description: 'Zigbee smart floor heating thermostat', fingerprint: [{ modelID: 'TH1320ZB-04' }] },
         ],
-        fromZigbee: [
-            fzLocal.thermostat,
-            fzLocal.sinope,
-            legacy.fz.hvac_user_interface,
-            fromZigbee_1.default.electrical_measurement,
-            fromZigbee_1.default.metering,
-            fromZigbee_1.default.ignore_temperature_report,
-        ],
+        extend: [(0, modernExtend_1.electricityMeter)()],
+        fromZigbee: [fzLocal.thermostat, fzLocal.sinope, legacy.fz.hvac_user_interface, fromZigbee_1.default.ignore_temperature_report],
         toZigbee: [
             toZigbee_1.default.thermostat_local_temperature,
             toZigbee_1.default.thermostat_occupied_heating_setpoint,
@@ -1153,7 +1059,6 @@ const definitions = [
             tzLocal.floor_min_heat_setpoint,
             tzLocal.floor_max_heat_setpoint,
             tzLocal.temperature_sensor,
-            toZigbee_1.default.electrical_measurement_power,
         ],
         exposes: [
             e
@@ -1194,10 +1099,6 @@ const definitions = [
             e.enum('time_format', ea.ALL, ['24h', '12h']).withDescription('The time format featured on the thermostat display'),
             e.enum('backlight_auto_dim', ea.ALL, ['on_demand', 'sensing']).withDescription('Control backlight dimming behavior'),
             e.enum('keypad_lockout', ea.ALL, ['unlock', 'lock1']).withDescription('Enables or disables the device’s buttons'),
-            e.power().withAccess(ea.STATE_GET),
-            e.current(),
-            e.voltage(),
-            e.energy(),
         ],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
@@ -1207,48 +1108,13 @@ const definitions = [
                 'genGroups',
                 'hvacThermostat',
                 'hvacUserInterfaceCfg',
-                'haElectricalMeasurement',
                 'msTemperatureMeasurement',
-                'seMetering',
                 'manuSpecificSinope',
             ];
             await reporting.bind(endpoint, coordinatorEndpoint, binds);
             await reporting.thermostatTemperature(endpoint);
             await reporting.thermostatPIHeatingDemand(endpoint);
             await reporting.thermostatOccupiedHeatingSetpoint(endpoint);
-            try {
-                await reporting.readMeteringMultiplierDivisor(endpoint);
-            }
-            catch {
-                /* Do nothing*/
-            }
-            try {
-                await reporting.currentSummDelivered(endpoint, { min: 10, max: 303, change: [1, 1] });
-            }
-            catch {
-                /* Do nothing*/
-            }
-            try {
-                await endpoint.read('haElectricalMeasurement', ['acPowerMultiplier', 'acPowerDivisor']);
-                await reporting.activePower(endpoint, { min: 10, max: 305, change: 1 }); // divider 1: 1W
-            }
-            catch {
-                endpoint.saveClusterAttributeKeyValue('haElectricalMeasurement', { acPowerMultiplier: 1, acPowerDivisor: 1 });
-            }
-            try {
-                await endpoint.read('haElectricalMeasurement', ['acCurrentMultiplier', 'acCurrentDivisor']);
-                await reporting.rmsCurrent(endpoint, { min: 10, max: 306, change: 100 }); // divider 1000: 0.1Arms
-            }
-            catch {
-                /* Do nothing*/
-            }
-            try {
-                await endpoint.read('haElectricalMeasurement', ['acVoltageMultiplier', 'acVoltageDivisor']);
-                await reporting.rmsVoltage(endpoint, { min: 10, max: 307, change: 5 }); // divider 10: 0.5Vrms
-            }
-            catch {
-                /* Do nothing*/
-            }
             try {
                 await reporting.thermostatKeypadLockMode(endpoint);
             }
@@ -1523,9 +1389,9 @@ const definitions = [
         model: 'SW2500ZB',
         vendor: 'Sinopé',
         description: 'Zigbee smart light switch',
-        fromZigbee: [fromZigbee_1.default.on_off, fzLocal.sinope, fromZigbee_1.default.metering],
+        extend: [(0, modernExtend_1.onOff)(), (0, modernExtend_1.electricityMeter)({ cluster: 'metering' })],
+        fromZigbee: [fzLocal.sinope],
         toZigbee: [
-            toZigbee_1.default.on_off,
             tzLocal.timer_seconds,
             tzLocal.led_intensity_on,
             tzLocal.led_intensity_off,
@@ -1535,7 +1401,6 @@ const definitions = [
             tzLocal.connected_load,
         ],
         exposes: [
-            e.switch(),
             e.action(['up_single', 'up_double', 'up_hold', 'down_single', 'down_double', 'down_hold']),
             e
                 .numeric('timer_seconds', ea.ALL)
@@ -1570,20 +1435,11 @@ const definitions = [
                 .withDescription('Control status LED color when load OFF'),
             e.enum('keypad_lockout', ea.ALL, ['unlock', 'lock']).withDescription('Enables or disables the device’s buttons'),
             e.numeric('connected_load', ea.ALL).withUnit('W').withValueMin(0).withValueMax(1800).withDescription('Load connected in watt'),
-            e.energy(),
         ],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
-            const binds = ['genOnOff', 'manuSpecificSinope', 'seMetering'];
+            const binds = ['manuSpecificSinope'];
             await reporting.bind(endpoint, coordinatorEndpoint, binds);
-            await reporting.onOff(endpoint);
-            try {
-                await reporting.readMeteringMultiplierDivisor(endpoint);
-                await reporting.currentSummDelivered(endpoint, { min: 10, max: 300, change: [0, 10] });
-            }
-            catch {
-                /* Do nothing*/
-            }
             const payload = [
                 {
                     attribute: 'actionReport',
@@ -1700,63 +1556,21 @@ const definitions = [
         model: 'SP2600ZB',
         vendor: 'Sinopé',
         description: 'Zigbee smart plug',
-        fromZigbee: [fromZigbee_1.default.on_off, fromZigbee_1.default.electrical_measurement, fromZigbee_1.default.metering],
-        toZigbee: [toZigbee_1.default.on_off, toZigbee_1.default.frequency],
-        exposes: [e.switch(), e.power(), e.current(), e.voltage(), e.energy()],
-        configure: async (device, coordinatorEndpoint) => {
-            const endpoint = device.getEndpoint(1);
-            const binds = ['genBasic', 'genIdentify', 'genOnOff', 'haElectricalMeasurement', 'seMetering'];
-            await reporting.bind(endpoint, coordinatorEndpoint, binds);
-            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
-            await reporting.onOff(endpoint);
-            await reporting.activePower(endpoint, { min: 10, max: 305, change: 1 }); // divider 10 : 0.1W
-            await reporting.rmsCurrent(endpoint, { min: 10, max: 306, change: 10 }); // divider 100: 0.1Arms
-            await reporting.rmsVoltage(endpoint, { min: 10, max: 307, change: 10 }); // divider 100: 0.1Vrms
-            endpoint.saveClusterAttributeKeyValue('seMetering', { divisor: 1000, multiplier: 1 });
-            await reporting.currentSummDelivered(endpoint, { min: 10, max: 303, change: [0, 1] }); // divider 1
-        },
+        extend: [(0, modernExtend_1.onOff)(), (0, modernExtend_1.electricityMeter)()],
     },
     {
         zigbeeModel: ['SP2610ZB'],
         model: 'SP2610ZB',
         vendor: 'Sinopé',
         description: 'Zigbee smart plug',
-        fromZigbee: [fromZigbee_1.default.on_off, fromZigbee_1.default.electrical_measurement, fromZigbee_1.default.metering],
-        toZigbee: [toZigbee_1.default.on_off, toZigbee_1.default.frequency],
-        exposes: [e.switch(), e.power(), e.current(), e.voltage(), e.energy()],
-        configure: async (device, coordinatorEndpoint) => {
-            const endpoint = device.getEndpoint(1);
-            const binds = ['genBasic', 'genIdentify', 'genOnOff', 'haElectricalMeasurement', 'seMetering'];
-            await reporting.bind(endpoint, coordinatorEndpoint, binds);
-            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
-            await reporting.onOff(endpoint);
-            await reporting.activePower(endpoint, { min: 10, max: 305, change: 1 }); // divider 10 : 0.1W
-            await reporting.rmsCurrent(endpoint, { min: 10, max: 306, change: 10 }); // divider 100: 0.1Arms
-            await reporting.rmsVoltage(endpoint, { min: 10, max: 307, change: 10 }); // divider 100: 0.1Vrms
-            endpoint.saveClusterAttributeKeyValue('seMetering', { divisor: 1000, multiplier: 1 });
-            await reporting.currentSummDelivered(endpoint, { min: 10, max: 303, change: [0, 1] }); // divider 1
-        },
+        extend: [(0, modernExtend_1.onOff)(), (0, modernExtend_1.electricityMeter)()],
     },
     {
         zigbeeModel: ['RM3250ZB'],
         model: 'RM3250ZB',
         vendor: 'Sinopé',
         description: '50A Smart electrical load controller',
-        fromZigbee: [fromZigbee_1.default.on_off, fromZigbee_1.default.electrical_measurement, fromZigbee_1.default.metering],
-        toZigbee: [toZigbee_1.default.on_off],
-        exposes: [e.switch(), e.power(), e.current(), e.voltage(), e.energy()],
-        configure: async (device, coordinatorEndpoint) => {
-            const endpoint = device.getEndpoint(1);
-            const binds = ['genOnOff', 'haElectricalMeasurement', 'seMetering'];
-            await reporting.bind(endpoint, coordinatorEndpoint, binds);
-            await reporting.onOff(endpoint);
-            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
-            await reporting.activePower(endpoint);
-            await reporting.rmsCurrent(endpoint);
-            await reporting.rmsVoltage(endpoint);
-            await reporting.readMeteringMultiplierDivisor(endpoint);
-            await reporting.currentSummDelivered(endpoint);
-        },
+        extend: [(0, modernExtend_1.onOff)(), (0, modernExtend_1.electricityMeter)()],
     },
     {
         zigbeeModel: ['WL4200'],