zigbee-herdsman-converters 25.47.0 → 25.49.0

package/dist/devices/sunricher.js

@@ -1537,7 +1537,7 @@ exports.definitions = [
         zigbeeModel: ["ZG9101SAC-HP"],
         model: "ZG9101SAC-HP",
         vendor: "Sunricher",
-        description: "ZigBee AC phase-cut dimmer",
+        description: "Zigbee AC phase-cut dimmer",
         extend: [m.light({ configureReporting: true })],
     },
     {
@@ -1551,7 +1551,7 @@ exports.definitions = [
         zigbeeModel: ["Micro Smart Dimmer", "SM311", "HK-SL-RDIM-A", "HK-SL-DIM-EU-A"],
         model: "ZG2835RAC",
         vendor: "Sunricher",
-        description: "ZigBee knob smart dimmer",
+        description: "Zigbee knob smart dimmer",
         extend: [m.light({ configureReporting: true }), m.electricityMeter()],
         whiteLabel: [
             { vendor: "YPHIX", model: "50208695" },
@@ -1562,14 +1562,14 @@ exports.definitions = [
         zigbeeModel: ["HK-SL-DIM-AU-R-A"],
         model: "HK-SL-DIM-AU-R-A",
         vendor: "Sunricher",
-        description: "ZigBee knob smart dimmer",
+        description: "Zigbee knob smart dimmer",
         extend: [m.identify(), m.electricityMeter(), m.light({ configureReporting: true }), sunricher.extend.externalSwitchType()],
     },
     {
         zigbeeModel: ["ZG2835"],
         model: "ZG2835",
         vendor: "Sunricher",
-        description: "ZigBee knob smart dimmer",
+        description: "Zigbee knob smart dimmer",
         fromZigbee: [fz.command_on, fz.command_off, fz.command_move_to_level],
         exposes: [e.action(["on", "off", "brightness_move_to_level"])],
         toZigbee: [],
@@ -1611,7 +1611,7 @@ exports.definitions = [
         zigbeeModel: ["SR-ZG9040A-S"],
         model: "SR-ZG9040A-S",
         vendor: "Sunricher",
-        description: "ZigBee AC phase-cut dimmer single-line",
+        description: "Zigbee AC phase-cut dimmer single-line",
         extend: [m.light({ configureReporting: true })],
     },
     {

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;AAo+BlH,eAAO,MAAM,WAAW,EAAE,oBAAoB,EAy8lB7C,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,EAqgmB7C,CAAC"}

package/dist/devices/tuya.js

@@ -1117,6 +1117,7 @@ exports.definitions = [
             tuya.whitelabel("QA", "QASD1", "Door sensor", ["_TZ3000_udyjylt7"]),
             tuya.whitelabel("Nous", "E3", "Door sensor", ["_TZ3000_v7chgqso"]),
             tuya.whitelabel("Woox", "R7047", "Smart Door & Window Sensor", ["_TZ3000_timx9ivq"]),
+            tuya.whitelabel("Wing", "WZDA1", "Door sensor", ["_TZ3000_rid8lzvo"]),
         ],
         exposes: (device, options) => {
             const exps = [e.contact(), e.battery(), e.battery_voltage()];
@@ -1697,7 +1698,7 @@ exports.definitions = [
         exposes: [e.temperature(), e.humidity(), e.co2(), e.voc().withUnit("ppb"), e.formaldehyd().withUnit("µg/m³")],
     },
     {
-        fingerprint: tuya.fingerprint("TS0601", ["_TZE200_rbbx5mfq"]),
+        fingerprint: tuya.fingerprint("TS0601", ["_TZE200_rbbx5mfq", "_TZE204_rbbx5mfq"]),
         model: "TS0601_illuminance_temperature_humidity_sensor_2",
         vendor: "Tuya",
         description: "Illuminance sensor",
@@ -3318,7 +3319,7 @@ exports.definitions = [
             tuya.whitelabel("LoraTap", "SC500ZB", "Smart curtain/shutter switch", ["_TZ3000_e3vhyirx", "_TZ3000_femsaaua"]),
             tuya.whitelabel("LoraTap", "SC500ZB-v4", "Smart curtain/shutter switch", ["_TZ3000_5iixzdo7"]),
             tuya.whitelabel("Nous", "B4Z", "Curtain switch", ["_TZ3000_yruungrl"]),
-            tuya.whitelabel("Nous", "L12Z", "Smart ZigBee Curtain Module L12Z", ["_TZ3000_jwv3cwak"]),
+            tuya.whitelabel("Nous", "L12Z", "Smart Zigbee Curtain Module L12Z", ["_TZ3000_jwv3cwak"]),
             tuya.whitelabel("Zemismart", "ZN-LC1E", "Smart curtain/shutter switch", ["_TZ3000_74hsp7qy"]),
             tuya.whitelabel("Girier", "TS130F_GIRIER", "Smart curtain switch", ["_TZ3210_dwytrmda"]),
             tuya.whitelabel("Zemismart", "TS130F_ZEMISMART", "Smart curtain wall switch", ["_TZ3000_vw8pawxa"]),
@@ -7216,9 +7217,9 @@ exports.definitions = [
             tuya.whitelabel("PSMART", "T440", "Smart wallsocket (with power monitoring)", ["_TZ3000_y4ona9me"]),
             tuya.whitelabel("Nous", "A6Z", "Outdoor smart socket", ["_TZ3000_266azbg3"]),
             tuya.whitelabel("Nedis", "ZBPO130FWT", "Outdoor smart plug (with power monitoring)", ["_TZ3000_3ias4w4o"]),
-            tuya.whitelabel("Nous", "A9Z", "Smart ZigBee Socket", ["_TZ3210_ddigca5n"]),
+            tuya.whitelabel("Nous", "A9Z", "Smart Zigbee Socket", ["_TZ3210_ddigca5n"]),
             tuya.whitelabel("Girier", "JR-ZPM01", "Smart Plug", ["_TZ3000_ww6drja5"]),
-            tuya.whitelabel("Nous", "A7Z", "Smart ZigBee Socket", ["_TZ3210_rwmitwj4"]),
+            tuya.whitelabel("Nous", "A7Z", "Smart Zigbee Socket", ["_TZ3210_rwmitwj4"]),
             tuya.whitelabel("Zbeacon", "TS011F_plug_1_1", "Smart plug (with power monitoring)", ["Zbeacon"]),
             tuya.whitelabel("NEO", "NAS-WR01B", "Smart plug (with electrical measurements)", ["_TZ3000_gjnozsaz"]),
         ],
@@ -7239,8 +7240,8 @@ exports.definitions = [
             await reporting.bind(endpoint, coordinatorEndpoint, ["genOnOff", "haElectricalMeasurement", "seMetering"]);
             if (!["_TZ3000_okaz9tjs"].includes(device.manufacturerName)) {
                 await reporting.rmsVoltage(endpoint, { change: 5 });
+                await reporting.rmsCurrent(endpoint, { change: 50 });
             }
-            await reporting.rmsCurrent(endpoint, { change: 50 });
             if (!["_TZ3000_0zfrhq4i", "_TZ3000_okaz9tjs", "_TZ3000_typdpbpg", "_TZ3000_ww6drja5", "Zbeacon"].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
@@ -7580,7 +7581,7 @@ exports.definitions = [
         },
     },
     {
-        fingerprint: tuya.fingerprint("TS0601", ["_TZE200_e2bedvo9", "_TZE200_dnz6yvl2", "_TZE284_6ycgarab", "_TZE284_e2bedvo9"]),
+        fingerprint: tuya.fingerprint("TS0601", ["_TZE200_e2bedvo9", "_TZE200_dnz6yvl2", "_TZE284_e2bedvo9"]),
         model: "ZSS-QY-SSD-A-EN",
         vendor: "Tuya",
         description: "Smart smoke alarm",
@@ -7606,6 +7607,65 @@ exports.definitions = [
             ],
         },
     },
+    {
+        fingerprint: tuya.fingerprint("TS0601", ["_TZE284_6ycgarab"]),
+        model: "TS0601_smoke_co",
+        vendor: "Tuya",
+        description: "Dual smoke CO sensor",
+        exposes: [
+            e.smoke(),
+            e
+                .enum("smoke_state", ea.STATE, ["alarm", "none", "detecting", "unknown"])
+                .withLabel("Smoke sensor status")
+                .withDescription("Possible states: alarm, none, detecting, unknown"),
+            e.enum("alarm_volume", ea.STATE_SET, ["mute", "low", "medium", "high"]).withDescription("Alarm volume"),
+            e.battery(),
+            tuya.exposes.silence(),
+            e.binary("alarm_switch", ea.STATE_SET, true, false).withDescription("Disable the alarm"),
+            e.carbon_monoxide(),
+        ],
+        meta: {
+            tuyaDatapoints: [
+                [
+                    1,
+                    null,
+                    {
+                        from: (v) => {
+                            const lookup = { alarm: tuya.enum(0), none: tuya.enum(1), detecting: tuya.enum(2), unknown: tuya.enum(3) };
+                            const smokeState = Object.entries(lookup).find((i) => i[1].valueOf() === v)[0];
+                            return {
+                                smoke: smokeState === "alarm",
+                                smoke_state: smokeState,
+                            };
+                        },
+                    },
+                ],
+                [
+                    5,
+                    "alarm_volume",
+                    tuya.valueConverterBasic.lookup({
+                        low: tuya.enum(0),
+                        medium: tuya.enum(1),
+                        high: tuya.enum(2),
+                        mute: tuya.enum(3),
+                    }),
+                ],
+                [15, "battery", tuya.valueConverter.raw],
+                [16, "silence", tuya.valueConverter.raw],
+                [17, "alarm_switch", tuya.valueConverter.raw],
+                [18, "carbon_monoxide", tuya.valueConverter.trueFalseEnum0],
+            ],
+        },
+        extend: [
+            tuya.modernExtend.tuyaBase({
+                dp: true,
+                bindBasicOnConfigure: true,
+                queryOnDeviceAnnounce: true,
+                queryOnConfigure: true,
+                forceTimeUpdates: true,
+            }),
+        ],
+    },
     {
         fingerprint: tuya.fingerprint("TS0601", ["_TZE200_5d3vhjro"]),
         model: "SA12IZL",
@@ -9107,6 +9167,7 @@ exports.definitions = [
             "_TZE284_gops3slb",
             "_TZE284_zjhoqbrd",
             "_TZE204_zjhoqbrd",
+            "_TZE284_aaeaifez",
         ]),
         model: "ZWT198/ZWT100-BH",
         vendor: "Tuya",