zigbee-herdsman-converters 20.16.2 → 20.17.0

package/devices/tuya.js

@@ -791,12 +791,18 @@ const definitions = [
             { vendor: 'Dongguan Daying Electornics Technology', model: 'YG400A' },
             tuya.whitelabel('Tuya', 'TS0205_smoke_2', 'Smoke sensor', ['_TZ3210_up3pngle']),
         ],
-        fromZigbee: [fromZigbee_1.default.ias_smoke_alarm_1, fromZigbee_1.default.ignore_basic_report],
-        toZigbee: [],
-        exposes: [e.smoke(), e.battery_low(), e.tamper()],
         // Configure battery % fails
         // https://github.com/Koenkk/zigbee2mqtt/issues/22421
-        extend: [(0, modernExtend_1.battery)({ percentageReporting: false })],
+        extend: [(0, modernExtend_1.battery)({ percentageReporting: false }), (0, modernExtend_1.iasZoneAlarm)({ zoneType: 'smoke', zoneAttributes: ['alarm_1', 'tamper'] })],
+        configure: async (device, coordinatorEndpoint) => {
+            if (device?.manufacturerName === '_TZ3210_up3pngle') {
+                // Required for this version
+                // https://github.com/Koenkk/zigbee-herdsman-converters/pull/8004
+                const endpoint = device.getEndpoint(1);
+                await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);
+                await reporting.batteryPercentageRemaining(endpoint);
+            }
+        },
     },
     {
         zigbeeModel: ['TS0111'],
@@ -1549,7 +1555,11 @@ const definitions = [
             tuya.whitelabel('Moes', 'ZB-TDA9-RCW-E27-MS', 'RGB+CCT 9W E27 LED bulb', ['_TZ3210_wxa85bwk']),
             tuya.whitelabel('Moes', 'ZB-LZD10-RCW', '10W RGB+CCT Smart Downlight', ['_TZ3210_s9lumfhn', '_TZ3210_jjqdqxfq']),
             tuya.whitelabel('MiBoxer', 'FUT106ZR', 'GU10 bulb', ['_TZB210_rwy5hexp']),
-            tuya.whitelabel('Tuya', 'TS0505B_1_1', 'Zigbee 3.0 18W led light bulb E27 RGBCW', ['_TZ3210_jd3z4yig', '_TZ3210_r5afgmkl']),
+            tuya.whitelabel('Tuya', 'TS0505B_1_1', 'Zigbee 3.0 18W led light bulb E27 RGBCW', [
+                '_TZ3210_jd3z4yig',
+                '_TZ3210_r5afgmkl',
+                '_TZ3210_mja6r5ix',
+            ]),
             tuya.whitelabel('MiBoxer', 'FUTC11ZR', 'Outdoor light', ['_TZB210_zmppwawa']),
         ],
         extend: [tuya.modernExtend.tuyaLight({ colorTemp: { range: [153, 500] }, color: true })],
@@ -1564,7 +1574,6 @@ const definitions = [
         description: 'Zigbee RGB+CCT light',
         whiteLabel: [
             tuya.whitelabel('Lidl', '14149505L/14149506L_2', 'Livarno Lux light bar RGB+CCT (black/white)', ['_TZ3210_iystcadi']),
-            tuya.whitelabel('Tuya', 'TS0505B_2_1', 'Zigbee 3.0 18W led light bulb E27 RGBCW', ['_TZ3210_mja6r5ix']),
             tuya.whitelabel('Tuya', 'TS0505B_2_2', 'Zigbee GU10/E14 5W smart bulb', ['_TZ3210_it1u8ahz']),
         ],
         toZigbee: [toZigbee_1.default.on_off, tzLocal.led_control, tuya.tz.do_not_disturb],
@@ -3590,6 +3599,7 @@ const definitions = [
             { vendor: 'Lonsonho', model: 'X701' },
             { vendor: 'Bandi', model: 'BDS03G1' },
             tuya.whitelabel('Nous', 'B1Z', '1 gang switch', ['_TZ3000_ctftgjwb']),
+            tuya.whitelabel('Tuya', 'XMSJ', 'Zigbee USB power switch', ['_TZ3000_8n7lqbm0']),
         ],
         configure: async (device, coordinatorEndpoint) => {
             await tuya.configureMagicPacket(device, coordinatorEndpoint);
@@ -3890,7 +3900,7 @@ const definitions = [
             { modelID: 'TS0601', manufacturerName: '_TZE200_1fuxihti' },
             { modelID: 'TS0601', manufacturerName: '_TZE204_1fuxihti' },
             { modelID: 'TS0601', manufacturerName: '_TZE204_57hjqelq' },
-            { modelID: 'TS0601', manufacturerName: '_TZE204_m1wl5fvq ' },
+            { modelID: 'TS0601', manufacturerName: '_TZE204_m1wl5fvq' },
             // Roller blinds:
             { modelID: 'TS0601', manufacturerName: '_TZE200_fctwhugx' },
             { modelID: 'TS0601', manufacturerName: '_TZE200_hsgrhjpf' },
@@ -3899,6 +3909,7 @@ const definitions = [
             // Tubular motors:
             { modelID: 'TS0601', manufacturerName: '_TZE200_5sbebbzs' },
             { modelID: 'TS0601', manufacturerName: '_TZE200_udank5zs' },
+            { modelID: 'TS0601', manufacturerName: '_TZE204_dpqsvdbi' },
             { modelID: 'TS0601', manufacturerName: '_TZE200_zuz7f94z' },
             { modelID: 'TS0601', manufacturerName: '_TZE200_nv6nxo0c' },
             { modelID: 'TS0601', manufacturerName: '_TZE200_3ylew7b4' },
@@ -4112,6 +4123,7 @@ const definitions = [
             { modelID: 'TS0601', manufacturerName: '_TZE200_rufdtfyv' },
             { modelID: 'TS0601', manufacturerName: '_TZE200_lpwgshtl' },
             { modelID: 'TS0601', manufacturerName: '_TZE200_rk1wojce' }, // Emos P5630S
+            { modelID: 'TS0601', manufacturerName: '_TZE200_rndg81sf' },
         ],
         model: 'TS0601_thermostat',
         vendor: 'Tuya',
@@ -5079,13 +5091,13 @@ const definitions = [
             await tuya.configureMagicPacket(device, coordinatorEndpoint);
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement', 'seMetering']);
-            // await reporting.rmsVoltage(endpoint, {change: 5});
-            // await reporting.rmsCurrent(endpoint, {change: 50});
-            // if (!['_TZ3000_0zfrhq4i', '_TZ3000_okaz9tjs', '_TZ3000_typdpbpg'].includes(device.manufacturerName)) {
-            //     // Gives INVALID_DATA_TYPE error for _TZ3000_0zfrhq4i (as well as a few others in issue 20028)
-            //     // https://github.com/Koenkk/zigbee2mqtt/discussions/19680#discussioncomment-7667035
-            //     await reporting.activePower(endpoint, {change: 10});
-            // }
+            await reporting.rmsVoltage(endpoint, { change: 5 });
+            await reporting.rmsCurrent(endpoint, { change: 50 });
+            if (!['_TZ3000_0zfrhq4i', '_TZ3000_okaz9tjs', '_TZ3000_typdpbpg'].includes(device.manufacturerName)) {
+                // Gives INVALID_DATA_TYPE error for _TZ3000_0zfrhq4i (as well as a few others in issue 20028)
+                // https://github.com/Koenkk/zigbee2mqtt/discussions/19680#discussioncomment-7667035
+                await reporting.activePower(endpoint, { change: 10 });
+            }
             await reporting.currentSummDelivered(endpoint);
             const acCurrentDivisor = device.manufacturerName === '_TZ3000_typdpbpg' ? 2000 : 1000;
             endpoint.saveClusterAttributeKeyValue('haElectricalMeasurement', { acCurrentDivisor, acCurrentMultiplier: 1 });
@@ -5477,6 +5489,69 @@ const definitions = [
             tuya.exposes.currentWithPhase('c'),
             e.temperature(),
             e.binary('leakage_test', ea.STATE_SET, 'ON', 'OFF').withDescription('Turn ON to perform a leagage test'),
+            e
+                .binary('over_current_breaker', ea.STATE_SET, 'ON', 'OFF')
+                .withDescription('OFF - alarm only, ON - relay will turn off when threshold reached'),
+            e
+                .numeric('over_current_threshold', ea.STATE_SET)
+                .withUnit('A')
+                .withDescription('Setup the value on the device')
+                .withValueMin(1)
+                .withValueMax(63),
+            e
+                .binary('over_voltage_breaker', ea.STATE_SET, 'ON', 'OFF')
+                .withDescription('OFF - alarm only, ON - relay will turn off when threshold reached'),
+            e
+                .numeric('over_voltage_threshold', ea.STATE_SET)
+                .withUnit('V')
+                .withDescription('Setup value on the device')
+                .withValueMin(250)
+                .withValueMax(300),
+            e
+                .binary('under_voltage_breaker', ea.STATE_SET, 'ON', 'OFF')
+                .withDescription('OFF - alarm only, ON - relay will turn off when threshold reached'),
+            e
+                .numeric('under_voltage_threshold', ea.STATE_SET)
+                .withUnit('V')
+                .withDescription('Setup value on the device')
+                .withValueMin(150)
+                .withValueMax(200),
+            e
+                .binary('insufficient_balance_breaker', ea.STATE_SET, 'ON', 'OFF')
+                .withDescription('OFF - alarm only, ON - relay will turn off when threshold reached'),
+            e
+                .numeric('insufficient_balance_threshold', ea.STATE_SET)
+                .withUnit('kWh')
+                .withDescription('Setup value on the device')
+                .withValueMin(1)
+                .withValueMax(65535),
+            e
+                .binary('overload_breaker', ea.STATE_SET, 'ON', 'OFF')
+                .withDescription('OFF - alarm only, ON - relay will turn off when threshold reached'),
+            e
+                .numeric('overload_threshold', ea.STATE_SET)
+                .withUnit('kW')
+                .withDescription('Setup value on the device')
+                .withValueMin(1)
+                .withValueMax(25),
+            e
+                .binary('leakage_breaker', ea.STATE_SET, 'ON', 'OFF')
+                .withDescription('OFF - alarm only, ON - relay will turn off when threshold reached'),
+            e
+                .numeric('leakage_threshold', ea.STATE_SET)
+                .withUnit('mA')
+                .withDescription('Setup value on the device')
+                .withValueMin(10)
+                .withValueMax(90),
+            e
+                .binary('high_temperature_breaker', ea.STATE_SET, 'ON', 'OFF')
+                .withDescription('OFF - alarm only, ON - relay will turn off when threshold reached'),
+            e
+                .numeric('high_temperature_threshold', ea.STATE_SET)
+                .withUnit('°C')
+                .withDescription('Setup value on the device')
+                .withValueMin(40)
+                .withValueMax(100),
         ],
         meta: {
             tuyaDatapoints: [
@@ -5509,6 +5584,22 @@ const definitions = [
                     }),
                 ],
                 [16, 'state', tuya.valueConverter.onOff],
+                [17, null, tuya.valueConverter.threshold_2],
+                [17, 'overload_breaker', tuya.valueConverter.threshold_2],
+                [17, 'overload_threshold', tuya.valueConverter.threshold_2],
+                [17, 'leakage_threshold', tuya.valueConverter.threshold_2],
+                [17, 'leakage_breaker', tuya.valueConverter.threshold_2],
+                [17, 'high_temperature_threshold', tuya.valueConverter.threshold_2],
+                [17, 'high_temperature_breaker', tuya.valueConverter.threshold_2],
+                [18, null, tuya.valueConverter.threshold_3],
+                [18, 'over_current_threshold', tuya.valueConverter.threshold_3],
+                [18, 'over_current_breaker', tuya.valueConverter.threshold_3],
+                [18, 'over_voltage_threshold', tuya.valueConverter.threshold_3],
+                [18, 'over_voltage_breaker', tuya.valueConverter.threshold_3],
+                [18, 'under_voltage_threshold', tuya.valueConverter.threshold_3],
+                [18, 'under_voltage_breaker', tuya.valueConverter.threshold_3],
+                [18, 'insufficient_balance_threshold', tuya.valueConverter.threshold_3],
+                [18, 'insufficient_balance_breaker', tuya.valueConverter.threshold_3],
                 [21, 'leakage_test', tuya.valueConverter.onOff], // Leakage test
                 [102, 'temperature', tuya.valueConverter.divideBy10],
                 // Ignored for now; we don't know what the values mean