zigbee-herdsman-converters 20.8.4 → 20.9.0

package/devices/tubeszb.js.map

@@ -1 +1 @@
-{"version":3,"file":"tubeszb.js","sourceRoot":"","sources":["../src/devices/tubeszb.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0EAA0C;AAC1C,4DAA8C;AAG9C,MAAM,WAAW,GAAiB;IAC9B;QACI,WAAW,EAAE,CAAC,gBAAgB,CAAC;QAC/B,KAAK,EAAE,gBAAgB;QACvB,MAAM,EAAE,SAAS;QACjB,WAAW,EAAE,eAAe;QAC5B,UAAU,EAAE,CAAC,oBAAE,CAAC,sBAAsB,CAAC;QACvC,QAAQ,EAAE,EAAE;QACZ,OAAO,EAAE,EAAE;QACX,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,mBAAmB,EAAE,EAAE;YAC7C,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;YACvC,MAAM,OAAO,GAAG,CAAC,EAAC,SAAS,EAAE,YAAY,EAAE,qBAAqB,EAAE,CAAC,EAAE,qBAAqB,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC,EAAC,CAAC,CAAC;YACxH,MAAM,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,mBAAmB,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;YAClE,MAAM,QAAQ,CAAC,kBAAkB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAC3D,CAAC;KACJ;CACJ,CAAC;AAEF,kBAAe,WAAW,CAAC;AAC3B,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC"}
+{"version":3,"file":"tubeszb.js","sourceRoot":"","sources":["../src/devices/tubeszb.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0EAA0C;AAC1C,4DAA8C;AAG9C,MAAM,WAAW,GAA2B;IACxC;QACI,WAAW,EAAE,CAAC,gBAAgB,CAAC;QAC/B,KAAK,EAAE,gBAAgB;QACvB,MAAM,EAAE,SAAS;QACjB,WAAW,EAAE,eAAe;QAC5B,UAAU,EAAE,CAAC,oBAAE,CAAC,sBAAsB,CAAC;QACvC,QAAQ,EAAE,EAAE;QACZ,OAAO,EAAE,EAAE;QACX,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,mBAAmB,EAAE,EAAE;YAC7C,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;YACvC,MAAM,OAAO,GAAG,CAAC,EAAC,SAAS,EAAE,YAAY,EAAE,qBAAqB,EAAE,CAAC,EAAE,qBAAqB,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC,EAAC,CAAC,CAAC;YACxH,MAAM,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,mBAAmB,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;YAClE,MAAM,QAAQ,CAAC,kBAAkB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAC3D,CAAC;KACJ;CACJ,CAAC;AAEF,kBAAe,WAAW,CAAC;AAC3B,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC"}

package/devices/tuya.d.ts

@@ -1,4 +1,4 @@
-import { Definition } from '../lib/types';
-declare const definitions: Definition[];
+import { DefinitionWithExtend } from '../lib/types';
+declare const definitions: DefinitionWithExtend[];
 export default definitions;
 //# sourceMappingURL=tuya.d.ts.map

package/devices/tuya.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tuya.d.ts","sourceRoot":"","sources":["../src/devices/tuya.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAW,UAAU,EAAgE,MAAM,cAAc,CAAC;AAgwBjH,QAAA,MAAM,WAAW,EAAE,UAAU,EA85U5B,CAAC;AAEF,eAAe,WAAW,CAAC"}
+{"version":3,"file":"tuya.d.ts","sourceRoot":"","sources":["../src/devices/tuya.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAW,oBAAoB,EAAgE,MAAM,cAAc,CAAC;AAgwB3H,QAAA,MAAM,WAAW,EAAE,oBAAoB,EAk4UtC,CAAC;AAEF,eAAe,WAAW,CAAC"}

package/devices/tuya.js

@@ -1872,6 +1872,7 @@ const definitions = [
         fromZigbee: [tuya.fz.datapoints, fromZigbee_1.default.battery, fromZigbee_1.default.ias_water_leak_alarm_1],
         toZigbee: [],
         exposes: [
+            e.water_leak().withDescription('Droplet detection (raining)'),
             e.illuminance().withUnit('lx'),
             e.numeric('illuminance_average_20min', ea.STATE).withUnit('lx').withDescription('Illuminance average for the last 20 minutes'),
             e.numeric('illuminance_maximum_today', ea.STATE).withUnit('lx').withDescription('Illuminance maximum for the last 24 hours'),
@@ -3595,12 +3596,36 @@ const definitions = [
             await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
         },
     },
+    ////////////////////////
+    // TS0002 DEFINITIONS //
+    ////////////////////////
     {
-        fingerprint: tuya.fingerprint('TS0002', ['_TZ3000_54hjn4vs', '_TZ3000_aa5t61rh']),
-        model: 'TS0002_switch_module_3',
+        // TS0002 model with only on/off capability
+        fingerprint: tuya.fingerprint('TS0002', [
+            '_TZ3000_01gpyda5',
+            '_TZ3000_bvrlqyj7',
+            '_TZ3000_7ed9cqgi',
+            '_TZ3000_zmy4lslw',
+            '_TZ3000_ruxexjfz',
+            '_TZ3000_4xfqlgqo',
+            '_TZ3000_eei0ubpy',
+            '_TZ3000_qaa59zqd',
+            '_TZ3000_lmlsduws',
+            '_TZ3000_lugaswf8',
+            '_TZ3000_fbjdkph9',
+        ]),
+        model: 'TS0002_basic',
         vendor: 'Tuya',
-        description: '2 gang switch with backlight',
-        extend: [tuya.modernExtend.tuyaOnOff({ powerOnBehavior2: true, indicatorMode: true, endpoints: ['l1', 'l2'] })],
+        description: '2 gang switch module',
+        whiteLabel: [
+            { vendor: 'OXT', model: 'SWTZ22' },
+            { vendor: 'Moes', model: 'ZM-104B-M' },
+            tuya.whitelabel('pcblab.io', 'RR620ZB', '2 gang Zigbee switch module', ['_TZ3000_4xfqlgqo']),
+            tuya.whitelabel('Nous', 'L13Z', '2 gang switch', ['_TZ3000_ruxexjfz']),
+            tuya.whitelabel('Tuya', 'ZG-2002-RF', 'Three mode Zigbee Switch', ['_TZ3000_lugaswf8']),
+            tuya.whitelabel('Mercator Ikuü', 'SSW02', '2 gang switch', ['_TZ3000_fbjdkph9']),
+        ],
+        extend: [tuya.modernExtend.tuyaOnOff({ switchType: true, endpoints: ['l1', 'l2'] })],
         endpoint: (device) => {
             return { l1: 1, l2: 2 };
         },
@@ -3610,69 +3635,99 @@ const definitions = [
             await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
             await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff']);
         },
-        whiteLabel: [tuya.whitelabel('Lonsonho', 'X702A', '2 gang switch with backlight', ['_TZ3000_54hjn4vs', '_TZ3000_aa5t61rh'])],
     },
     {
-        fingerprint: tuya.fingerprint('TS0002', ['_TZ3000_mufwv0ry']),
-        model: 'TS0002_switch_module_1',
+        // TS0002 model with limited functionality available
+        fingerprint: tuya.fingerprint('TS0002', [
+            '_TZ3000_fisb3ajo',
+            '_TZ3000_5gey1ohx',
+            '_TZ3000_mtnpt6ws',
+            '_TZ3000_mufwv0ry',
+            '_TZ3000_54hjn4vs',
+            '_TZ3000_aa5t61rh',
+            '_TZ3000_in5qxhtt',
+            '_TZ3000_ogpla3lh',
+            '_TZ3000_i9w5mehz',
+        ]),
+        model: 'TS0002_limited',
         vendor: 'Tuya',
-        description: '1 gang switch module',
-        extend: [tuya.modernExtend.tuyaOnOff({ endpoints: ['l1', 'l2'], indicatorMode: true, backlightModeOffOn: true })],
+        description: '2 gang switch module',
+        extend: [tuya.modernExtend.tuyaOnOff({ switchType: true, indicatorMode: true, backlightModeOffOn: true, endpoints: ['l1', 'l2'] })],
         endpoint: (device) => {
             return { l1: 1, l2: 2 };
         },
         meta: { multiEndpoint: true },
-        whiteLabel: [tuya.whitelabel('PSMART', 'T442', '2 gang switch module', ['_TZ3000_mufwv0ry'])],
         configure: async (device, coordinatorEndpoint) => {
             await tuya.configureMagicPacket(device, coordinatorEndpoint);
             await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
+            await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff']);
         },
+        whiteLabel: [
+            tuya.whitelabel('AVATTO', 'ZWSM16-2-Zigbee', '2 gang switch module', ['_TZ3000_mtnpt6ws']),
+            tuya.whitelabel('PSMART', 'T442', '2 gang switch module', ['_TZ3000_mufwv0ry']),
+            tuya.whitelabel('Lonsonho', 'X702A', '2 gang switch with backlight', ['_TZ3000_54hjn4vs', '_TZ3000_aa5t61rh']),
+            tuya.whitelabel('Homeetec', '37022463', '2 Gang switch with backlight', ['_TZ3000_in5qxhtt']),
+            tuya.whitelabel('RoomsAI', '37022463', '2 Gang switch with backlight', ['_TZ3000_ogpla3lh']),
+        ],
     },
     {
-        fingerprint: tuya.fingerprint('TS0003', ['_TZ3000_rhkfbfcv', '_TZ3000_empogkya', '_TZ3000_lubfc1t5', '_TZ3000_lsunm46z', '_TZ3000_v4l4b0lp']),
-        model: 'TS0003_switch_3_gang_with_backlight',
+        // TS0002 2 gang switch module with all available features. This is the default for TS0002 devices.
+        model: 'TS0002',
+        zigbeeModel: ['TS0002'],
         vendor: 'Tuya',
-        description: '3-Gang switch with backlight',
-        extend: [tuya.modernExtend.tuyaOnOff({ powerOnBehavior2: true, indicatorMode: true, backlightModeOffOn: true, endpoints: ['l1', 'l2', 'l3'] })],
+        description: '2-Gang switch with backlight, countdown and inching',
+        extend: [
+            tuya.modernExtend.tuyaOnOff({
+                switchType: true,
+                powerOnBehavior2: true,
+                backlightModeOffOn: true,
+                indicatorMode: true,
+                onOffCountdown: true,
+                inchingSwitch: true,
+                endpoints: ['l1', 'l2'],
+            }),
+            tuya.clusters.addTuyaCommonPrivateCluster(),
+        ],
         endpoint: (device) => {
-            return { l1: 1, l2: 2, l3: 3 };
+            return { l1: 1, l2: 2 };
         },
         meta: { multiEndpoint: true },
         configure: async (device, coordinatorEndpoint) => {
             await tuya.configureMagicPacket(device, coordinatorEndpoint);
             await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
             await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff']);
-            await reporting.bind(device.getEndpoint(3), coordinatorEndpoint, ['genOnOff']);
         },
         whiteLabel: [
-            tuya.whitelabel('Lonsonho', 'X703A', '3 Gang switch with backlight', ['_TZ3000_rhkfbfcv']),
-            tuya.whitelabel('Zemismart', 'ZM-L03E-Z', '3 gang switch with neutral', ['_TZ3000_empogkya', '_TZ3000_lsunm46z']),
-            tuya.whitelabel('Tuya', 'M10Z', '2 gang switch with 20A power socket', ['_TZ3000_lubfc1t5']),
-        ],
-    },
-    {
-        zigbeeModel: ['TS0002'],
-        model: 'TS0002',
-        vendor: 'Tuya',
-        description: '2 gang switch',
-        whiteLabel: [
+            tuya.whitelabel('Zemismart', 'TB26-2', '2 Gang switch with backlight, countdown, inching', ['_TZ3000_ywubfuvt']),
             { vendor: 'Zemismart', model: 'ZM-CSW002-D_switch' },
             { vendor: 'Lonsonho', model: 'X702' },
             { vendor: 'AVATTO', model: 'ZTS02' },
-            tuya.whitelabel('Tuya', 'ZG-2002-RF', 'Three mode Zigbee Switch', ['_TZ3000_lugaswf8']),
-            tuya.whitelabel('Mercator Ikuü', 'SSW02', '2 gang switch', ['_TZ3000_fbjdkph9']),
         ],
-        extend: [tuya.modernExtend.tuyaOnOff()],
-        exposes: [e.switch().withEndpoint('l1'), e.switch().withEndpoint('l2')],
+    },
+    ////////////////////////
+    // TS0003 DEFINITIONS //
+    ////////////////////////
+    {
+        fingerprint: tuya.fingerprint('TS0003', ['_TZ3000_rhkfbfcv', '_TZ3000_empogkya', '_TZ3000_lubfc1t5', '_TZ3000_lsunm46z', '_TZ3000_v4l4b0lp']),
+        model: 'TS0003_switch_3_gang_with_backlight',
+        vendor: 'Tuya',
+        description: '3-Gang switch with backlight',
+        extend: [tuya.modernExtend.tuyaOnOff({ powerOnBehavior2: true, indicatorMode: true, backlightModeOffOn: true, endpoints: ['l1', 'l2', 'l3'] })],
         endpoint: (device) => {
-            return { l1: 1, l2: 2 };
+            return { l1: 1, l2: 2, l3: 3 };
         },
         meta: { multiEndpoint: true },
         configure: async (device, coordinatorEndpoint) => {
             await tuya.configureMagicPacket(device, coordinatorEndpoint);
             await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
             await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff']);
+            await reporting.bind(device.getEndpoint(3), coordinatorEndpoint, ['genOnOff']);
         },
+        whiteLabel: [
+            tuya.whitelabel('Lonsonho', 'X703A', '3 Gang switch with backlight', ['_TZ3000_rhkfbfcv']),
+            tuya.whitelabel('Zemismart', 'ZM-L03E-Z', '3 gang switch with neutral', ['_TZ3000_empogkya', '_TZ3000_lsunm46z']),
+            tuya.whitelabel('Tuya', 'M10Z', '2 gang switch with 20A power socket', ['_TZ3000_lubfc1t5']),
+        ],
     },
     {
         zigbeeModel: ['TS0003'],
@@ -3693,78 +3748,6 @@ const definitions = [
             await tuya.configureMagicPacket(device, coordinatorEndpoint);
         },
     },
-    {
-        fingerprint: tuya.fingerprint('TS0001', [
-            '_TZ3000_tqlv4ug4',
-            '_TZ3000_gjrubzje',
-            '_TZ3000_tygpxwqa',
-            '_TZ3000_4rbqgcuv',
-            '_TZ3000_veu2v775',
-            '_TZ3000_prits6g4',
-        ]),
-        model: 'TS0001_switch_module',
-        vendor: 'Tuya',
-        description: '1 gang switch module',
-        whiteLabel: [
-            { vendor: 'OXT', model: 'SWTZ21' },
-            { vendor: 'Moes', model: 'ZM-104-M' },
-            tuya.whitelabel('AVATTO', 'ZWSM16-1-Zigbee', '1 gang switch module', ['_TZ3000_4rbqgcuv']),
-        ],
-        extend: [tuya.modernExtend.tuyaOnOff({ switchType: true, onOffCountdown: true })],
-        configure: async (device, coordinatorEndpoint) => {
-            await tuya.configureMagicPacket(device, coordinatorEndpoint);
-            await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
-        },
-    },
-    {
-        fingerprint: tuya.fingerprint('TS0002', [
-            '_TZ3000_01gpyda5',
-            '_TZ3000_bvrlqyj7',
-            '_TZ3000_7ed9cqgi',
-            '_TZ3000_zmy4lslw',
-            '_TZ3000_ruxexjfz',
-            '_TZ3000_4xfqlgqo',
-            '_TZ3000_eei0ubpy',
-            '_TZ3000_qaa59zqd',
-            '_TZ3000_lmlsduws',
-        ]),
-        model: 'TS0002_switch_module',
-        vendor: 'Tuya',
-        description: '2 gang switch module',
-        whiteLabel: [
-            { vendor: 'OXT', model: 'SWTZ22' },
-            { vendor: 'Moes', model: 'ZM-104B-M' },
-            tuya.whitelabel('pcblab.io', 'RR620ZB', '2 gang Zigbee switch module', ['_TZ3000_4xfqlgqo']),
-            tuya.whitelabel('Nous', 'L13Z', '2 gang switch', ['_TZ3000_ruxexjfz']),
-        ],
-        extend: [tuya.modernExtend.tuyaOnOff({ switchType: true, endpoints: ['l1', 'l2'] })],
-        endpoint: (device) => {
-            return { l1: 1, l2: 2 };
-        },
-        meta: { multiEndpoint: true },
-        configure: async (device, coordinatorEndpoint) => {
-            await tuya.configureMagicPacket(device, coordinatorEndpoint);
-            await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
-            await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff']);
-        },
-    },
-    {
-        fingerprint: tuya.fingerprint('TS0002', ['_TZ3000_fisb3ajo', '_TZ3000_5gey1ohx', '_TZ3000_mtnpt6ws']),
-        model: 'TS0002_switch_module_2',
-        vendor: 'Tuya',
-        description: '2 gang switch module',
-        extend: [tuya.modernExtend.tuyaOnOff({ switchType: true, indicatorMode: true, endpoints: ['l1', 'l2'] })],
-        endpoint: (device) => {
-            return { l1: 1, l2: 2 };
-        },
-        meta: { multiEndpoint: true },
-        configure: async (device, coordinatorEndpoint) => {
-            await tuya.configureMagicPacket(device, coordinatorEndpoint);
-            await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
-            await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff']);
-        },
-        whiteLabel: [tuya.whitelabel('AVATTO', 'ZWSM16-2-Zigbee', '2 gang switch module', ['_TZ3000_mtnpt6ws'])],
-    },
     {
         fingerprint: tuya.fingerprint('TS0003', ['_TZ3000_4o16jdca', '_TZ3000_odzoiovu', '_TZ3000_hbic3ka3', '_TZ3000_lvhy15ix']),
         model: 'TS0003_switch_module_2',
@@ -3801,6 +3784,29 @@ const definitions = [
             await reporting.bind(device.getEndpoint(3), coordinatorEndpoint, ['genOnOff']);
         },
     },
+    {
+        fingerprint: tuya.fingerprint('TS0001', [
+            '_TZ3000_tqlv4ug4',
+            '_TZ3000_gjrubzje',
+            '_TZ3000_tygpxwqa',
+            '_TZ3000_4rbqgcuv',
+            '_TZ3000_veu2v775',
+            '_TZ3000_prits6g4',
+        ]),
+        model: 'TS0001_switch_module',
+        vendor: 'Tuya',
+        description: '1 gang switch module',
+        whiteLabel: [
+            { vendor: 'OXT', model: 'SWTZ21' },
+            { vendor: 'Moes', model: 'ZM-104-M' },
+            tuya.whitelabel('AVATTO', 'ZWSM16-1-Zigbee', '1 gang switch module', ['_TZ3000_4rbqgcuv']),
+        ],
+        extend: [tuya.modernExtend.tuyaOnOff({ switchType: true, onOffCountdown: true })],
+        configure: async (device, coordinatorEndpoint) => {
+            await tuya.configureMagicPacket(device, coordinatorEndpoint);
+            await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
+        },
+    },
     {
         fingerprint: tuya.fingerprint('TS0004', ['_TZ3000_ltt60asa', '_TZ3000_mmkbptmx']),
         model: 'TS0004_switch_module',
@@ -8349,45 +8355,6 @@ const definitions = [
             tuya.whitelabel('RoomsAI', 'RoomsAI_37022454', '1 Gang switch with backlight', ['_TZ3000_w1tcofu8']),
         ],
     },
-    {
-        fingerprint: [
-            { modelID: 'TS0002', manufacturerName: '_TZ3000_in5qxhtt' },
-            { modelID: 'TS0002', manufacturerName: '_TZ3000_ogpla3lh' },
-        ],
-        model: 'TS0002_switch_2_gang',
-        vendor: 'Tuya',
-        description: '2-Gang switch with backlight',
-        extend: [tuya.modernExtend.tuyaOnOff({ powerOnBehavior2: true, backlightModeOffOn: true, endpoints: ['l1', 'l2'] })],
-        endpoint: (device) => {
-            return { l1: 1, l2: 2 };
-        },
-        meta: { multiEndpoint: true },
-        configure: async (device, coordinatorEndpoint) => {
-            await tuya.configureMagicPacket(device, coordinatorEndpoint);
-            await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
-            await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff']);
-        },
-        whiteLabel: [
-            tuya.whitelabel('Homeetec', '37022463', '2 Gang switch with backlight', ['_TZ3000_in5qxhtt']),
-            tuya.whitelabel('RoomsAI', '37022463', '2 Gang switch with backlight', ['_TZ3000_ogpla3lh']),
-        ],
-    },
-    {
-        fingerprint: [{ modelID: 'TS0002', manufacturerName: '_TZ3000_i9w5mehz' }],
-        model: 'TS0002_switch_module_4',
-        vendor: 'Tuya',
-        description: '2 gang switch with backlight',
-        extend: [tuya.modernExtend.tuyaOnOff({ powerOnBehavior2: true, backlightModeOffOn: true, indicatorMode: true, endpoints: ['l1', 'l2'] })],
-        endpoint: (device) => {
-            return { l1: 1, l2: 2 };
-        },
-        meta: { multiEndpoint: true },
-        configure: async (device, coordinatorEndpoint) => {
-            await tuya.configureMagicPacket(device, coordinatorEndpoint);
-            await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
-            await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff']);
-        },
-    },
     {
         fingerprint: [
             { modelID: 'TS0003', manufacturerName: '_TZ3000_pv4puuxi' },