zigbee-herdsman-converters 25.37.2 → 25.39.0

package/dist/devices/tuya.js

@@ -273,9 +273,8 @@ const convLocal = {
             from: (v, meta, options) => {
                 const invertedEnergyFlowKey = `invert_energy_flow_${channel}`;
                 const result_key = options[invertedEnergyFlowKey] ? `energy_produced_${channel}` : `energy_${channel}`;
-                const energy_sign = options[invertedEnergyFlowKey] ? -1 : 1;
                 const result = {};
-                result[result_key] = (v / 100) * energy_sign;
+                result[result_key] = v / 100;
                 return result;
             },
         };
@@ -285,9 +284,8 @@ const convLocal = {
             from: (v, meta, options) => {
                 const invertedEnergyFlowKey = `invert_energy_flow_${channel}`;
                 const result_key = options[invertedEnergyFlowKey] ? `energy_${channel}` : `energy_produced_${channel}`;
-                const energy_sign = options[invertedEnergyFlowKey] ? 1 : -1;
                 const result = {};
-                result[result_key] = (v / 100) * energy_sign;
+                result[result_key] = v / 100;
                 return result;
             },
         };
@@ -362,6 +360,17 @@ const convLocal = {
     },
 };
 const tzLocal = {
+    ts0049_countdown: {
+        key: ["water_countdown"],
+        convertSet: async (entity, key, value, meta) => {
+            utils.assertNumber(value);
+            const data = Buffer.alloc(5);
+            const scaledValue = value * 60; //
+            data.writeUInt32BE(scaledValue, 1); //
+            data[0] = 0x0b; //
+            await entity.command("manuSpecificTuyaE001", "setCountdown", { data });
+        },
+    },
     ts110eCountdown: {
         key: ["countdown"],
         convertSet: async (entity, key, value, meta) => {
@@ -928,6 +937,21 @@ const fzLocal = {
             return result;
         },
     },
+    ts0049_countdown: {
+        cluster: "manuSpecificTuyaE001",
+        type: "raw",
+        convert: (model, msg, publish, options, meta) => {
+            const len = msg.data.length;
+            const command = msg.data[2];
+            if (len > 10 && command === 0x0a && msg.data[7] === 0x0b && (msg.data[6] === 0x05 || msg.data[6] === 0x06)) {
+                const data = msg.data.slice(8);
+                const value = data.readUInt32BE(0);
+                return {
+                    countdown: value / 60,
+                };
+            }
+        },
+    },
 };
 exports.definitions = [
     {
@@ -936,7 +960,7 @@ exports.definitions = [
         vendor: "Tuya",
         description: "Gas sensor",
         whiteLabel: [{ vendor: "Tesla Smart", model: "TSL-SEN-GAS" }],
-        fromZigbee: [fz.ias_gas_alarm_1, fz.ignore_basic_report],
+        fromZigbee: [fz.ias_gas_alarm_1],
         toZigbee: [],
         exposes: [e.gas(), e.tamper()],
     },
@@ -1062,7 +1086,7 @@ exports.definitions = [
         model: "TS0203",
         vendor: "Tuya",
         description: "Door/window sensor",
-        fromZigbee: [fz.ias_contact_alarm_1, fz.battery, fz.ignore_basic_report, fz.ias_contact_alarm_1_report],
+        fromZigbee: [fz.ias_contact_alarm_1, fz.battery, fz.ias_contact_alarm_1_report],
         toZigbee: [],
         whiteLabel: [
             { vendor: "CR Smart Home", model: "TS0203" },
@@ -1260,7 +1284,7 @@ exports.definitions = [
         model: "TS0203_1",
         vendor: "Tuya",
         description: "Door sensor with scene switch",
-        fromZigbee: [fz.ias_contact_alarm_1, fz.battery, fz.ignore_basic_report, fz.ias_contact_alarm_1_report],
+        fromZigbee: [fz.ias_contact_alarm_1, fz.battery, fz.ias_contact_alarm_1_report],
         extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
         exposes: [e.action(["single", "double", "hold"]), e.contact(), e.battery_low(), e.tamper(), e.battery(), e.battery_voltage()],
         meta: {
@@ -2026,7 +2050,7 @@ exports.definitions = [
             tuya.whitelabel("Tuya", "TS0505B_2_2", "Zigbee GU10/E14 5W smart bulb", ["_TZ3210_it1u8ahz"]),
         ],
         toZigbee: [tz.on_off, tzLocal.led_control, tuya.tz.do_not_disturb],
-        fromZigbee: [fz.on_off, fz.tuya_led_controller, fz.brightness, fz.ignore_basic_report],
+        fromZigbee: [fz.on_off, fz.tuya_led_controller, fz.brightness],
         exposes: [e.light_brightness_colortemp_colorhs([143, 500]).removeFeature("color_temp_startup"), tuya.exposes.doNotDisturb()],
         configure: (device, coordinatorEndpoint) => {
             device.getEndpoint(1).saveClusterAttributeKeyValue("lightingColorCtrl", {
@@ -2134,7 +2158,7 @@ exports.definitions = [
         model: "TS0202_3",
         vendor: "Tuya",
         description: "Motion detector with illuminance",
-        fromZigbee: [fz.ias_occupancy_alarm_1, fz.battery, fz.ignore_basic_report, fz.ias_occupancy_alarm_1_report],
+        fromZigbee: [fz.ias_occupancy_alarm_1, fz.battery, fz.ias_occupancy_alarm_1_report],
         toZigbee: [],
         extend: [m.illuminance(), tuya.modernExtend.tuyaBase({ timeStart: "2000" })],
         exposes: [e.occupancy(), e.battery_low(), e.battery(), e.tamper()],
@@ -2173,7 +2197,7 @@ exports.definitions = [
         vendor: "Tuya",
         description: "Motion sensor",
         // Requires alarm_1_with_timeout https://github.com/Koenkk/zigbee2mqtt/issues/2818#issuecomment-776119586
-        fromZigbee: [fz.ias_occupancy_alarm_1_with_timeout, fz.battery, fz.ignore_basic_report],
+        fromZigbee: [fz.ias_occupancy_alarm_1_with_timeout, fz.battery],
         toZigbee: [],
         exposes: [e.occupancy(), e.battery_low(), e.battery(), e.battery_voltage()],
         configure: async (device, coordinatorEndpoint) => {
@@ -2202,7 +2226,7 @@ exports.definitions = [
             tuya.whitelabel("Tuya", "HW500A", "Motion sensor", ["_TZ3000_bsvqrxru"]),
             tuya.whitelabel("Nedis", "ZBSM10WT", "Motion sensor", ["_TZ3000_nss8amz9"]),
         ],
-        fromZigbee: [fz.ias_occupancy_alarm_1, fz.battery, fz.ignore_basic_report, fz.ias_occupancy_alarm_1_report],
+        fromZigbee: [fz.ias_occupancy_alarm_1, fz.battery, fz.ias_occupancy_alarm_1_report],
         toZigbee: [],
         exposes: (device, options) => {
             const exps = [e.occupancy(), e.battery_low(), e.battery(), e.battery_voltage()];
@@ -2228,7 +2252,7 @@ exports.definitions = [
         model: "ZM-35H-Q",
         vendor: "Tuya",
         description: "Motion sensor",
-        fromZigbee: [fz.ias_occupancy_alarm_1, fz.battery, fz.ignore_basic_report, fz.ZM35HQ_attr, legacy.fromZigbee.ZM35HQ_battery],
+        fromZigbee: [fz.ias_occupancy_alarm_1, fz.battery, fz.ZM35HQ_attr, legacy.fromZigbee.ZM35HQ_battery],
         toZigbee: [tz.ZM35HQ_attr],
         extend: [m.quirkCheckinInterval(15000)],
         exposes: [
@@ -2247,7 +2271,7 @@ exports.definitions = [
         model: "IH012-RT01",
         vendor: "Tuya",
         description: "Motion sensor",
-        fromZigbee: [fz.ignore_basic_report, fz.ZM35HQ_attr, fz.battery],
+        fromZigbee: [fz.ZM35HQ_attr, fz.battery],
         toZigbee: [tz.ZM35HQ_attr],
         extend: [
             m.quirkCheckinInterval(15000),
@@ -2284,7 +2308,7 @@ exports.definitions = [
         model: "IH012-RT02",
         vendor: "Tuya",
         description: "Motion sensor",
-        fromZigbee: [fz.ias_occupancy_alarm_1, fz.ignore_basic_report, fz.ZM35HQ_attr, fz.battery],
+        fromZigbee: [fz.ias_occupancy_alarm_1, fz.ZM35HQ_attr, fz.battery],
         toZigbee: [tz.ZM35HQ_attr],
         extend: [m.quirkCheckinInterval(15000)],
         exposes: [
@@ -2335,7 +2359,7 @@ exports.definitions = [
         model: "TS0207_water_leak_detector",
         vendor: "Tuya",
         description: "Water leak detector",
-        fromZigbee: [fz.ias_water_leak_alarm_1, fz.battery, fz.ignore_basic_report],
+        fromZigbee: [fz.ias_water_leak_alarm_1, fz.battery],
         whiteLabel: [
             { vendor: "CR Smart Home", model: "TS0207" },
             {
@@ -3180,7 +3204,7 @@ exports.definitions = [
             e.switch().withEndpoint("l3").setAccess("state", ea.STATE_SET),
             e.switch().withEndpoint("l4").setAccess("state", ea.STATE_SET),
         ],
-        fromZigbee: [fz.ignore_basic_report, legacy.fromZigbee.tuya_switch],
+        fromZigbee: [legacy.fromZigbee.tuya_switch],
         toZigbee: [legacy.toZigbee.tuya_switch_state],
         meta: { multiEndpoint: true },
         whiteLabel: [
@@ -3345,6 +3369,31 @@ exports.definitions = [
             tuya.whitelabel("Nova Digital", "SA-6", "Safira smart switch - 6 gang", ["_TZE204_gxbdnfrh"]),
         ],
     },
+    {
+        fingerprint: tuya.fingerprint("TS0601", ["_TZE200_raz9qavg"]),
+        model: "KRC-103",
+        vendor: "Videosec",
+        description: "6 gang kinetic switch actuator",
+        extend: [tuya.modernExtend.tuyaBase({ dp: true }), m.deviceEndpoints({ endpoints: { l1: 1, l2: 1, l3: 1, l4: 1, l5: 1, l6: 1 } })],
+        exposes: [
+            e.switch().withEndpoint("l1"),
+            e.switch().withEndpoint("l2"),
+            e.switch().withEndpoint("l3"),
+            e.switch().withEndpoint("l4"),
+            e.switch().withEndpoint("l5"),
+            e.switch().withEndpoint("l6"),
+        ],
+        meta: {
+            tuyaDatapoints: [
+                [19, "state_l1", tuya.valueConverter.onOff],
+                [20, "state_l2", tuya.valueConverter.onOff],
+                [21, "state_l3", tuya.valueConverter.onOff],
+                [22, "state_l4", tuya.valueConverter.onOff],
+                [23, "state_l5", tuya.valueConverter.onOff],
+                [24, "state_l6", tuya.valueConverter.onOff],
+            ],
+        },
+    },
     {
         zigbeeModel: ["ZG-302Z1"],
         fingerprint: tuya.fingerprint("TS0601", ["_TZE204_ojtqawav", "_TZE204_gbagoilo", "_TZE200_ojtqawav"]),
@@ -3352,7 +3401,7 @@ exports.definitions = [
         vendor: "Tuya",
         description: "1 gang switch",
         exposes: [e.switch().setAccess("state", ea.STATE_SET)],
-        fromZigbee: [fz.ignore_basic_report, legacy.fromZigbee.tuya_switch],
+        fromZigbee: [legacy.fromZigbee.tuya_switch],
         toZigbee: [legacy.toZigbee.tuya_switch_state],
         whiteLabel: [tuya.whitelabel("Shawader", "SMKG-1KNL-US/TZB-W", "1 gang switch", ["_TZE204_ojtqawav"])],
         configure: async (device, coordinatorEndpoint) => {
@@ -3403,7 +3452,7 @@ exports.definitions = [
         vendor: "Tuya",
         description: "2 gang switch",
         exposes: [e.switch().withEndpoint("l1").setAccess("state", ea.STATE_SET), e.switch().withEndpoint("l2").setAccess("state", ea.STATE_SET)],
-        fromZigbee: [fz.ignore_basic_report, legacy.fromZigbee.tuya_switch],
+        fromZigbee: [legacy.fromZigbee.tuya_switch],
         toZigbee: [legacy.toZigbee.tuya_switch_state],
         meta: { multiEndpoint: true },
         configure: async (device, coordinatorEndpoint) => {
@@ -3455,7 +3504,7 @@ exports.definitions = [
             e.switch().withEndpoint("l2").setAccess("state", ea.STATE_SET),
             e.switch().withEndpoint("l3").setAccess("state", ea.STATE_SET),
         ],
-        fromZigbee: [fz.ignore_basic_report, legacy.fromZigbee.tuya_switch],
+        fromZigbee: [legacy.fromZigbee.tuya_switch],
         toZigbee: [legacy.toZigbee.tuya_switch_state],
         meta: { multiEndpoint: true },
         configure: async (device, coordinatorEndpoint) => {
@@ -3639,7 +3688,7 @@ exports.definitions = [
         vendor: "Tuya",
         description: "RGB+CCT LED",
         toZigbee: [tz.on_off, tz.tuya_led_control],
-        fromZigbee: [fz.on_off, fz.tuya_led_controller, fz.brightness, fz.ignore_basic_report],
+        fromZigbee: [fz.on_off, fz.tuya_led_controller, fz.brightness],
         exposes: [e.light_brightness_colortemp_colorhs([153, 500]).removeFeature("color_temp_startup")],
     },
     {
@@ -3729,8 +3778,8 @@ exports.definitions = [
         vendor: "Tuya",
         description: "Temperature & humidity sensor",
         fromZigbee: [fzLocal.TS0201_battery, fz.temperature, fz.humidity],
-        toZigbee: [],
-        exposes: [e.battery(), e.temperature(), e.humidity(), e.battery_voltage()],
+        extend: [m.battery()],
+        exposes: [e.temperature(), e.humidity(), e.battery_voltage()],
         configure: tuya.configureMagicPacket,
         whiteLabel: [tuya.whitelabel("Tuya", "RSH-HS06_1", "Temperature & humidity sensor", ["_TZ3000_zl1kmjqx"])],
     },
@@ -4235,7 +4284,7 @@ exports.definitions = [
         model: "TS0601_water_sensor",
         vendor: "Tuya",
         description: "Water leak sensor",
-        fromZigbee: [legacy.fromZigbee.tuya_water_leak, fz.ignore_basic_report],
+        fromZigbee: [legacy.fromZigbee.tuya_water_leak],
         exposes: [e.water_leak()],
         toZigbee: [],
         whiteLabel: [{ vendor: "NEO", model: "NAS-WS02B0" }],
@@ -4245,7 +4294,7 @@ exports.definitions = [
         model: "WLS-100z",
         vendor: "Tuya",
         description: "Water leak sensor",
-        fromZigbee: [fz.ignore_basic_report, fz.ignore_tuya_raw, legacy.fromZigbee.wls100z_water_leak],
+        fromZigbee: [fz.ignore_tuya_raw, legacy.fromZigbee.wls100z_water_leak],
         extend: [tuya.modernExtend.tuyaBase({ timeStart: "2000", bindBasicOnConfigure: true })],
         exposes: [e.battery(), e.water_leak()],
     },
@@ -4270,7 +4319,7 @@ exports.definitions = [
         description: "Switch with power monitoring",
         vendor: "Tuya",
         ota: true,
-        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, fz.ignore_basic_report, tuya.fz.power_outage_memory, tuya.fz.switch_type],
+        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, tuya.fz.power_outage_memory, tuya.fz.switch_type],
         toZigbee: [tz.on_off, tuya.tz.power_on_behavior_1, tuya.tz.switch_type],
         configure: async (device, coordinatorEndpoint) => {
             await tuya.configureMagicPacket(device, coordinatorEndpoint);
@@ -4372,7 +4421,7 @@ exports.definitions = [
         model: "TS000F_power",
         description: "Switch with power monitoring",
         vendor: "Tuya",
-        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, fz.ignore_basic_report, tuya.fz.power_on_behavior_1, tuya.fz.switch_type],
+        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, tuya.fz.power_on_behavior_1, tuya.fz.switch_type],
         toZigbee: [tz.on_off, tuya.tz.power_on_behavior_1, tuya.tz.switch_type],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
@@ -4955,7 +5004,7 @@ exports.definitions = [
             tuya.whitelabel("Novato", "WPK", "Smart curtain track", ["_TZE204_lh3arisb"]),
             tuya.whitelabel("Zemismart", "ZMS1-TYZ", "Smart curtain track", ["_TZE204_zuq5xxib"]),
         ],
-        fromZigbee: [legacy.fromZigbee.tuya_cover, fz.ignore_basic_report],
+        fromZigbee: [legacy.fromZigbee.tuya_cover],
         toZigbee: [legacy.toZigbee.tuya_cover_control, legacy.toZigbee.tuya_cover_options],
         exposes: [
             e.cover_position().setAccess("position", ea.STATE_SET),
@@ -4970,7 +5019,7 @@ exports.definitions = [
         model: "M3TYW-2.0-13",
         vendor: "Tuya",
         description: "Longsam M3 curtain motor",
-        fromZigbee: [legacy.fromZigbee.tuya_cover, fz.ignore_basic_report],
+        fromZigbee: [legacy.fromZigbee.tuya_cover],
         toZigbee: [tzLocal.invert_cover_percent_fix, legacy.toZigbee.tuya_cover_options],
         exposes: [
             e.cover_position().setAccess("position", ea.STATE_SET),
@@ -4990,7 +5039,7 @@ exports.definitions = [
             tuya.whitelabel("Zemismart", "BCM100DB", "Curtain Motor", ["_TZE200_eegnwoyw"]),
             tuya.whitelabel("Nova Digital", "ZBCMR-01", "Roller Blind Motor", ["_TZE600_ogyg1y6b"]),
         ],
-        fromZigbee: [legacy.fromZigbee.tuya_cover, fz.ignore_basic_report],
+        fromZigbee: [legacy.fromZigbee.tuya_cover],
         toZigbee: [legacy.toZigbee.tuya_cover_control],
         exposes: [e.cover_position().setAccess("position", ea.STATE_SET)],
     },
@@ -5455,7 +5504,7 @@ exports.definitions = [
         },
         ota: true,
         extend: [tuya.modernExtend.tuyaBase({ forceTimeUpdates: true })],
-        fromZigbee: [legacy.fromZigbee.tuya_thermostat, fz.ignore_basic_report, fz.ignore_tuya_set_time],
+        fromZigbee: [legacy.fromZigbee.tuya_thermostat, fz.ignore_tuya_set_time],
         toZigbee: [
             legacy.toZigbee.tuya_thermostat_child_lock,
             legacy.toZigbee.tuya_thermostat_window_detection,
@@ -6205,12 +6254,7 @@ exports.definitions = [
         model: "HT-08",
         vendor: "ETOP",
         description: "Wall-mount thermostat",
-        fromZigbee: [
-            legacy.fromZigbee.tuya_thermostat_weekly_schedule_2,
-            legacy.fromZigbee.etop_thermostat,
-            fz.ignore_basic_report,
-            fz.ignore_tuya_set_time,
-        ],
+        fromZigbee: [legacy.fromZigbee.tuya_thermostat_weekly_schedule_2, legacy.fromZigbee.etop_thermostat, fz.ignore_tuya_set_time],
         toZigbee: [
             legacy.toZigbee.etop_thermostat_system_mode,
             legacy.toZigbee.etop_thermostat_away_mode,
@@ -6242,12 +6286,7 @@ exports.definitions = [
         model: "HT-10",
         vendor: "ETOP",
         description: "Radiator valve",
-        fromZigbee: [
-            legacy.fromZigbee.tuya_thermostat_weekly_schedule_2,
-            legacy.fromZigbee.etop_thermostat,
-            fz.ignore_basic_report,
-            fz.ignore_tuya_set_time,
-        ],
+        fromZigbee: [legacy.fromZigbee.tuya_thermostat_weekly_schedule_2, legacy.fromZigbee.etop_thermostat, fz.ignore_tuya_set_time],
         toZigbee: [
             legacy.toZigbee.etop_thermostat_system_mode,
             legacy.toZigbee.etop_thermostat_away_mode,
@@ -6900,7 +6939,7 @@ exports.definitions = [
             { vendor: "Connecte", model: "4500993" },
         ],
         vendor: "Tuya",
-        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, fz.ignore_basic_report, tuya.fz.power_outage_memory, tuya.fz.indicator_mode],
+        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, tuya.fz.power_outage_memory, tuya.fz.indicator_mode],
         toZigbee: [tz.on_off, tuya.tz.power_on_behavior_1, tuya.tz.backlight_indicator_mode_1],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
@@ -7938,7 +7977,7 @@ exports.definitions = [
         model: "SNTZ007",
         vendor: "Tuya",
         description: "Rechargeable Zigbee contact sensor",
-        fromZigbee: [fz.ias_contact_alarm_1, fz.battery, fz.ignore_basic_report, fz.ignore_time_read],
+        fromZigbee: [fz.ias_contact_alarm_1, fz.battery],
         toZigbee: [],
         exposes: [e.contact(), e.battery_low(), e.tamper(), e.battery()],
         whiteLabel: [{ vendor: "BlitzWolf", model: "BW-IS2" }],
@@ -7948,7 +7987,7 @@ exports.definitions = [
         model: "RH3040",
         vendor: "Tuya",
         description: "PIR sensor",
-        fromZigbee: [fz.battery, fz.ignore_basic_report, fz.ias_occupancy_alarm_1],
+        fromZigbee: [fz.battery, fz.ias_occupancy_alarm_1],
         toZigbee: [],
         whiteLabel: [
             { vendor: "Samotech", model: "SM301Z" },
@@ -8206,7 +8245,7 @@ exports.definitions = [
         model: "gq8b1uv",
         vendor: "Tuya",
         description: "Zigbee smart dimmer",
-        fromZigbee: [legacy.fromZigbee.tuya_dimmer, fz.ignore_basic_report],
+        fromZigbee: [legacy.fromZigbee.tuya_dimmer],
         toZigbee: [legacy.toZigbee.tuya_dimmer_state, legacy.toZigbee.tuya_dimmer_level],
         exposes: [e.light_brightness().setAccess("state", ea.STATE_SET).setAccess("brightness", ea.STATE_SET)],
         configure: async (device, coordinatorEndpoint) => {
@@ -8238,7 +8277,7 @@ exports.definitions = [
         model: "SNTZ009",
         vendor: "Tuya",
         description: "Water leak sensor",
-        fromZigbee: [legacy.fromZigbee.tuya_water_leak, fz.ignore_basic_report],
+        fromZigbee: [legacy.fromZigbee.tuya_water_leak],
         exposes: [e.water_leak()],
         toZigbee: [],
     },
@@ -8277,7 +8316,7 @@ exports.definitions = [
         model: "TS0726_2_gang",
         vendor: "Tuya",
         description: "2 gang switch with neutral wire",
-        fromZigbee: [fz.on_off, tuya.fz.power_on_behavior_2, fz.ignore_basic_report, fzLocal.TS0726_action],
+        fromZigbee: [fz.on_off, tuya.fz.power_on_behavior_2, fzLocal.TS0726_action],
         toZigbee: [tz.on_off, tuya.tz.power_on_behavior_2, tzLocal.TS0726_switch_mode],
         exposes: [
             ...[1, 2].map((ep) => e.switch().withEndpoint(`l${ep}`)),
@@ -8301,7 +8340,7 @@ exports.definitions = [
         model: "TS0726_multi_1_gang",
         vendor: "Tuya",
         description: "Multi 1 gang switch with backlight",
-        fromZigbee: [fz.on_off, tuya.fz.power_on_behavior_2, fz.ignore_basic_report, fzLocal.TS0726_action],
+        fromZigbee: [fz.on_off, tuya.fz.power_on_behavior_2, fzLocal.TS0726_action],
         toZigbee: [tz.on_off, tuya.tz.power_on_behavior_2, tzLocal.TS0726_switch_mode, tuya.tz.backlight_indicator_mode_2],
         exposes: [
             e.switch(),
@@ -8322,7 +8361,7 @@ exports.definitions = [
         model: "TS0726_multi_3_gang",
         vendor: "Tuya",
         description: "multi 3 gang switch with backlight",
-        fromZigbee: [fz.on_off, tuya.fz.power_on_behavior_2, fz.ignore_basic_report, fzLocal.TS0726_action],
+        fromZigbee: [fz.on_off, tuya.fz.power_on_behavior_2, fzLocal.TS0726_action],
         toZigbee: [tz.on_off, tuya.tz.power_on_behavior_2, tzLocal.TS0726_switch_mode, tuya.tz.backlight_indicator_mode_2],
         exposes: [
             ...[1, 2, 3].map((ep) => e.switch().withEndpoint(`l${ep}`)),
@@ -8347,7 +8386,7 @@ exports.definitions = [
         model: "TS0726_multi_4_gang",
         vendor: "Tuya",
         description: "Multi 4 gang switch with backlight",
-        fromZigbee: [fz.on_off, tuya.fz.power_on_behavior_2, fz.ignore_basic_report, fzLocal.TS0726_action],
+        fromZigbee: [fz.on_off, tuya.fz.power_on_behavior_2, fzLocal.TS0726_action],
         toZigbee: [tz.on_off, tuya.tz.power_on_behavior_2, tzLocal.TS0726_switch_mode, tuya.tz.backlight_indicator_mode_2],
         exposes: [
             ...[1, 2, 3, 4].map((ep) => e.switch().withEndpoint(`l${ep}`)),
@@ -8372,7 +8411,7 @@ exports.definitions = [
         model: "TS0726_4_gang_switch_and_2_scene",
         vendor: "Tuya",
         description: "Multi 4 gang switch and 2 scene with backlight",
-        fromZigbee: [fz.on_off, tuya.fz.power_on_behavior_2, fz.ignore_basic_report, fzLocal.TS0726_action],
+        fromZigbee: [fz.on_off, tuya.fz.power_on_behavior_2, fzLocal.TS0726_action],
         toZigbee: [tz.on_off, tuya.tz.power_on_behavior_2, tzLocal.TS0726_switch_mode, tuya.tz.backlight_indicator_mode_2],
         exposes: [
             ...[1, 2, 3, 4].map((ep) => e.switch().withEndpoint(`l${ep}`)),
@@ -8397,7 +8436,7 @@ exports.definitions = [
         model: "TS0726_3_gang",
         vendor: "Tuya",
         description: "3 gang switch with neutral wire",
-        fromZigbee: [fz.on_off, tuya.fz.power_on_behavior_2, fz.ignore_basic_report, fzLocal.TS0726_action],
+        fromZigbee: [fz.on_off, tuya.fz.power_on_behavior_2, fzLocal.TS0726_action],
         toZigbee: [tz.on_off, tuya.tz.power_on_behavior_2, tzLocal.TS0726_switch_mode],
         exposes: [
             ...[1, 2, 3].map((ep) => e.switch().withEndpoint(`l${ep}`)),
@@ -8421,7 +8460,7 @@ exports.definitions = [
         model: "TS0726_4_gang",
         vendor: "Tuya",
         description: "4 gang switch with neutral wire",
-        fromZigbee: [fz.on_off, tuya.fz.power_on_behavior_2, fz.ignore_basic_report, fzLocal.TS0726_action],
+        fromZigbee: [fz.on_off, tuya.fz.power_on_behavior_2, fzLocal.TS0726_action],
         toZigbee: [tz.on_off, tuya.tz.power_on_behavior_2, tzLocal.TS0726_switch_mode],
         exposes: [
             ...[1, 2, 3, 4].map((ep) => e.switch().withEndpoint(`l${ep}`)),
@@ -8555,7 +8594,7 @@ exports.definitions = [
                 .withSystemMode(["off", "auto", "heat"], ea.STATE_SET)
                 .withRunningState(["idle", "heat", "cool"], ea.STATE),
         ],
-        fromZigbee: [legacy.fromZigbee.tuya_thermostat, fz.ignore_basic_report, legacy.fromZigbee.tuya_dimmer],
+        fromZigbee: [legacy.fromZigbee.tuya_thermostat, legacy.fromZigbee.tuya_dimmer],
         meta: {
             tuyaThermostatSystemMode: legacy.thermostatSystemModes2,
             tuyaThermostatPreset: legacy.thermostatPresets,
@@ -8614,7 +8653,7 @@ exports.definitions = [
         model: "HY08WE",
         vendor: "Tuya",
         description: "Wall-mount thermostat",
-        fromZigbee: [legacy.fromZigbee.hy_thermostat, fz.ignore_basic_report],
+        fromZigbee: [legacy.fromZigbee.hy_thermostat],
         toZigbee: [legacy.toZigbee.hy_thermostat],
         extend: [tuya.modernExtend.tuyaBase({ timeStart: "2000" })],
         exposes: [
@@ -8804,7 +8843,7 @@ exports.definitions = [
         model: "X5H-GB-B",
         vendor: "Tuya",
         description: "Wall-mount thermostat",
-        fromZigbee: [fz.ignore_basic_report, fz.ignore_tuya_set_time, legacy.fromZigbee.x5h_thermostat],
+        fromZigbee: [fz.ignore_tuya_set_time, legacy.fromZigbee.x5h_thermostat],
         toZigbee: [legacy.toZigbee.x5h_thermostat],
         whiteLabel: [
             { vendor: "Beok", model: "TGR85-ZB" },
@@ -9214,14 +9253,7 @@ exports.definitions = [
         model: "TS011F_din_smart_relay",
         description: "Din smart relay (with power monitoring)",
         vendor: "Tuya",
-        fromZigbee: [
-            fz.on_off,
-            fz.electrical_measurement,
-            fz.metering,
-            fz.ignore_basic_report,
-            tuya.fz.power_outage_memory,
-            fz.tuya_relay_din_led_indicator,
-        ],
+        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, tuya.fz.power_outage_memory, fz.tuya_relay_din_led_indicator],
         toZigbee: [tz.on_off, tuya.tz.power_on_behavior_1, tz.tuya_relay_din_led_indicator],
         whiteLabel: [{ vendor: "MatSee Plus", model: "ATMS1602Z" }],
         ota: true,
@@ -9257,14 +9289,7 @@ exports.definitions = [
         model: "TS011F_din_smart_relay_polling",
         description: "Din smart relay (with power monitoring via polling)",
         vendor: "Tuya",
-        fromZigbee: [
-            fz.on_off,
-            fz.electrical_measurement,
-            fz.metering,
-            fz.ignore_basic_report,
-            tuya.fz.power_outage_memory,
-            fz.tuya_relay_din_led_indicator,
-        ],
+        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, tuya.fz.power_outage_memory, fz.tuya_relay_din_led_indicator],
         toZigbee: [tz.on_off, tuya.tz.power_on_behavior_1, tz.tuya_relay_din_led_indicator],
         whiteLabel: [
             tuya.whitelabel("Tongou", "TO-Q-SY1-JZT", "Din smart relay (with power monitoring via polling)", ["_TZ3000_qeuvnohg"]),
@@ -9305,7 +9330,7 @@ exports.definitions = [
         model: "ATMS1601Z",
         description: "Din smart relay (without power monitoring)",
         vendor: "Tuya",
-        fromZigbee: [fz.on_off, fz.ignore_basic_report, tuya.fz.power_outage_memory, fz.tuya_relay_din_led_indicator],
+        fromZigbee: [fz.on_off, tuya.fz.power_outage_memory, fz.tuya_relay_din_led_indicator],
         toZigbee: [tz.on_off, tuya.tz.power_on_behavior_1, tz.tuya_relay_din_led_indicator],
         whiteLabel: [tuya.whitelabel("Tongou", "TO-Q-SY1-ZT", "Din smart relay (without power monitoring)", ["_TZ3000_gzvniqjb"])],
         configure: async (device, coordinatorEndpoint) => {
@@ -9389,7 +9414,7 @@ exports.definitions = [
         model: "GDC311ZBQ1",
         vendor: "Tuya",
         description: "LoraTap garage door opener with wireless sensor",
-        fromZigbee: [legacy.fromZigbee.matsee_garage_door_opener, fz.ignore_basic_report],
+        fromZigbee: [legacy.fromZigbee.matsee_garage_door_opener],
         toZigbee: [legacy.toZigbee.matsee_garage_door_opener, legacy.toZigbee.tuya_data_point_test],
         whiteLabel: [{ vendor: "LoraTap", model: "GDC311ZBQ1" }],
         configure: async (device, coordinatorEndpoint) => {
@@ -10372,7 +10397,7 @@ exports.definitions = [
         model: "ZB-Sm",
         vendor: "Tuya",
         description: "Tubular motor",
-        fromZigbee: [legacy.fromZigbee.zb_sm_cover, fz.ignore_basic_report],
+        fromZigbee: [legacy.fromZigbee.zb_sm_cover],
         toZigbee: [legacy.toZigbee.zb_sm_cover],
         extend: [tuya.modernExtend.tuyaBase({ timeStart: "2000" })],
         exposes: [
@@ -10491,8 +10516,8 @@ exports.definitions = [
                 [2, "humidity", tuya.valueConverter.raw],
                 [4, "battery", tuya.valueConverter.raw],
                 [9, "temperature_unit", tuya.valueConverter.temperatureUnit],
-                [23, "temperature_calibration", tuya.valueConverter.divideBy10],
-                [24, "humidity_calibration", tuya.valueConverter.raw],
+                [23, "temperature_calibration", tuya.valueConverter.localTempCalibration3],
+                [24, "humidity_calibration", tuya.valueConverter.localTempCalibration2],
             ],
         },
     },
@@ -11299,7 +11324,7 @@ exports.definitions = [
         extend: [m.battery(), m.onOff({ powerOnBehavior: false }), tuya.modernExtend.tuyaBase({ dp: true })],
         // Countdown is not working properly yet - device ignores it and uses the default (10 minutes)
         // Countdown can be set using the Tuya app/hub and it will persist
-        fromZigbee: [fz.battery, fz.on_off, fz.ignore_basic_report /*tuya.fz.on_off_countdown,*/],
+        fromZigbee: [fz.battery, fz.on_off /*tuya.fz.on_off_countdown,*/],
         toZigbee: [tz.on_off /*tuya.tz.on_off_countdown,*/],
         exposes: [
             tuya.exposes.countdown().withAccess(ea.ALL),
@@ -11529,6 +11554,7 @@ exports.definitions = [
             "_TZ3000_qystbcjg",
             "_TZ3000_zrm3oxsh",
             "_TZ3000_303avxxt",
+            "_TZ3000_ibefeicf",
             "_TZ3000_zjchz7pd",
             "_TZ3000_zv6x8bt2",
         ]),
@@ -11549,7 +11575,7 @@ exports.definitions = [
         toZigbee: [tzLocal.TS011F_threshold],
         exposes: (device, options) => {
             const exposes = [];
-            if (!["_TZ3000_303avxxt", "_TZ3000_zjchz7pd"].includes(device.manufacturerName)) {
+            if (!["_TZ3000_303avxxt", "_TZ3000_ibefeicf", "_TZ3000_zjchz7pd"].includes(device.manufacturerName)) {
                 exposes.push(e.temperature(), e
                     .numeric("temperature_threshold", ea.STATE_SET)
                     .withValueMin(40)
@@ -11610,7 +11636,7 @@ exports.definitions = [
             tuya.whitelabel("EARU", "EAKCB-T-M-Z", "Smart circuit breaker", ["_TZ3000_lepzuhto"]),
             tuya.whitelabel("EARU", "EAYCB-Z-2P", "Smart circuit breaker with leakage protection", ["_TZ3000_zrm3oxsh"]),
             tuya.whitelabel("UNSH", "SMKG-1KNL-EU-Z", "Smart circuit Breaker", ["_TZ3000_qystbcjg"]),
-            tuya.whitelabel("Tomzn", "TOB9Z-VAP", "Smart circuit breaker", ["_TZ3000_303avxxt"]),
+            tuya.whitelabel("Tomzn", "TOB9Z-VAP", "Smart circuit breaker", ["_TZ3000_303avxxt", "_TZ3000_ibefeicf"]),
             tuya.whitelabel("Immax", "07573L", "Smart circuit breaker", ["_TZ3000_zjchz7pd"]),
             tuya.whitelabel("Moes", "A5", "Smart circuit breaker", ["_TZ3000_zv6x8bt2"]),
         ],
@@ -11838,7 +11864,7 @@ exports.definitions = [
         ],
     },
     {
-        fingerprint: tuya.fingerprint("TS0601", ["_TZE200_jhkttplm"]),
+        fingerprint: tuya.fingerprint("TS0601", ["TLSR82xx"]),
         model: "TS0601_cover_with_1_switch",
         vendor: "Tuya",
         description: "Curtain/blind switch with 1 Gang switch",
@@ -16337,9 +16363,9 @@ exports.definitions = [
                 [107, "soil_moisture", tuya.valueConverter.raw],
                 [108, "battery", tuya.valueConverter.raw],
                 [106, "temperature_unit", tuya.valueConverter.temperatureUnit],
-                [104, "temperature_calibration", tuya.valueConverter.divideBy10],
-                [105, "humidity_calibration", tuya.valueConverter.raw],
-                [102, "soil_calibration", tuya.valueConverter.raw],
+                [104, "temperature_calibration", tuya.valueConverter.localTempCalibration3],
+                [105, "humidity_calibration", tuya.valueConverter.localTempCalibration2],
+                [102, "soil_calibration", tuya.valueConverter.localTempCalibration2],
                 [111, "temperature_sampling", tuya.valueConverter.raw],
                 [112, "soil_sampling", tuya.valueConverter.raw],
                 [110, "soil_warning", tuya.valueConverter.raw],
@@ -18016,7 +18042,7 @@ exports.definitions = [
         model: "TS0001_1_gang_switch",
         vendor: "Tuya",
         description: "1 gang switch with backlight",
-        fromZigbee: [fz.ignore_basic_report],
+        fromZigbee: [],
         extend: [
             tuya.modernExtend.tuyaOnOff({
                 powerOnBehavior2: true,
@@ -18035,7 +18061,7 @@ exports.definitions = [
         vendor: "Tuya",
         description: "1 gang switch with scene and backlight",
         whiteLabel: [tuya.whitelabel("BSEED", "EC-GL86ZPCS11", "1 gang switch with scene and backlight", ["_TZ3002_jn2x20tg"])],
-        fromZigbee: [fz.ignore_basic_report, fzLocal.TS0726_action],
+        fromZigbee: [fzLocal.TS0726_action],
         exposes: [e.action(["scene_1"])],
         extend: [
             tuya.modernExtend.tuyaOnOff({
@@ -18057,7 +18083,7 @@ exports.definitions = [
         vendor: "Tuya",
         description: "2 gang switch with scene and backlight",
         whiteLabel: [tuya.whitelabel("BSEED", "EC-GL86ZPCS21", "2 gang switch with scene and backlight", ["_TZ3002_zjuvw9zf"])],
-        fromZigbee: [fz.ignore_basic_report, fzLocal.TS0726_action],
+        fromZigbee: [fzLocal.TS0726_action],
         exposes: [e.action(["scene_1", "scene_2"])],
         extend: [
             tuya.modernExtend.tuyaOnOff({
@@ -18085,7 +18111,7 @@ exports.definitions = [
         model: "TS0726_3_gang_scene_switch",
         vendor: "Tuya",
         description: "3 gang switch with scene and backlight",
-        fromZigbee: [fz.ignore_basic_report, fzLocal.TS0726_action],
+        fromZigbee: [fzLocal.TS0726_action],
         exposes: [e.action(["scene_1", "scene_2", "scene_3"])],
         extend: [
             tuya.modernExtend.tuyaOnOff({
@@ -18113,7 +18139,7 @@ exports.definitions = [
         model: "TS0726_4_gang_scene_switch",
         vendor: "Tuya",
         description: "4 gang switch with scene and backlight",
-        fromZigbee: [fz.ignore_basic_report, fzLocal.TS0726_action],
+        fromZigbee: [fzLocal.TS0726_action],
         exposes: [e.action(["scene_1", "scene_2", "scene_3", "scene_4"])],
         extend: [
             tuya.modernExtend.tuyaOnOff({
@@ -18412,8 +18438,8 @@ exports.definitions = [
                 [111, "temperature", tuya.valueConverter.divideBy10],
                 [101, "humidity", tuya.valueConverter.raw],
                 [109, "temperature_unit", tuya.valueConverter.temperatureUnit],
-                [105, "temperature_calibration", tuya.valueConverter.divideBy10],
-                [104, "humidity_calibration", tuya.valueConverter.raw],
+                [105, "temperature_calibration", tuya.valueConverter.localTempCalibration3],
+                [104, "humidity_calibration", tuya.valueConverter.localTempCalibration2],
                 [107, "illuminance_interval", tuya.valueConverter.raw],
             ],
         },
@@ -18589,9 +18615,9 @@ exports.definitions = [
                 [3, "soil_moisture", tuya.valueConverter.raw],
                 [15, "battery", tuya.valueConverter.raw],
                 [9, "temperature_unit", tuya.valueConverter.temperatureUnit],
-                [104, "temperature_calibration", tuya.valueConverter.divideBy10],
-                [105, "humidity_calibration", tuya.valueConverter.raw],
-                [102, "soil_calibration", tuya.valueConverter.raw],
+                [104, "temperature_calibration", tuya.valueConverter.localTempCalibration3],
+                [105, "humidity_calibration", tuya.valueConverter.localTempCalibration2],
+                [102, "soil_calibration", tuya.valueConverter.localTempCalibration2],
                 [111, "temperature_sampling", tuya.valueConverter.raw],
                 [112, "soil_sampling", tuya.valueConverter.raw],
                 [110, "soil_warning", tuya.valueConverter.raw],
@@ -18854,6 +18880,7 @@ exports.definitions = [
                 .withValueStep(1)
                 .withUnit("x")
                 .withDescription("Static detection sensitivity"),
+            e.enum("motion_detection_mode", ea.STATE_SET, ["pir_and_radar", "pir_or_radar", "only_radar"]).withDescription("Motion detection mode"),
         ],
         meta: {
             tuyaDatapoints: [
@@ -18867,9 +18894,18 @@ exports.definitions = [
                 [111, "temperature", tuya.valueConverter.divideBy10],
                 [101, "humidity", tuya.valueConverter.raw],
                 [109, "temperature_unit", tuya.valueConverter.temperatureUnit],
-                [105, "temperature_calibration", tuya.valueConverter.divideBy10],
-                [104, "humidity_calibration", tuya.valueConverter.raw],
+                [105, "temperature_calibration", tuya.valueConverter.localTempCalibration3],
+                [104, "humidity_calibration", tuya.valueConverter.localTempCalibration2],
                 [107, "illuminance_interval", tuya.valueConverter.raw],
+                [
+                    112,
+                    "motion_detection_mode",
+                    tuya.valueConverterBasic.lookup({
+                        pir_and_radar: tuya.enum(0),
+                        pir_or_radar: tuya.enum(1),
+                        only_radar: tuya.enum(2),
+                    }),
+                ],
             ],
         },
     },
@@ -19359,6 +19395,130 @@ exports.definitions = [
             ],
         },
     },
+    {
+        zigbeeModel: ["ZG-204ZK"],
+        fingerprint: tuya.fingerprint("TS0601", ["_TZE200_ka8l86iu"]),
+        model: "ZG-204ZK",
+        vendor: "HOBEIAN",
+        description: "24Ghz human presence sensor",
+        fromZigbee: [tuya.fz.datapoints],
+        toZigbee: [tuya.tz.datapoints],
+        exposes: [
+            e.presence(),
+            e.illuminance(),
+            e.battery(),
+            e
+                .numeric("fading_time", ea.STATE_SET)
+                .withValueMin(0)
+                .withValueMax(28800)
+                .withValueStep(1)
+                .withUnit("s")
+                .withDescription("Presence keep time"),
+            e
+                .numeric("static_detection_distance", ea.STATE_SET)
+                .withValueMin(0)
+                .withValueMax(10)
+                .withValueStep(0.01)
+                .withUnit("m")
+                .withDescription("Static detection distance"),
+            e
+                .numeric("static_detection_sensitivity", ea.STATE_SET)
+                .withValueMin(0)
+                .withValueMax(10)
+                .withValueStep(1)
+                .withUnit("x")
+                .withDescription("Static detection sensitivity"),
+            e
+                .numeric("motion_detection_sensitivity", ea.STATE_SET)
+                .withValueMin(0)
+                .withValueMax(10)
+                .withValueStep(1)
+                .withUnit("x")
+                .withDescription("Motion detection sensitivity (Firmware version>=0122052017)"),
+            e.binary("indicator", ea.STATE_SET, "ON", "OFF").withDescription("LED indicator mode"),
+        ],
+        meta: {
+            tuyaDatapoints: [
+                [1, "presence", tuya.valueConverter.trueFalse1],
+                [106, "illuminance", tuya.valueConverter.raw],
+                [102, "fading_time", tuya.valueConverter.raw],
+                [4, "static_detection_distance", tuya.valueConverter.divideBy100],
+                [2, "static_detection_sensitivity", tuya.valueConverter.raw],
+                [107, "indicator", tuya.valueConverter.onOff],
+                [123, "motion_detection_sensitivity", tuya.valueConverter.raw],
+                [121, "battery", tuya.valueConverter.raw],
+            ],
+        },
+    },
+    {
+        zigbeeModel: ["ZG-204ZE"],
+        fingerprint: [{ modelID: "CK-BL702-MWS-01(7016)", manufacturerName: "ZG-204ZE" }],
+        model: "ZG-204ZE",
+        vendor: "HOBEIAN",
+        description: "10G mw motion detection",
+        fromZigbee: [tuya.fz.datapoints],
+        toZigbee: [tuya.tz.datapoints],
+        exposes: [
+            e.presence(),
+            e.battery(),
+            e
+                .numeric("fading_time", ea.STATE_SET)
+                .withValueMin(0)
+                .withValueMax(28800)
+                .withValueStep(1)
+                .withUnit("s")
+                .withDescription("Motion keep time"),
+            e.binary("indicator", ea.STATE_SET, "ON", "OFF").withDescription("LED indicator mode"),
+            e
+                .numeric("motion_detection_sensitivity", ea.STATE_SET)
+                .withValueMin(0)
+                .withValueMax(19)
+                .withValueStep(1)
+                .withUnit("x")
+                .withDescription("The larger the value, the more sensitive it is (refresh and update only while active)"),
+        ],
+        meta: {
+            tuyaDatapoints: [
+                [1, "presence", tuya.valueConverter.trueFalse1],
+                [102, "fading_time", tuya.valueConverter.raw],
+                [2, "motion_detection_sensitivity", tuya.valueConverter.raw],
+                [108, "indicator", tuya.valueConverter.onOff],
+                [110, "battery", tuya.valueConverter.raw],
+            ],
+        },
+    },
+    {
+        fingerprint: tuya.fingerprint("TS0049", ["_TZ3000_kz1anoi8"]),
+        model: "HZ-WT02",
+        vendor: "Haozee",
+        description: "Water valve",
+        toZigbee: [tzLocal.ts0049_countdown],
+        fromZigbee: [fzLocal.ts0049_countdown],
+        extend: [
+            m.battery(),
+            m.onOff({ powerOnBehavior: false }),
+            m.deviceAddCustomCluster("manuSpecificTuyaE001", {
+                ID: 0xe001,
+                attributes: {},
+                commands: {
+                    setCountdown: {
+                        ID: 0xfe,
+                        parameters: [{ name: "data", type: 1008 }],
+                    },
+                },
+                commandsResponse: {},
+            }),
+        ],
+        exposes: [
+            e
+                .numeric("water_countdown", ea.STATE_SET)
+                .withValueMin(1)
+                .withValueMax(1440)
+                .withValueStep(1)
+                .withUnit("minute")
+                .withDescription("Watering countdown to turn device off after a certain time"),
+        ],
+    },
     {
         fingerprint: tuya.fingerprint("TS0601", ["_TZE284_7zazvlyn", "_TZE284_idn2htgu"]),
         model: "F3-Pro",