zigbee-herdsman-converters 14.0.376 → 14.0.377

package/converters/fromZigbee.js

@@ -7561,22 +7561,33 @@ const converters = {
             const dpValue = tuya.firstDpValue(msg, meta, 'tuya_radar_sensor');
             const dp = dpValue.dp;
             const value = tuya.getDataValue(dpValue);
+            let result = null;
             switch (dp) {
             case tuya.dataPoints.trsPresenceState:
-                return {presence: {0: false, 1: true}[value]};
+                result = {presence: {0: false, 1: true}[value]};
+                break;
             case tuya.dataPoints.trsMotionState:
-                return {motion: {1: false, 2: true}[value]};
+                result = {occupancy: {1: false, 2: true}[value]};
+                break;
             case tuya.dataPoints.trsMotionSpeed:
-                return {motion_speed: value};
+                result = {motion_speed: value};
+                break;
             case tuya.dataPoints.trsMotionDirection:
-                return {motion_direction: {0: 'standing_still', 1: 'moving_forward', 2: 'moving_backward'}[value]};
+                result = {motion_direction: tuya.tuyaRadar.motionDirection[value]};
+                break;
             case tuya.dataPoints.trsScene:
-                return {radar_scene: {'default': 0, 'area': 1, 'toilet': 2, 'bedroom': 3, 'parlour': 4, 'office': 5, 'hotel': 6}[value]};
+                result = {radar_scene: tuya.tuyaRadar.radarScene[value]};
+                break;
             case tuya.dataPoints.trsSensitivity:
-                return {radar_sensitivity: value};
+                result = {radar_sensitivity: value};
+                break;
             case tuya.dataPoints.trsIlluminanceLux:
-                return {illuminance_lux: value};
+                result = {illuminance_lux: value};
+                break;
+            default:
+                meta.logger.warn(`fromZigbee.tuya_radar_sensor: NOT RECOGNIZED DP ${dp} with data ${JSON.stringify(dpValue)}`);
             }
+            return result;
         },
     },
     tuya_smart_vibration_sensor: {

package/converters/toZigbee.js

@@ -5029,6 +5029,28 @@ const converters = {
             }
         },
     },
+    ts0201_temperature_humidity_alarm: {
+        key: ['alarm_humidity_max', 'alarm_humidity_min', 'alarm_temperature_max', 'alarm_temperature_min'],
+        convertSet: async (entity, key, value, meta) => {
+            switch (key) {
+            case 'alarm_temperature_max':
+            case 'alarm_temperature_min':
+            case 'alarm_humidity_max':
+            case 'alarm_humidity_min': {
+                // await entity.write('manuSpecificTuya_2', {[key]: value});
+                // instead write as custom attribute to override incorrect herdsman dataType from uint16 to int16
+                // https://github.com/Koenkk/zigbee-herdsman/blob/v0.13.191/src/zcl/definition/cluster.ts#L4235
+                const keyToAttributeLookup = {'alarm_temperature_max': 0xD00A, 'alarm_temperature_min': 0xD00B,
+                    'alarm_humidity_max': 0xD00D, 'alarm_humidity_min': 0xD00E};
+                const payload = {[keyToAttributeLookup[key]]: {value: value, type: 0x29}};
+                await entity.write('manuSpecificTuya_2', payload);
+                break;
+            }
+            default: // Unknown key
+                meta.logger.warn(`Unhandled key ${key}`);
+            }
+        },
+    },
     heiman_ir_remote: {
         key: ['send_key', 'create', 'learn', 'delete', 'get_list'],
         convertSet: async (entity, key, value, meta) => {
@@ -5066,7 +5088,7 @@ const converters = {
         key: ['scene_store'],
         convertSet: async (entity, key, value, meta) => {
             const isGroup = entity.constructor.name === 'Group';
-            const groupid = isGroup ? entity.groupID : 0;
+            const groupid = isGroup ? entity.groupID : value.hasOwnProperty('group_id') ? value.group_id : 0;
             let sceneid = value;
             let scenename = null;
             if (typeof value === 'object') {
@@ -5166,7 +5188,7 @@ const converters = {
             }
 
             const isGroup = entity.constructor.name === 'Group';
-            const groupid = isGroup ? entity.groupID : 0;
+            const groupid = isGroup ? entity.groupID : value.hasOwnProperty('group_id') ? value.group_id : 0;
             const sceneid = value.ID;
             const scenename = value.name;
             const transtime = value.hasOwnProperty('transition') ? value.transition : 0;
@@ -6273,11 +6295,13 @@ const converters = {
         convertSet: async (entity, key, value, meta) => {
             switch (key) {
             case 'radar_scene':
-                await tuya.sendDataPointValue(entity, tuya.dataPoints.trsScene, value);
-                return {state: {radar_scene: value}};
+                await tuya.sendDataPointEnum(entity, tuya.dataPoints.trsScene, utils.getKey(tuya.tuyaRadar.radarScene, value));
+                break;
             case 'radar_sensitivity':
                 await tuya.sendDataPointValue(entity, tuya.dataPoints.trsSensitivity, value);
-                return {state: {radar_sensitivity: value}};
+                break;
+            default: // Unknown Key
+                meta.logger.warn(`toZigbee.tuya_radar_sensor: Unhandled Key ${key}`);
             }
         },
     },

package/devices/hive.js

@@ -2,9 +2,9 @@ const exposes = require('../lib/exposes');
 const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/legacy').fromZigbee};
 const tz = require('../converters/toZigbee');
 const globalStore = require('../lib/store');
-const constants = require('../lib/constants');
 const reporting = require('../lib/reporting');
 const extend = require('../lib/extend');
+const {extendDevice} = require('../lib/utils');
 const e = exposes.presets;
 const ea = exposes.access;
 
@@ -149,130 +149,12 @@ module.exports = [
             }
         },
     },
-    {
-        // TRV001 is the same as Danfoss Ally (eTRV0100) and Popp eT093WRO. If implementing anything, please consider
-        // changing those two too.
+    extendDevice(require('./danfoss'), '014G2461', {
         zigbeeModel: ['TRV001'],
         model: 'UK7004240',
         vendor: 'Hive',
-        description: 'Radiator valve based on Danfos Ally',
-        fromZigbee: [fz.battery, fz.thermostat, fz.thermostat_weekly_schedule, fz.hvac_user_interface, fz.danfoss_thermostat],
-        toZigbee: [tz.danfoss_thermostat_occupied_heating_setpoint, tz.thermostat_local_temperature, tz.danfoss_mounted_mode_active,
-            tz.danfoss_mounted_mode_control, tz.danfoss_thermostat_vertical_orientation, tz.danfoss_algorithm_scale_factor,
-            tz.danfoss_heat_available, tz.danfoss_heat_required, tz.danfoss_day_of_week, tz.danfoss_trigger_time,
-            tz.danfoss_window_open_internal, tz.danfoss_window_open_external, tz.danfoss_load_estimate,
-            tz.danfoss_viewing_direction, tz.danfoss_external_measured_room_sensor, tz.thermostat_keypad_lockout,
-            tz.thermostat_system_mode, tz.danfoss_load_balancing_enable, tz.danfoss_load_room_mean,
-            tz.thermostat_weekly_schedule, tz.thermostat_clear_weekly_schedule, tz.thermostat_programming_operation_mode],
-        exposes: [e.battery(), e.keypad_lockout(), e.programming_operation_mode(),
-            exposes.binary('mounted_mode_active', ea.STATE_GET, true, false)
-                .withDescription('Is the unit in mounting mode. This is set to `false` for mounted (already on ' +
-                    'the radiator) or `true` for not mounted (after factory reset)'),
-            exposes.binary('mounted_mode_control', ea.ALL, true, false)
-                .withDescription('Set the unit mounting mode. `false` Go to Mounted Mode or `true` Go to Mounting Mode'),
-            exposes.binary('thermostat_vertical_orientation', ea.ALL, true, false)
-                .withDescription('Thermostat Orientation. This is important for the PID in how it assesses temperature. ' +
-                    '`false` Horizontal or `true` Vertical'),
-            exposes.binary('viewing_direction', ea.ALL, true, false)
-                .withDescription('Viewing/Display Direction. `false` Horizontal or `true` Vertical'),
-            exposes.binary('heat_available', ea.ALL, true, false)
-                .withDescription('Not clear how this affects operation. `false` No Heat Available or `true` Heat Available'),
-            exposes.binary('heat_required', ea.STATE_GET, true, false)
-                .withDescription('Whether or not the unit needs warm water. `false` No Heat Request or `true` Heat Request'),
-            exposes.enum('setpoint_change_source', ea.STATE, ['manual', 'schedule', 'externally'])
-                .withDescription('Values observed are `0` (manual), `1` (schedule) or `2` (externally)'),
-            exposes.climate().withSetpoint('occupied_heating_setpoint', 5, 32, 0.5).withLocalTemperature().withPiHeatingDemand()
-                .withSystemMode(['heat']).withRunningState(['idle', 'heat'], ea.STATE),
-            exposes.numeric('external_measured_room_sensor', ea.ALL)
-                .withDescription('Set at maximum 3 hours interval but not more often than every 30 minutes and 0.1 ' +
-                    'degrees difference. Resets every 3hours to standard. e.g. 21C = 2100 (-8000=undefined).')
-                .withValueMin(-8000).withValueMax(3500),
-            exposes.numeric('window_open_internal', ea.STATE_GET).withValueMin(0).withValueMax(4)
-                .withDescription('0=Quarantine, 1=Windows are closed, 2=Hold - Windows are maybe about to open, ' +
-                    '3=Open window detected, 4=In window open state from external but detected closed locally'),
-            exposes.binary('window_open_external', ea.ALL, true, false)
-                .withDescription('Set if the window is open or close. This setting will trigger a change in the internal ' +
-                    'window and heating demand. `false` (windows are closed) or `true` (windows are open)'),
-            exposes.enum('day_of_week', ea.ALL,
-                ['sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'away_or_vacation'])
-                .withDescription('Exercise day of week: 0=Sun...6=Sat, 7=undefined'),
-            exposes.numeric('trigger_time', ea.ALL).withValueMin(0).withValueMax(65535)
-                .withDescription('Exercise trigger time. Minutes since midnight (65535=undefined). Range 0 to 1439'),
-            exposes.numeric('algorithm_scale_factor', ea.ALL).withValueMin(1).withValueMax(10)
-                .withDescription('Scale factor of setpoint filter timeconstant ("aggressiveness" of control algorithm) '+
-                    '1= Quick ...  5=Moderate ... 10=Slow'),
-            exposes.binary('load_balancing_enable', ea.ALL, true, false)
-                .withDescription('Whether or not the thermostat acts as standalone thermostat or shares load with other ' +
-                    'thermostats in the room. The gateway must update load_room_mean if enabled.'),
-            exposes.numeric('load_room_mean', ea.ALL)
-                .withDescription('Mean radiator load for room calculated by gateway for load balancing purposes (-8000=undefined)')
-                .withValueMin(-8000).withValueMax(2000),
-            exposes.numeric('load_estimate', ea.STATE_GET)
-                .withDescription('Load estimate on this radiator')],
-        configure: async (device, coordinatorEndpoint, logger) => {
-            const endpoint = device.getEndpoint(1);
-            const options = {manufacturerCode: 0x1246};
-            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg', 'hvacThermostat']);
-
-            // standard ZCL attributes
-            await reporting.batteryPercentageRemaining(endpoint);
-            await reporting.thermostatTemperature(endpoint);
-            await reporting.thermostatPIHeatingDemand(endpoint);
-            await reporting.thermostatOccupiedHeatingSetpoint(endpoint);
-
-            // danfoss attributes
-            await endpoint.configureReporting('hvacThermostat', [{
-                attribute: 'danfossMountedModeActive',
-                minimumReportInterval: constants.repInterval.MINUTE,
-                maximumReportInterval: constants.repInterval.MAX,
-                reportableChange: 1,
-            }], options);
-            await endpoint.configureReporting('hvacThermostat', [{
-                attribute: 'danfossWindowOpenInternal',
-                minimumReportInterval: constants.repInterval.MINUTE,
-                maximumReportInterval: constants.repInterval.HOUR,
-                reportableChange: 1,
-            }], options);
-            await endpoint.configureReporting('hvacThermostat', [{
-                attribute: 'danfossHeatRequired',
-                minimumReportInterval: constants.repInterval.MINUTE,
-                maximumReportInterval: constants.repInterval.HOUR,
-                reportableChange: 1,
-            }], options);
-            await endpoint.configureReporting('hvacThermostat', [{
-                attribute: 'danfossExternalMeasuredRoomSensor',
-                minimumReportInterval: constants.repInterval.MINUTE,
-                maximumReportInterval: constants.repInterval.MAX,
-                reportableChange: 1,
-            }], options);
-
-            await endpoint.read('hvacThermostat', [
-                'danfossWindowOpenExternal',
-                'danfossDayOfWeek',
-                'danfossTriggerTime',
-                'danfossAlgorithmScaleFactor',
-                'danfossHeatAvailable',
-                'danfossMountedModeControl',
-                'danfossMountedModeActive',
-                'danfossExternalMeasuredRoomSensor',
-                'danfossLoadBalancingEnable',
-                'danfossLoadRoomMean',
-            ], options);
-
-            // read systemMode to have an initial value
-            await endpoint.read('hvacThermostat', ['systemMode']);
-
-            // read keypadLockout, we don't need reporting as it cannot be set physically on the device
-            await endpoint.read('hvacUserInterfaceCfg', ['keypadLockout']);
-
-            // Seems that it is bug in Danfoss, device does not asks for the time with binding
-            // So, we need to write time during configure (same as for HEIMAN devices)
-            const time = Math.round(((new Date()).getTime() - constants.OneJanuary2000) / 1000);
-            // Time-master + synchronised
-            const values = {timeStatus: 3, time: time, timeZone: ((new Date()).getTimezoneOffset() * -1) * 60};
-            endpoint.write('genTime', values);
-        },
-    },
+        description: 'Radiator valve based on Danfoss Ally (014G2461)',
+    }),
     {
         zigbeeModel: ['SLR1'],
         model: 'SLR1',

package/devices/ledvance.js

@@ -3,6 +3,13 @@ const extend = require('../lib/extend');
 const reporting = require('../lib/reporting');
 
 module.exports = [
+    {
+        zigbeeModel: ['A60S TW'],
+        model: 'AC33898',
+        vendor: 'LEDVANCE',
+        description: ' Smart+ LED classic E27 Zigbee 10W/810lm',
+        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}),
+    },
     {
         zigbeeModel: ['Outdoor Plug', 'Plug Value'],
         model: 'AC26940/AC31266',

package/devices/popp.js

@@ -1,136 +1,10 @@
-const exposes = require('../lib/exposes');
-const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/legacy').fromZigbee};
-const tz = require('../converters/toZigbee');
-const ota = require('../lib/ota');
-const constants = require('../lib/constants');
-const reporting = require('../lib/reporting');
-const e = exposes.presets;
-const ea = exposes.access;
+const {extendDevice} = require('../lib/utils');
 
 module.exports = [
-    {
-        // eT093WRO is the same as Hive TRV001 and Danfoss Ally (eTRV0100). If implementing anything, please consider
-        // changing those two too.
+    extendDevice(require('./danfoss'), '014G2461', {
         zigbeeModel: ['eT093WRO'],
         model: '701721',
         vendor: 'Popp',
-        description: 'Smart thermostat',
-        fromZigbee: [fz.battery, fz.thermostat, fz.thermostat_weekly_schedule, fz.hvac_user_interface, fz.danfoss_thermostat],
-        toZigbee: [tz.danfoss_thermostat_occupied_heating_setpoint, tz.thermostat_local_temperature, tz.danfoss_mounted_mode_active,
-            tz.danfoss_mounted_mode_control, tz.danfoss_thermostat_vertical_orientation, tz.danfoss_algorithm_scale_factor,
-            tz.danfoss_heat_available, tz.danfoss_heat_required, tz.danfoss_day_of_week, tz.danfoss_trigger_time,
-            tz.danfoss_window_open_internal, tz.danfoss_window_open_external, tz.danfoss_load_estimate,
-            tz.danfoss_viewing_direction, tz.danfoss_external_measured_room_sensor, tz.thermostat_keypad_lockout,
-            tz.thermostat_system_mode, tz.danfoss_load_balancing_enable, tz.danfoss_load_room_mean,
-            tz.thermostat_weekly_schedule, tz.thermostat_clear_weekly_schedule, tz.thermostat_programming_operation_mode],
-        exposes: [e.battery(), e.keypad_lockout(), e.programming_operation_mode(),
-            exposes.binary('mounted_mode_active', ea.STATE_GET, true, false)
-                .withDescription('Is the unit in mounting mode. This is set to `false` for mounted (already on ' +
-                    'the radiator) or `true` for not mounted (after factory reset)'),
-            exposes.binary('mounted_mode_control', ea.ALL, true, false)
-                .withDescription('Set the unit mounting mode. `false` Go to Mounted Mode or `true` Go to Mounting Mode'),
-            exposes.binary('thermostat_vertical_orientation', ea.ALL, true, false)
-                .withDescription('Thermostat Orientation. This is important for the PID in how it assesses temperature. ' +
-                    '`false` Horizontal or `true` Vertical'),
-            exposes.binary('viewing_direction', ea.ALL, true, false)
-                .withDescription('Viewing/Display Direction. `false` Horizontal or `true` Vertical'),
-            exposes.binary('heat_available', ea.ALL, true, false)
-                .withDescription('Not clear how this affects operation. `false` No Heat Available or `true` Heat Available'),
-            exposes.binary('heat_required', ea.STATE_GET, true, false)
-                .withDescription('Whether or not the unit needs warm water. `false` No Heat Request or `true` Heat Request'),
-            exposes.enum('setpoint_change_source', ea.STATE, ['manual', 'schedule', 'externally'])
-                .withDescription('Values observed are `0` (manual), `1` (schedule) or `2` (externally)'),
-            exposes.climate().withSetpoint('occupied_heating_setpoint', 5, 32, 0.5).withLocalTemperature().withPiHeatingDemand()
-                .withSystemMode(['heat']).withRunningState(['idle', 'heat'], ea.STATE),
-            exposes.numeric('external_measured_room_sensor', ea.ALL)
-                .withDescription('Set at maximum 3 hours interval but not more often than every 30 minutes and 0.1 ' +
-                    'degrees difference. Resets every 3hours to standard. e.g. 21C = 2100 (-8000=undefined).')
-                .withValueMin(-8000).withValueMax(3500),
-            exposes.numeric('window_open_internal', ea.STATE_GET).withValueMin(0).withValueMax(4)
-                .withDescription('0=Quarantine, 1=Windows are closed, 2=Hold - Windows are maybe about to open, ' +
-                    '3=Open window detected, 4=In window open state from external but detected closed locally'),
-            exposes.binary('window_open_external', ea.ALL, true, false)
-                .withDescription('Set if the window is open or close. This setting will trigger a change in the internal ' +
-                    'window and heating demand. `false` (windows are closed) or `true` (windows are open)'),
-            exposes.enum('day_of_week', ea.ALL,
-                ['sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'away_or_vacation'])
-                .withDescription('Exercise day of week: 0=Sun...6=Sat, 7=undefined'),
-            exposes.numeric('trigger_time', ea.ALL).withValueMin(0).withValueMax(65535)
-                .withDescription('Exercise trigger time. Minutes since midnight (65535=undefined). Range 0 to 1439'),
-            exposes.numeric('algorithm_scale_factor', ea.ALL).withValueMin(1).withValueMax(10)
-                .withDescription('Scale factor of setpoint filter timeconstant ("aggressiveness" of control algorithm) '+
-                    '1= Quick ...  5=Moderate ... 10=Slow'),
-            exposes.binary('load_balancing_enable', ea.ALL, true, false)
-                .withDescription('Whether or not the thermostat acts as standalone thermostat or shares load with other ' +
-                    'thermostats in the room. The gateway must update load_room_mean if enabled.'),
-            exposes.numeric('load_room_mean', ea.ALL)
-                .withDescription('Mean radiator load for room calculated by gateway for load balancing purposes (-8000=undefined)')
-                .withValueMin(-8000).withValueMax(2000),
-            exposes.numeric('load_estimate', ea.STATE_GET)
-                .withDescription('Load estimate on this radiator')],
-        ota: ota.zigbeeOTA,
-        configure: async (device, coordinatorEndpoint, logger) => {
-            const endpoint = device.getEndpoint(1);
-            const options = {manufacturerCode: 0x1246};
-            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg', 'hvacThermostat']);
-
-            // standard ZCL attributes
-            await reporting.batteryPercentageRemaining(endpoint);
-            await reporting.thermostatTemperature(endpoint);
-            await reporting.thermostatPIHeatingDemand(endpoint);
-            await reporting.thermostatOccupiedHeatingSetpoint(endpoint);
-
-            // danfoss attributes
-            await endpoint.configureReporting('hvacThermostat', [{
-                attribute: 'danfossMountedModeActive',
-                minimumReportInterval: constants.repInterval.MINUTE,
-                maximumReportInterval: constants.repInterval.MAX,
-                reportableChange: 1,
-            }], options);
-            await endpoint.configureReporting('hvacThermostat', [{
-                attribute: 'danfossWindowOpenInternal',
-                minimumReportInterval: constants.repInterval.MINUTE,
-                maximumReportInterval: constants.repInterval.HOUR,
-                reportableChange: 1,
-            }], options);
-            await endpoint.configureReporting('hvacThermostat', [{
-                attribute: 'danfossHeatRequired',
-                minimumReportInterval: constants.repInterval.MINUTE,
-                maximumReportInterval: constants.repInterval.HOUR,
-                reportableChange: 1,
-            }], options);
-            await endpoint.configureReporting('hvacThermostat', [{
-                attribute: 'danfossExternalMeasuredRoomSensor',
-                minimumReportInterval: constants.repInterval.MINUTE,
-                maximumReportInterval: constants.repInterval.MAX,
-                reportableChange: 1,
-            }], options);
-
-            await endpoint.read('hvacThermostat', [
-                'danfossWindowOpenExternal',
-                'danfossDayOfWeek',
-                'danfossTriggerTime',
-                'danfossAlgorithmScaleFactor',
-                'danfossHeatAvailable',
-                'danfossMountedModeControl',
-                'danfossMountedModeActive',
-                'danfossExternalMeasuredRoomSensor',
-                'danfossLoadBalancingEnable',
-                'danfossLoadRoomMean',
-            ], options);
-
-            // read systemMode to have an initial value
-            await endpoint.read('hvacThermostat', ['systemMode']);
-
-            // read keypadLockout, we don't need reporting as it cannot be set physically on the device
-            await endpoint.read('hvacUserInterfaceCfg', ['keypadLockout']);
-
-            // Seems that it is bug in Danfoss, device does not asks for the time with binding
-            // So, we need to write time during configure (same as for HEIMAN devices)
-            const time = Math.round(((new Date()).getTime() - constants.OneJanuary2000) / 1000);
-            // Time-master + synchronised
-            const values = {timeStatus: 3, time: time, timeZone: ((new Date()).getTimezoneOffset() * -1) * 60};
-            endpoint.write('genTime', values);
-        },
-    },
+        description: 'Smart thermostat based on Danfoss Ally (014G2461)',
+    }),
 ];

package/devices/tuya.js

@@ -1658,7 +1658,7 @@ module.exports = [
         vendor: 'TuYa',
         description: 'Temperature & humidity & illuminance sensor with display',
         fromZigbee: [fz.battery, fz.illuminance, fz.temperature, fz.humidity, fz.ts0201_temperature_humidity_alarm],
-        toZigbee: [],
+        toZigbee: [tz.ts0201_temperature_humidity_alarm],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             // Enables reporting of measurement state changes
@@ -1667,10 +1667,14 @@ module.exports = [
                 'msTemperatureMeasurement', 'msIlluminanceMeasurement', 'msRelativeHumidity', 'manuSpecificTuya_2']);
         },
         exposes: [e.temperature(), e.humidity(), e.battery(), e.illuminance(), e.illuminance_lux(),
-            exposes.numeric('alarm_temperature_max', ea.STATE).withUnit('°C').withDescription('Alarm temperature max'),
-            exposes.numeric('alarm_temperature_min', ea.STATE).withUnit('°C').withDescription('Alarm temperature min'),
-            exposes.numeric('alarm_humidity_max', ea.STATE).withUnit('%').withDescription('Alarm humidity max'),
-            exposes.numeric('alarm_humidity_min', ea.STATE).withUnit('%').withDescription('Alarm humidity min'),
+            exposes.numeric('alarm_temperature_max', ea.STATE_SET).withUnit('°C').withDescription('Alarm temperature max')
+                .withValueMin(-20).withValueMax(80),
+            exposes.numeric('alarm_temperature_min', ea.STATE_SET).withUnit('°C').withDescription('Alarm temperature min')
+                .withValueMin(-20).withValueMax(80),
+            exposes.numeric('alarm_humidity_max', ea.STATE_SET).withUnit('%').withDescription('Alarm humidity max')
+                .withValueMin(0).withValueMax(100),
+            exposes.numeric('alarm_humidity_min', ea.STATE_SET).withUnit('%').withDescription('Alarm humidity min')
+                .withValueMin(0).withValueMax(100),
             exposes.enum('alarm_humidity', ea.STATE, ['below_min_humdity', 'over_humidity', 'off'])
                 .withDescription('Alarm humidity status'),
             exposes.enum('alarm_temperature', ea.STATE, ['below_min_temperature', 'over_temperature', 'off'])
@@ -1708,17 +1712,16 @@ module.exports = [
         model: 'MIR-HE200-TY',
         vendor: 'TuYa',
         description: 'Human presence sensor',
-        fromZigbee: [fz.ignore_basic_report, fz.tuya_radar_sensor],
+        fromZigbee: [fz.tuya_radar_sensor],
         toZigbee: [tz.tuya_radar_sensor],
         exposes: [
-            e.illuminance_lux(), e.presence(),
-            exposes.binary('motion', ea.STATE, [true, false]).withDescription('moving inside the range of the sensor'),
+            e.illuminance_lux(), e.presence(), e.occupancy(),
             exposes.numeric('motion_speed', ea.STATE).withDescription('Speed of movement'),
-            exposes.enum('motion_direction', ea.STATE, ['standing_still', 'moving_forward', 'moving_backward'])
+            exposes.enum('motion_direction', ea.STATE, Object.values(tuya.tuyaRadar.motionDirection))
                 .withDescription('direction of movement from the point of view of the radar'),
             exposes.numeric('radar_sensitivity', ea.STATE_SET).withValueMin(0).withValueMax(10).withValueStep(1)
                 .withDescription('sensitivity of the radar'),
-            exposes.enum('radar_scene', ea.STATE_SET, ['default', 'area', 'toilet', 'bedroom', 'parlour', 'office', 'hotel'])
+            exposes.enum('radar_scene', ea.STATE_SET, Object.values(tuya.tuyaRadar.radarScene))
                 .withDescription('presets for sensitivity for presence and movement'),
         ],
     },

package/devices/xiaomi.js

@@ -923,6 +923,10 @@ module.exports = [
         fromZigbee: [fz.xiaomi_battery, fz.xiaomi_contact, fz.xiaomi_contact_interval],
         toZigbee: [],
         exposes: [e.battery(), e.contact(), e.temperature(), e.battery_voltage()],
+        configure: async (device) => {
+            device.powerSource = 'Battery';
+            device.save();
+        },
     },
     {
         zigbeeModel: ['lumi.sensor_wleak.aq1'],

package/lib/tuya.js

@@ -600,6 +600,24 @@ const fanModes = {
     3: 'auto',
 };
 
+// Radar sensor lookups
+const tuyaRadar = {
+    radarScene: {
+        0: 'default',
+        1: 'area',
+        2: 'toilet',
+        3: 'bedroom',
+        4: 'parlour',
+        5: 'office',
+        6: 'hotel',
+    },
+    motionDirection: {
+        0: 'standing_still',
+        1: 'moving_forward',
+        2: 'moving_backward',
+    },
+};
+
 // Motion sensor lookups
 const msLookups = {
     OSensitivity: {
@@ -781,4 +799,5 @@ module.exports = {
     msLookups,
     tvThermostatMode,
     tvThermostatPreset,
+    tuyaRadar,
 };

package/lib/utils.js

@@ -376,6 +376,14 @@ function normalizeCelsiusVersionOfFahrenheit(value) {
     return ((roundedFahrenheit - 32)/1.8).toFixed(2);
 }
 
+function extendDevice(deviceConfigs, modelName, adjustments) {
+    const baseDevice = deviceConfigs.find((device) => device.model === modelName);
+    if (typeof baseDevice !== 'object') {
+        throw Error(`Could not find model ${modelName} in provided device list`);
+    }
+    return {...baseDevice, ...adjustments};
+}
+
 module.exports = {
     getOptions,
     isLegacyEnabled,
@@ -406,4 +414,5 @@ module.exports = {
     normalizeCelsiusVersionOfFahrenheit,
     deleteSceneState,
     getSceneState,
+    extendDevice,
 };