zigbee-herdsman-converters 25.50.0 → 25.51.1

package/dist/devices/tuya.js

@@ -1173,7 +1173,7 @@ exports.definitions = [
         model: "TS0601_water_valve",
         vendor: "Tuya",
         description: "Ultrasonic water meter valve",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             // Main valve switch
             e
@@ -1227,7 +1227,7 @@ exports.definitions = [
         model: "TS0601_water_meter",
         vendor: "Tuya",
         description: "Ultrasonic water meter",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             // Water consumption sensor
             e
@@ -1271,7 +1271,7 @@ exports.definitions = [
         model: "ZN2S-RS02E",
         vendor: "Tuya",
         description: "Two gang switch with colored backlight modes",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.switch().withDescription("All switches"),
             e.switch().withEndpoint("l1"),
@@ -1340,7 +1340,7 @@ exports.definitions = [
         vendor: "Tuya",
         description: "Door sensor with scene switch",
         fromZigbee: [fz.ias_contact_alarm_1, fz.battery, fz.ias_contact_alarm_1_report],
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [e.action(["single", "double", "hold"]), e.contact(), e.battery_low(), e.tamper(), e.battery(), e.battery_voltage()],
         meta: {
             tuyaDatapoints: [[101, "action", tuya.valueConverterBasic.lookup({ single: 0, double: 1, hold: 2 })]],
@@ -1352,7 +1352,7 @@ exports.definitions = [
         model: "LKWSZ211",
         vendor: "Linkoze",
         description: "Scene remote with 2 keys",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.battery(),
             e.action(["button_1_single", "button_1_double", "button_1_hold", "button_2_single", "button_2_double", "button_2_hold"]),
@@ -1511,7 +1511,15 @@ exports.definitions = [
         model: "TS0601_temperature_humidity_sensor_2",
         vendor: "Tuya",
         description: "Temperature and humidity sensor",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, queryOnDeviceAnnounce: true, queryOnConfigure: true, respondToMcuVersionResponse: true })],
+        extend: [
+            tuya.modernExtend.tuyaBase({
+                dp: true,
+                queryOnDeviceAnnounce: true,
+                queryOnConfigure: true,
+                respondToMcuVersionResponse: true,
+                timeStart: "1970",
+            }),
+        ],
         exposes: [e.temperature(), e.humidity(), tuya.exposes.batteryState(), tuya.exposes.temperatureUnit()],
         meta: {
             tuyaDatapoints: [
@@ -1535,7 +1543,7 @@ exports.definitions = [
         model: "TS0601_temperature_humidity_sensor_3",
         vendor: "Tuya",
         description: "Temperature & humidity sensor",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, forceTimeUpdates: true, queryOnConfigure: true })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true, forceTimeUpdates: true, queryOnConfigure: true, timeStart: "1970" })],
         exposes: [e.temperature(), e.humidity(), e.battery(), tuya.exposes.temperatureUnit()],
         meta: {
             tuyaDatapoints: [
@@ -1570,7 +1578,15 @@ exports.definitions = [
         model: "ZTH05Z",
         vendor: "Tuya",
         description: "Temperature and humidity sensor",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, queryOnDeviceAnnounce: true, queryOnConfigure: true, respondToMcuVersionResponse: true })],
+        extend: [
+            tuya.modernExtend.tuyaBase({
+                dp: true,
+                queryOnDeviceAnnounce: true,
+                queryOnConfigure: true,
+                respondToMcuVersionResponse: true,
+                timeStart: "1970",
+            }),
+        ],
         exposes: [
             e.temperature(),
             e.humidity(),
@@ -1660,7 +1676,7 @@ exports.definitions = [
         model: "TS0601_contact_temperature_humidity_sensor",
         vendor: "Tuya",
         description: "Contact, temperature and humidity sensor",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "off" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [e.contact(), e.temperature(), e.humidity(), e.battery()],
         meta: {
             tuyaDatapoints: [
@@ -1703,9 +1719,7 @@ exports.definitions = [
         model: "TS0601_illuminance_temperature_humidity_sensor_2",
         vendor: "Tuya",
         description: "Illuminance sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [e.illuminance(), e.temperature(), e.humidity()],
         meta: {
             tuyaDatapoints: [
@@ -1763,9 +1777,7 @@ exports.definitions = [
         model: "TS0601_gas_sensor_1",
         vendor: "Tuya",
         description: "Gas sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [e.gas(), tuya.exposes.selfTest(), tuya.exposes.selfTestResult(), tuya.exposes.faultAlarm(), tuya.exposes.silence()],
         meta: {
             tuyaDatapoints: [
@@ -1782,9 +1794,7 @@ exports.definitions = [
         model: "TS0601_gas_sensor_2",
         vendor: "Tuya",
         description: "Gas sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.gas(),
             tuya.exposes.gasValue().withUnit("LEL"),
@@ -1827,9 +1837,7 @@ exports.definitions = [
         model: "TS0601_gas_sensor_3",
         vendor: "Tuya",
         description: "Gas sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [e.gas(), tuya.exposes.selfTest(), tuya.exposes.selfTestResult(), tuya.exposes.faultAlarm(), tuya.exposes.silence()],
         meta: {
             tuyaDatapoints: [
@@ -1844,9 +1852,7 @@ exports.definitions = [
         model: "TS0601_gas_sensor_4", // _TZE200_mby4kbtq looks like TS0601_gas_sensor_2
         vendor: "Tuya",
         description: "Gas sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.gas(),
             tuya.exposes.gasValue().withUnit("LEL"),
@@ -1905,9 +1911,7 @@ exports.definitions = [
         model: "R3 Smart Switch",
         vendor: "Tuya",
         description: "Circuit Breaker/Switch",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [e.switch()],
         meta: {
             tuyaDatapoints: [[16, "state", tuya.valueConverter.onOff]],
@@ -1920,7 +1924,7 @@ exports.definitions = [
         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" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             // DP101 → enum; device reports 0=open, 1=closed, 2=tilted (note swapped 0/1).
             e
@@ -2303,7 +2307,7 @@ exports.definitions = [
         description: "Motion detector with illuminance",
         fromZigbee: [fz.ias_occupancy_alarm_1, fz.battery, fz.ias_occupancy_alarm_1_report],
         toZigbee: [],
-        extend: [m.illuminance(), tuya.modernExtend.tuyaBase({ timeStart: "2000" })],
+        extend: [m.illuminance(), tuya.modernExtend.tuyaBase()],
         exposes: [e.occupancy(), e.battery_low(), e.battery(), e.tamper()],
     },
     {
@@ -2311,11 +2315,10 @@ exports.definitions = [
         model: "TS0202_2",
         vendor: "Tuya",
         description: "Motion sensor with scene switch",
-        fromZigbee: [tuya.fz.datapoints, fz.ias_occupancy_alarm_1, fz.battery],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
+        fromZigbee: [fz.ias_occupancy_alarm_1, fz.battery],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
-            await tuya.configureMagicPacket(device, coordinatorEndpoint);
             await reporting.batteryPercentageRemaining(endpoint);
             await reporting.batteryVoltage(endpoint);
         },
@@ -2620,9 +2623,7 @@ exports.definitions = [
         model: "TS0601_soil",
         vendor: "Tuya",
         description: "Soil sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [e.temperature(), e.soil_moisture(), tuya.exposes.temperatureUnit(), e.battery(), tuya.exposes.batteryState()],
         meta: {
             tuyaDatapoints: [
@@ -2639,9 +2640,7 @@ exports.definitions = [
         model: "TS0601_soil_2",
         vendor: "Tuya",
         description: "Soil sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.soil_moisture(),
             e.numeric("temperature", ea.STATE).withUnit("°C").withValueMin(-10).withValueMax(60).withDescription("Soil temperature"),
@@ -2721,9 +2720,7 @@ exports.definitions = [
         model: "TS0601_soil_3",
         vendor: "Tuya",
         description: "Soil sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [e.temperature(), e.soil_moisture(), tuya.exposes.temperatureUnit(), e.battery(), tuya.exposes.batteryState()],
         meta: {
             tuyaDatapoints: [
@@ -2799,20 +2796,19 @@ exports.definitions = [
             "_TZE200_ykgar0ow",
             "_TZE284_m1cvyneb",
             "_TZE200_0hb4rdnp",
+            "_TZE200_gne0e6mk",
         ]),
         model: "TS0601_dimmer_1_gang_1",
         vendor: "Tuya",
         description: "1 gang smart dimmer",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: (device, options) => {
             const exps = [
                 tuya.exposes.lightBrightnessWithMinMax(),
                 tuya.exposes.countdown(),
                 e.power_on_behavior().withAccess(ea.STATE_SET),
             ];
-            if (!device || !["_TZE200_4mh6tyyo", "_TZE200_ykgar0ow", "_TZE200_0hb4rdnp"].includes(device.manufacturerName)) {
+            if (!device || !["_TZE200_4mh6tyyo", "_TZE200_ykgar0ow", "_TZE200_0hb4rdnp", "_TZE200_gne0e6mk"].includes(device.manufacturerName)) {
                 exps.push(tuya.exposes.lightType(), tuya.exposes.backlightModeOffNormalInverted().withAccess(ea.STATE_SET));
             }
             return exps;
@@ -2847,6 +2843,7 @@ exports.definitions = [
             tuya.whitelabel("Lonsonho", "EDM-1ZBB-EU", "Smart Dimmer Switch", ["_TZE200_0nauxa0p"]),
             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"]),
+            tuya.whitelabel("ION Industries", "90.500.040", "LED Zigbee Dimmer", ["_TZE200_gne0e6mk"]),
         ],
     },
     {
@@ -2854,9 +2851,7 @@ exports.definitions = [
         model: "TS0601_dimmer_1_gang_2",
         vendor: "Tuya",
         description: "1 gang smart dimmer",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             tuya.exposes.lightBrightness(),
             tuya.exposes.countdown(),
@@ -2881,9 +2876,7 @@ exports.definitions = [
         model: "TS0601_dimmer_1_gang_3",
         vendor: "Tuya",
         description: "1 gang smart dimmer",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [tuya.exposes.lightBrightness(), e.voltage(), e.current(), e.power(), e.child_lock(), tuya.exposes.backlightModeOffOn()],
         meta: {
             tuyaDatapoints: [
@@ -2977,9 +2970,7 @@ exports.definitions = [
         model: "TS0601_dimmer_3",
         vendor: "Tuya",
         description: "3 gang smart dimmer",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             tuya.exposes.lightBrightnessWithMinMax().withEndpoint("l1"),
             tuya.exposes.lightBrightnessWithMinMax().withEndpoint("l2"),
@@ -3032,9 +3023,7 @@ exports.definitions = [
         model: "TS0601_dimmer_4",
         vendor: "Tuya",
         description: "2 gang smart dimmer module",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             tuya.exposes.lightBrightnessWithMinMax().withEndpoint("l1"),
             tuya.exposes.lightBrightnessWithMinMax().withEndpoint("l2"),
@@ -3099,9 +3088,7 @@ exports.definitions = [
         model: "TS0601_dimmer_5",
         vendor: "Tuya",
         description: "1 gang smart dimmer module",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             tuya.exposes.lightBrightnessWithMinMax(),
             e.enum("power_on_behavior", ea.STATE_SET, ["off", "on", "previous"]),
@@ -3153,9 +3140,7 @@ exports.definitions = [
         model: "TS0601_dimmer_knob",
         vendor: "Tuya",
         description: "Zigbee smart knob dimmer",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             tuya.exposes.lightBrightness().withMinBrightness().setAccess("min_brightness", ea.STATE_SET),
             tuya.exposes.lightType(),
@@ -3437,9 +3422,7 @@ exports.definitions = [
             tuya.exposes.switch().withEndpoint("l3"),
             tuya.exposes.switch().withEndpoint("l4"),
         ],
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         whiteLabel: [
             tuya.whitelabel("ZYXH", "TY-04Z", "4 gang switch", ["_TZE204_iik0pquw"]),
             { vendor: "Norklmes", model: "MKS-CM-W5" },
@@ -3468,9 +3451,7 @@ exports.definitions = [
         model: "TS0601_switch_5_gang",
         vendor: "Tuya",
         description: "5 gang switch",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             tuya.exposes.switch().withEndpoint("l1"),
             tuya.exposes.switch().withEndpoint("l2"),
@@ -3508,10 +3489,8 @@ exports.definitions = [
         model: "TS0601_switch_6_gang",
         vendor: "Tuya",
         description: "6 gang switch",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         configure: async (device, coordinatorEndpoint) => {
-            await tuya.configureMagicPacket(device, coordinatorEndpoint);
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ["genOnOff"]);
             device.powerSource = "Mains (single phase)";
@@ -3601,9 +3580,7 @@ exports.definitions = [
             e.power_on_behavior().withAccess(ea.STATE_SET),
             tuya.exposes.backlightModeOffOn().withAccess(ea.STATE_SET),
         ],
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         meta: {
             tuyaDatapoints: [
                 [1, "state", tuya.valueConverter.onOff],
@@ -3650,9 +3627,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: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         meta: {
             multiEndpoint: true,
             tuyaDatapoints: [
@@ -3700,9 +3675,7 @@ exports.definitions = [
         model: "MG-ZG03W",
         vendor: "Tuya",
         description: "3 gang switch",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.switch().withEndpoint("l1").setAccess("state", ea.STATE_SET),
             e.switch().withEndpoint("l2").setAccess("state", ea.STATE_SET),
@@ -4293,7 +4266,7 @@ exports.definitions = [
         model: "BAC-003",
         vendor: "Tuya",
         description: "FCU thermostat temperature controller",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, forceTimeUpdates: true })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true, forceTimeUpdates: true, timeStart: "1970" })],
         options: [
             e
                 .enum("control_sequence_of_operation", ea.SET, ["cooling_only", "cooling_and_heating_4-pipes"])
@@ -4473,7 +4446,7 @@ exports.definitions = [
         vendor: "Tuya",
         description: "Water leak sensor",
         fromZigbee: [fz.ignore_tuya_raw, legacy.fromZigbee.wls100z_water_leak],
-        extend: [tuya.modernExtend.tuyaBase({ timeStart: "2000", bindBasicOnConfigure: true })],
+        extend: [tuya.modernExtend.tuyaBase({ bindBasicOnConfigure: true })],
         exposes: [e.battery(), e.water_leak()],
     },
     {
@@ -4484,6 +4457,7 @@ exports.definitions = [
             "_TZ3000_mkhkxx1p",
             "_TZ3000_tgddllx4",
             "_TZ3000_kqvb5akv",
+            "_TZ3000_q8r0bbvy",
             "_TZ3000_g92baclx",
             "_TZ3000_qlai3277",
             "_TZ3000_qaabwu5c",
@@ -5245,8 +5219,7 @@ exports.definitions = [
         model: "TS0601_cover_6",
         vendor: "Tuya",
         description: "Cover motor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.text("work_state", ea.STATE),
             e.cover_position().setAccess("position", ea.STATE_SET),
@@ -5341,9 +5314,7 @@ exports.definitions = [
         model: "TS0601_cover_8",
         vendor: "Tuya",
         description: "Cover motor",
-        configure: tuya.configureMagicPacket,
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         options: [exposes.options.invert_cover()],
         exposes: [
             e.cover_position().setAccess("position", ea.STATE_SET),
@@ -5406,7 +5377,7 @@ exports.definitions = [
         vendor: "Tuya",
         description: "Window opener",
         options: [exposes.options.invert_cover()],
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [e.cover_position().setAccess("position", ea.STATE_SET)],
         meta: {
             tuyaDatapoints: [
@@ -5457,7 +5428,7 @@ exports.definitions = [
         },
     },
     {
-        fingerprint: tuya.fingerprint("TS0601", ["_TZE284_debczeci", "_TZE284_1lvln0x6"]),
+        fingerprint: tuya.fingerprint("TS0601", ["_TZE284_debczeci", "_TZE284_1lvln0x6", "_TZE204_debczeci"]),
         model: "iHsenso_TS0601_human_presence",
         vendor: "iHseno",
         description: "Human presence sensor",
@@ -5513,9 +5484,7 @@ exports.definitions = [
         model: "ZM79E-DT",
         vendor: "Tervix",
         description: "Pro Line Zigbee curtain motor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.text("work_state", ea.STATE),
             e.cover_position().setAccess("position", ea.STATE_SET),
@@ -5700,7 +5669,7 @@ exports.definitions = [
             tuyaThermostatSystemMode: legacy.thermostatSystemModes3,
         },
         ota: true,
-        extend: [tuya.modernExtend.tuyaBase({ forceTimeUpdates: true })],
+        extend: [tuya.modernExtend.tuyaBase({ forceTimeUpdates: true, timeStart: "1970" })],
         fromZigbee: [legacy.fromZigbee.tuya_thermostat, fz.ignore_tuya_set_time],
         toZigbee: [
             legacy.toZigbee.tuya_thermostat_child_lock,
@@ -5964,7 +5933,7 @@ exports.definitions = [
         model: "TS0601_cover_3",
         vendor: "Tuya",
         description: "Cover motor",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         options: [exposes.options.invert_cover()],
         exposes: [
             e.battery(),
@@ -6031,8 +6000,7 @@ exports.definitions = [
         model: "TS0601_cover_4",
         vendor: "Tuya",
         description: "Cover",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.cover_position().setAccess("position", ea.STATE_SET),
             e.enum("motor_direction", ea.STATE_SET, ["normal", "reversed"]).withDescription("Set the motor direction"),
@@ -6107,7 +6075,7 @@ exports.definitions = [
             tuya.whitelabel("GIEX", "TV06", "Thermostat radiator valve", ["_TZE200_py4cm3he"]),
         ],
         ota: true,
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, forceTimeUpdates: true })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true, forceTimeUpdates: true, timeStart: "1970" })],
         exposes: [
             e.battery_low(),
             e.child_lock(),
@@ -6216,7 +6184,7 @@ exports.definitions = [
         vendor: "Tuya",
         description: "Thermostat radiator valve",
         whiteLabel: [{ vendor: "S366", model: "Cloud Even" }],
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, forceTimeUpdates: true })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true, forceTimeUpdates: true, timeStart: "1970" })],
         meta: {
             tuyaDatapoints: [
                 [1, "system_mode", tuya.valueConverterBasic.lookup({ heat: true, off: false })],
@@ -6376,7 +6344,7 @@ exports.definitions = [
         model: "TS0601_thermostat_4",
         vendor: "Tuya",
         description: "Thermostatic radiator valve",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, forceTimeUpdates: true })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true, forceTimeUpdates: true, timeStart: "1970" })],
         exposes: [
             e.child_lock(),
             e.battery(),
@@ -6523,7 +6491,7 @@ exports.definitions = [
             tuya.whitelabel("id3", "GTZ06", "Thermostatic radiator valve", ["_TZE200_z1tyspqw"]),
             tuya.whitelabel("AVATTO", "TRV07", "Thermostatic radiator valve", ["_TZE200_bvrlmajk"]),
         ],
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, forceTimeUpdates: true })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true, forceTimeUpdates: true, timeStart: "1970" })],
         exposes: [
             e.battery(),
             e.child_lock(),
@@ -6610,7 +6578,7 @@ exports.definitions = [
             tuya.whitelabel("Moes", "TRV801_1", "Thermostatic radiator valve", ["_TZE204_rtrmfadk"]),
         ],
         description: "Thermostatic radiator valve",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, forceTimeUpdates: true })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true, forceTimeUpdates: true, timeStart: "1970" })],
         exposes: [
             e.battery(),
             e.child_lock(),
@@ -6686,7 +6654,7 @@ exports.definitions = [
         vendor: "Tuya",
         description: "Thermostatic radiator valve.",
         whiteLabel: [tuya.whitelabel("Moes", "TRV801", "Thermostatic radiator valve", ["_TZE204_9mjy74mp", "_TZE200_9mjy74mp"])],
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, forceTimeUpdates: true })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true, forceTimeUpdates: true, timeStart: "1970" })],
         exposes: [
             e.battery(),
             e.child_lock(),
@@ -6776,7 +6744,7 @@ exports.definitions = [
         vendor: "Tuya",
         description: "Thermostatic radiator valve.",
         whiteLabel: [tuya.whitelabel("Moes", "TRV801Z", "Thermostatic radiator valve", ["_TZE204_qyr2m29i", "_TZE284_ltwbm23f"])],
-        extend: [tuyaBase({ dp: true })],
+        extend: [tuyaBase({ dp: true, timeStart: "1970" })],
         exposes: [
             e.battery(),
             e.child_lock(),
@@ -7040,7 +7008,7 @@ exports.definitions = [
         model: "TRV603-WZ",
         vendor: "Tuya",
         description: "Thermostatic radiator valve.",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, forceTimeUpdates: true })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true, forceTimeUpdates: true, timeStart: "1970" })],
         exposes: [
             e.battery(),
             e.child_lock(),
@@ -7231,7 +7199,7 @@ exports.definitions = [
                 electricalMeasurements: true,
                 electricalMeasurementsFzConverter: fzLocal.TS011F_electrical_measurement,
                 powerOutageMemory: true,
-                indicatorMode: (manufacturerName) => manufacturerName === "_TZ3000_ww6drja5",
+                indicatorMode: (manufacturerName) => manufacturerName !== "_TZ3000_ww6drja5",
                 childLock: true,
                 onOffCountdown: true,
             }),
@@ -7296,8 +7264,6 @@ exports.definitions = [
     },
     {
         fingerprint: [
-            // https://github.com/Koenkk/zigbee2mqtt/issues/28729
-            { modelID: "TS011F", applicationVersion: 240, manufacturerName: "_TZ3000_gjnozsaz", priority: -1 },
             { modelID: "TS011F", applicationVersion: 160, priority: -1 },
             { modelID: "TS011F", applicationVersion: 100, priority: -1 },
             { modelID: "TS011F", applicationVersion: 69, priority: -1 },
@@ -7396,9 +7362,7 @@ exports.definitions = [
         model: "TS0601_smoke_1",
         vendor: "Tuya",
         description: "Smoke sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [e.smoke(), e.tamper(), e.battery_low()],
         meta: {
             tuyaDatapoints: [
@@ -7414,9 +7378,7 @@ exports.definitions = [
         model: "TS0601_smoke_6",
         vendor: "Tuya",
         description: "Smoke sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [e.smoke(), e.tamper(), tuya.exposes.batteryState()],
         meta: {
             tuyaDatapoints: [
@@ -7431,7 +7393,7 @@ exports.definitions = [
         model: "HS2SA-1",
         vendor: "Heiman",
         description: "Photoelectric Smoke Alarm",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.smoke(),
             e.battery(),
@@ -7454,7 +7416,7 @@ exports.definitions = [
         model: "PA-44Z",
         vendor: "Tuya",
         description: "Photoelectric smoke detector",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.smoke(),
             e.battery(),
@@ -7480,9 +7442,7 @@ exports.definitions = [
         model: "TS0601_smoke_3",
         description: "Photoelectric smoke detector",
         whiteLabel: [{ vendor: "KnockautX", model: "SMOAL024" }],
-        configure: tuya.configureMagicPacket,
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [e.smoke(), tuya.exposes.batteryState()],
         meta: {
             tuyaDatapoints: [
@@ -7506,8 +7466,7 @@ exports.definitions = [
         model: "TS0601_smoke_4",
         vendor: "Tuya",
         description: "Smoke sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [e.smoke(), e.battery(), tuya.exposes.batteryState()],
         meta: {
             tuyaDatapoints: [
@@ -7522,9 +7481,7 @@ exports.definitions = [
         model: "TS0601_smoke_5",
         vendor: "Tuya",
         description: "Smoke sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.smoke(),
             e.tamper(),
@@ -7549,7 +7506,7 @@ exports.definitions = [
         model: "ZS-301Z",
         vendor: "Arteco",
         description: "Soil moisture sensor",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.enum("battery_state", ea.STATE, ["low", "middle", "high"]).withDescription("low: 1-25%, middle: 26-50%, high: 51-100%"),
             e.temperature(),
@@ -7588,7 +7545,7 @@ exports.definitions = [
         model: "ZSS-QY-SSD-A-EN",
         vendor: "Tuya",
         description: "Smart smoke alarm",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.smoke(),
             tuya.exposes.faultAlarm(),
@@ -7684,14 +7641,14 @@ exports.definitions = [
             e.binary("alarm", ea.STATE_SET, true, false).withDescription("Enable the alarm"),
             e.binary("silence_siren", ea.STATE_SET, true, false).withDescription("Silence the siren"),
         ],
-        extend: [tuya.modernExtend.tuyaBase({ timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase()],
     },
     {
         fingerprint: tuya.fingerprint("TS0601", ["_TZE204_cjbofhxw", "_TZE284_cjbofhxw"]),
         model: "PJ-MGW1203",
         vendor: "Tuya",
         description: "Clamp meter",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "off" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [e.current(), e.power(), e.voltage(), e.energy()],
         meta: {
             tuyaDatapoints: [
@@ -7708,9 +7665,7 @@ exports.definitions = [
         model: "TS0601_din_1",
         vendor: "Tuya",
         description: "Zigbee DIN energy meter",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             tuya.exposes.switch(),
             e.ac_frequency(),
@@ -7755,9 +7710,7 @@ exports.definitions = [
         model: "RMDZB-1PNL63",
         vendor: "TNCE",
         description: "Zigbee DIN single phase energy meter",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             tuya.exposes.switch(),
             e.energy(),
@@ -7880,9 +7833,7 @@ exports.definitions = [
         model: "STB3L-125-ZJ",
         vendor: "SUTON",
         description: "Zigbee DIN RCBO energy meter",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             tuya.exposes.switch(),
             e.energy(),
@@ -8046,9 +7997,7 @@ exports.definitions = [
         model: "TS0601_din_2",
         vendor: "Tuya",
         description: "Zigbee DIN energy meter",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             tuya.exposes.switch(),
             e.energy(),
@@ -8114,9 +8063,7 @@ exports.definitions = [
         model: "TS0601_din_3",
         vendor: "Tuya",
         description: "Zigbee DIN energy meter",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         whiteLabel: [{ vendor: "XOCA", model: "DAC2161C" }],
         exposes: [
             tuya.exposes.switch(),
@@ -8931,7 +8878,7 @@ exports.definitions = [
         model: "ZWT07",
         vendor: "Tuya",
         description: "Wall-mount thermostat",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, respondToMcuVersionResponse: true })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true, respondToMcuVersionResponse: true, timeStart: "2000" })],
         exposes: [
             e
                 .climate()
@@ -8965,8 +8912,7 @@ exports.definitions = [
         model: "_TZE284_6kijc7nd",
         vendor: "Tervix",
         description: "Tervix Zigbee thermostat",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             // Weekly Schedule (Datapoint 48) - Placeholder
             // The schedule is a raw 168-byte array (7 days x 24 bytes/day):
@@ -9175,7 +9121,7 @@ exports.definitions = [
         model: "ZWT198/ZWT100-BH",
         vendor: "Tuya",
         description: "Wall thermostat",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, respondToMcuVersionResponse: true })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true, respondToMcuVersionResponse: 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!"),
@@ -9326,7 +9272,7 @@ exports.definitions = [
         model: "TGM50-ZB",
         vendor: "Tuya",
         description: "Beok wall thermostat",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, respondToMcuVersionResponse: true })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true, respondToMcuVersionResponse: true, timeStart: "1970" })],
         exposes: [
             e.child_lock(),
             e.temperature_sensor_select(["internal", "external", "both"]),
@@ -9484,32 +9430,6 @@ exports.definitions = [
                 "Press button on the device right before changing this"),
         ],
     },
-    {
-        fingerprint: tuya.fingerprint("TS0601", ["_TZE200_8ply8mjj"]),
-        model: "COZIGVS",
-        vendor: "Conecto",
-        description: "Vibration sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
-        exposes: [
-            e.vibration(),
-            e
-                .numeric("sensitivity", ea.STATE_SET)
-                .withValueMin(0)
-                .withValueMax(2)
-                .withDescription("Sensitivity of the sensor (single press the button when muted to switch between" +
-                " low (one beep), medium (two beeps) and max (three beeps))"),
-            e.text("buzzer_mute", ea.STATE).withDescription("ON when buzzer is muted (double press the button on device to toggle)"),
-        ],
-        meta: {
-            tuyaDatapoints: [
-                [1, "vibration", tuya.valueConverter.trueFalse1],
-                [101, "sensitivity", tuya.valueConverter.raw],
-                [103, "buzzer_mute", tuya.valueConverter.onOff],
-            ],
-        },
-    },
     {
         fingerprint: tuya.fingerprint("TS011F", ["_TZ3000_8bxrzyxz", "_TZ3000_ky0fq4ho"]),
         model: "TS011F_din_smart_relay",
@@ -9704,12 +9624,10 @@ exports.definitions = [
         },
         description: "Garage door opener",
         configure: async (device, coordinatorEndpoint) => {
-            await tuya.configureMagicPacket(device, coordinatorEndpoint);
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ["genBasic"]);
         },
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.binary("state", ea.STATE_SET, true, false).withDescription("Trigger the door movement"),
             e
@@ -9785,12 +9703,10 @@ exports.definitions = [
         model: "MIR-HE200-TY",
         vendor: "Tuya",
         description: "Human presence sensor with fall function",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
             await tuya.sendDataPointEnum(endpoint, legacy.dataPoints.trsfTumbleSwitch, 0);
-            await tuya.configureMagicPacket(device, coordinatorEndpoint);
         },
         exposes: [
             e.illuminance(),
@@ -10316,7 +10232,7 @@ exports.definitions = [
         model: "Y1_IN",
         vendor: "Tuya",
         description: "Smart human presence sensor 24G",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.presence(),
             e.illuminance(),
@@ -10348,8 +10264,7 @@ exports.definitions = [
         model: "ZY-M100-S_1",
         vendor: "Tuya",
         description: "Mini human breathe sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         whiteLabel: [tuya.whitelabel("Wenzhi", "WZ-M100-W", "Human presence sensor", ["_TZE204_e5m9c5hl"])],
         exposes: [
             e.illuminance(),
@@ -10397,8 +10312,7 @@ exports.definitions = [
         model: "ZY-M100-S_2",
         vendor: "Tuya",
         description: "Mini human breathe sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.illuminance(),
             e.presence(),
@@ -10458,7 +10372,7 @@ exports.definitions = [
         model: "WZ-M100",
         vendor: "Wenzhi",
         description: "Human presence sensor",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.illuminance(),
             e.presence(),
@@ -10530,8 +10444,7 @@ exports.definitions = [
         model: "ZG-205ZL",
         vendor: "Tuya",
         description: "24Ghz/5.8GHz human presence sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.presence(),
             e.enum("motion_state", ea.STATE, ["none", "large", "small", "static"]).withDescription("Motion state"),
@@ -10645,7 +10558,7 @@ exports.definitions = [
         description: "Temperature & humidity sensor with clock",
         fromZigbee: [legacy.fromZigbee.nous_lcd_temperature_humidity_sensor, fz.ignore_tuya_set_time],
         toZigbee: [legacy.toZigbee.nous_lcd_temperature_humidity_sensor],
-        extend: [tuya.modernExtend.tuyaBase({ forceTimeUpdates: true, bindBasicOnConfigure: true })],
+        extend: [tuya.modernExtend.tuyaBase({ forceTimeUpdates: true, bindBasicOnConfigure: true, timeStart: "1970" })],
         exposes: [
             e.temperature(),
             e.humidity(),
@@ -10673,7 +10586,7 @@ exports.definitions = [
         description: "Tubular motor",
         fromZigbee: [legacy.fromZigbee.zb_sm_cover],
         toZigbee: [legacy.toZigbee.zb_sm_cover],
-        extend: [tuya.modernExtend.tuyaBase({ timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase()],
         exposes: [
             e.cover_position().setAccess("position", ea.STATE_SET),
             e.enum("goto_positon", ea.SET, ["25", "50", "75", "FAVORITE"]),
@@ -10771,9 +10684,7 @@ exports.definitions = [
         model: "ZG-227ZL",
         vendor: "Tuya",
         description: "Temperature & humidity LCD sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.temperature(),
             e.humidity(),
@@ -10802,10 +10713,7 @@ exports.definitions = [
         model: "S8",
         vendor: "SODA",
         description: "S8 premium window handle",
-        extend: [],
-        toZigbee: [tuya.tz.datapoints],
-        fromZigbee: [tuya.fz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.battery(),
             e.battery_low(),
@@ -10959,7 +10867,6 @@ exports.definitions = [
                 dp: true,
                 queryOnDeviceAnnounce: true,
                 queryOnConfigure: true,
-                timeStart: "off",
                 respondToMcuVersionResponse: true,
             }),
         ],
@@ -10987,9 +10894,7 @@ exports.definitions = [
         model: "ZG-102Z",
         vendor: "Tuya",
         description: "Door sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [e.contact(), e.battery()],
         meta: {
             tuyaDatapoints: [
@@ -11004,9 +10909,7 @@ exports.definitions = [
         model: "ZG-102ZL",
         vendor: "Tuya",
         description: "Luminance door sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.contact(),
             e.illuminance().withUnit("lx"),
@@ -11036,7 +10939,7 @@ exports.definitions = [
         model: "TS0601_pir",
         vendor: "Tuya",
         description: "Haozee PIR sensor",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "off", respondToMcuVersionResponse: true })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true, respondToMcuVersionResponse: true })],
         exposes: (device, options) => {
             const exposes = [e.occupancy(), e.illuminance()];
             // https://github.com/Koenkk/zigbee2mqtt.io/pull/4018
@@ -11063,9 +10966,7 @@ exports.definitions = [
         model: "ZG-225Z",
         vendor: "Tuya",
         description: "Gas sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.gas(),
             tuya.exposes.gasValue().withUnit("ppm"),
@@ -11112,8 +11013,7 @@ exports.definitions = [
         model: "ZG-204ZL",
         vendor: "Tuya",
         description: "Luminance motion sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.occupancy(),
             e.illuminance().withUnit("lx"),
@@ -11170,8 +11070,7 @@ exports.definitions = [
         model: "ZG-205Z/A",
         vendor: "Tuya",
         description: "5.8Ghz/24Ghz Human presence sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.presence(),
             e.enum("motion_state", ea.STATE, ["none", "small", "medium", "large", "far", "near"]).withDescription("State of the motion"),
@@ -11286,8 +11185,7 @@ exports.definitions = [
         model: "ZG-204ZM",
         vendor: "Tuya",
         description: "PIR 24Ghz human presence sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.presence(),
             e.enum("motion_state", ea.STATE, ["none", "large", "small", "static"]).withDescription("Motion state"),
@@ -11484,9 +11382,7 @@ exports.definitions = [
         model: "TS0601_3_phase_clamp_meter",
         vendor: "Tuya",
         description: "3-phase clamp power meter",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         whiteLabel: [
             { vendor: "MatSee Plus", model: "PC321-Z-TY" },
             { vendor: "OWON", model: "PC321-Z-TY" },
@@ -11539,9 +11435,7 @@ exports.definitions = [
         model: "TS0601_3_phase_clamp_meter_relay",
         vendor: "Tuya",
         description: "3-phase clamp power meter with relay",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         whiteLabel: [{ vendor: "Wenzhou Taiye Electric", model: "TAC7361C BI" }],
         exposes: [
             e.switch().setAccess("state", ea.STATE_SET),
@@ -11627,7 +11521,7 @@ exports.definitions = [
         vendor: "Tuya",
         description: "Dual water valve",
         fromZigbee: [fz.battery],
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.enum("valve_status", ea.STATE, ["manual", "auto", "idle"]).withDescription("Valve 1 status (manual, auto, idle)").withEndpoint("l1"),
             e.enum("valve_status", ea.STATE, ["manual", "auto", "idle"]).withDescription("Valve 2 status (manual, auto, idle)").withEndpoint("l2"),
@@ -11677,9 +11571,7 @@ exports.definitions = [
         model: "TS0601_fan_switch",
         vendor: "Tuya",
         description: "Fan switch",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             tuya.exposes.switch(),
             e.power_on_behavior(["off", "on"]).withAccess(ea.STATE_SET),
@@ -11718,9 +11610,7 @@ exports.definitions = [
         model: "TS0601_fan_and_light_switch",
         vendor: "Tuya",
         description: "Fan & light switch",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.binary("status_indication", ea.STATE_SET, "ON", "OFF").withDescription("Light switch"),
             tuya.exposes.switch(),
@@ -11757,9 +11647,7 @@ exports.definitions = [
         model: "TS0601_fan_5_levels_and_light_switch",
         vendor: "Tuya",
         description: "Fan with 5 levels & light switch",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.binary("status_indication", ea.STATE_SET, "ON", "OFF").withDescription("Light switch"),
             tuya.exposes.switch(),
@@ -12038,9 +11926,7 @@ exports.definitions = [
         model: "TS0601_switch_4_gang_2",
         vendor: "Tuya",
         description: "4 gang switch with backlight",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             tuya.exposes.switch().withEndpoint("l1"),
             tuya.exposes.switch().withEndpoint("l2"),
@@ -12069,8 +11955,7 @@ exports.definitions = [
         vendor: "Tuya",
         description: "Curtain/blind switch",
         options: [exposes.options.invert_cover()],
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.cover_position().setAccess("position", ea.STATE_SET),
             e.enum("calibration", ea.STATE_SET, ["START", "END"]).withDescription("Calibration"),
@@ -12145,8 +12030,7 @@ exports.definitions = [
         vendor: "Tuya",
         description: "Curtain/blind switch with 1 Gang switch",
         options: [exposes.options.invert_cover()],
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.cover_position().setAccess("position", ea.STATE_SET),
             tuya.exposes.switch().withEndpoint("l1"),
@@ -12200,8 +12084,7 @@ exports.definitions = [
         vendor: "Tuya",
         description: "Curtain/blind switch with 2 Gang switch",
         options: [exposes.options.invert_cover()],
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.cover_position().setAccess("position", ea.STATE_SET),
             tuya.exposes.switch().withEndpoint("l1"),
@@ -12257,9 +12140,7 @@ exports.definitions = [
         vendor: "Tuya",
         description: "Smart energy monitor for 1P+N system",
         ota: true,
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.voltage(),
             e.power(),
@@ -12299,9 +12180,7 @@ exports.definitions = [
         model: "SPM02",
         vendor: "Tuya",
         description: "Smart energy monitor for 3P+N system",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             tuya.exposes.voltageWithPhase("X"),
             tuya.exposes.voltageWithPhase("Y"),
@@ -12334,9 +12213,7 @@ exports.definitions = [
         model: "SPM01V2",
         vendor: "Tuya",
         description: "Smart energy monitor for 1P+N system",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.voltage(),
             e.power(),
@@ -12410,9 +12287,7 @@ exports.definitions = [
         model: "SPM02V2",
         vendor: "Tuya",
         description: "Smart energy monitor for 3P+N system",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             tuya.exposes.voltageWithPhase("a"),
             tuya.exposes.voltageWithPhase("b"),
@@ -12550,9 +12425,7 @@ exports.definitions = [
         model: "SPM01V2.5",
         vendor: "Tuya",
         description: "Smart energy monitor for 1P+N system",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.voltage(),
             e.power(),
@@ -12624,9 +12497,7 @@ exports.definitions = [
         model: "SPM02V2.5",
         vendor: "Tuya",
         description: "Smart energy monitor for 3P+N system",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             tuya.exposes.voltageWithPhase("a"),
             tuya.exposes.voltageWithPhase("b"),
@@ -12716,9 +12587,7 @@ exports.definitions = [
         model: "SPM02V3",
         vendor: "Tuya",
         description: "Smart energy monitor for 3P+N system",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             tuya.exposes.voltageWithPhase("a"),
             tuya.exposes.voltageWithPhase("b"),
@@ -12785,9 +12654,7 @@ exports.definitions = [
         model: "SDM01",
         vendor: "Tuya",
         description: "Smart energy monitor for 3P+N system",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         whiteLabel: [tuya.whitelabel("Nous", "D4Z", "Smart energy monitor for 3P+N system", ["_TZE204_loejka0i"])],
         exposes: [
             tuya.exposes.voltageWithPhase("a"),
@@ -12847,9 +12714,7 @@ exports.definitions = [
         model: "SDM01V1.5",
         vendor: "Tuya",
         description: "Smart energy monitor for 3P+N system",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             tuya.exposes.voltageWithPhase("a"),
             tuya.exposes.voltageWithPhase("b"),
@@ -12916,9 +12781,7 @@ exports.definitions = [
         model: "SDM02V1",
         vendor: "Tuya",
         description: "Smart energy monitor for 2P+N system",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             tuya.exposes.voltageWithPhase("l1"),
             tuya.exposes.voltageWithPhase("l2"),
@@ -12973,7 +12836,7 @@ exports.definitions = [
         model: "TS0601_bidirectional_energy meter",
         vendor: "Tuya",
         description: "Bidirectional energy meter with 150A Current Clamp",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.energy(),
             e.produced_energy(),
@@ -13004,9 +12867,7 @@ exports.definitions = [
         model: "TS0601_switch_8",
         vendor: "Tuya",
         description: "ZYXH 8 gang switch",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             tuya.exposes.switch().withEndpoint("l1"),
             tuya.exposes.switch().withEndpoint("l2"),
@@ -13040,9 +12901,7 @@ exports.definitions = [
         model: "TS0601_switch_8_2",
         vendor: "Tuya",
         description: "8 gang switch",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             tuya.exposes.switch().withEndpoint("l1"),
             tuya.exposes.switch().withEndpoint("l2"),
@@ -13093,9 +12952,7 @@ exports.definitions = [
         model: "TS0601_switch_10",
         vendor: "Tuya",
         description: "10 gang switch",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [...Array.from({ length: 10 }, (_, i) => tuya.exposes.switch().withEndpoint(`l${i + 1}`))],
         endpoint: (device) => {
             return {
@@ -13134,9 +12991,7 @@ exports.definitions = [
         model: "TS0601_switch_12",
         vendor: "Tuya",
         description: "ZXYH 12 gang switch",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [...Array.from({ length: 12 }, (_, i) => tuya.exposes.switch().withEndpoint(`l${i + 1}`))],
         endpoint: (device) => {
             return {
@@ -13274,8 +13129,9 @@ exports.definitions = [
         vendor: "Tuya",
         description: "Zigbee fingerbot plus",
         whiteLabel: [tuya.whitelabel("Adaprox", "TS0001_fingerbot_1", "Zigbee fingerbot plus", ["_TZ3210_dse8ogfy"])],
-        fromZigbee: [fz.on_off, tuya.fz.datapoints],
-        toZigbee: [tz.on_off, tuya.tz.datapoints],
+        fromZigbee: [fz.on_off],
+        toZigbee: [tz.on_off],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.switch(),
             e.battery(),
@@ -13287,7 +13143,6 @@ exports.definitions = [
             e.binary("touch", ea.STATE_SET, "ON", "OFF").withDescription("Touch control"),
         ],
         configure: async (device, coordinatorEndpoint) => {
-            await tuya.configureMagicPacket(device, coordinatorEndpoint);
             await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ["genOnOff"]);
         },
         meta: {
@@ -13326,9 +13181,7 @@ exports.definitions = [
         model: "SWS6TZ-WHITE",
         vendor: "Tuya",
         description: "6 gang wall switch",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.switch().withEndpoint("l1"),
             e.switch().withEndpoint("l2"),
@@ -13363,7 +13216,7 @@ exports.definitions = [
         model: "ZS-TYG3-SM-61Z",
         vendor: "Tuya",
         description: "Smart switch (4 gang + 2 scene) with backlight and neutral wire",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "off" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             tuya.exposes.switch().withDescription("All Switches"),
             tuya.exposes.switch().withEndpoint("l1"),
@@ -13419,7 +13272,7 @@ exports.definitions = [
         model: "ZS-TYG3-SM-21Z",
         vendor: "Tuya",
         description: "2 gang smart switch with backlight and neutral wire",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             tuya.exposes.switch().withDescription("All Switches"),
             tuya.exposes.switch().withEndpoint("l1"),
@@ -13461,7 +13314,7 @@ exports.definitions = [
             tuya.exposes.countdown().withEndpoint("l3"),
             e.power_on_behavior(["off", "on", "previous"]).withAccess(ea.STATE_SET),
         ],
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         endpoint: (device) => {
             return { l1: 1, l2: 1, l3: 1, state: 1, backlight: 1 };
         },
@@ -13485,7 +13338,7 @@ exports.definitions = [
         model: "ZS-TYG3-SM-41Z",
         vendor: "Tuya",
         description: "4 gang smart switch with backlight and neutral wire",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             tuya.exposes.switch().withDescription("All Switches"),
             tuya.exposes.switch().withEndpoint("l1"),
@@ -13525,9 +13378,9 @@ exports.definitions = [
         model: "M9-zigbee-SL",
         vendor: "Tuya",
         description: "Smart Switch (4 gang + 4 scene) with neutral wire and motion sensing",
-        fromZigbee: [tuya.fz.datapoints, fz.ias_occupancy_only_alarm_2, tuya.fz.indicator_mode],
-        toZigbee: [tuya.tz.datapoints, tuya.tz.power_on_behavior_1, tuya.tz.backlight_indicator_mode_1],
-        configure: tuya.configureMagicPacket,
+        fromZigbee: [fz.ias_occupancy_only_alarm_2, tuya.fz.indicator_mode],
+        toZigbee: [tuya.tz.power_on_behavior_1, tuya.tz.backlight_indicator_mode_1],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             ...[1, 2, 3, 4, 5, 6, 7, 8].map((i) => tuya.exposes.switch().withEndpoint(`l${i}`)),
             ...[1, 2, 3, 4, 5, 6, 7, 8].map((i) => e.power_on_behavior().withAccess(ea.STATE_SET).withEndpoint(`l${i}`)),
@@ -13606,8 +13459,7 @@ exports.definitions = [
         model: "YXZBRB58",
         vendor: "Tuya",
         description: "Smart human presence sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.illuminance(),
             e.presence(),
@@ -13668,8 +13520,7 @@ exports.definitions = [
         model: "TS0601_light",
         vendor: "Tuya",
         description: "Light",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [tuya.exposes.lightBrightness(), e.power_on_behavior().withAccess(ea.STATE_SET)],
         meta: {
             tuyaDatapoints: [
@@ -13691,8 +13542,7 @@ exports.definitions = [
         model: "YXZBSL",
         vendor: "Tuya",
         description: "Smart siren",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.binary("alarm", ea.STATE_SET, "ON", "OFF").withDescription("Turn the light of the alarm ON/OFF"),
             e.enum("type", ea.STATE_SET, ["sound", "light", "sound+light", "normal"]).withDescription("Alarm type"),
@@ -13787,9 +13637,7 @@ exports.definitions = [
         model: "ZYXH",
         vendor: "Tuya",
         description: "24 gang switch",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [...Array.from(Array(24).keys()).map((ep) => tuya.exposes.switch().withEndpoint(`l${ep + 1}`))],
         endpoint: (device) => {
             return {
@@ -13854,9 +13702,7 @@ exports.definitions = [
         model: "ZY-M100-24G",
         vendor: "Tuya",
         description: "24G MmWave radar human presence motion sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.enum("state", ea.STATE, ["none", "presence", "move"]).withDescription("Presence state"),
             e.presence(),
@@ -13913,9 +13759,7 @@ exports.definitions = [
         model: "ZY-M100-24GV2",
         vendor: "Tuya",
         description: "24G MmWave radar human presence motion sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.enum("state", ea.STATE, ["none", "presence", "move"]).withDescription("Presence state sensor"),
             e.presence().withDescription("Occupancy"),
@@ -13964,9 +13808,7 @@ exports.definitions = [
         model: "ZY-M100-24GV3",
         vendor: "Tuya",
         description: "24G MmWave radar human presence motion sensor (added distance switch)",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: (device, options) => {
             const exps = [
                 e.enum("state", ea.STATE, ["none", "presence", "move"]).withDescription("Presence state sensor"),
@@ -14071,8 +13913,7 @@ exports.definitions = [
         model: "CTL-R1-TY-Zigbee",
         vendor: "Tuya",
         description: "24G radar human presence motion sensor.",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.illuminance().withUnit("lx"),
             e.presence(),
@@ -14181,9 +14022,7 @@ exports.definitions = [
             tuya.whitelabel("Tuya", "MTG235-ZB-RL", "24G Human presence sensor with relay", ["_TZE204_clrdrnya", "_TZE200_clrdrnya"]),
             tuya.whitelabel("QA", "QASZ24R", "mmWave 24 Ghz sensor with relay", ["_TZE284_4qznlkbu"]),
         ],
-        configure: tuya.configureMagicPacket,
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.presence(),
             e.illuminance(),
@@ -14330,7 +14169,7 @@ exports.definitions = [
         description: "Bidirectional energy meter with 80A current clamp",
         fromZigbee: [fzLocal.PJ1203A_strict_fz_datapoints, fzLocal.PJ1203A_sync_time_increase_seq],
         toZigbee: [tuya.tz.datapoints],
-        extend: [tuya.modernExtend.tuyaBase({ timeStart: "off" })],
+        extend: [tuya.modernExtend.tuyaBase()],
         options: [
             e
                 .binary("late_energy_flow_a", ea.SET, true, false)
@@ -14406,7 +14245,7 @@ exports.definitions = [
         model: "PC311-Z-TY",
         vendor: "Tuya",
         description: "Bidirectional energy meter with 80A current clamp",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.ac_frequency(),
             e.voltage(),
@@ -14452,7 +14291,7 @@ exports.definitions = [
         model: "TYBAC-006",
         vendor: "Tuya",
         description: "Wall-mount thermostat for 2-pipe fan-coil unit",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, forceTimeUpdates: true })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true, forceTimeUpdates: true, timeStart: "1970" })],
         options: [
             e
                 .enum("control_sequence_of_operation", ea.SET, ["cooling_only", "cooling_and_heating_4-pipes"])
@@ -14578,7 +14417,7 @@ exports.definitions = [
         model: "rtsc11r",
         vendor: "Tuya",
         description: "5.8G human presence sensor with relay",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.presence(),
             e.illuminance().withUnit("lx"),
@@ -14637,9 +14476,7 @@ exports.definitions = [
         model: "NAS-PS09B2",
         vendor: "NEO",
         description: "Human presence sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.occupancy(),
             e.enum("human_motion_state", ea.STATE, ["none", "small", "large"]).withDescription("Human Motion State"),
@@ -14820,7 +14657,7 @@ exports.definitions = [
         model: "SP02-ZB001",
         vendor: "iAlarm",
         description: "Infrared motion sensor",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [e.tamper(), e.battery(), e.occupancy()],
         meta: {
             tuyaDatapoints: [
@@ -14835,9 +14672,7 @@ exports.definitions = [
         model: "THS317-ET-TY",
         vendor: "Tuya",
         description: "Temperature sensor with probe",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [e.temperature(), e.battery()],
         whiteLabel: [tuya.whitelabel("OWON", "THS317-ET-EY", "Temperature sensor with probe", ["_TZE200_01fvxamo"])],
         meta: {
@@ -14852,7 +14687,7 @@ exports.definitions = [
         model: "DCR-RQJ",
         vendor: "Tuya",
         description: "Carbon monoxide sensor gas leak detector",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [e.gas(), tuya.exposes.gasValue().withUnit("LEL %"), e.carbon_monoxide(), e.co()],
         meta: {
             tuyaDatapoints: [
@@ -14882,7 +14717,7 @@ exports.definitions = [
         model: "SZR07U",
         vendor: "Tuya",
         description: "24GHz millimeter wave radar",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.presence(),
             e
@@ -14978,7 +14813,6 @@ exports.definitions = [
                 dp: true,
                 queryOnConfigure: true,
                 queryIntervalSeconds: 10,
-                timeStart: "off",
                 respondToMcuVersionResponse: true,
             }),
         ],
@@ -15194,7 +15028,6 @@ exports.definitions = [
                 dp: true,
                 queryOnConfigure: true,
                 queryIntervalSeconds: 10,
-                timeStart: "off",
                 respondToMcuVersionResponse: true,
             }),
         ],
@@ -15379,7 +15212,7 @@ exports.definitions = [
         model: "EA4161C-BI",
         vendor: "Tuya",
         description: "Single-phase multifunction energy meter (DIN Module)",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "off" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [e.current(), e.power(), e.voltage(), e.energy(), e.text("meter_id", ea.STATE).withDescription("Meter ID (ID of device)")],
         meta: {
             tuyaDatapoints: [
@@ -15422,7 +15255,7 @@ exports.definitions = [
         model: "ZR360CDB",
         vendor: "Zorro Alert",
         description: "Multifunctional CO2 detector",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         whiteLabel: [tuya.whitelabel("Nous", "E10", "Multifunctional CO2 detector", ["_TZE200_xpvamyfz", "_TZE284_xpvamyfz"])],
         exposes: [
             e.humidity(),
@@ -15800,7 +15633,7 @@ exports.definitions = [
         model: "ZPV-01",
         vendor: "Novato",
         description: "Battery powered smart valve",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.switch().setAccess("state", ea.STATE_SET),
             e.enum("valve_state", ea.STATE, ["Closed", "Unknown", "Open"]).withDescription("Valve Status"),
@@ -15921,8 +15754,7 @@ exports.definitions = [
         model: "RT_ZCZ03Z",
         vendor: "Tuya",
         description: "Human presence sensor 24G",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.illuminance(),
             e.presence(),
@@ -15972,7 +15804,7 @@ exports.definitions = [
         description: "Smart circuit breaker",
         // Important: respondToMcuVersionResponse should be false otherwise there is an avalanche of commandMcuVersionResponse messages every second.
         // queryIntervalSeconds: is doing a pooling to update the device's parameters, now defined to update data every 3 minutes.
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, queryIntervalSeconds: 3 * 60, timeStart: "off", respondToMcuVersionResponse: true })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true, queryIntervalSeconds: 3 * 60, respondToMcuVersionResponse: true })],
         exposes: [
             tuya.exposes.switch(),
             e.energy(),
@@ -16151,7 +15983,7 @@ exports.definitions = [
         model: "ZY-M100-S_3",
         vendor: "Tuya",
         description: "Human presence detector",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.presence(),
             e.illuminance(),
@@ -16190,7 +16022,7 @@ exports.definitions = [
         model: "ZG-205Z",
         vendor: "Tuya",
         description: "5.8 GHz human presence sensor",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.presence(),
             e
@@ -16306,9 +16138,7 @@ exports.definitions = [
         model: "PN6",
         vendor: "ZSVIOT",
         description: "6-way controller",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             tuya.exposes.switch(),
             tuya.exposes.switchMode2().withEndpoint("l1_l2").withLabel("1-2 channels"),
@@ -16360,9 +16190,7 @@ exports.definitions = [
         model: "PN16",
         vendor: "ZSVIOT",
         description: "16-way controller",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.power_on_behavior(["off", "on", "previous"]).withAccess(ea.STATE_SET),
             tuya.exposes.switch().withEndpoint("all"),
@@ -16468,9 +16296,7 @@ exports.definitions = [
         model: "ZG-103Z",
         vendor: "Tuya",
         description: "Vibration sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.vibration(),
             e.tilt(),
@@ -16513,8 +16339,7 @@ exports.definitions = [
         model: "ZG-302ZM",
         vendor: "HOBEIAN",
         description: "Motion sensing switch",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.presence(),
             e.binary("switch1", ea.STATE_SET, "ON", "OFF").withDescription("Switch1"),
@@ -16607,9 +16432,7 @@ exports.definitions = [
         model: "ZG-303Z",
         vendor: "HOBEIAN",
         description: "Soil moisture sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.enum("water_warning", ea.STATE, ["none", "alarm"]).withDescription("Water shortage warning"),
             e.temperature(),
@@ -16653,10 +16476,8 @@ exports.definitions = [
         model: "TS0601_din_4",
         vendor: "Tuya",
         description: "Din rail switch with power monitoring and threshold settings",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         configure: async (device, coordinatorEndpoint) => {
-            await tuya.configureMagicPacket(device, coordinatorEndpoint);
             // Required to get the device to start reporting
             await device.getEndpoint(1).command("manuSpecificTuya", "dataQuery", {});
         },
@@ -16701,9 +16522,7 @@ exports.definitions = [
         model: "ZA03",
         vendor: "Tuya",
         description: "Siren alarm",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.binary("alarm", ea.STATE_SET, "ON", "OFF").withDescription("Sound the alarm"),
             e.enum("volume", ea.STATE_SET, ["low", "medium", "high", "mute"]),
@@ -16809,10 +16628,7 @@ exports.definitions = [
         model: "ZY_HPS01",
         vendor: "Tuya",
         description: "mmWave radar 5.8GHz",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
-        extend: [],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         whiteLabel: [tuya.whitelabel("Nova Digital", "ZTS-MM", "mmWave radar 5.8GHz", ["_TZE204_lbbg34rj"])],
         exposes: [
             e.illuminance().withUnit("lx"),
@@ -16886,8 +16702,7 @@ exports.definitions = [
         model: "ZPIR-10",
         vendor: "Tuya",
         description: "Treatlife human presence sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [e.occupancy(), e.battery(), e.illuminance()],
         meta: {
             tuyaDatapoints: [
@@ -16902,7 +16717,7 @@ exports.definitions = [
         model: "TS0601_thermostat_thermosphere",
         vendor: "Tuya",
         description: "ThermoSphere thermostat",
-        extend: [tuyaBase({ dp: true })],
+        extend: [tuyaBase({ dp: true, timeStart: "1970" })],
         exposes: [
             e
                 .climate()
@@ -17069,7 +16884,7 @@ exports.definitions = [
         model: "TS0601_GTZ10",
         vendor: "Tuya",
         description: "Thermostat radiator valve",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, forceTimeUpdates: true })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true, forceTimeUpdates: true, timeStart: "1970" })],
         ota: true,
         exposes: [
             e.battery(),
@@ -17354,7 +17169,7 @@ exports.definitions = [
         model: "HHST001",
         vendor: "HeatHUB",
         description: "Fan coil thermostat",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.binary("state", ea.STATE_SET, "ON", "OFF").withDescription("Turn the thermostat ON/OFF"),
             e
@@ -17432,9 +17247,7 @@ exports.definitions = [
         model: "GX03",
         vendor: "GIEX",
         description: "GIEX 2 zone watering timer",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.binary("valve_1", ea.STATE_SET, "ON", "OFF").withDescription("Switch state"),
             e
@@ -17486,9 +17299,7 @@ exports.definitions = [
         model: "PJ3201A",
         vendor: "Dongguan Pinjia Technology Co.,LTD.",
         description: "Human Presence Sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.presence().withDescription("Indicates whether the device detected presence. Will be true also when movement (occupancy) is detected."),
             e
@@ -17745,7 +17556,7 @@ exports.definitions = [
         model: "PO-BOCO-ELEC",
         vendor: "Powernity",
         description: "Pilot wire heating module",
-        extend: [tuyaBase({ dp: true })],
+        extend: [tuyaBase({ dp: true, timeStart: "1970" })],
         exposes: [
             e
                 .climate()
@@ -18013,7 +17824,7 @@ exports.definitions = [
         model: "TR-M3Z",
         vendor: "Tuya",
         description: "Thermostatic radiator valve actuator",
-        extend: [tuyaBase({ dp: true })],
+        extend: [tuyaBase({ dp: true, timeStart: "1970" })],
         exposes: [
             e.child_lock(),
             e.battery(),
@@ -18167,7 +17978,7 @@ exports.definitions = [
         model: "AE-669K",
         vendor: "ACMELEC",
         description: "Compatible with Mitsubishi Electric vrf system",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.binary("state", ea.STATE_SET, "ON", "OFF").withDescription("Turn the thermostat ON/OFF"),
             e
@@ -18211,9 +18022,7 @@ exports.definitions = [
         model: "ATMS10013Z3",
         vendor: "Ourtop",
         description: "Zigbee 3 Phase Meter",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         whiteLabel: [{ vendor: "Ourtop", model: "ATMS100133Z" }],
         exposes: [
             e.energy(),
@@ -18258,9 +18067,7 @@ exports.definitions = [
         model: "ZG-WK-DA-Wh-Zigbee",
         vendor: "Tuya",
         description: "Wall thermostat with humidity sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.humidity(),
             e.child_lock(),
@@ -18443,7 +18250,7 @@ exports.definitions = [
         model: "HY-SZLUMPIR",
         vendor: "Homcloud",
         description: "PIR sensor",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "off", respondToMcuVersionResponse: true })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true, respondToMcuVersionResponse: true })],
         exposes: [e.occupancy(), e.illuminance(), e.battery()],
         meta: {
             tuyaDatapoints: [
@@ -18458,7 +18265,7 @@ exports.definitions = [
         model: "XZ-AKT101",
         vendor: "Tuya",
         description: "Intelligent air conditioning wall switch",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         ota: true,
         exposes: [
             e.binary("air_switch", ea.STATE_SET, true, false),
@@ -18512,8 +18319,7 @@ exports.definitions = [
         model: "ZBN-JT-63",
         vendor: "Tuya",
         description: "Din rail switch with power monitoring",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             tuya.exposes.switch(),
             e.numeric("power", ea.STATE).withDescription("power").withUnit("W").withDescription("Instantaneous measured power"),
@@ -18603,7 +18409,7 @@ exports.definitions = [
         model: "EPJ-ZB",
         vendor: "Nova Digital",
         description: "Smart sliding window pusher",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.battery(),
             e.cover_position(),
@@ -18639,9 +18445,7 @@ exports.definitions = [
         model: "ZG-102ZM",
         vendor: "HOBEIAN",
         description: "Vibration sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.vibration(),
             e.contact(),
@@ -18669,8 +18473,7 @@ exports.definitions = [
         model: "ZG-204ZV",
         vendor: "HOBEIAN",
         description: "Millimeter wave motion detection",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.presence(),
             e.illuminance(),
@@ -18726,9 +18529,7 @@ exports.definitions = [
         model: "ZG-223Z",
         vendor: "HOBEIAN",
         description: "Rainwater detection sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.enum("rainwater", ea.STATE, ["none", "raining"]).withDescription("Sensor rainwater status"),
             e.illuminance(),
@@ -18770,7 +18571,7 @@ exports.definitions = [
         model: "RD24G01",
         vendor: "Tuya",
         description: "24GHz human presence sensor",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             exposes
                 .enum("presence_state", exposes.access.STATE, ["none", "motion", "stationary"])
@@ -18819,7 +18620,7 @@ exports.definitions = [
         model: "M515EGBZTN",
         vendor: "Quoya",
         description: "Zigbee roller blind",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         options: [exposes.options.invert_cover()],
         exposes: [
             e.cover_position().setAccess("position", ea.STATE_SET),
@@ -18866,9 +18667,7 @@ exports.definitions = [
         model: "CS-201Z",
         vendor: "COOLO",
         description: "Soil moisture sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.dry(),
             e.temperature(),
@@ -19021,8 +18820,8 @@ exports.definitions = [
         model: "TS0601_knob_dimmer_switch",
         vendor: "Tuya",
         description: "Dimmer knob with two lights",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tzLocal.TS0601_knob_dimmer_switch_group_id, tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
+        toZigbee: [tzLocal.TS0601_knob_dimmer_switch_group_id],
         exposes: [
             e.switch(),
             e.switch().withEndpoint("l1"),
@@ -19055,7 +18854,6 @@ exports.definitions = [
         },
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
-            await tuya.configureMagicPacket(device, coordinatorEndpoint);
             await endpoint.command("genBasic", "tuyaSetup", {}, { disableDefaultResponse: true });
         },
         endpoint: (device) => ({
@@ -19069,9 +18867,7 @@ exports.definitions = [
         model: "HY607W-3A",
         vendor: "Tuya",
         description: "Thermostat for gas boiler",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
-        configure: tuya.configureMagicPacket,
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.climate().withLocalTemperature(ea.STATE).withSetpoint("occupied_heating_setpoint", 5, 35, 0.5, ea.STATE_SET),
             e
@@ -19133,8 +18929,7 @@ exports.definitions = [
         model: "ZG-204ZH",
         vendor: "HOBEIAN",
         description: "PIR 24Ghz human presence sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.presence(),
             e.illuminance(),
@@ -19254,8 +19049,7 @@ exports.definitions = [
         vendor: "Tongou",
         description: "Zigbee energy meter (transformer clamp)",
         whiteLabel: [tuya.whitelabel("Tongou", "TOSA1-01WXJAT2A", "Smart energy meter, two wire", ["_TZE284_4hdbt6rn"])],
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.energy(),
             e.voltage(),
@@ -19467,7 +19261,7 @@ exports.definitions = [
         model: "_TZE204_3regm3h6",
         vendor: "Tuya",
         description: "Smart thermostat for electric radiator with pilot wire",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "1970" })],
         exposes: [
             e.binary("state", ea.STATE_SET, "ON", "OFF").withDescription("Turn the heater on or off").withCategory("config"),
             e.child_lock(),
@@ -19657,7 +19451,7 @@ exports.definitions = [
         model: "ZS-300Z",
         vendor: "Arteco",
         description: "Soil moisture sensor",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, timeStart: "2000" })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.enum("water_warning", ea.STATE, ["none", "alarm"]).withDescription("Water shortage warning"),
             e.enum("battery_state", ea.STATE, ["low", "middle", "high"]).withDescription("low: 16.67%, middle:16.68-83.33%, high: 83.34-100%"),
@@ -19701,8 +19495,7 @@ exports.definitions = [
         model: "ZG-204ZK",
         vendor: "HOBEIAN",
         description: "24Ghz human presence sensor",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.presence(),
             e.illuminance(),
@@ -19756,8 +19549,7 @@ exports.definitions = [
         model: "ZG-204ZE",
         vendor: "HOBEIAN",
         description: "10G mw motion detection",
-        fromZigbee: [tuya.fz.datapoints],
-        toZigbee: [tuya.tz.datapoints],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.presence(),
             e.battery(),
@@ -19963,7 +19755,7 @@ exports.definitions = [
         fingerprint: tuya.fingerprint("TS0601", ["_TZE204_mvtclclq"]),
         model: "DS-1450WN",
         vendor: "Tuya",
-        description: "Smart Zigbee Switch with Power Monitoring",
+        description: "Smart Zigbee Switch with power monitoring",
         extend: [tuya.modernExtend.tuyaBase({ dp: true })],
         exposes: [
             e.switch().withEndpoint("usb_a"),
@@ -20046,7 +19838,7 @@ exports.definitions = [
         model: "TS0601_thermostat_14",
         vendor: "AVATTO",
         description: "Thermostatic radiator valve",
-        extend: [tuya.modernExtend.tuyaBase({ dp: true, forceTimeUpdates: true })],
+        extend: [tuya.modernExtend.tuyaBase({ dp: true, forceTimeUpdates: true, timeStart: "1970" })],
         exposes: [
             e.child_lock(),
             e.battery(),
@@ -20185,5 +19977,30 @@ exports.definitions = [
             ],
         },
     },
+    {
+        fingerprint: tuya.fingerprint("TS0601", ["_TZE284_4cqhd2ha", "_TZE200_8ply8mjj"]),
+        model: "TZE284_4cqhd2ha",
+        vendor: "Girier",
+        description: "Vibration sensor",
+        extend: [tuya.modernExtend.tuyaBase({ dp: true })],
+        whiteLabel: [tuya.whitelabel("Conecto", "COZIGVS", "Vibration sensor", ["_TZE200_8ply8mjj"])],
+        exposes: [
+            e.vibration(),
+            e
+                .numeric("sensitivity", ea.STATE)
+                .withValueMin(0)
+                .withValueMax(2)
+                .withDescription("Sensitivity of the sensor (single press the button when muted to switch between" +
+                " low (one beep), medium (two beeps) and max (three beeps))"),
+            e.text("buzzer_mute", ea.STATE).withDescription("ON when buzzer is muted (double press the button on device to toggle)"),
+        ],
+        meta: {
+            tuyaDatapoints: [
+                [1, "vibration", tuya.valueConverter.trueFalse1],
+                [101, "sensitivity", tuya.valueConverter.raw],
+                [103, "buzzer_mute", tuya.valueConverter.onOff],
+            ],
+        },
+    },
 ];
 //# sourceMappingURL=tuya.js.map