zigbee-herdsman-converters 25.80.0 → 25.82.0

package/dist/devices/tuya.js

@@ -184,6 +184,17 @@ const storeLocal = {
                     this[`power_factor_${channel}`] = 100;
                     this.flush(result, channel, options);
                 },
+                // Some times the device sends a single zero value (either power or current).
+                // This is most likely a glitch. We flush all values but set them to null
+                // to indicate that they are not valid.
+                //
+                flushNull: function (result, channel, options) {
+                    this[`sign_${channel}`] = null;
+                    this[`power_${channel}`] = null;
+                    this[`current_${channel}`] = null;
+                    this[`power_factor_${channel}`] = null;
+                    this.flush(result, channel, options);
+                },
                 clear: () => {
                     priv.sign_a = null;
                     priv.sign_b = null;
@@ -193,6 +204,11 @@ const storeLocal = {
                     priv.current_b = null;
                     priv.power_factor_a = null;
                     priv.power_factor_b = null;
+                    // Used to detect single zero values
+                    priv.zero_power_a = null;
+                    priv.zero_power_b = null;
+                    priv.zero_current_a = null;
+                    priv.zero_current_b = null;
                 },
             };
             globalStore.putValue(device, "private_state", priv);
@@ -224,8 +240,19 @@ const convLocal = {
                 priv[`power_${channel}`] = v / 10;
                 priv[`timestamp_${channel}`] = new Date().toISOString();
                 if (v === 0) {
-                    priv.flushZero(result, channel, options);
-                    return result;
+                    const singleZeroRemoveKey = "single_zero_remove";
+                    const singleZeroRemove = options[singleZeroRemoveKey] != null ? options[singleZeroRemoveKey] : false;
+                    if (singleZeroRemove && !priv[`zero_power_${channel}`]) {
+                        logger_1.logger.info("[PJ1203A] power is zero, flushing one time", NS);
+                        priv.flushNull(result, channel, options);
+                    }
+                    else {
+                        priv.flushZero(result, channel, options);
+                    }
+                    priv[`zero_power_${channel}`] = true;
+                }
+                else {
+                    priv[`zero_power_${channel}`] = false;
                 }
                 return result;
             },
@@ -238,8 +265,19 @@ const convLocal = {
                 const result = {};
                 priv[`current_${channel}`] = v / 1000;
                 if (v === 0) {
-                    priv.flushZero(result, channel, options);
-                    return result;
+                    const singleZeroRemoveKey = "single_zero_remove";
+                    const singleZeroRemove = options[singleZeroRemoveKey] != null ? options[singleZeroRemoveKey] : false;
+                    if (singleZeroRemove && !priv[`zero_current_${channel}`]) {
+                        logger_1.logger.info("[PJ1203A] current is zero, flushing one time", NS);
+                        priv.flushNull(result, channel, options);
+                    }
+                    else {
+                        priv.flushZero(result, channel, options);
+                    }
+                    priv[`zero_current_${channel}`] = true;
+                }
+                else {
+                    priv[`zero_current_${channel}`] = false;
                 }
                 return result;
             },
@@ -755,7 +793,7 @@ const tzLocal = {
             const lookup = { red_when_on: 0, pink_when_on: 1, red_on_blue_off: 2, pink_on_blue_off: 3 };
             const modeValue = utils.getFromLookup(value, lookup);
             await entity.write("genOnOff", { tuyaBacklightMode: modeValue });
-            return { state: { backlight_mode: utils.getFromLookup(modeValue, lookup) } };
+            return { state: { backlight_mode: value } };
         },
     },
 };
@@ -828,7 +866,7 @@ const fzLocal = {
     TS0201_humidity: {
         ...fz.humidity,
         convert: (model, msg, publish, options, meta) => {
-            if (["_TZ3210_ncw88jfq", "_TZ3000_ywagc4rj", "_TZ3000_isw9u95y"].includes(meta.device.manufacturerName)) {
+            if (["_TZ3210_ncw88jfq", "_TZ3000_ywagc4rj", "_TZ3000_isw9u95y", "_TZ3000_yupc0pb7"].includes(meta.device.manufacturerName)) {
                 msg.data.measuredValue *= 10;
             }
             return fz.humidity.convert(model, msg, publish, options, meta);
@@ -2290,11 +2328,10 @@ exports.definitions = [
         },
     },
     {
-        // Tuya/Senoro window sensor variant with 3-state opening on DP101.
+        // 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" }],
+        model: "Senoro.Win v2",
+        vendor: "Senoro",
         description: "Window sensor with 3-state opening (DP101), optional alarm, battery",
         extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
@@ -2977,9 +3014,9 @@ exports.definitions = [
         fromZigbee: [tuya.fz.datapoints],
         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"),
-            e.numeric("illuminance_maximum_today", ea.STATE).withUnit("lx").withDescription("Illuminance maximum for the last 24 hours"),
+            e.illuminance().withUnit("mV"),
+            e.numeric("illuminance_average_20min", ea.STATE).withUnit("mV").withDescription("Illuminance average for the last 20 minutes"),
+            e.numeric("illuminance_maximum_today", ea.STATE).withUnit("mV").withDescription("Illuminance maximum for the last 24 hours"),
             e.binary("cleaning_reminder", ea.STATE, true, false).withDescription("Cleaning reminder"),
             e.numeric("rain_intensity", ea.STATE).withUnit("mV").withDescription("Rainfall intensity"),
         ],
@@ -4094,7 +4131,7 @@ exports.definitions = [
         },
     },
     {
-        fingerprint: tuya.fingerprint("TS0601", ["_TZE204_2imwyigp", "_TZE200_2imwyigp"]),
+        fingerprint: tuya.fingerprint("TS0601", ["_TZE204_2imwyigp", "_TZE200_2imwyigp", "_TZE200_go3tvswy"]),
         model: "MG-ZG03W",
         vendor: "Tuya",
         description: "3 gang switch",
@@ -4117,7 +4154,7 @@ exports.definitions = [
         },
     },
     {
-        fingerprint: tuya.fingerprint("TS0601", ["_TZE200_go3tvswy", "_TZE200_oyti2ums"]),
+        fingerprint: tuya.fingerprint("TS0601", ["_TZE200_oyti2ums"]),
         model: "MG-GPO04ZSLP",
         vendor: "Tuya",
         description: "2 x socket + 1 x light with master switch and metering",
@@ -4339,7 +4376,7 @@ exports.definitions = [
             tuya.whitelabel("Danfoss", "014G2480", "Temperature and humidity sensor", ["_TZ3000_mxzo5rhf"]),
             tuya.whitelabel("Tuya", "HS09", "Hanging temperature humidity sensor", ["_TZ3000_1twfmkcc"]),
             tuya.whitelabel("Nedis", "ZBSC10WT", "Temperature and humidity sensor", ["_TZ3000_fie1dpkm"]),
-            tuya.whitelabel("Tuya", "TH09Z", "Temperature and humidity sensor", ["_TZ3000_isw9u95y"]),
+            tuya.whitelabel("Tuya", "TH09Z", "Temperature and humidity sensor", ["_TZ3000_isw9u95y", "_TZ3000_yupc0pb7"]),
         ],
     },
     {
@@ -7556,35 +7593,41 @@ exports.definitions = [
         exposes: [
             e.battery(),
             e.child_lock(),
-            e.window_detection(),
-            e.binary("window", ea.STATE, "OPEN", "CLOSE").withDescription("Window status closed or open "),
-            e.enum("mode", ea.STATE_SET, ["auto", "manual"]).withDescription("Mode"),
-            e.binary("holiday_mode", ea.STATE_SET, "ON", "OFF"),
-            e.binary("heating_stop", ea.STATE_SET, "ON", "OFF"),
+            e.window_detection_bool(),
+            e.window_open(),
             e
                 .climate()
-                .withLocalTemperature(ea.STATE)
                 .withSetpoint("current_heating_setpoint", 5, 35, 0.5, ea.STATE_SET)
-                .withLocalTemperatureCalibration(-30, 30, 0.1, ea.STATE_SET),
-            e.comfort_temperature().withValueMin(5).withValueMax(30).withDescription("Comfort mode temperature"),
-            e.eco_temperature().withValueMin(5).withValueMax(30).withDescription("Eco mode temperature"),
-            e.enum("screen_orientation", ea.STATE_SET, ["up", "right", "down", "left"]).withDescription("Screen orientation"),
-            tuya.exposes.frostProtection(),
+                .withLocalTemperature(ea.STATE) // local_temperature
+                .withLocalTemperatureCalibration(-7, 7, 0.5, ea.STATE_SET) // local_temperature_calibration
+                .withSystemMode(["auto", "off"], ea.STATE_SET) // system_mode
+                .withPreset(["schedule", "manual", "holiday"]), //preset
+            e.comfort_temperature().withValueMin(15).withValueMax(35),
+            e.eco_temperature().withValueMin(5).withValueMax(22),
+            e.holiday_temperature().withValueMin(5).withValueMax(35),
+            e.text("holiday_time", ea.STATE_SET).withDescription("Holiday start and end time in format YYYY/MM/DD HH:MM | YYYY/MM/DD HH:MM"),
             e.binary("boost_heating", ea.STATE_SET, "ON", "OFF"),
-            e.numeric("boost_time", ea.STATE_SET).withUnit("min").withDescription("Countdown in minutes").withValueMin(0).withValueMax(1000),
+            e.numeric("boost_time", ea.STATE_SET).withUnit("min").withDescription("Countdown in minutes").withValueMin(0).withValueMax(30),
+            e
+                .binary("frost_protection", ea.STATE_SET, "ON", "OFF")
+                .withDescription("When the room temperature is lower than 5 °C, the valve opens; when the temperature rises to 8 °C, the valve closes."),
+            ...["monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday"].map((day) => e.text(`schedule_${day}`, ea.STATE_SET).withDescription("Schedule in 8 segments format: HH:MM/TT.T HH:MM/TT.T ...")),
+            e.enum("screen_orientation", ea.STATE_SET, ["up", "right", "down", "left"]).withDescription("Screen orientation"),
             e.numeric("fault_code", ea.STATE).withDescription("Raw fault code"),
         ],
         meta: {
             tuyaDatapoints: [
                 [
                     2,
-                    "mode",
+                    "preset",
                     tuya.valueConverterBasic.lookup({
-                        auto: tuya.enum(0),
+                        schedule: tuya.enum(0),
+                        holiday: tuya.enum(1), // only possible to set during holiday_time
                         manual: tuya.enum(2),
                     }),
                 ],
-                [4, "current_heating_setpoint", tuya.valueConverter.divideBy10],
+                // when system_mode is 'off', current_heating_setpoint is set to -5000... hence limits
+                [4, "current_heating_setpoint", tuya.valueConverterBasic.divideByWithLimits(10, 0, 35)],
                 [5, "local_temperature", tuya.valueConverter.divideBy10],
                 [6, "battery", tuya.valueConverter.raw],
                 [
@@ -7595,29 +7638,23 @@ exports.definitions = [
                         UNLOCK: false,
                     }),
                 ],
-                [14, "window_detection", tuya.valueConverter.onOff],
-                [
-                    15,
-                    "window",
-                    tuya.valueConverterBasic.lookup({
-                        CLOSE: tuya.enum(0),
-                        OPEN: tuya.enum(1),
-                    }),
-                ],
+                [14, "window_detection", tuya.valueConverter.raw],
+                [15, "window_open", tuya.valueConverter.trueFalseEnum1],
                 [21, "holiday_temperature", tuya.valueConverter.divideBy10],
                 [36, "frost_protection", tuya.valueConverter.onOff],
-                [39, "switch_scale", tuya.valueConverter.raw],
-                [47, "local_temperature_calibration", tuya.valueConverter.localTempCalibration1],
+                [39, "anti_scale", tuya.valueConverter.raw],
+                [47, "local_temperature_calibration", tuya.valueConverter.localTempCalibration1], // duplicate/legacy
+                [49, "valve_status", tuya.valueConverter.raw],
                 [101, "boost_heating", tuya.valueConverter.onOff],
                 [102, "boost_time", tuya.valueConverter.countdown],
-                [103, "schedule_monday", tuya.valueConverter.thermostatScheduleDayMultiDP_TRV602Z_WithDayNumber(1)],
-                [104, "schedule_tuesday", tuya.valueConverter.thermostatScheduleDayMultiDP_TRV602Z_WithDayNumber(2)],
-                [105, "schedule_wednesday", tuya.valueConverter.thermostatScheduleDayMultiDP_TRV602Z_WithDayNumber(3)],
-                [106, "schedule_thursday", tuya.valueConverter.thermostatScheduleDayMultiDP_TRV602Z_WithDayNumber(4)],
-                [107, "schedule_friday", tuya.valueConverter.thermostatScheduleDayMultiDP_TRV602Z_WithDayNumber(5)],
-                [108, "schedule_saturday", tuya.valueConverter.thermostatScheduleDayMultiDP_TRV602Z_WithDayNumber(6)],
-                [109, "schedule_sunday", tuya.valueConverter.thermostatScheduleDayMultiDP_TRV602Z_WithDayNumber(7)],
-                [110, "holiday_mode", tuya.valueConverter.onOff],
+                [103, "schedule_monday", tuya.valueConverter.thermostatScheduleDayMultiDP_TRV603WZ],
+                [104, "schedule_tuesday", tuya.valueConverter.thermostatScheduleDayMultiDP_TRV603WZ],
+                [105, "schedule_wednesday", tuya.valueConverter.thermostatScheduleDayMultiDP_TRV603WZ],
+                [106, "schedule_thursday", tuya.valueConverter.thermostatScheduleDayMultiDP_TRV603WZ],
+                [107, "schedule_friday", tuya.valueConverter.thermostatScheduleDayMultiDP_TRV603WZ],
+                [108, "schedule_saturday", tuya.valueConverter.thermostatScheduleDayMultiDP_TRV603WZ],
+                [109, "schedule_sunday", tuya.valueConverter.thermostatScheduleDayMultiDP_TRV603WZ],
+                [110, "holiday_time", tuya.valueConverter.thermostatHolidayStartStopUnixTS],
                 [
                     111,
                     "screen_orientation",
@@ -7629,7 +7666,14 @@ exports.definitions = [
                     }),
                 ],
                 [112, "antifrost_temperature", tuya.valueConverter.divideBy10],
-                [113, "heating_stop", tuya.valueConverter.onOff],
+                [
+                    113,
+                    "system_mode",
+                    tuya.valueConverterBasic.lookup({
+                        auto: false,
+                        off: true,
+                    }),
+                ],
                 [114, "local_temperature_calibration", tuya.valueConverter.localTempCalibration1],
                 [115, "programming_mode", tuya.valueConverter.raw],
                 [116, "eco_temperature", tuya.valueConverter.divideBy10],
@@ -9248,7 +9292,7 @@ exports.definitions = [
         },
     },
     {
-        fingerprint: tuya.fingerprint("TS0726", ["_TZ3000_wsspgtcd", "_TZ3000_s678wazd", "_TZ3002_pzao9ls1"]),
+        fingerprint: tuya.fingerprint("TS0726", ["_TZ3000_wsspgtcd", "_TZ3000_s678wazd", "_TZ3002_pzao9ls1", "_TZ3000_kfkqkjqe"]),
         model: "TS0726_4_gang",
         vendor: "Tuya",
         description: "4 gang switch with neutral wire",
@@ -9764,7 +9808,9 @@ exports.definitions = [
         model: "ZWT198/ZWT100-BH",
         vendor: "Tuya",
         description: "Wall thermostat",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, respondToMcuVersionResponse: true, timeStart: "1970" })],
+        // Don't enable mcuVersionResponse
+        // https://github.com/Koenkk/zigbee2mqtt/issues/28455#issuecomment-3603696676
+        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "1970" })],
         whiteLabel: [tuya.whitelabel("AVATTO", "WT-100-BH", "Wall thermostat", ["_TZE204_gops3slb", "_TZE284_gops3slb"])],
         exposes: [
             e.binary("factory_reset", ea.STATE_SET, "ON", "OFF").withDescription("Full factory reset, use with caution!"),
@@ -11838,11 +11884,15 @@ exports.definitions = [
         model: "ZG-204ZM",
         vendor: "Tuya",
         description: "PIR 24Ghz human presence sensor",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
+        extend: [
+            tuya.modernExtend.tuyaBase({ dp: true }),
+            // Besides dp, also uses standard illuminance cluster
+            // https://github.com/Koenkk/zigbee-herdsman-converters/issues/10897
+            m.illuminance({ reporting: false }),
+        ],
         exposes: [
             e.presence(),
             e.enum("motion_state", ea.STATE, ["none", "large", "small", "static"]).withDescription("Motion state"),
-            e.illuminance(),
             e.battery(),
             e
                 .numeric("fading_time", ea.STATE_SET)
@@ -13784,7 +13834,7 @@ exports.definitions = [
         ],
     },
     {
-        fingerprint: tuya.fingerprint("TS0001", ["_TZ3210_dse8ogfy", "_TZ3210_j4pdtz9v", "_TZ3210_7vgttna6", "_TZ3210_a04acm9s"]),
+        fingerprint: tuya.fingerprint("TS0001", ["_TZ3210_dse8ogfy", "_TZ3210_j4pdtz9v", "_TZ3210_7vgttna6", "_TZ3210_a04acm9s", "_TZ3210_cm9mbpr1"]),
         model: "TS0001_fingerbot",
         vendor: "Tuya",
         description: "Zigbee fingerbot plus",
@@ -15012,6 +15062,9 @@ exports.definitions = [
                 .withDescription("Report energy flow direction for channel B using signed power (default false)."),
             e.binary("invert_energy_flow_a", ea.SET, true, false).withDescription("Report energy flow direction inverted for channel A."),
             e.binary("invert_energy_flow_b", ea.SET, true, false).withDescription("Report energy flow direction inverted for channel B."),
+            e
+                .binary("single_zero_remove", ea.SET, true, false)
+                .withDescription("If true then single-zero power or current values will be disgarded. The default is false."),
         ],
         exposes: [
             e.ac_frequency(),
@@ -21125,7 +21178,7 @@ exports.definitions = [
         fingerprint: tuya.fingerprint("TS0601", ["_TZE284_iwyqtclw"]),
         model: "M9Pro",
         vendor: "Tuya",
-        description: "Smart 4 gang switch, curtain, smart light or scene. 1x thermosat control",
+        description: "Smart 4 gang switch, curtain, smart light or scene. 1x thermostat control",
         exposes: [
             ...[1, 2, 3, 4].map((i) => e.switch().withEndpoint(`l${i}`).setAccess("state", ea.STATE_SET)),
             ...[1, 2, 3].map((i) => e.enum("mode", ea.STATE_SET, ["switch", "scene", "smart_light", "curtain"]).withEndpoint(`l${i}`).withDescription(`Switch ${i} mode`)),