zigbee-herdsman-converters 21.20.0 → 21.21.1

package/devices/sunricher.js

@@ -42,7 +42,7 @@ const toZigbee_1 = __importDefault(require("../converters/toZigbee"));
 const constants = __importStar(require("../lib/constants"));
 const exposes = __importStar(require("../lib/exposes"));
 const logger_1 = require("../lib/logger");
-const modernExtend_1 = require("../lib/modernExtend");
+const m = __importStar(require("../lib/modernExtend"));
 const reporting = __importStar(require("../lib/reporting"));
 const globalStore = __importStar(require("../lib/store"));
 const sunricher = __importStar(require("../lib/sunricher"));
@@ -403,26 +403,59 @@ async function syncTime(endpoint) {
     }
 }
 const definitions = [
+    {
+        zigbeeModel: ['HK-SENSOR-GAS'],
+        model: 'SR-ZG9060A-GS',
+        vendor: 'Sunricher',
+        description: 'Smart Combustible Gas Sensor',
+        extend: [m.iasZoneAlarm({ zoneType: 'generic', zoneAttributes: ['alarm_1', 'alarm_2', 'tamper', 'battery_low'] }), m.iasWarning()],
+    },
+    {
+        zigbeeModel: ['HK-SENSOR-CO'],
+        model: 'SR-ZG9060B-CS',
+        vendor: 'Sunricher',
+        description: 'Smart Carbon Monoxide Alarm',
+        extend: [m.battery(), m.iasZoneAlarm({ zoneType: 'generic', zoneAttributes: ['alarm_1', 'alarm_2', 'tamper', 'battery_low'] }), m.iasWarning()],
+    },
+    {
+        zigbeeModel: ['HK-SENSOR-WT1'],
+        model: 'SR-ZG9050C-WS',
+        vendor: 'Sunricher',
+        description: 'Smart Water Leakage Sensor',
+        extend: [m.battery(), m.iasZoneAlarm({ zoneType: 'generic', zoneAttributes: ['alarm_1', 'alarm_2', 'tamper', 'battery_low'] })],
+    },
+    {
+        zigbeeModel: ['HK-SENSOR-WT2'],
+        model: 'SR-ZG9050B-WS',
+        vendor: 'Sunricher',
+        description: 'Water Leakage Alarm',
+        extend: [
+            m.battery(),
+            m.temperature(),
+            m.iasZoneAlarm({ zoneType: 'generic', zoneAttributes: ['alarm_1', 'alarm_2', 'tamper', 'battery_low'] }),
+            m.iasWarning(),
+        ],
+    },
     {
         zigbeeModel: ['HK-SL-DIM-UK'],
         model: 'SR-ZG2835RAC-UK',
         vendor: 'Sunricher',
         description: 'Push compatible zigBee knob smart dimmer',
-        extend: [(0, modernExtend_1.light)(), (0, modernExtend_1.electricityMeter)(), sunricherExternalSwitchType()],
+        extend: [m.light(), m.electricityMeter(), sunricherExternalSwitchType()],
     },
     {
         zigbeeModel: ['ZG2837RAC-K4'],
         model: 'SR-ZG2835RAC-NK4',
         vendor: 'Sunricher',
         description: '4-Key zigbee rotary & push button smart dimmer',
-        extend: [(0, modernExtend_1.light)(), (0, modernExtend_1.electricityMeter)(), (0, modernExtend_1.commandsScenes)()],
+        extend: [m.light(), m.electricityMeter(), m.commandsScenes()],
     },
     {
         zigbeeModel: ['HK-ZRC-K5&RS-TL'],
         model: 'SR-ZG2836D5',
         vendor: 'Sunricher',
         description: 'Zigbee smart remote',
-        extend: [(0, modernExtend_1.battery)(), (0, modernExtend_1.commandsOnOff)(), (0, modernExtend_1.commandsLevelCtrl)(), (0, modernExtend_1.commandsWindowCovering)(), (0, modernExtend_1.commandsColorCtrl)()],
+        extend: [m.battery(), m.commandsOnOff(), m.commandsLevelCtrl(), m.commandsWindowCovering(), m.commandsColorCtrl()],
     },
     {
         zigbeeModel: ['ZG9032B'],
@@ -430,11 +463,11 @@ const definitions = [
         vendor: 'Sunricher',
         description: 'Zigbee temperature and humidity sensor',
         extend: [
-            (0, modernExtend_1.deviceEndpoints)({ endpoints: { '1': 1, '2': 2 } }),
-            (0, modernExtend_1.battery)(),
-            (0, modernExtend_1.temperature)(),
-            (0, modernExtend_1.humidity)({ endpointNames: ['2'] }),
-            (0, modernExtend_1.numeric)({
+            m.deviceEndpoints({ endpoints: { '1': 1, '2': 2 } }),
+            m.battery(),
+            m.temperature(),
+            m.humidity({ endpointNames: ['2'] }),
+            m.numeric({
                 name: 'temperature_sensor_compensation',
                 cluster: 0x0402,
                 attribute: { ID: 0x1000, type: 0x28 },
@@ -447,7 +480,7 @@ const definitions = [
                 zigbeeCommandOptions: { manufacturerCode: 0x1224 },
                 endpointNames: ['1'],
             }),
-            (0, modernExtend_1.enumLookup)({
+            m.enumLookup({
                 name: 'temperature_display_unit',
                 cluster: 0x0402,
                 attribute: { ID: 0x1001, type: 0x30 },
@@ -460,7 +493,7 @@ const definitions = [
                 endpointName: '1',
                 zigbeeCommandOptions: { manufacturerCode: 0x1224 },
             }),
-            (0, modernExtend_1.numeric)({
+            m.numeric({
                 name: 'humidity_sensor_compensation',
                 cluster: 0x0405,
                 attribute: { ID: 0x1000, type: 0x28 },
@@ -481,7 +514,7 @@ const definitions = [
         model: 'SR-ZG9002K16-Pro',
         vendor: 'Sunricher',
         description: 'Zigbee smart wall panel remote',
-        extend: [(0, modernExtend_1.battery)(), sunricherSRZG9002K16Pro()],
+        extend: [m.battery(), sunricherSRZG9002K16Pro()],
     },
     {
         zigbeeModel: ['ZG9030A-MW'],
@@ -489,7 +522,7 @@ const definitions = [
         vendor: 'Sunricher',
         description: 'Zigbee compatible ceiling mount occupancy sensor',
         extend: [
-            (0, modernExtend_1.numeric)({
+            m.numeric({
                 name: 'light_pwm_frequency',
                 cluster: 'genBasic',
                 attribute: { ID: 0x9001, type: 0x21 },
@@ -498,7 +531,7 @@ const definitions = [
                 description: 'Light PWM frequency (0-65535, default: 3300)',
                 access: 'ALL',
             }),
-            (0, modernExtend_1.enumLookup)({
+            m.enumLookup({
                 name: 'brightness_curve',
                 cluster: 'genBasic',
                 attribute: { ID: 0x8806, type: 0x20 },
@@ -510,7 +543,7 @@ const definitions = [
                 description: 'Brightness curve (default: Linear)',
                 access: 'ALL',
             }),
-            (0, modernExtend_1.enumLookup)({
+            m.enumLookup({
                 name: 'start_up_on_off',
                 cluster: 'genOnOff',
                 attribute: { ID: 0x4003, type: 0x30 },
@@ -522,7 +555,7 @@ const definitions = [
                 description: 'Start up on/off (default: last_state)',
                 access: 'ALL',
             }),
-            (0, modernExtend_1.numeric)({
+            m.numeric({
                 name: 'motion_sensor_light_duration',
                 cluster: 'genBasic',
                 attribute: { ID: 0x8902, type: 0x21 },
@@ -532,7 +565,7 @@ const definitions = [
                 description: 'Motion sensor light duration (0s-65535s, default: 5s)',
                 access: 'ALL',
             }),
-            (0, modernExtend_1.numeric)({
+            m.numeric({
                 name: 'motion_sensor_light_sensitivity',
                 cluster: 'genBasic',
                 attribute: { ID: 0x8903, type: 0x21 },
@@ -541,7 +574,7 @@ const definitions = [
                 description: 'Motion sensor light sensitivity (0-255, default: 0)',
                 access: 'ALL',
             }),
-            (0, modernExtend_1.enumLookup)({
+            m.enumLookup({
                 name: 'motion_sensor_working_mode',
                 cluster: 'genBasic',
                 attribute: { ID: 0x8904, type: 0x20 },
@@ -552,7 +585,7 @@ const definitions = [
                 description: 'Motion sensor working mode (default: Automatic)',
                 access: 'ALL',
             }),
-            (0, modernExtend_1.numeric)({
+            m.numeric({
                 name: 'motion_sensor_sensing_distance',
                 cluster: 'genBasic',
                 attribute: { ID: 0x8905, type: 0x20 },
@@ -561,7 +594,7 @@ const definitions = [
                 description: 'Motion sensor sensing distance (0-15, default: 1)',
                 access: 'ALL',
             }),
-            (0, modernExtend_1.enumLookup)({
+            m.enumLookup({
                 name: 'motion_sensor_microwave_switch',
                 cluster: 'genBasic',
                 attribute: { ID: 0x8906, type: 0x20 },
@@ -572,7 +605,7 @@ const definitions = [
                 description: 'Motion sensor microwave switch (default: On)',
                 access: 'ALL',
             }),
-            (0, modernExtend_1.enumLookup)({
+            m.enumLookup({
                 name: 'motion_sensor_onoff_broadcast',
                 cluster: 'genBasic',
                 attribute: { ID: 0x8907, type: 0x20 },
@@ -583,7 +616,7 @@ const definitions = [
                 description: 'Motion sensor on/off broadcast (default: On)',
                 access: 'ALL',
             }),
-            (0, modernExtend_1.enumLookup)({
+            m.enumLookup({
                 name: 'motion_sensor_light_state',
                 cluster: 'genBasic',
                 attribute: { ID: 0x890c, type: 0x20 },
@@ -594,7 +627,7 @@ const definitions = [
                 description: 'Motion sensor light state (default: On)',
                 access: 'ALL',
             }),
-            (0, modernExtend_1.numeric)({
+            m.numeric({
                 name: 'motion_sensor_in_pwm_brightness',
                 cluster: 'genBasic',
                 attribute: { ID: 0x8908, type: 0x21 },
@@ -604,7 +637,7 @@ const definitions = [
                 description: 'Motion sensor IN PWM brightness (0-1000 lux, default: 0)',
                 access: 'ALL',
             }),
-            (0, modernExtend_1.numeric)({
+            m.numeric({
                 name: 'motion_sensor_in_pwm_output',
                 cluster: 'genBasic',
                 attribute: { ID: 0x8909, type: 0x20 },
@@ -613,7 +646,7 @@ const definitions = [
                 description: 'Motion sensor IN PWM output (0-254, default: 254)',
                 access: 'ALL',
             }),
-            (0, modernExtend_1.numeric)({
+            m.numeric({
                 name: 'motion_sensor_leave_pwm_output',
                 cluster: 'genBasic',
                 attribute: { ID: 0x890a, type: 0x20 },
@@ -623,7 +656,7 @@ const definitions = [
                 description: 'Motion sensor LEAVE PWM output (0%-100%, default: 0%)',
                 access: 'ALL',
             }),
-            (0, modernExtend_1.numeric)({
+            m.numeric({
                 name: 'motion_sensor_leave_delay',
                 cluster: 'genBasic',
                 attribute: { ID: 0x8901, type: 0x21 },
@@ -633,7 +666,7 @@ const definitions = [
                 description: 'Motion sensor LEAVE delay (0s-65535s, default: 0s)',
                 access: 'ALL',
             }),
-            (0, modernExtend_1.numeric)({
+            m.numeric({
                 name: 'motion_sensor_pwm_output_after_delay',
                 cluster: 'genBasic',
                 attribute: { ID: 0x890b, type: 0x20 },
@@ -643,7 +676,7 @@ const definitions = [
                 description: 'Motion sensor PWM output after delay (0%-100%, default: 0%)',
                 access: 'ALL',
             }),
-            (0, modernExtend_1.numeric)({
+            m.numeric({
                 name: 'linear_error_ratio_coefficient_of_lux_measurement',
                 cluster: 'genBasic',
                 attribute: { ID: 0x890d, type: 0x21 },
@@ -652,7 +685,7 @@ const definitions = [
                 description: 'Linear error ratio coefficient of LUX measurement (100‰-10000‰, default: 1000‰)',
                 access: 'ALL',
             }),
-            (0, modernExtend_1.numeric)({
+            m.numeric({
                 name: 'fixed_deviation_of_lux_measurement',
                 cluster: 'genBasic',
                 attribute: { ID: 0x890e, type: 0x29 },
@@ -661,12 +694,12 @@ const definitions = [
                 description: 'Fixed deviation of LUX measurement (-100~100, default: 0)',
                 access: 'ALL',
             }),
-            (0, modernExtend_1.deviceEndpoints)({ endpoints: { '1': 1, '2': 2, '3': 3 } }),
-            (0, modernExtend_1.light)(),
-            (0, modernExtend_1.occupancy)(),
-            (0, modernExtend_1.illuminance)({ endpointNames: ['3'] }),
-            (0, modernExtend_1.commandsOnOff)(),
-            (0, modernExtend_1.commandsLevelCtrl)(),
+            m.deviceEndpoints({ endpoints: { '1': 1, '2': 2, '3': 3 } }),
+            m.light(),
+            m.occupancy(),
+            m.illuminance({ endpointNames: ['3'] }),
+            m.commandsOnOff(),
+            m.commandsLevelCtrl(),
         ],
         meta: { multiEndpoint: true },
         toZigbee: [sunricher.tz.setModel],
@@ -677,42 +710,42 @@ const definitions = [
         model: 'SR-ZG2836D5-Pro',
         vendor: 'Sunricher',
         description: 'Zigbee smart remote',
-        extend: [(0, modernExtend_1.battery)(), sunricherSRZG2836D5Pro()],
+        extend: [m.battery(), sunricherSRZG2836D5Pro()],
     },
     {
         zigbeeModel: ['HK-ZRC-K12&RS-E'],
         model: 'SR-ZG9002KR12-Pro',
         vendor: 'Sunricher',
         description: 'Zigbee smart wall panel remote',
-        extend: [(0, modernExtend_1.battery)(), sunricherSRZG9002KR12Pro()],
+        extend: [m.battery(), sunricherSRZG9002KR12Pro()],
     },
     {
         zigbeeModel: ['ZV9380A', 'ZG9380A'],
         model: 'SR-ZG9042MP',
         vendor: 'Sunricher',
         description: 'Zigbee three phase power meter',
-        extend: [(0, modernExtend_1.electricityMeter)()],
+        extend: [m.electricityMeter()],
     },
     {
         zigbeeModel: ['HK-SL-DIM-AU-K-A'],
         model: 'SR-ZG2835PAC-AU',
         vendor: 'Sunricher',
         description: 'Zigbee push button smart dimmer',
-        extend: [(0, modernExtend_1.light)({ configureReporting: true }), sunricherExternalSwitchType(), (0, modernExtend_1.electricityMeter)()],
+        extend: [m.light({ configureReporting: true }), sunricherExternalSwitchType(), m.electricityMeter()],
     },
     {
         zigbeeModel: ['HK-SL-DIM-CLN'],
         model: 'SR-ZG9101SAC-HP-CLN',
         vendor: 'Sunricher',
         description: 'Zigbee micro smart dimmer',
-        extend: [(0, modernExtend_1.light)({ configureReporting: true }), sunricherExternalSwitchType(), sunricherMinimumPWM()],
+        extend: [m.light({ configureReporting: true }), sunricherExternalSwitchType(), sunricherMinimumPWM()],
     },
     {
         zigbeeModel: ['HK-SENSOR-CT-MINI'],
         model: 'SR-ZG9011A-DS',
         vendor: 'Sunricher',
         description: 'Door/window sensor',
-        extend: [(0, modernExtend_1.battery)(), (0, modernExtend_1.iasZoneAlarm)({ zoneType: 'contact', zoneAttributes: ['alarm_1', 'battery_low'] })],
+        extend: [m.battery(), m.iasZoneAlarm({ zoneType: 'contact', zoneAttributes: ['alarm_1', 'battery_low'] })],
     },
     {
         zigbeeModel: ['ZG2858A'],
@@ -720,13 +753,13 @@ const definitions = [
         vendor: 'Sunricher',
         description: 'Zigbee handheld remote RGBCCT 3 channels',
         extend: [
-            (0, modernExtend_1.deviceEndpoints)({ endpoints: { '1': 1, '2': 2, '3': 3 } }),
-            (0, modernExtend_1.battery)(),
-            (0, modernExtend_1.identify)(),
-            (0, modernExtend_1.commandsOnOff)(),
-            (0, modernExtend_1.commandsLevelCtrl)(),
-            (0, modernExtend_1.commandsColorCtrl)(),
-            (0, modernExtend_1.commandsScenes)(),
+            m.deviceEndpoints({ endpoints: { '1': 1, '2': 2, '3': 3 } }),
+            m.battery(),
+            m.identify(),
+            m.commandsOnOff(),
+            m.commandsLevelCtrl(),
+            m.commandsColorCtrl(),
+            m.commandsScenes(),
         ],
     },
     {
@@ -734,28 +767,28 @@ const definitions = [
         model: 'HK-SL-DIM-US-A',
         vendor: 'Sunricher',
         description: 'Keypad smart dimmer',
-        extend: [(0, modernExtend_1.light)({ configureReporting: true }), (0, modernExtend_1.electricityMeter)()],
+        extend: [m.light({ configureReporting: true }), m.electricityMeter()],
     },
     {
         zigbeeModel: ['HK-SENSOR-4IN1-A'],
         model: 'HK-SENSOR-4IN1-A',
         vendor: 'Sunricher',
         description: '4IN1 Sensor',
-        extend: [(0, modernExtend_1.battery)(), (0, modernExtend_1.identify)(), (0, modernExtend_1.occupancy)(), (0, modernExtend_1.temperature)(), (0, modernExtend_1.humidity)(), (0, modernExtend_1.illuminance)()],
+        extend: [m.battery(), m.identify(), m.occupancy(), m.temperature(), m.humidity(), m.illuminance()],
     },
     {
         zigbeeModel: ['SR-ZG9023A-EU'],
         model: 'SR-ZG9023A-EU',
         vendor: 'Sunricher',
         description: '4 ports switch with 2 usb ports (no metering)',
-        extend: [(0, modernExtend_1.deviceEndpoints)({ endpoints: { l1: 1, l2: 2, l3: 3, l4: 4, l5: 5 } }), (0, modernExtend_1.onOff)({ endpointNames: ['l1', 'l2', 'l3', 'l4', 'l5'] })],
+        extend: [m.deviceEndpoints({ endpoints: { l1: 1, l2: 2, l3: 3, l4: 4, l5: 5 } }), m.onOff({ endpointNames: ['l1', 'l2', 'l3', 'l4', 'l5'] })],
     },
     {
         zigbeeModel: ['ON/OFF(2CH)'],
         model: 'UP-SA-9127D',
         vendor: 'Sunricher',
         description: 'LED-Trading 2 channel AC switch',
-        extend: [(0, modernExtend_1.deviceEndpoints)({ endpoints: { l1: 1, l2: 2 } }), (0, modernExtend_1.onOff)({ endpointNames: ['l1', 'l2'] })],
+        extend: [m.deviceEndpoints({ endpoints: { l1: 1, l2: 2 } }), m.onOff({ endpointNames: ['l1', 'l2'] })],
     },
     {
         fingerprint: [{ modelID: 'ON/OFF(2CH)', softwareBuildID: '2.9.2_r54' }],
@@ -797,7 +830,7 @@ const definitions = [
         model: 'HK-ZD-CCT-A',
         vendor: 'Sunricher',
         description: '50W Zigbee CCT LED driver (constant current)',
-        extend: [(0, modernExtend_1.light)({ colorTemp: { range: [160, 450] } })],
+        extend: [m.light({ colorTemp: { range: [160, 450] } })],
     },
     {
         zigbeeModel: ['ZGRC-KEY-004'],
@@ -954,28 +987,28 @@ const definitions = [
         model: 'ZG192910-4',
         vendor: 'Sunricher',
         description: 'Zigbee LED-controller',
-        extend: [(0, modernExtend_1.light)({ colorTemp: { range: undefined } })],
+        extend: [m.light({ colorTemp: { range: undefined } })],
     },
     {
         zigbeeModel: ['ZG9101SAC-HP'],
         model: 'ZG9101SAC-HP',
         vendor: 'Sunricher',
         description: 'ZigBee AC phase-cut dimmer',
-        extend: [(0, modernExtend_1.light)({ configureReporting: true })],
+        extend: [m.light({ configureReporting: true })],
     },
     {
         zigbeeModel: ['ON/OFF -M', 'ON/OFF', 'ZIGBEE-SWITCH'],
         model: 'ZG9101SAC-HP-Switch',
         vendor: 'Sunricher',
         description: 'Zigbee AC in wall switch',
-        extend: [(0, modernExtend_1.onOff)({ powerOnBehavior: false }), sunricherExternalSwitchType()],
+        extend: [m.onOff({ powerOnBehavior: false }), sunricherExternalSwitchType()],
     },
     {
         zigbeeModel: ['Micro Smart Dimmer', 'SM311', 'HK-SL-RDIM-A', 'HK-SL-DIM-EU-A'],
         model: 'ZG2835RAC',
         vendor: 'Sunricher',
         description: 'ZigBee knob smart dimmer',
-        extend: [(0, modernExtend_1.light)({ configureReporting: true }), (0, modernExtend_1.electricityMeter)()],
+        extend: [m.light({ configureReporting: true }), m.electricityMeter()],
         whiteLabel: [
             { vendor: 'YPHIX', model: '50208695' },
             { vendor: 'Samotech', model: 'SM311' },
@@ -986,7 +1019,7 @@ const definitions = [
         model: 'HK-SL-DIM-AU-R-A',
         vendor: 'Sunricher',
         description: 'ZigBee knob smart dimmer',
-        extend: [(0, modernExtend_1.identify)(), (0, modernExtend_1.electricityMeter)(), (0, modernExtend_1.light)({ configureReporting: true })],
+        extend: [m.identify(), m.electricityMeter(), m.light({ configureReporting: true })],
     },
     {
         zigbeeModel: ['ZG2835'],
@@ -1002,21 +1035,21 @@ const definitions = [
         model: 'SR-ZG9040A/ZG9041A-D',
         vendor: 'Sunricher',
         description: 'Zigbee micro smart dimmer',
-        extend: [(0, modernExtend_1.light)({ configureReporting: true }), (0, modernExtend_1.electricityMeter)(), sunricherExternalSwitchType(), sunricherMinimumPWM()],
+        extend: [m.light({ configureReporting: true }), m.electricityMeter(), sunricherExternalSwitchType(), sunricherMinimumPWM()],
     },
     {
         zigbeeModel: ['HK-ZD-DIM-A'],
         model: 'SRP-ZG9105-CC',
         vendor: 'Sunricher',
         description: 'Constant Current Zigbee LED dimmable driver',
-        extend: [(0, modernExtend_1.light)()],
+        extend: [m.light()],
     },
     {
         zigbeeModel: ['HK-DIM'],
         model: '50208702',
         vendor: 'Sunricher',
         description: 'LED dimmable driver',
-        extend: [(0, modernExtend_1.light)()],
+        extend: [m.light()],
         whiteLabel: [{ vendor: 'Yphix', model: '50208702' }],
         toZigbee: [sunricher.tz.setModel],
         // Some ZG9030A-MW devices were mistakenly set with the modelId HK-DIM during manufacturing.
@@ -1028,14 +1061,14 @@ const definitions = [
         model: 'SR-ZG9040A-S',
         vendor: 'Sunricher',
         description: 'ZigBee AC phase-cut dimmer single-line',
-        extend: [(0, modernExtend_1.light)({ configureReporting: true })],
+        extend: [m.light({ configureReporting: true })],
     },
     {
         zigbeeModel: ['Micro Smart OnOff', 'HK-SL-RELAY-A'],
         model: 'SR-ZG9100A-S',
         vendor: 'Sunricher',
         description: 'Zigbee AC in wall switch single-line',
-        extend: [(0, modernExtend_1.onOff)()],
+        extend: [m.onOff()],
     },
     {
         zigbeeModel: ['ZG2819S-CCT'],