zigbee-herdsman-converters 25.41.0 → 25.43.0

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

@@ -1 +1 @@
-{"version":3,"file":"saswell.d.ts","sourceRoot":"","sources":["../../src/devices/saswell.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,cAAc,CAAC;AAKvD,eAAO,MAAM,WAAW,EAAE,oBAAoB,EA2E7C,CAAC"}
+{"version":3,"file":"saswell.d.ts","sourceRoot":"","sources":["../../src/devices/saswell.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,cAAc,CAAC;AAKvD,eAAO,MAAM,WAAW,EAAE,oBAAoB,EA4E7C,CAAC"}

package/dist/devices/saswell.js

@@ -61,6 +61,7 @@ exports.definitions = [
                 "_TZE200_gd4rvykv",
                 "_TZE200_exfrnlow",
                 "_TZE200_9m4kmbfu",
+                "_TZE284_9m4kmbfu",
                 "_TZE200_3yp57tby",
                 "_TZE200_7p8ugv8d",
                 "_TZE284_3yp57tby",

package/dist/devices/saswell.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"shelly.d.ts","sourceRoot":"","sources":["../../src/devices/shelly.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,cAAc,CAAC;AAEvD,eAAO,MAAM,WAAW,EAAE,oBAAoB,EAwF7C,CAAC"}
+{"version":3,"file":"shelly.d.ts","sourceRoot":"","sources":["../../src/devices/shelly.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAY,oBAAoB,EAAyC,MAAM,cAAc,CAAC;AA+K1G,eAAO,MAAM,WAAW,EAAE,oBAAoB,EA2G7C,CAAC"}

package/dist/devices/shelly.js

@@ -34,35 +34,206 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.definitions = void 0;
+const zigbee_herdsman_1 = require("zigbee-herdsman");
+const exposes = __importStar(require("../lib/exposes"));
 const m = __importStar(require("../lib/modernExtend"));
+const utils_1 = require("../lib/utils");
+const e = exposes.presets;
+const ea = exposes.access;
+const SHELLY_ENDPOINT_ID = 239;
+const SHELLY_OPTIONS = { profileId: zigbee_herdsman_1.ZSpec.CUSTOM_SHELLY_PROFILE_ID };
+const shellyModernExtend = {
+    shellyCustomClusters() {
+        return [
+            m.deviceAddCustomCluster("shellyRPCCluster", {
+                ID: 0xfc01,
+                manufacturerCode: zigbee_herdsman_1.Zcl.ManufacturerCode.SHELLY,
+                attributes: {
+                    data: { ID: 0x0000, type: zigbee_herdsman_1.Zcl.DataType.CHAR_STR },
+                    txCtl: { ID: 0x0001, type: zigbee_herdsman_1.Zcl.DataType.UINT32 },
+                    rxCtl: { ID: 0x0002, type: zigbee_herdsman_1.Zcl.DataType.UINT32 },
+                },
+                commands: {},
+                commandsResponse: {},
+            }),
+            m.deviceAddCustomCluster("shellyWiFiSetupCluster", {
+                ID: 0xfc02,
+                manufacturerCode: zigbee_herdsman_1.Zcl.ManufacturerCode.SHELLY,
+                attributes: {
+                    status: { ID: 0x0000, type: zigbee_herdsman_1.Zcl.DataType.CHAR_STR },
+                    ip: { ID: 0x0001, type: zigbee_herdsman_1.Zcl.DataType.CHAR_STR },
+                    actionCode: { ID: 0x0002, type: zigbee_herdsman_1.Zcl.DataType.UINT8 },
+                    dhcp: { ID: 0x0003, type: zigbee_herdsman_1.Zcl.DataType.BOOLEAN },
+                    enabled: { ID: 0x0004, type: zigbee_herdsman_1.Zcl.DataType.BOOLEAN },
+                    ssid: { ID: 0x0005, type: zigbee_herdsman_1.Zcl.DataType.CHAR_STR },
+                    password: { ID: 0x0006, type: zigbee_herdsman_1.Zcl.DataType.CHAR_STR },
+                    staticIp: { ID: 0x0007, type: zigbee_herdsman_1.Zcl.DataType.CHAR_STR },
+                    netMask: { ID: 0x0008, type: zigbee_herdsman_1.Zcl.DataType.CHAR_STR },
+                    gateway: { ID: 0x0009, type: zigbee_herdsman_1.Zcl.DataType.CHAR_STR },
+                    nameServer: { ID: 0x000a, type: zigbee_herdsman_1.Zcl.DataType.CHAR_STR },
+                },
+                commands: {},
+                commandsResponse: {},
+            }),
+        ];
+    },
+    shellyWiFiSetup() {
+        // biome-ignore lint/suspicious/noExplicitAny: generic
+        const refresh = async (endpoint) => {
+            await endpoint.write("shellyWiFiSetupCluster", { actionCode: 0 }, SHELLY_OPTIONS);
+            await endpoint.read("shellyWiFiSetupCluster", ["status", "ip", "enabled", "dhcp", "ssid"], SHELLY_OPTIONS);
+            await endpoint.read("shellyWiFiSetupCluster", ["staticIp", "netMask", "gateway", "nameServer"], SHELLY_OPTIONS);
+        };
+        const exposes = [
+            e.text("wifi_status", ea.STATE_GET).withLabel("Wi-Fi status").withDescription("Current connection status").withCategory("diagnostic"),
+            e
+                .text("ip_address", ea.STATE_GET)
+                .withLabel("IP address")
+                .withDescription("IP address currently assigned to the device")
+                .withCategory("diagnostic"),
+            e
+                .binary("dhcp_enabled", ea.STATE_GET, true, false)
+                .withLabel("DHCP enabled")
+                .withDescription("Indicates whether DHCP is used to automatically assign network settings")
+                .withCategory("diagnostic"),
+            e
+                .composite("wifi_config", "wifi_config", ea.ALL)
+                .withFeature(e.binary("enabled", ea.STATE_SET, true, false).withLabel("Wi-Fi enabled").withDescription("Enable/disable Wi-Fi connectivity"))
+                .withFeature(e.text("ssid", ea.STATE_SET).withLabel("Network").withDescription("Name (SSID) of the Wi-Fi network to connect to"))
+                .withFeature(e.text("password", ea.SET).withLabel("Password").withDescription("Password for the selected Wi-Fi network"))
+                .withFeature(e
+                .text("static_ip", ea.STATE_SET)
+                .withLabel("IPv4 address")
+                .withDescription("Manually assigned IP address (used when DHCP is disabled)"))
+                .withFeature(e.text("net_mask", ea.STATE_SET).withLabel("Network mask").withDescription("Subnet mask for the static IP configuration"))
+                .withFeature(e.text("gateway", ea.STATE_SET).withLabel("Gateway").withDescription("Default gateway address for static IP configuration"))
+                .withFeature(e.text("name_server", ea.STATE_SET).withLabel("DNS").withDescription("Name server address for static IP configuration"))
+                .withLabel("Wi-Fi Configuration")
+                .withCategory("config"),
+        ];
+        // biome-ignore lint/suspicious/noExplicitAny: generic
+        const fromZigbee = [
+            {
+                cluster: "shellyWiFiSetupCluster",
+                type: ["attributeReport", "readResponse"],
+                convert: (model, msg, publish, options, meta) => {
+                    const wifi_config = {};
+                    const state = { wifi_config };
+                    // Diagnostic data
+                    if (msg.data.status !== undefined)
+                        state.wifi_status = msg.data.status;
+                    if (msg.data.ip !== undefined)
+                        state.ip_address = msg.data.ip;
+                    if (msg.data.dhcp !== undefined)
+                        state.dhcp_enabled = msg.data.dhcp === 1;
+                    // Wi-Fi config
+                    if (msg.data.enabled !== undefined)
+                        wifi_config.enabled = msg.data.enabled === 1;
+                    if (msg.data.ssid !== undefined)
+                        wifi_config.ssid = msg.data.ssid;
+                    if (msg.data.staticIp !== undefined)
+                        wifi_config.static_ip = msg.data.staticIp;
+                    if (msg.data.netMask !== undefined)
+                        wifi_config.net_mask = msg.data.netMask;
+                    if (msg.data.gateway !== undefined)
+                        wifi_config.gateway = msg.data.gateway;
+                    if (msg.data.nameServer !== undefined)
+                        wifi_config.name_server = msg.data.nameServer;
+                    // Cleanup empty keys
+                    for (const key in wifi_config) {
+                        if (wifi_config[key] === "") {
+                            wifi_config[key] = undefined;
+                        }
+                    }
+                    return state;
+                },
+            },
+        ];
+        const toZigbee = [
+            {
+                key: ["wifi_status", "ip_address", "dhcp_enabled"],
+                convertGet: async (entity, key, meta) => {
+                    const ep = (0, utils_1.determineEndpoint)(entity, meta, "shellyWiFiSetupCluster");
+                    await refresh(ep);
+                },
+            },
+            {
+                key: ["wifi_config"],
+                convertGet: async (entity, key, meta) => {
+                    const ep = (0, utils_1.determineEndpoint)(entity, meta, "shellyWiFiSetupCluster");
+                    await refresh(ep);
+                },
+                convertSet: async (entity, key, value, meta) => {
+                    (0, utils_1.assertObject)(value);
+                    const ep = (0, utils_1.determineEndpoint)(entity, meta, "shellyWiFiSetupCluster");
+                    // Write first batch
+                    const attr1 = {
+                        enabled: value.enabled === true,
+                        ssid: value.ssid || "",
+                        password: value.password || "",
+                    };
+                    await ep.write("shellyWiFiSetupCluster", attr1, SHELLY_OPTIONS);
+                    // Write second batch batch
+                    const attr2 = {
+                        staticIp: value.static_ip || "",
+                        netMask: value.net_mask || "",
+                        gateway: value.gateway || "",
+                        nameServer: value.name_server || "",
+                    };
+                    await ep.write("shellyWiFiSetupCluster", attr2, SHELLY_OPTIONS);
+                    // Apply config
+                    const attr3 = { actionCode: 1 };
+                    await ep.write("shellyWiFiSetupCluster", attr3, SHELLY_OPTIONS);
+                },
+            },
+        ];
+        const configure = [
+            async (device, coordinatorEndpoint, definition) => {
+                const ep = device.getEndpoint(SHELLY_ENDPOINT_ID);
+                await refresh(ep);
+            },
+        ];
+        return { exposes, fromZigbee, toZigbee, configure, isModernExtend: true };
+    },
+};
 exports.definitions = [
     {
         zigbeeModel: ["Mini1", "1 Mini"],
         model: "S4SW-001X8EU",
         vendor: "Shelly",
         description: "1 Mini Gen 4",
-        extend: [m.onOff({ powerOnBehavior: false })],
+        extend: [m.onOff({ powerOnBehavior: false }), ...shellyModernExtend.shellyCustomClusters(), shellyModernExtend.shellyWiFiSetup()],
     },
     {
         fingerprint: [{ modelID: "1", manufacturerName: "Shelly" }],
         model: "S4SW-001X16EU",
         vendor: "Shelly",
         description: "1 Gen 4",
-        extend: [m.onOff({ powerOnBehavior: false })],
+        extend: [m.onOff({ powerOnBehavior: false }), ...shellyModernExtend.shellyCustomClusters(), shellyModernExtend.shellyWiFiSetup()],
     },
     {
         zigbeeModel: ["Mini1PM", "1PM Mini"],
         model: "S4SW-001P8EU",
         vendor: "Shelly",
         description: "1PM Mini Gen 4",
-        extend: [m.onOff({ powerOnBehavior: false }), m.electricityMeter({ producedEnergy: true, acFrequency: true })],
+        extend: [
+            m.onOff({ powerOnBehavior: false }),
+            m.electricityMeter({ producedEnergy: true, acFrequency: true }),
+            ...shellyModernExtend.shellyCustomClusters(),
+            shellyModernExtend.shellyWiFiSetup(),
+        ],
     },
     {
         zigbeeModel: ["1PM"],
         model: "S4SW-001P16EU",
         vendor: "Shelly",
         description: "1PM Gen 4",
-        extend: [m.onOff({ powerOnBehavior: false }), m.electricityMeter({ producedEnergy: true, acFrequency: true })],
+        extend: [
+            m.onOff({ powerOnBehavior: false }),
+            m.electricityMeter({ producedEnergy: true, acFrequency: true }),
+            ...shellyModernExtend.shellyCustomClusters(),
+            shellyModernExtend.shellyWiFiSetup(),
+        ],
     },
     {
         fingerprint: [
@@ -80,7 +251,7 @@ exports.definitions = [
         model: "S4SW-002P16EU-COVER",
         vendor: "Shelly",
         description: "2PM Gen4 (Cover mode)",
-        extend: [m.windowCovering({ controls: ["lift", "tilt"] })],
+        extend: [m.windowCovering({ controls: ["lift", "tilt"] }), ...shellyModernExtend.shellyCustomClusters(), shellyModernExtend.shellyWiFiSetup()],
     },
     {
         fingerprint: [
@@ -103,6 +274,8 @@ exports.definitions = [
             m.deviceEndpoints({ endpoints: { l1: 1, l2: 2 } }),
             m.onOff({ powerOnBehavior: false, endpointNames: ["l1", "l2"] }),
             m.electricityMeter({ producedEnergy: true, acFrequency: true, endpointNames: ["l1", "l2"] }),
+            ...shellyModernExtend.shellyCustomClusters(),
+            shellyModernExtend.shellyWiFiSetup(),
         ],
     },
     {
@@ -114,6 +287,8 @@ exports.definitions = [
             m.deviceEndpoints({ endpoints: { "1": 1, "2": 2, "3": 3, "4": 4 } }),
             m.onOff({ powerOnBehavior: false, endpointNames: ["1", "2", "3", "4"] }),
             m.electricityMeter({ endpointNames: ["1", "2", "3", "4"] }),
+            ...shellyModernExtend.shellyCustomClusters(),
+            shellyModernExtend.shellyWiFiSetup(),
         ],
     },
     {
@@ -121,7 +296,12 @@ exports.definitions = [
         model: "S4SN-0071A",
         vendor: "Shelly",
         description: "Flood Gen 4",
-        extend: [m.battery(), m.iasZoneAlarm({ zoneType: "water_leak", zoneAttributes: ["alarm_1", "tamper", "battery_low"] })],
+        extend: [
+            m.battery(),
+            m.iasZoneAlarm({ zoneType: "water_leak", zoneAttributes: ["alarm_1", "tamper", "battery_low"] }),
+            ...shellyModernExtend.shellyCustomClusters(),
+            shellyModernExtend.shellyWiFiSetup(),
+        ],
     },
 ];
 //# sourceMappingURL=shelly.js.map

package/dist/devices/shelly.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"tuya.d.ts","sourceRoot":"","sources":["../../src/devices/tuya.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAC,oBAAoB,EAA4D,MAAM,cAAc,CAAC;AAy9BlH,eAAO,MAAM,WAAW,EAAE,oBAAoB,EAmhlB7C,CAAC"}
+{"version":3,"file":"tuya.d.ts","sourceRoot":"","sources":["../../src/devices/tuya.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAC,oBAAoB,EAA4D,MAAM,cAAc,CAAC;AAo+BlH,eAAO,MAAM,WAAW,EAAE,oBAAoB,EAirlB7C,CAAC"}

package/dist/devices/tuya.js

@@ -723,6 +723,16 @@ const tzLocal = {
             return ret;
         },
     },
+    // biome-ignore lint/style/useNamingConvention: ignored using `--suppress`
+    TS0601_knob_dimmer_switch_group_id: {
+        key: ["group_id"],
+        convertSet: async (entity, key, value, meta) => {
+            // The device uses custom group command known from miboxer switches to bind to a group.
+            await entity.command("genGroups", "miboxerSetZones", {
+                zones: [{ zoneNum: 1, groupId: Number(value) }],
+            });
+        },
+    },
 };
 const fzLocal = {
     // biome-ignore lint/style/useNamingConvention: ignored using `--suppress`
@@ -1476,7 +1486,7 @@ exports.definitions = [
         ],
     },
     {
-        fingerprint: tuya.fingerprint("TS0601", ["_TZE200_s1xgth2u"]),
+        fingerprint: tuya.fingerprint("TS0601", ["_TZE200_s1xgth2u", "_TZE284_9ern5sfh"]),
         model: "TS0601_temperature_humidity_sensor_3",
         vendor: "Tuya",
         description: "Temperature & humidity sensor",
@@ -1806,6 +1816,42 @@ exports.definitions = [
             tuyaDatapoints: [[16, "state", tuya.valueConverter.onOff]],
         },
     },
+    {
+        // Tuya/Senoro window sensor variant with 3-state opening on DP101.
+        fingerprint: tuya.fingerprint("TS0601", ["_TZE284_6teua268"]),
+        model: "TZE284_6teua268",
+        vendor: "Tuya",
+        whiteLabel: [{ vendor: "Senoro", model: "Senoro.Win v2" }],
+        description: "Window sensor with 3-state opening (DP101), optional alarm, battery",
+        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        exposes: [
+            // DP101 → enum; device reports 0=open, 1=closed, 2=tilted (note swapped 0/1).
+            e
+                .enum("opening_state", ea.STATE, ["open", "closed", "tilted"])
+                .withDescription("Opening state (Tuya DP101)"),
+            // Some firmware variants expose an alarm bit (commonly DP16).
+            e
+                .binary("alarm", ea.STATE, true, false)
+                .withDescription("Alarm (Tuya DP16; some FW variants may use DP10/13)"),
+            e.battery(),
+        ],
+        meta: {
+            // Datapoints from logs:
+            //  - 101: 0=open, 1=closed, 2=tilted
+            //  - 16 : alarm (boolean) — optional by firmware
+            //  - 102: battery percentage (0..100)
+            tuyaDatapoints: [
+                [101, "opening_state", tuya.valueConverterBasic.lookup({ open: 0, closed: 1, tilted: 2 })],
+                // Alarm: primary DP16; some FW-Versions uses 10/13
+                [10, "alarm", tuya.valueConverter.raw],
+                [13, "alarm", tuya.valueConverter.raw],
+                [16, "alarm", tuya.valueConverter.raw],
+                // Battery: primary DP102; DP2 as fallback for other batches
+                [102, "battery", tuya.valueConverter.raw],
+                [2, "battery", tuya.valueConverter.raw],
+            ],
+        },
+    },
     {
         zigbeeModel: ["ZG-301Z"],
         fingerprint: [
@@ -2091,7 +2137,7 @@ exports.definitions = [
                 effect: true,
                 powerOnBehavior: true,
                 moveToLevelWithOnOffDisable: true,
-                color: { modes: ["xy"], enhancedHue: false },
+                color: { modes: ["hs", "xy"], enhancedHue: false },
             }),
         ],
         exposes: [tuya.exposes.doNotDisturb()],
@@ -2409,7 +2455,7 @@ exports.definitions = [
         vendor: "Tuya",
         description: "Solar rain sensor",
         fromZigbee: [tuya.fz.datapoints],
-        extend: [m.iasZoneAlarm({ zoneType: "rain", zoneAttributes: ["alarm_1"] }), m.battery({ percentageReporting: false })],
+        extend: [m.iasZoneAlarm({ zoneType: "rain", zoneAttributes: ["alarm_1"] }), m.battery({ percentageReporting: true })],
         exposes: [
             e.illuminance().withUnit("lx"),
             e.numeric("illuminance_average_20min", ea.STATE).withUnit("lx").withDescription("Illuminance average for the last 20 minutes"),
@@ -2636,7 +2682,7 @@ exports.definitions = [
                 tuya.exposes.countdown(),
                 e.power_on_behavior().withAccess(ea.STATE_SET),
             ];
-            if (!device || !["_TZE200_ykgar0ow", "_TZE200_0hb4rdnp"].includes(device.manufacturerName)) {
+            if (!device || !["_TZE200_4mh6tyyo", "_TZE200_ykgar0ow", "_TZE200_0hb4rdnp"].includes(device.manufacturerName)) {
                 exps.push(tuya.exposes.lightType(), tuya.exposes.backlightModeOffNormalInverted().withAccess(ea.STATE_SET));
             }
             return exps;
@@ -2669,7 +2715,7 @@ exports.definitions = [
             tuya.whitelabel("Zemismart", "ZN2S-US1-SD", "Single gang dimmer", ["_TZE204_68utemio"]),
             tuya.whitelabel("Mercator Ikuü", "SSWRM-ZB", "Rotary dimmer mechanism", ["_TZE200_a0syesf5"]),
             tuya.whitelabel("Lonsonho", "EDM-1ZBB-EU", "Smart Dimmer Switch", ["_TZE200_0nauxa0p"]),
-            tuya.whitelabel("ION Industries", "ID200W-ZIGB", "LED Zigbee Dimmer", ["_TZE200_ykgar0ow"]),
+            tuya.whitelabel("ION Industries", "ID200W-ZIGB", "LED Zigbee Dimmer", ["_TZE200_ykgar0ow", "_TZE200_4mh6tyyo"]),
             tuya.whitelabel("ION Industries", "90.500.090", "Zigbee Dimmer Master/Slave set", ["_TZE200_0hb4rdnp"]),
         ],
     },
@@ -4704,6 +4750,23 @@ exports.definitions = [
             }),
         ],
     },
+    {
+        fingerprint: tuya.fingerprint("TS0003", ["_TZ3000_aracgljk"]),
+        model: "SA-3",
+        vendor: "Nova Digital",
+        description: "Safira smart light switch - 3 gang",
+        extend: [
+            tuya.modernExtend.tuyaBase(),
+            m.deviceEndpoints({ endpoints: { l1: 1, l2: 2, l3: 3 } }),
+            tuya.modernExtend.tuyaOnOff({
+                endpoints: ["l1", "l2", "l3"],
+                powerOutageMemory: true,
+                switchType: true,
+                indicatorMode: true,
+                backlightModeOffOn: true,
+            }),
+        ],
+    },
     {
         zigbeeModel: ["TS0003"],
         model: "TS0003",
@@ -6088,6 +6151,7 @@ exports.definitions = [
             "_TZE284_rv6iuyxb" /* model: 'TRV06-AT', vendor: 'THALEOS' */,
             "_TZE200_rv6iuyxb" /* model: 'TRV06-AT', vendor: 'THALEOS' */,
             "_TZE200_suxywabt" /* model: 'TRV06-AT', vendor: 'THALEOS' */,
+            "_TZE200_d3z1ukqw" /* model: 'Eco-4160', vendor: 'Echos' */,
         ]),
         model: "TS0601_thermostat_3",
         vendor: "Tuya",
@@ -6110,6 +6174,7 @@ exports.definitions = [
                 "_TZE200_rv6iuyxb",
                 "_TZE200_suxywabt",
             ]),
+            tuya.whitelabel("Echos", "Eco-4160", "Thermostatic radiator valve", ["_TZE200_d3z1ukqw"]),
         ],
         extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
         exposes: [
@@ -18763,25 +18828,42 @@ exports.definitions = [
         vendor: "Tuya",
         description: "Dimmer knob with two lights",
         fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        toZigbee: [tzLocal.TS0601_knob_dimmer_switch_group_id, tuya.tz.datapoints],
         exposes: [
+            e.switch(),
             e.switch().withEndpoint("l1"),
             e.switch().withEndpoint("l2"),
+            tuya.exposes.switchMode().withEndpoint("l1"),
+            tuya.exposes.switchMode().withEndpoint("l2"),
             e.light_brightness_colortemp([154, 370]),
-            e.enum("adjustment_mode", ea.STATE_SET, ["brightness", "color_temp"]).withDescription("Adjustment mode"),
+            e.enum("adjustment_mode", ea.ALL, ["brightness", "color_temp"]).withDescription("Adjustment mode"),
+            tuya.exposes.powerOnBehavior(),
+            e.action(["button_1", "button_2"]),
+            e.enum("mode", ea.ALL, ["knob", "scene"]).withDescription("Mode"),
+            e.numeric("group_id", ea.SET).withValueMin(1).withValueMax(10000).withDescription("Group ID to bind to."),
         ],
         meta: {
             multiEndpoint: true,
             tuyaDatapoints: [
                 [102, "state", tuya.valueConverter.onOff],
-                [103, "brightness", tuya.valueConverterBasic.scale(0, 254, 0, 1000)],
-                [105, "adjustment_mode", tuya.valueConverterBasic.lookup({ brightness: tuya.enum(0), color_temp: tuya.enum(1) })],
-                [107, "color_temp", tuya.valueConverterBasic.scale(154, 370, 0, 1000)],
                 [121, "state_l1", tuya.valueConverter.onOff],
                 [122, "state_l2", tuya.valueConverter.onOff],
+                [131, "switch_mode_l1", tuya.valueConverter.switchMode],
+                [132, "switch_mode_l2", tuya.valueConverter.switchMode],
+                [103, "brightness", tuya.valueConverterBasic.scale(0, 254, 0, 1000)],
+                [107, "color_temp", tuya.valueConverterBasic.scale(154, 370, 0, 1000)],
+                [105, "adjustment_mode", tuya.valueConverterBasic.lookup({ brightness: tuya.enum(0), color_temp: tuya.enum(1) })],
+                [106, "power_on_behavior", tuya.valueConverter.powerOnBehavior],
+                [111, "action", tuya.valueConverterBasic.lookup({ button_1: tuya.enum(0) })],
+                [112, "action", tuya.valueConverterBasic.lookup({ button_2: tuya.enum(0) })],
+                [141, "mode", tuya.valueConverterBasic.lookup({ knob: tuya.enum(0), scene: tuya.enum(1) })],
             ],
         },
-        configure: tuya.configureMagicPacket,
+        configure: async (device, coordinatorEndpoint) => {
+            const endpoint = device.getEndpoint(1);
+            await tuya.configureMagicPacket(device, coordinatorEndpoint);
+            await endpoint.command("genBasic", "tuyaSetup", {}, { disableDefaultResponse: true });
+        },
         endpoint: (device) => ({
             default: 1,
             l1: 1,
@@ -19681,5 +19763,87 @@ exports.definitions = [
             ],
         },
     },
+    {
+        fingerprint: tuya.fingerprint("TS0601", ["_TZE204_mvtclclq"]),
+        model: "DS-1450WN",
+        vendor: "Tuya",
+        description: "Smart Zigbee Switch with Power Monitoring",
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
+        exposes: [
+            e.switch().withEndpoint("usb_a"),
+            e.switch().withEndpoint("usb_c"),
+            e.switch().withEndpoint("plug_1"),
+            e.switch().withEndpoint("plug_2"),
+            e
+                .numeric("countdown_usb_a", ea.STATE_SET)
+                .withLabel("USB A Countdown")
+                .withValueMin(0)
+                .withValueMax(86400)
+                .withValueStep(1)
+                .withDescription("Countdown timer for USB A")
+                .withUnit("s"),
+            e
+                .numeric("countdown_usb_c", ea.STATE_SET)
+                .withLabel("USB C Countdown")
+                .withValueMin(0)
+                .withValueMax(86400)
+                .withValueStep(1)
+                .withDescription("Countdown timer for USB C")
+                .withUnit("s"),
+            e
+                .numeric("countdown_plug_1", ea.STATE_SET)
+                .withLabel("Plug 1 Countdown")
+                .withValueMin(0)
+                .withValueMax(86400)
+                .withValueStep(1)
+                .withDescription("Countdown timer for Plug 1")
+                .withUnit("s"),
+            e
+                .numeric("countdown_plug_2", ea.STATE_SET)
+                .withLabel("Plug 2 Countdown")
+                .withValueMin(0)
+                .withValueMax(86400)
+                .withValueStep(1)
+                .withDescription("Countdown timer for Plug 2")
+                .withUnit("s"),
+            e.enum("relay_status", ea.STATE_SET, ["memory", "on", "off"]).withLabel("Relay Status").withDescription("Set the Relay Status"),
+            e
+                .binary("switch_backlight", ea.STATE_SET, "ON", "OFF")
+                .withLabel("Switch Backlight")
+                .withDescription("Enables/disables backlight indicator"),
+            e.current(),
+            e.power(),
+            e.voltage(),
+            e.produced_energy(),
+            e.child_lock(),
+        ],
+        endpoint: (_) => ({
+            default: 1,
+            usb_a: 1,
+            usb_c: 1,
+            plug_1: 1,
+            plug_2: 1,
+        }),
+        meta: {
+            multiEndpoint: true,
+            tuyaDatapoints: [
+                [1, "state_usb_a", tuya.valueConverter.onOff],
+                [2, "state_usb_c", tuya.valueConverter.onOff],
+                [3, "state_plug_1", tuya.valueConverter.onOff],
+                [4, "state_plug_2", tuya.valueConverter.onOff],
+                [7, "countdown_usb_a", tuya.valueConverter.countdown],
+                [8, "countdown_usb_c", tuya.valueConverter.countdown],
+                [9, "countdown_plug_1", tuya.valueConverter.countdown],
+                [10, "countdown_plug_2", tuya.valueConverter.countdown],
+                [14, "relay_status", tuya.valueConverterBasic.lookup({ memory: tuya.enum(0), on: tuya.enum(1), off: tuya.enum(2) })],
+                [16, "switch_backlight", tuya.valueConverter.onOff],
+                [21, "current", tuya.valueConverter.divideBy10],
+                [22, "power", tuya.valueConverter.divideBy10],
+                [23, "voltage", tuya.valueConverter.divideBy10],
+                [105, "produced_energy", tuya.valueConverter.divideBy10],
+                [106, "child_lock", tuya.valueConverter.lockUnlock],
+            ],
+        },
+    },
 ];
 //# sourceMappingURL=tuya.js.map