zigbee-herdsman-converters 20.44.0 → 21.0.0-pre.1

package/devices/tuya.js

@@ -34,7 +34,6 @@ const exposes = __importStar(require("../lib/exposes"));
 const legacy = __importStar(require("../lib/legacy"));
 const logger_1 = require("../lib/logger");
 const modernExtend_1 = require("../lib/modernExtend");
-const ota = __importStar(require("../lib/ota"));
 const reporting = __importStar(require("../lib/reporting"));
 const globalStore = __importStar(require("../lib/store"));
 const tuya = __importStar(require("../lib/tuya"));
@@ -860,7 +859,7 @@ const definitions = [
         model: 'TS0218',
         vendor: 'Tuya',
         description: 'Button',
-        fromZigbee: [legacy.fromZigbee.TS0218_click, fromZigbee_1.default.battery],
+        fromZigbee: [fromZigbee_1.default.command_emergency, fromZigbee_1.default.battery],
         exposes: [e.battery(), e.action(['click'])],
         toZigbee: [],
     },
@@ -1263,7 +1262,7 @@ const definitions = [
         description: 'Illuminance, temperature & humidity sensor',
         fromZigbee: [legacy.fromZigbee.tuya_illuminance_temperature_humidity_sensor],
         toZigbee: [],
-        exposes: [e.temperature(), e.humidity(), e.illuminance_lux(), e.battery()],
+        exposes: [e.temperature(), e.humidity(), e.illuminance(), e.battery()],
     },
     {
         fingerprint: [
@@ -1502,7 +1501,7 @@ const definitions = [
         model: 'TS011F_2_gang_wall',
         vendor: 'Tuya',
         description: '2 gang wall outlet',
-        ota: ota.zigbeeOTA,
+        ota: true,
         extend: [tuya.modernExtend.tuyaOnOff({ backlightModeLowMediumHigh: true, childLock: true, endpoints: ['l1', 'l2'] })],
         whiteLabel: [
             tuya.whitelabel('ClickSmart+', 'CMA30036', '2 gang socket outlet', ['_TYZB01_hlla45kx']),
@@ -1709,7 +1708,7 @@ const definitions = [
         toZigbee: [],
         onEvent: tuya.onEventSetTime,
         configure: tuya.configureMagicPacket,
-        exposes: [e.occupancy(), e.battery_low(), e.battery(), e.tamper(), e.illuminance_lux()],
+        exposes: [e.occupancy(), e.battery_low(), e.battery(), e.tamper(), e.illuminance()],
     },
     {
         fingerprint: tuya.fingerprint('TS0202', ['_TZ3210_cwamkvua']),
@@ -2551,7 +2550,7 @@ const definitions = [
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genBasic']);
         },
-        exposes: [e.battery(), e.illuminance_lux(), e.linkquality(), e.enum('brightness_level', ea.STATE, ['LOW', 'MEDIUM', 'HIGH'])],
+        exposes: [e.battery(), e.illuminance(), e.linkquality(), e.enum('brightness_level', ea.STATE, ['LOW', 'MEDIUM', 'HIGH'])],
     },
     {
         zigbeeModel: ['TS130F'],
@@ -2601,7 +2600,7 @@ const definitions = [
         vendor: 'Moes',
         description: 'Zigbee + RF curtain switch module',
         whiteLabel: [tuya.whitelabel('Girier', 'TS130F_GIRIER', 'Smart curtain switch', ['_TZ3210_dwytrmda'])],
-        ota: ota.zigbeeOTA,
+        ota: true,
         meta: { coverInverted: true },
         fromZigbee: [fromZigbee_1.default.tuya_cover_options, fromZigbee_1.default.cover_position_tilt],
         toZigbee: [toZigbee_1.default.cover_state, toZigbee_1.default.moes_cover_calibration, toZigbee_1.default.cover_position_tilt, toZigbee_1.default.tuya_cover_reversal],
@@ -4210,7 +4209,7 @@ const definitions = [
             tuya.whitelabel('Emos', 'P5630S', 'Radiator valve with thermostat', ['_TZE200_rk1wojce']),
         ],
         meta: { tuyaThermostatPreset: legacy.thermostatPresets, tuyaThermostatSystemMode: legacy.thermostatSystemModes3 },
-        ota: ota.zigbeeOTA,
+        ota: true,
         onEvent: tuya.onEventSetLocalTime,
         fromZigbee: [legacy.fromZigbee.tuya_thermostat, fromZigbee_1.default.ignore_basic_report, fromZigbee_1.default.ignore_tuya_set_time],
         toZigbee: [
@@ -4486,7 +4485,7 @@ const definitions = [
             tuya.whitelabel('Moes', 'TV01-ZB', 'Thermostat radiator valve', ['_TZE200_e9ba97vf']),
             tuya.whitelabel('AlecoAir', 'HA-08_THERMO', 'Thermostat radiator valve', ['_TZE200_wsbfwodu']),
         ],
-        ota: ota.zigbeeOTA,
+        ota: true,
         fromZigbee: [tuya.fz.datapoints],
         toZigbee: [tuya.tz.datapoints],
         onEvent: tuya.onEventSetLocalTime,
@@ -4786,7 +4785,7 @@ const definitions = [
         vendor: 'ETOP',
         description: 'Wall-mount thermostat',
         fromZigbee: [
-            legacy.fromZigbee.tuya_thermostat_weekly_schedule_1,
+            legacy.fromZigbee.tuya_thermostat_weekly_schedule_2,
             legacy.fromZigbee.etop_thermostat,
             fromZigbee_1.default.ignore_basic_report,
             fromZigbee_1.default.ignore_tuya_set_time,
@@ -4826,7 +4825,7 @@ const definitions = [
         vendor: 'ETOP',
         description: 'Radiator valve',
         fromZigbee: [
-            legacy.fromZigbee.tuya_thermostat_weekly_schedule_1,
+            legacy.fromZigbee.tuya_thermostat_weekly_schedule_2,
             legacy.fromZigbee.etop_thermostat,
             fromZigbee_1.default.ignore_basic_report,
             fromZigbee_1.default.ignore_tuya_set_time,
@@ -5283,7 +5282,7 @@ const definitions = [
             tuya.whitelabel('Elivco', 'LSPA9', 'Smart plug (with power monitoring)', ['_TZ3000_okaz9tjs']),
             tuya.whitelabel('PSMART', 'T440', 'Smart wallsocket (with power monitoring)', ['_TZ3000_y4ona9me']),
         ],
-        ota: ota.zigbeeOTA,
+        ota: true,
         extend: [
             tuya.modernExtend.tuyaOnOff({
                 electricalMeasurements: true,
@@ -5352,7 +5351,7 @@ const definitions = [
             { vendor: 'Neo', model: 'PLUG-001SPB2' },
             tuya.whitelabel('Tuya', 'BSD29_1', 'Smart plug (with power monitoring by polling)', ['_TZ3000_okaz9tjs']),
         ],
-        ota: ota.zigbeeOTA,
+        ota: true,
         extend: [tuya.modernExtend.tuyaOnOff({ electricalMeasurements: true, powerOutageMemory: true, indicatorMode: true, childLock: true })],
         configure: async (device, coordinatorEndpoint) => {
             await tuya.configureMagicPacket(device, coordinatorEndpoint);
@@ -6514,7 +6513,7 @@ const definitions = [
         model: 'U86KWF-ZPSJ',
         vendor: 'Tuya',
         description: 'Environment controller',
-        fromZigbee: [legacy.fromZigbee.thermostat_att_report, fromZigbee_1.default.fan],
+        fromZigbee: [fromZigbee_1.default.thermostat, fromZigbee_1.default.fan],
         toZigbee: [
             toZigbee_1.default.thermostat_local_temperature,
             toZigbee_1.default.thermostat_local_temperature_calibration,
@@ -6933,7 +6932,7 @@ const definitions = [
         fromZigbee: [fromZigbee_1.default.battery, fromZigbee_1.default.illuminance],
         toZigbee: [],
         configure: tuya.configureMagicPacket,
-        exposes: [e.battery(), e.illuminance(), e.illuminance_lux()],
+        exposes: [e.battery(), e.illuminance()],
     },
     {
         fingerprint: tuya.fingerprint('TS0222', ['_TZ3000_t9qqxn70']),
@@ -6943,7 +6942,7 @@ const definitions = [
         fromZigbee: [fromZigbee_1.default.humidity, fromZigbee_1.default.battery, fromZigbee_1.default.temperature, fromZigbee_1.default.illuminance],
         toZigbee: [],
         configure: tuya.configureMagicPacket,
-        exposes: [e.battery(), e.temperature(), e.humidity(), e.illuminance_lux()],
+        exposes: [e.battery(), e.temperature(), e.humidity(), e.illuminance()],
     },
     {
         fingerprint: [
@@ -6955,7 +6954,7 @@ const definitions = [
         description: 'Light intensity sensor',
         fromZigbee: [fromZigbee_1.default.battery, fromZigbee_1.default.illuminance, legacy.fromZigbee.TS0222],
         toZigbee: [],
-        exposes: [e.battery(), e.illuminance(), e.illuminance_lux()],
+        exposes: [e.battery(), e.illuminance()],
         configure: tuya.configureMagicPacket,
     },
     {
@@ -7022,7 +7021,7 @@ const definitions = [
         ],
         toZigbee: [toZigbee_1.default.on_off, tuya.tz.power_on_behavior_1, toZigbee_1.default.tuya_relay_din_led_indicator],
         whiteLabel: [{ vendor: 'MatSee Plus', model: 'ATMS1602Z' }],
-        ota: ota.zigbeeOTA,
+        ota: true,
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement', 'seMetering']);
@@ -7062,7 +7061,7 @@ const definitions = [
             tuya.whitelabel('Tongou', 'TO-Q-SY1-JZT', 'Din smart relay (with power monitoring via polling)', ['_TZ3000_qeuvnohg']),
             tuya.whitelabel('TOMZN', 'TOB9Z-63M', 'Din smart relay (with power monitoring via polling)', ['_TZ3000_6l1pjfqe']),
         ],
-        ota: ota.zigbeeOTA,
+        ota: true,
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement', 'seMetering']);
@@ -7196,7 +7195,6 @@ const definitions = [
             e.humidity(),
             e.battery(),
             e.illuminance(),
-            e.illuminance_lux(),
             e
                 .numeric('alarm_temperature_max', ea.STATE_SET)
                 .withUnit('°C')
@@ -7249,7 +7247,7 @@ const definitions = [
             await tuya.configureMagicPacket(device, coordinatorEndpoint);
         },
         exposes: [
-            e.illuminance_lux(),
+            e.illuminance(),
             e.presence(),
             e.occupancy(),
             e.numeric('motion_speed', ea.STATE).withDescription('Speed of movement'),
@@ -7287,7 +7285,7 @@ const definitions = [
                 [1, 'presence', tuya.valueConverter.trueFalse1],
                 [2, 'radar_sensitivity', tuya.valueConverter.raw],
                 [102, 'occupancy', tuya.valueConverter.trueFalse1],
-                [103, 'illuminance_lux', tuya.valueConverter.raw],
+                [103, 'illuminance', tuya.valueConverter.raw],
                 [105, 'tumble_switch', tuya.valueConverter.plus1],
                 [106, 'tumble_alarm_time', tuya.valueConverter.raw],
                 [112, 'radar_scene', tuya.valueConverterBasic.lookup({ default: 0, area: 1, toilet: 2, bedroom: 3, parlour: 4, office: 5, hotel: 6 })],
@@ -7521,7 +7519,7 @@ const definitions = [
         description: 'Illuminance sensor',
         fromZigbee: [legacy.fromZigbee.tuya_illuminance_sensor],
         toZigbee: [],
-        exposes: [e.illuminance_lux(), e.brightness_state()],
+        exposes: [e.illuminance(), e.brightness_state()],
     },
     {
         fingerprint: [
@@ -7612,7 +7610,7 @@ const definitions = [
             tuya.whitelabel('Moes', 'ZSS-QY-HP', 'Human presence sensor', ['_TZE204_fwondbzy']),
         ],
         exposes: [
-            e.illuminance_lux(),
+            e.illuminance(),
             e.presence(),
             e.numeric('target_distance', ea.STATE).withDescription('Distance to target').withUnit('m'),
             e.numeric('radar_sensitivity', ea.STATE_SET).withValueMin(0).withValueMax(9).withValueStep(1).withDescription('sensitivity of the radar'),
@@ -7676,7 +7674,7 @@ const definitions = [
         configure: tuya.configureMagicPacket,
         exposes: [
             e.presence(),
-            e.illuminance_lux(),
+            e.illuminance(),
             e.numeric('keep_sensitivity', ea.STATE_SET).withValueMin(0).withValueMax(10).withValueStep(1).withDescription('Keep sensitivity'),
             e.numeric('trigger_sensitivity', ea.STATE_SET).withValueMin(1).withValueMax(20).withValueStep(1).withDescription('Trigger sensitivity'),
             e
@@ -7692,7 +7690,7 @@ const definitions = [
             tuyaDatapoints: [
                 [1, 'presence', tuya.valueConverter.trueFalse1],
                 [102, 'fading_time', tuya.valueConverter.raw],
-                [103, 'illuminance_lux', tuya.valueConverter.raw],
+                [103, 'illuminance', tuya.valueConverter.raw],
                 [110, 'keep_sensitivity', tuya.valueConverter.raw],
                 [114, 'trigger_sensitivity', tuya.valueConverter.raw],
                 [182, 'target_distance', tuya.valueConverter.divideBy10],
@@ -7709,7 +7707,7 @@ const definitions = [
         toZigbee: [tuya.tz.datapoints],
         whiteLabel: [tuya.whitelabel('Wenzhi', 'WZ-M100-W', 'Human presence sensor', ['_TZE204_e5m9c5hl'])],
         exposes: [
-            e.illuminance_lux(),
+            e.illuminance(),
             e.presence(),
             e.numeric('target_distance', ea.STATE).withDescription('Distance to target').withUnit('m'),
             e.numeric('radar_sensitivity', ea.STATE_SET).withValueMin(0).withValueMax(9).withValueStep(1).withDescription('sensitivity of the radar'),
@@ -7738,7 +7736,7 @@ const definitions = [
         ],
         meta: {
             tuyaDatapoints: [
-                [104, 'illuminance_lux', tuya.valueConverter.raw],
+                [104, 'illuminance', tuya.valueConverter.raw],
                 [105, 'presence', tuya.valueConverter.trueFalse1],
                 [106, 'radar_sensitivity', tuya.valueConverter.raw],
                 [107, 'maximum_range', tuya.valueConverter.divideBy100],
@@ -7757,7 +7755,7 @@ const definitions = [
         fromZigbee: [tuya.fz.datapoints],
         toZigbee: [tuya.tz.datapoints],
         exposes: [
-            e.illuminance_lux(),
+            e.illuminance(),
             e.presence(),
             e.numeric('target_distance', ea.STATE).withDescription('Distance to target').withUnit('m'),
             e.numeric('radar_sensitivity', ea.STATE_SET).withValueMin(0).withValueMax(9).withValueStep(1).withDescription('sensitivity of the radar'),
@@ -7788,7 +7786,7 @@ const definitions = [
             tuyaDatapoints: [
                 [1, 'presence', tuya.valueConverter.trueFalse1],
                 [9, 'target_distance', tuya.valueConverter.divideBy100],
-                [104, 'illuminance_lux', tuya.valueConverter.raw],
+                [104, 'illuminance', tuya.valueConverter.raw],
                 [2, 'radar_sensitivity', tuya.valueConverter.raw],
                 [4, 'maximum_range', tuya.valueConverter.divideBy100],
                 [3, 'minimum_range', tuya.valueConverter.divideBy100],
@@ -7808,7 +7806,7 @@ const definitions = [
         onEvent: tuya.onEventSetTime,
         configure: tuya.configureMagicPacket,
         exposes: [
-            e.illuminance_lux(),
+            e.illuminance(),
             e.presence(),
             e
                 .numeric('target_distance', ea.STATE)
@@ -7861,7 +7859,7 @@ const definitions = [
                 [3, 'minimum_range', tuya.valueConverter.divideBy100],
                 [4, 'maximum_range', tuya.valueConverter.divideBy100],
                 [9, 'target_distance', tuya.valueConverter.divideBy100],
-                [103, 'illuminance_lux', tuya.valueConverter.raw],
+                [103, 'illuminance', tuya.valueConverter.raw],
                 [104, 'interval_time', tuya.valueConverter.raw],
                 [105, 'detection_delay', tuya.valueConverter.divideBy10],
                 [106, 'fading_time', tuya.valueConverter.divideBy10],
@@ -7878,7 +7876,7 @@ const definitions = [
         exposes: [
             e.presence(),
             e.enum('motion_state', ea.STATE, ['none', 'large', 'small', 'static']).withDescription('Motion state'),
-            e.illuminance_lux(),
+            e.illuminance(),
             e
                 .numeric('fading_time', ea.STATE_SET)
                 .withValueMin(0)
@@ -7936,7 +7934,7 @@ const definitions = [
         meta: {
             tuyaDatapoints: [
                 [1, 'presence', tuya.valueConverter.trueFalse1],
-                [20, 'illuminance_lux', tuya.valueConverter.raw],
+                [20, 'illuminance', tuya.valueConverter.raw],
                 [
                     11,
                     'motion_state',
@@ -8459,7 +8457,7 @@ const definitions = [
         exposes: [
             e.presence(),
             e.enum('motion_state', ea.STATE, ['none', 'large', 'small', 'static']).withDescription('Motion state'),
-            e.illuminance_lux(),
+            e.illuminance(),
             e.battery(),
             e
                 .numeric('fading_time', ea.STATE_SET)
@@ -8497,7 +8495,7 @@ const definitions = [
         meta: {
             tuyaDatapoints: [
                 [1, 'presence', tuya.valueConverter.trueFalse1],
-                [106, 'illuminance_lux', tuya.valueConverter.raw],
+                [106, 'illuminance', tuya.valueConverter.raw],
                 [
                     101,
                     'motion_state',
@@ -8546,7 +8544,7 @@ const definitions = [
             tuya.whitelabel('Lonsonho', 'QS-Zigbee-D02-TRIAC-L_1', '1 channel dimmer', ['_TZ3210_weaqkhab']),
             tuya.whitelabel('Lonsonho', 'QS-Zigbee-D02-TRIAC-LN_1', '1 channel dimmer', ['_TZ3210_ngqk6jia']),
         ],
-        ota: ota.zigbeeOTA,
+        ota: true,
         fromZigbee: [fromZigbee_1.default.TS110E, fromZigbee_1.default.TS110E_light_type, tuya.fz.power_on_behavior_1, fromZigbee_1.default.on_off],
         toZigbee: [toZigbee_1.default.TS110E_onoff_brightness, toZigbee_1.default.TS110E_options, tuya.tz.power_on_behavior_1, toZigbee_1.default.light_brightness_move],
         exposes: [
@@ -8859,7 +8857,7 @@ const definitions = [
         model: 'TS011F_with_threshold',
         description: 'Din rail switch with power monitoring and threshold settings',
         vendor: 'Tuya',
-        ota: ota.zigbeeOTA,
+        ota: true,
         extend: [
             tuya.modernExtend.tuyaOnOff({
                 electricalMeasurements: true,
@@ -9826,7 +9824,7 @@ const definitions = [
         model: 'TS011F_4',
         description: '2 gang plug',
         vendor: 'Tuya',
-        ota: ota.zigbeeOTA,
+        ota: true,
         extend: [
             tuya.modernExtend.tuyaOnOff({
                 electricalMeasurements: true,
@@ -10207,7 +10205,7 @@ const definitions = [
         fromZigbee: [tuya.fz.datapoints],
         toZigbee: [tuya.tz.datapoints],
         exposes: [
-            e.illuminance_lux(),
+            e.illuminance(),
             e.presence(),
             e.numeric('target_distance', ea.STATE).withDescription('Distance to target').withUnit('m'),
             e.numeric('radar_sensitivity', ea.STATE_SET).withValueMin(0).withValueMax(9).withValueStep(1).withDescription('Sensitivity of the radar'),
@@ -10243,7 +10241,7 @@ const definitions = [
                 [0x02, 'radar_sensitivity', tuya.valueConverter.raw],
                 [0x03, 'minimum_range', tuya.valueConverter.divideBy100],
                 [0x04, 'maximum_range', tuya.valueConverter.divideBy100],
-                [0x65, 'illuminance_lux', tuya.valueConverter.raw],
+                [0x65, 'illuminance', tuya.valueConverter.raw],
                 [0x66, 'detection_delay', tuya.valueConverter.divideBy10],
                 [0x67, 'fading_time', tuya.valueConverter.divideBy10],
                 [
@@ -10456,9 +10454,9 @@ const definitions = [
         configure: tuya.configureMagicPacket,
         exposes: [
             e.enum('state', ea.STATE, ['none', 'presence', 'move']).withDescription('Presence state'),
-            e.occupancy(),
+            e.presence(),
             e.numeric('distance', ea.STATE).withUnit('m').withDescription('Target distance'),
-            e.illuminance_lux(),
+            e.illuminance(),
             e
                 .numeric('motion_sensitivity', ea.STATE_SET)
                 .withValueMin(1)
@@ -10467,12 +10465,12 @@ const definitions = [
                 .withCategory('config')
                 .withDescription('Motion sensitivity'),
             e
-                .numeric('occupancy_sensitivity', ea.STATE_SET)
+                .numeric('presence_sensitivity', ea.STATE_SET)
                 .withValueMin(1)
                 .withValueMax(10)
                 .withValueStep(1)
                 .withCategory('config')
-                .withDescription('Occupancy sensitivity'),
+                .withDescription('Presence sensitivity'),
             e
                 .numeric('max_range', ea.STATE_SET)
                 .withValueMin(1.5)
@@ -10482,23 +10480,23 @@ const definitions = [
                 .withCategory('config')
                 .withDescription('Maximum range'),
             e
-                .numeric('occupancy_timeout', ea.STATE_SET)
+                .numeric('presence_timeout', ea.STATE_SET)
                 .withValueMin(1)
                 .withValueMax(1500)
                 .withValueStep(1)
                 .withUnit('s')
-                .withDescription('Occupancy timeout'),
+                .withDescription('Presence timeout'),
         ],
         meta: {
             multiEndpoint: true,
             tuyaDatapoints: [
-                [112, 'occupancy', tuya.valueConverter.trueFalse1],
+                [112, 'presence', tuya.valueConverter.trueFalse1],
                 [106, 'motion_sensitivity', tuya.valueConverter.divideBy10FromOnly],
                 [111, 'occupancy_sensitivity', tuya.valueConverter.divideBy10FromOnly],
                 [107, 'max_range', tuya.valueConverter.divideBy100],
                 [109, 'distance', tuya.valueConverter.divideBy100],
-                [110, 'occupancy_timeout', tuya.valueConverter.raw],
-                [104, 'illuminance_lux', tuya.valueConverter.raw],
+                [110, 'presence_timeout', tuya.valueConverter.raw],
+                [104, 'illuminance', tuya.valueConverter.raw],
                 [102, 'illuminance_treshold_max', tuya.valueConverter.raw],
                 [103, 'illuminance_treshold_min', tuya.valueConverter.raw],
                 [105, 'state', tuya.valueConverterBasic.lookup({ none: 0, presence: 1, move: 2 })],
@@ -10517,7 +10515,7 @@ const definitions = [
             e.enum('state', ea.STATE, ['none', 'presence', 'move']).withDescription('Presence state sensor'),
             e.presence().withDescription('Occupancy'),
             e.numeric('distance', ea.STATE).withUnit('m').withDescription('Target distance'),
-            e.illuminance_lux().withDescription('Illuminance sensor'),
+            e.illuminance().withDescription('Illuminance sensor'),
             e.numeric('move_sensitivity', ea.STATE_SET).withValueMin(0).withValueMax(10).withValueStep(1).withDescription('Motion Sensitivity'),
             e.numeric('presence_sensitivity', ea.STATE_SET).withValueMin(0).withValueMax(10).withValueStep(1).withDescription('Presence Sensitivity'),
             e
@@ -10551,7 +10549,7 @@ const definitions = [
                 [4, 'detection_distance_max', tuya.valueConverter.divideBy100],
                 [9, 'distance', tuya.valueConverter.divideBy10],
                 [105, 'presence_timeout', tuya.valueConverter.raw],
-                [103, 'illuminance_lux', tuya.valueConverter.raw],
+                [103, 'illuminance', tuya.valueConverter.raw],
                 [1, 'state', tuya.valueConverterBasic.lookup({ none: 0, presence: 1, move: 2 })],
             ],
         },
@@ -10569,7 +10567,7 @@ const definitions = [
             e.presence().withDescription('Occupancy'),
             e.numeric('distance', ea.STATE).withDescription('Target distance'),
             e.binary('find_switch', ea.STATE_SET, 'ON', 'OFF').withDescription('distance switch'),
-            e.illuminance_lux().withDescription('Illuminance sensor'),
+            e.illuminance().withDescription('Illuminance sensor'),
             e.numeric('move_sensitivity', ea.STATE_SET).withValueMin(0).withValueMax(10).withValueStep(1).withDescription('Motion Sensitivity'),
             e.numeric('presence_sensitivity', ea.STATE_SET).withValueMin(0).withValueMax(10).withValueStep(1).withDescription('Presence Sensitivity'),
             e
@@ -10634,7 +10632,7 @@ const definitions = [
                 [9, 'distance', tuya.valueConverter.divideBy10],
                 [101, 'find_switch', tuya.valueConverter.onOff],
                 [102, 'presence_sensitivity', tuya.valueConverter.raw],
-                [103, 'illuminance_lux', tuya.valueConverter.raw],
+                [103, 'illuminance', tuya.valueConverter.raw],
                 [105, 'presence_timeout', tuya.valueConverter.raw],
             ],
         },
@@ -10743,7 +10741,7 @@ const definitions = [
         toZigbee: [tuya.tz.datapoints],
         exposes: [
             e.presence(),
-            e.illuminance_lux(),
+            e.illuminance(),
             e.numeric('target_distance', ea.STATE).withDescription('Distance to target').withUnit('m'),
             e
                 .numeric('radar_sensitivity', ea.STATE_SET)
@@ -10828,7 +10826,7 @@ const definitions = [
                 [101, 'entry_filter_time', tuya.valueConverter.divideBy10],
                 [102, 'departure_delay', tuya.valueConverter.raw],
                 [103, 'cline', tuya.valueConverter.raw],
-                [104, 'illuminance_lux', tuya.valueConverter.divideBy10],
+                [104, 'illuminance', tuya.valueConverter.divideBy10],
                 [105, 'entry_sensitivity', tuya.valueConverter.raw],
                 [106, 'entry_distance_indentation', tuya.valueConverter.divideBy100],
                 [107, 'breaker_mode', tuya.valueConverterBasic.lookup({ standard: tuya.enum(0), local: tuya.enum(1) })],
@@ -11801,7 +11799,7 @@ const definitions = [
         fromZigbee: [tuya.fz.datapoints],
         toZigbee: [tuya.tz.datapoints],
         exposes: [
-            e.illuminance_lux(),
+            e.illuminance(),
             e.presence(),
             e
                 .numeric('detection_distance_max', ea.STATE_SET)
@@ -11826,7 +11824,7 @@ const definitions = [
             tuyaDatapoints: [
                 [1, 'presence', tuya.valueConverter.trueFalse1],
                 [101, 'target_distance', tuya.valueConverter.raw],
-                [102, 'illuminance_lux', tuya.valueConverter.raw],
+                [102, 'illuminance', tuya.valueConverter.raw],
                 [103, 'fading_time', tuya.valueConverter.raw],
                 [104, 'indicator', tuya.valueConverter.onOff],
                 [107, 'detection_distance_max', tuya.valueConverter.raw],
@@ -11990,7 +11988,7 @@ const definitions = [
         configure: tuya.configureMagicPacket,
         exposes: [
             e.presence(),
-            e.illuminance_lux(),
+            e.illuminance(),
             e
                 .enum('sensitivity', ea.STATE_SET, ['low', 'medium', 'high'])
                 .withDescription('PIR sensor sensitivity (refresh and update only while active)'),
@@ -12001,7 +11999,7 @@ const definitions = [
                 [1, 'presence', tuya.valueConverterBasic.lookup({ True: 0, False: 1 })],
                 [9, 'sensitivity', tuya.valueConverterBasic.lookup({ low: tuya.enum(0), medium: tuya.enum(1), high: tuya.enum(2) })],
                 [10, 'keep_time', tuya.valueConverterBasic.lookup({ '30': tuya.enum(0), '60': tuya.enum(1), '120': tuya.enum(2) })],
-                [12, 'illuminance_lux', tuya.valueConverter.raw],
+                [12, 'illuminance', tuya.valueConverter.raw],
             ],
         },
     },
@@ -12025,7 +12023,7 @@ const definitions = [
                 .withValueStep(0.01)
                 .withUnit('m')
                 .withDescription('Target distance'),
-            e.illuminance_lux(),
+            e.illuminance(),
             e.binary('indicator', ea.STATE_SET, 'ON', 'OFF').withDescription('LED Indicator'),
             e
                 .numeric('none_delay_time', ea.STATE_SET)
@@ -12108,7 +12106,7 @@ const definitions = [
                     },
                 ],
                 [101, 'target_distance', tuya.valueConverter.divideBy100],
-                [102, 'illuminance_lux', tuya.valueConverter.raw],
+                [102, 'illuminance', tuya.valueConverter.raw],
                 [103, 'none_delay_time', tuya.valueConverter.raw],
                 [104, 'indicator', tuya.valueConverter.onOff],
                 [107, 'move_detection_max', tuya.valueConverter.divideBy100],
@@ -12567,7 +12565,7 @@ const definitions = [
         toZigbee: [tuya.tz.datapoints],
         onEvent: tuya.onEventSetLocalTime,
         configure: tuya.configureMagicPacket,
-        ota: ota.zigbeeOTA,
+        ota: true,
         exposes: [
             e.battery(),
             e.child_lock(),