@willieee802/zigbee-herdsman-converters 19.44.3 → 19.45.0

package/dist/devices/mercator.js

@@ -46,7 +46,10 @@ exports.definitions = [
         model: "SPP04G",
         vendor: "Mercator Ikuü",
         description: "Quad power point",
-        extend: [tuya.modernExtend.tuyaOnOff({ powerOutageMemory: true, electricalMeasurements: true, endpoints: ["left", "right"] })],
+        extend: [
+            tuya.modernExtend.tuyaBase(),
+            tuya.modernExtend.tuyaOnOff({ powerOutageMemory: true, electricalMeasurements: true, endpoints: ["left", "right"] }),
+        ],
         endpoint: (device) => {
             return { left: 1, right: 2 };
         },
@@ -120,7 +123,10 @@ exports.definitions = [
         model: "SPP02G",
         vendor: "Mercator Ikuü",
         description: "Double power point",
-        extend: [tuya.modernExtend.tuyaOnOff({ powerOutageMemory: true, electricalMeasurements: true, endpoints: ["left", "right"] })],
+        extend: [
+            tuya.modernExtend.tuyaBase(),
+            tuya.modernExtend.tuyaOnOff({ powerOutageMemory: true, electricalMeasurements: true, endpoints: ["left", "right"] }),
+        ],
         endpoint: (device) => {
             return { left: 1, right: 2 };
         },
@@ -148,7 +154,10 @@ exports.definitions = [
         model: "SPP02GIP",
         vendor: "Mercator Ikuü",
         description: "Double power point IP54",
-        extend: [tuya.modernExtend.tuyaOnOff({ powerOutageMemory: true, electricalMeasurements: true, endpoints: ["left", "right"] })],
+        extend: [
+            tuya.modernExtend.tuyaBase(),
+            tuya.modernExtend.tuyaOnOff({ powerOutageMemory: true, electricalMeasurements: true, endpoints: ["left", "right"] }),
+        ],
         endpoint: (device) => {
             return { left: 1, right: 2 };
         },
@@ -176,7 +185,10 @@ exports.definitions = [
         model: "SSW03G",
         vendor: "Mercator Ikuü",
         description: "Triple switch",
-        extend: [tuya.modernExtend.tuyaOnOff({ backlightModeLowMediumHigh: true, endpoints: ["left", "center", "right"] })],
+        extend: [
+            tuya.modernExtend.tuyaBase(),
+            tuya.modernExtend.tuyaOnOff({ backlightModeLowMediumHigh: true, endpoints: ["left", "center", "right"] }),
+        ],
         endpoint: (device) => {
             return { left: 1, center: 2, right: 3 };
         },
@@ -215,7 +227,10 @@ exports.definitions = [
         model: "SPPUSB02",
         vendor: "Mercator Ikuü",
         description: "Double power point with USB",
-        extend: [tuya.modernExtend.tuyaOnOff({ powerOutageMemory: true, electricalMeasurements: true, endpoints: ["left", "right"] })],
+        extend: [
+            tuya.modernExtend.tuyaBase(),
+            tuya.modernExtend.tuyaOnOff({ powerOutageMemory: true, electricalMeasurements: true, endpoints: ["left", "right"] }),
+        ],
         endpoint: (device) => {
             return { left: 1, right: 2 };
         },

package/dist/devices/mercator.js.map

@@ -1 +1 @@
-{"version":3,"file":"mercator.js","sourceRoot":"","sources":["../../src/devices/mercator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mercator.js","sourceRoot":"","sources":["../../src/devices/mercator.ts"],"names":[],"mappings":"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"}

package/dist/devices/miboxer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"miboxer.d.ts","sourceRoot":"","sources":["../../src/devices/miboxer.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAwC,oBAAoB,EAA4B,MAAM,cAAc,CAAC;AA8RzH,eAAO,MAAM,WAAW,EAAE,oBAAoB,EAmB7C,CAAC"}
+{"version":3,"file":"miboxer.d.ts","sourceRoot":"","sources":["../../src/devices/miboxer.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAwC,oBAAoB,EAA4B,MAAM,cAAc,CAAC;AA8RzH,eAAO,MAAM,WAAW,EAAE,oBAAoB,EAqB7C,CAAC"}

package/dist/devices/miboxer.js

@@ -156,7 +156,7 @@ function miboxerFut089zControls() {
         colorTempConverter,
         colorConverter,
         fz.battery,
-        fz.tuya_switch_scene,
+        tuya.fz.switch_scene,
         // Add converters for numeric sensors (always included, but they check options internally)
         actionPropertyConverters.hue_saturation,
         actionPropertyConverters.color_temp,
@@ -296,6 +296,8 @@ exports.definitions = [
         description: "RGB+CCT Remote",
         whiteLabel: [tuya.whitelabel("Ledron", "YK-16", "RGB+CCT Remote", ["_TZ3000_zwszqdpy"])],
         extend: [
+            tuya.clusters.addTuyaGenGroupsCluster(),
+            tuya.clusters.addTuyaGenOnOffCluster(),
             miboxerFut089zControls(),
             m.quirkCheckinInterval(21600), // Device observed to report every 4h, set to 6h (21600s) for safety margin
         ],

package/dist/devices/miboxer.js.map

@@ -1 +1 @@
-{"version":3,"file":"miboxer.js","sourceRoot":"","sources":["../../src/devices/miboxer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"miboxer.js","sourceRoot":"","sources":["../../src/devices/miboxer.ts"],"names":[],"mappings":"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"}

package/dist/devices/mill.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mill.d.ts","sourceRoot":"","sources":["../../src/devices/mill.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,cAAc,CAAC;AAIvD,eAAO,MAAM,WAAW,EAAE,oBAAoB,EAU7C,CAAC"}
+{"version":3,"file":"mill.d.ts","sourceRoot":"","sources":["../../src/devices/mill.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,cAAc,CAAC;AAEvD,eAAO,MAAM,WAAW,EAAE,oBAAoB,EAuC7C,CAAC"}

package/dist/devices/mill.js

@@ -34,19 +34,45 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.definitions = void 0;
-const fz = __importStar(require("../converters/fromZigbee"));
-const tz = __importStar(require("../converters/toZigbee"));
-const exposes = __importStar(require("../lib/exposes"));
-const e = exposes.presets;
+const m = __importStar(require("../lib/modernExtend"));
 exports.definitions = [
     {
         zigbeeModel: ["Panel gen4", "Mill Wi-Fi Panel Heater Gen4\u0000\u0000\u0000\u0018Mill Int"],
         model: "Mill-gen-4",
         vendor: "Mill",
         description: "WiFi heating panel gen4",
-        fromZigbee: [fz.thermostat, fz.identify],
-        toZigbee: [tz.thermostat_occupied_heating_setpoint, tz.thermostat_system_mode, tz.identify],
-        exposes: [e.climate().withSetpoint("occupied_heating_setpoint", 5, 35, 0.5).withLocalTemperature().withSystemMode(["off", "heat"])],
+        extend: [
+            m.identify(),
+            m.thermostat({
+                setpoints: {
+                    values: {
+                        occupiedHeatingSetpoint: { min: 5, max: 35, step: 0.5 },
+                    },
+                },
+                systemMode: {
+                    values: ["off", "heat"],
+                },
+            }),
+        ],
+    },
+    {
+        fingerprint: [{ manufacturerName: "Mill International\u0000Threa" }, { manufacturerName: "Mill InternationalThrea" }],
+        zigbeeModel: ["Mill International\u0000Threa", "Mill InternationalThrea"],
+        model: "MFTWIFI",
+        vendor: "Mill",
+        description: "Smart floor thermostat WiFi & Zigbee",
+        extend: [
+            m.thermostat({
+                setpoints: {
+                    values: {
+                        occupiedHeatingSetpoint: { min: 5, max: 35, step: 0.5 },
+                    },
+                },
+                systemMode: {
+                    values: ["off", "heat"],
+                },
+            }),
+        ],
     },
 ];
 //# sourceMappingURL=mill.js.map

package/dist/devices/mill.js.map

@@ -1 +1 @@
-{"version":3,"file":"mill.js","sourceRoot":"","sources":["../../src/devices/mill.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAA+C;AAC/C,2DAA6C;AAC7C,wDAA0C;AAG1C,MAAM,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;AAEb,QAAA,WAAW,GAA2B;IAC/C;QACI,WAAW,EAAE,CAAC,YAAY,EAAE,8DAA8D,CAAC;QAC3F,KAAK,EAAE,YAAY;QACnB,MAAM,EAAE,MAAM;QACd,WAAW,EAAE,yBAAyB;QACtC,UAAU,EAAE,CAAC,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,QAAQ,CAAC;QACxC,QAAQ,EAAE,CAAC,EAAE,CAAC,oCAAoC,EAAE,EAAE,CAAC,sBAAsB,EAAE,EAAE,CAAC,QAAQ,CAAC;QAC3F,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,YAAY,CAAC,2BAA2B,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC,oBAAoB,EAAE,CAAC,cAAc,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;KACtI;CACJ,CAAC"}
+{"version":3,"file":"mill.js","sourceRoot":"","sources":["../../src/devices/mill.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAyC;AAG5B,QAAA,WAAW,GAA2B;IAC/C;QACI,WAAW,EAAE,CAAC,YAAY,EAAE,8DAA8D,CAAC;QAC3F,KAAK,EAAE,YAAY;QACnB,MAAM,EAAE,MAAM;QACd,WAAW,EAAE,yBAAyB;QACtC,MAAM,EAAE;YACJ,CAAC,CAAC,QAAQ,EAAE;YACZ,CAAC,CAAC,UAAU,CAAC;gBACT,SAAS,EAAE;oBACP,MAAM,EAAE;wBACJ,uBAAuB,EAAE,EAAC,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAC;qBACxD;iBACJ;gBACD,UAAU,EAAE;oBACR,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC;iBAC1B;aACJ,CAAC;SACL;KACJ;IACD;QACI,WAAW,EAAE,CAAC,EAAC,gBAAgB,EAAE,+BAA+B,EAAC,EAAE,EAAC,gBAAgB,EAAE,yBAAyB,EAAC,CAAC;QACjH,WAAW,EAAE,CAAC,+BAA+B,EAAE,yBAAyB,CAAC;QACzE,KAAK,EAAE,SAAS;QAChB,MAAM,EAAE,MAAM;QACd,WAAW,EAAE,sCAAsC;QACnD,MAAM,EAAE;YACJ,CAAC,CAAC,UAAU,CAAC;gBACT,SAAS,EAAE;oBACP,MAAM,EAAE;wBACJ,uBAAuB,EAAE,EAAC,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAC;qBACxD;iBACJ;gBACD,UAAU,EAAE;oBACR,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC;iBAC1B;aACJ,CAAC;SACL;KACJ;CACJ,CAAC"}

package/dist/devices/moes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"moes.d.ts","sourceRoot":"","sources":["../../src/devices/moes.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAC,oBAAoB,EAAS,MAAM,cAAc,CAAC;AAgB/D,eAAO,MAAM,WAAW,EAAE,oBAAoB,EAwzE7C,CAAC"}
+{"version":3,"file":"moes.d.ts","sourceRoot":"","sources":["../../src/devices/moes.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAC,oBAAoB,EAAS,MAAM,cAAc,CAAC;AAgB/D,eAAO,MAAM,WAAW,EAAE,oBAAoB,EAm4E7C,CAAC"}

package/dist/devices/moes.js

@@ -471,12 +471,56 @@ exports.definitions = [
             };
         },
     },
+    {
+        fingerprint: tuya.fingerprint("TS0601", ["_TZE284_upt8lzi0"]),
+        model: "ZS-SF-EUC-WH-MS",
+        vendor: "Moes",
+        description: "Star feather Zigbee curtain switch",
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
+        options: [exposes.options.invert_cover()],
+        exposes: [e.cover_position().setAccess("position", ea.STATE_SET)],
+        meta: {
+            tuyaDatapoints: [
+                [1, "state", tuya.valueConverterBasic.lookup({ OPEN: tuya.enum(0), STOP: tuya.enum(1), CLOSE: tuya.enum(2) })],
+                [2, "position", tuya.valueConverter.coverPosition],
+            ],
+        },
+    },
+    {
+        fingerprint: tuya.fingerprint("TS0601", ["_TZE284_koxaopnk"]),
+        model: "ZC-LS02",
+        vendor: "Moes",
+        description: "Roller blind motor",
+        extend: [tuya.modernExtend.tuyaBase({ dp: true, respondToMcuVersionResponse: true })],
+        exposes: [
+            e.cover_position().setAccess("position", ea.STATE_SET),
+            e.enum("motor_direction", ea.STATE_SET, ["normal", "reversed"]).withDescription("Set the motor direction"),
+            e.battery(),
+        ],
+        meta: {
+            tuyaDatapoints: [
+                [
+                    1,
+                    "state",
+                    tuya.valueConverterBasic.lookup({
+                        OPEN: tuya.enum(0),
+                        STOP: tuya.enum(1),
+                        CLOSE: tuya.enum(2),
+                    }),
+                ],
+                [2, "position", tuya.valueConverter.coverPositionInverted],
+                [3, "position", tuya.valueConverter.coverPositionInverted],
+                [5, "motor_direction", tuya.valueConverterBasic.lookup({ normal: tuya.enum(0), reversed: tuya.enum(1) })],
+                [13, "battery", tuya.valueConverter.raw],
+            ],
+        },
+    },
     {
         fingerprint: tuya.fingerprint("TS0601", ["_TZE200_stvgmdjz", "_TZE200_ydkqbmpt", "_TZE200_z3u99qxt"]),
         model: "SFL02-Z-1",
         vendor: "Moes",
         description: "Star feather smart switch 1 gang",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "1970" })],
         whiteLabel: [tuya.whitelabel("Nova Digital", "TPZ-1", "Topazio smart switch 1 gang", ["_TZE200_ydkqbmpt"])],
         exposes: [
             tuya.exposes.backlightModeOffOn().withAccess(ea.STATE_SET),
@@ -558,7 +602,7 @@ exports.definitions = [
             exposes.enum("induction_mode", ea.ALL, ["ON", "OFF"]).withDescription("Induction mode"),
             exposes.enum("vibration_mode", ea.ALL, ["Gear 0", "Gear 1", "Gear 2", "Gear 3"]).withDescription("Vibration"),
         ],
-        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "1970" })],
         endpoint: (device) => {
             return { l1: 1, l2: 1, state: 1, backlight: 1 };
         },
@@ -592,7 +636,7 @@ exports.definitions = [
         model: "SFL02-Z-3",
         vendor: "Moes",
         description: "Star feather smart switch 3 gangs",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "1970" })],
         whiteLabel: [tuya.whitelabel("Nova Digital", "TPZ-3", "Topazio smart switch 3 gangs", ["_TZE200_rd8cdssd"])],
         exposes: [
             e.switch().withEndpoint("l1").setAccess("state", ea.STATE_SET),
@@ -678,7 +722,7 @@ exports.definitions = [
         model: "SFL02-Z-4",
         vendor: "Moes",
         description: "Star feather smart switch 4 gangs",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "1970" })],
         whiteLabel: [tuya.whitelabel("Nova Digital", "TPZ-4", "Topazio smart switch 4 gangs", ["_TZE200_hmabvy81"])],
         exposes: [
             e.switch().withEndpoint("l1").setAccess("state", ea.STATE_SET),
@@ -875,6 +919,7 @@ exports.definitions = [
         vendor: "Moes",
         description: "Zigbee 3.0 dual USB wireless socket plug",
         extend: [
+            tuya.modernExtend.tuyaBase(),
             tuya.modernExtend.tuyaOnOff({
                 powerOutageMemory: true,
                 indicatorMode: true,
@@ -899,7 +944,7 @@ exports.definitions = [
         model: "MS-104Z",
         description: "Smart light switch module (1 gang)",
         vendor: "Moes",
-        extend: [tuya.modernExtend.tuyaOnOff()],
+        extend: [tuya.modernExtend.tuyaBase(), tuya.modernExtend.tuyaOnOff()],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ["genOnOff"]);
@@ -918,7 +963,7 @@ exports.definitions = [
         model: "MS-104BZ",
         description: "Smart light switch module (2 gang)",
         vendor: "Moes",
-        extend: [tuya.modernExtend.tuyaOnOff({ endpoints: ["l1", "l2"] })],
+        extend: [tuya.modernExtend.tuyaBase(), tuya.modernExtend.tuyaOnOff({ endpoints: ["l1", "l2"] })],
         meta: { multiEndpoint: true },
         endpoint: (device) => {
             return { l1: 1, l2: 2 };
@@ -1318,6 +1363,7 @@ exports.definitions = [
         model: "UFO-R11",
         vendor: "Moes",
         description: "Universal smart IR remote control",
+        extend: [zosung.zosungExtend.addZosungIRTransmitCluster(), zosung.zosungExtend.addZosungIRControlCluster()],
         fromZigbee: [
             fzZosung.zosung_send_ir_code_00,
             fzZosung.zosung_send_ir_code_01,
@@ -1351,14 +1397,29 @@ exports.definitions = [
         model: "ZWV-YC",
         vendor: "Moes",
         description: "Water valve",
-        extend: [m.battery(), m.onOff({ powerOnBehavior: false, configureReporting: true })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true, forceTimeUpdates: true })],
+        exposes: [
+            tuya.exposes.errorStatus(),
+            tuya.exposes.switch(),
+            tuya.exposes.batteryState(),
+            tuya.exposes.countdown().withValueMin(0).withValueMax(255).withUnit("minutes").withDescription("Max on time in minutes"),
+        ],
+        meta: {
+            tuyaSendCommand: "sendData",
+            tuyaDatapoints: [
+                [26, "error_status", tuya.valueConverter.raw],
+                [101, "state", tuya.valueConverter.onOff],
+                [111, "countdown", tuya.valueConverter.raw],
+                [115, "battery_state", tuya.valueConverter.batteryState],
+            ],
+        },
     },
     {
         fingerprint: tuya.fingerprint("TS0011", ["_TZ3000_hhiodade"]),
         model: "ZS-EUB_1gang",
         vendor: "Moes",
         description: "Wall light switch (1 gang)",
-        extend: [tuya.modernExtend.tuyaOnOff({ backlightModeOffNormalInverted: true })],
+        extend: [tuya.modernExtend.tuyaBase(), tuya.modernExtend.tuyaOnOff({ backlightModeOffNormalInverted: true })],
         configure: async (device, coordinatorEndpoint) => {
             await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ["genOnOff"]);
             device.powerSource = "Mains (single phase)";
@@ -1384,7 +1445,7 @@ exports.definitions = [
         whiteLabel: [tuya.whitelabel("Heiman", "HS-720ES", "Carbon monoxide alarm", ["_TZE200_hr0tdd47"])],
     },
     {
-        fingerprint: tuya.fingerprint("TS0601", ["_TZE204_vawy74yh", "_TZE284_vawy74yh"]),
+        fingerprint: tuya.fingerprint("TS0601", ["_TZE200_vawy74yh", "_TZE204_vawy74yh", "_TZE284_vawy74yh"]),
         model: "ZSS-HM-SSD01",
         vendor: "Moes",
         description: "Smoke sensor",
@@ -1416,22 +1477,32 @@ exports.definitions = [
     },
     {
         zigbeeModel: ["ZG-101ZL"],
-        fingerprint: tuya.fingerprint("TS004F", ["_TZ3000_ja5osu5g", "_TZ3000_kjfzuycl", "_TZ3000_egvb1p2g", "_TZ3000_kaflzta4", "_TZ3000_lrfvzq1e"]),
+        fingerprint: tuya.fingerprint("TS004F", [
+            "_TZ3000_ja5osu5g",
+            "_TZ3000_kjfzuycl",
+            "_TZ3000_egvb1p2g",
+            "_TZ3000_kaflzta4",
+            "_TZ3000_lrfvzq1e",
+            "_TZ3000_wc3gjyp3",
+        ]),
         model: "ERS-10TZBVB-AA",
         vendor: "Moes",
         description: "Smart button",
-        whiteLabel: [tuya.whitelabel("Loginovo", "ZG-101ZL", "Smart button", ["_TZ3000_ja5osu5g", "_TZ3000_lrfvzq1e", "_TZ3000_kaflzta4"])],
+        whiteLabel: [
+            tuya.whitelabel("Loginovo", "ZG-101ZL", "Smart button", ["_TZ3000_ja5osu5g", "_TZ3000_lrfvzq1e", "_TZ3000_kaflzta4", "_TZ3000_wc3gjyp3"]),
+        ],
+        extend: [tuya.clusters.addTuyaGenOnOffCluster()],
         fromZigbee: [
             fz.command_step,
             fz.command_on,
             fz.command_off,
             fz.command_move_to_color_temp,
             fz.command_move_to_level,
-            fz.tuya_multi_action,
-            fz.tuya_operation_mode,
+            tuya.fz.multi_action,
+            tuya.fz.operation_mode,
             fz.battery,
         ],
-        toZigbee: [tz.tuya_operation_mode],
+        toZigbee: [tuya.tz.operation_mode],
         exposes: [
             e.action([
                 "single",
@@ -1515,7 +1586,7 @@ exports.definitions = [
         vendor: "Moes",
         description: "Smart switch (light + sence)",
         extend: [
-            tuya.modernExtend.tuyaMagicPacket(),
+            tuya.modernExtend.tuyaBase(),
             m.deviceEndpoints({ endpoints: { l1: 1, l2: 2, l3: 3 } }),
             tuya.modernExtend.tuyaOnOff({
                 endpoints: ["l1", "l2", "l3"],
@@ -1832,6 +1903,7 @@ exports.definitions = [
         model: "ZT-B-EU1",
         vendor: "Moes",
         description: "Scene remote with 1 key",
+        extend: [tuya.clusters.addTuyaGenOnOffCluster()],
         fromZigbee: [tuya.fz.on_off_action, fz.battery, tuya.fz.datapoints],
         toZigbee: [],
         configure: tuya.configureMagicPacket,
@@ -1856,6 +1928,7 @@ exports.definitions = [
         model: "ZT-B-EU2",
         vendor: "Moes",
         description: "Scene remote with 2 keys",
+        extend: [tuya.clusters.addTuyaGenOnOffCluster()],
         fromZigbee: [tuya.fz.on_off_action, fz.battery, tuya.fz.datapoints],
         toZigbee: [],
         configure: tuya.configureMagicPacket,
@@ -1889,6 +1962,7 @@ exports.definitions = [
         model: "ZT-B-EU3",
         vendor: "Moes",
         description: "Scene remote with 3 keys",
+        extend: [tuya.clusters.addTuyaGenOnOffCluster()],
         fromZigbee: [tuya.fz.on_off_action, fz.battery, tuya.fz.datapoints],
         toZigbee: [],
         configure: tuya.configureMagicPacket,