zigbee-herdsman-converters 14.0.335 → 14.0.339

package/converters/fromZigbee.js

@@ -2318,20 +2318,20 @@ const converters = {
             exposes.options.precision('humidity'), exposes.options.calibration('humidity')],
         convert: (model, msg, publish, options, meta) => {
             const dp = msg.data.dp;
-            if (dp === 101) return {occupancy: msg.data.data[0] > 0};
+            const value = tuya.getDataValue(msg.data.datatype, msg.data.data);
+
+            if (dp === 101) return {occupancy: value > 0 ? true : false};
             else if (dp === 102) {
-                const value = msg.data.data[0];
                 return {
                     power_type: {0: 'battery_full', 1: 'battery_high', 2: 'battery_medium', 3: 'battery_low', 4: 'usb'}[value],
                     battery_low: value === 3,
                 };
             } else if (dp === 103) {
-                return {tamper: msg.data.data[0] > 0 ? true : false};
+                return {tamper: value > 0 ? true : false};
             } else if (dp === 104) {
-                const temperature = parseFloat(msg.data.data[3]) / 10.0;
-                return {temperature: calibrateAndPrecisionRoundOptions(temperature, options, 'temperature')};
+                return {temperature: calibrateAndPrecisionRoundOptions(value / 10, options, 'temperature')};
             } else if (dp === 105) {
-                return {humidity: calibrateAndPrecisionRoundOptions(msg.data.data[3], options, 'humidity')};
+                return {humidity: calibrateAndPrecisionRoundOptions(value, options, 'humidity')};
             } else {
                 meta.logger.warn(`zigbee-herdsman-converters:NEO-PD07: NOT RECOGNIZED DP #${dp} with data ${JSON.stringify(msg.data)}`);
             }
@@ -2471,7 +2471,7 @@ const converters = {
                 buttonMapping = {1: '1', 2: '2'};
             } else if (model.model === 'TS0043') {
                 buttonMapping = {1: '1', 2: '2', 3: '3'};
-            } else if (['TS0044', 'YSR-MINI-Z'].includes(model.model)) {
+            } else if (['TS0044', 'YSR-MINI-Z', 'TS004F'].includes(model.model)) {
                 buttonMapping = {1: '1', 2: '2', 3: '3', 4: '4'};
             }
             const button = buttonMapping ? `${buttonMapping[msg.endpoint.ID]}_` : '';
@@ -7510,6 +7510,44 @@ const converters = {
             }
         },
     },
+    sunricher_switch2801K2: {
+        cluster: 'greenPower',
+        type: ['commandNotification', 'commandCommisioningNotification'],
+        convert: (model, msg, publish, options, meta) => {
+            const commandID = msg.data.commandID;
+            if (hasAlreadyProcessedMessage(msg, msg.data.frameCounter, `${msg.device.ieeeAddr}_${commandID}`)) return;
+            if (commandID === 224) return;
+            const lookup = {0x21: 'press_on', 0x20: 'press_off', 0x34: 'release', 0x35: 'hold_on', 0x36: 'hold_off'};
+            if (!lookup.hasOwnProperty(commandID)) {
+                meta.logger.error(`Sunricher: missing command '${commandID}'`);
+            } else {
+                return {action: lookup[commandID]};
+            }
+        },
+    },
+    sunricher_switch2801K4: {
+        cluster: 'greenPower',
+        type: ['commandNotification', 'commandCommisioningNotification'],
+        convert: (model, msg, publish, options, meta) => {
+            const commandID = msg.data.commandID;
+            if (hasAlreadyProcessedMessage(msg, msg.data.frameCounter, `${msg.device.ieeeAddr}_${commandID}`)) return;
+            if (commandID === 224) return;
+            const lookup = {
+                0x21: 'press_on',
+                0x20: 'press_off',
+                0x37: 'press_high',
+                0x38: 'press_low',
+                0x35: 'hold_high',
+                0x36: 'hold_low',
+                0x34: 'release',
+            };
+            if (!lookup.hasOwnProperty(commandID)) {
+                meta.logger.error(`Sunricher: missing command '${commandID}'`);
+            } else {
+                return {action: lookup[commandID]};
+            }
+        },
+    },
     // #endregion
 
     // #region Ignore converters (these message dont need parsing).

package/devices/acova.js

@@ -0,0 +1,34 @@
+const exposes = require('../lib/exposes');
+const fz = require('../converters/fromZigbee');
+const tz = require('../converters/toZigbee');
+const reporting = require('../lib/reporting');
+
+module.exports = [{
+    zigbeeModel: ['PERCALE2 D1.00P1.01Z1.00'],
+    model: 'PERCALE2',
+    vendor: 'Acova',
+    description: 'Percale 2 heater',
+    fromZigbee: [fz.thermostat, fz.hvac_user_interface],
+    toZigbee: [
+        tz.thermostat_local_temperature,
+        tz.thermostat_system_mode,
+        tz.thermostat_occupied_heating_setpoint,
+        tz.thermostat_unoccupied_heating_setpoint,
+        tz.thermostat_occupied_cooling_setpoint,
+        tz.thermostat_running_state,
+    ],
+    exposes: [
+        exposes.climate()
+            .withSetpoint('occupied_heating_setpoint', 7, 28, 0.5)
+            .withLocalTemperature()
+            .withSystemMode(['off', 'heat', 'auto'])
+            .withRunningState(['idle', 'heat']),
+    ],
+    configure: async (device, coordinatorEndpoint, logger) => {
+        const endpoint = device.getEndpoint(1);
+        await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg', 'hvacThermostat']);
+        await reporting.thermostatTemperature(endpoint);
+        await reporting.thermostatOccupiedHeatingSetpoint(endpoint);
+        await reporting.thermostatUnoccupiedHeatingSetpoint(endpoint);
+    },
+}];

package/devices/custom_devices_diy.js

@@ -233,4 +233,40 @@ module.exports = [
         },
         exposes: [e.soil_moisture(), e.battery(), e.temperature()],
     },
+    {
+        zigbeeModel: ['EFEKTA_eON213z'],
+        model: 'EFEKTA_eON213z',
+        vendor: 'Custom devices (DiY)',
+        description: '[Temperature and humidity sensor with e-ink2.13](http://efektalab.com/eON213z)',
+        fromZigbee: [fz.temperature, fz.humidity, fz.battery],
+        toZigbee: [tz.factory_reset],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, [
+                'genPowerCfg', 'msTemperatureMeasurement', 'msRelativeHumidity']);
+            const overides = {min: 0, max: 21600, change: 0};
+            await reporting.batteryVoltage(endpoint, overides);
+            await reporting.batteryPercentageRemaining(endpoint, overides);
+            await reporting.temperature(endpoint, overides);
+            await reporting.humidity(endpoint, overides);
+        },
+        exposes: [e.battery(), e.temperature(), e.humidity()],
+    },
+    {
+        zigbeeModel: ['EFEKTA_miniPWS'],
+        model: 'EFEKTA_miniPWS',
+        vendor: 'Custom devices (DiY)',
+        description: '[Mini plant wattering sensor](http://efektalab.com/miniPWS)',
+        fromZigbee: [fz.soil_moisture, fz.battery],
+        toZigbee: [tz.factory_reset],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const firstEndpoint = device.getEndpoint(1);
+            await reporting.bind(firstEndpoint, coordinatorEndpoint, ['genPowerCfg', 'msSoilMoisture']);
+            const overides = {min: 0, max: 21600, change: 0};
+            await reporting.batteryVoltage(firstEndpoint, overides);
+            await reporting.batteryPercentageRemaining(firstEndpoint, overides);
+            await reporting.soil_moisture(firstEndpoint, overides);
+        },
+        exposes: [e.soil_moisture(), e.battery()],
+    },
 ];

package/devices/danfoss.js

@@ -34,7 +34,9 @@ module.exports = [
             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'),
+                .withDescription('Not clear how this affects operation. However, it would appear that the device does not execute any ' +
+                    'motor functions if this is set to false. This may be a means to conserve battery during periods that the heating ' +
+                    'system is not energized (e.g. during summer). `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'])
@@ -42,8 +44,9 @@ module.exports = [
             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 at every 100 ' +
-                    'value change. Resets every 3hours to standard. e.g. 21C = 2100 (-8000=undefined).'),
+                .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'),
@@ -62,7 +65,8 @@ module.exports = [
                 .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'),
+                .withDescription('Mean radiator load for room calculated by gateway for load balancing purposes (-8000=undefined)')
+                .withValueMin(-8000).withValueMax(100),
             exposes.numeric('load_estimate', ea.STATE_GET)
                 .withDescription('Load estimate on this radiator')],
         ota: ota.zigbeeOTA,

package/devices/develco.js

@@ -318,7 +318,7 @@ module.exports = [
                 ['electricity', 'gas', 'water', 'kamstrup-kmp', 'linky', 'IEC62056-21', 'DSMR-2.3', 'DSMR-4.0'])
                 .withDescription('Operating mode/probe'),
             exposes.numeric('current_summation', ea.SET)
-                .withDescription('Current summation value sent to the display. e.g. 570 = 0,570 kWh'),
+                .withDescription('Current summation value sent to the display. e.g. 570 = 0,570 kWh').withValueMin(0).withValueMax(10000),
             exposes.binary('check_meter', ea.STATE, true, false)
                 .withDescription('Is true if communication problem with meter is experienced'),
         ],

package/devices/diyruz.js

@@ -150,11 +150,13 @@ module.exports = [
             exposes.numeric('radiation_dose_per_hour', ea.STATE).withUnit('μR/h').withDescription('Current radiation level'),
             exposes.binary('led_feedback', ea.ALL, 'ON', 'OFF').withDescription('Enable LED feedback'),
             exposes.binary('buzzer_feedback', ea.ALL, 'ON', 'OFF').withDescription('Enable buzzer feedback'),
-            exposes.numeric('alert_threshold', ea.ALL).withUnit('μR/h').withDescription('Critical radiation level'),
+            exposes.numeric('alert_threshold', ea.ALL).withUnit('μR/h').withDescription('Critical radiation level')
+                .withValueMin(0).withValueMax(10000),
             exposes.enum('sensors_type', ea.ALL, ['СБМ-20/СТС-5/BOI-33', 'СБМ-19/СТС-6', 'Others'])
                 .withDescription('Type of installed tubes'),
-            exposes.numeric('sensors_count', ea.ALL).withDescription('Count of installed tubes'),
-            exposes.numeric('sensitivity', ea.ALL).withDescription('This is applicable if tubes type is set to other')],
+            exposes.numeric('sensors_count', ea.ALL).withDescription('Count of installed tubes').withValueMin(0).withValueMax(50),
+            exposes.numeric('sensitivity', ea.ALL).withDescription('This is applicable if tubes type is set to other')
+                .withValueMin(0).withValueMax(100)],
         toZigbee: [tz.diyruz_geiger_config, tz.factory_reset],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
@@ -250,11 +252,16 @@ module.exports = [
         exposes: [e.co2(), e.temperature(), e.humidity(), e.pressure(),
             exposes.binary('led_feedback', ea.ALL, 'ON', 'OFF').withDescription('Enable LEDs feedback'),
             exposes.binary('enable_abc', ea.ALL, 'ON', 'OFF').withDescription('Enable ABC (Automatic Baseline Correction)'),
-            exposes.numeric('threshold1', ea.ALL).withUnit('ppm').withDescription('Warning (LED2) CO2 level'),
-            exposes.numeric('threshold2', ea.ALL).withUnit('ppm').withDescription('Critical (LED3) CO2 level'),
-            exposes.numeric('temperature_offset', ea.ALL).withUnit('°C').withDescription('Adjust temperature'),
-            exposes.numeric('humidity_offset', ea.ALL).withUnit('%').withDescription('Adjust humidity'),
-            exposes.numeric('pressure_offset', ea.ALL).withUnit('hPa').withDescription('Adjust pressure')],
+            exposes.numeric('threshold1', ea.ALL).withUnit('ppm').withDescription('Warning (LED2) CO2 level')
+                .withValueMin(0).withValueMax(50000),
+            exposes.numeric('threshold2', ea.ALL).withUnit('ppm').withDescription('Critical (LED3) CO2 level')
+                .withValueMin(0).withValueMax(50000),
+            exposes.numeric('temperature_offset', ea.ALL).withUnit('°C').withDescription('Adjust temperature')
+                .withValueMin(-20).withValueMax(20),
+            exposes.numeric('humidity_offset', ea.ALL).withUnit('%').withDescription('Adjust humidity')
+                .withValueMin(-50).withValueMax(50),
+            exposes.numeric('pressure_offset', ea.ALL).withUnit('hPa').withDescription('Adjust pressure')
+                .withValueMin(-1000).withValueMax(1000)],
     },
     {
         zigbeeModel: ['DIY_Zintercom'],
@@ -282,15 +289,15 @@ module.exports = [
             exposes.binary('sound', ea.ALL, 'ON', 'OFF').withProperty('sound')
                 .withDescription('Enable or disable sound'),
             exposes.numeric('time_ring', ea.ALL).withUnit('sec')
-                .withDescription('Time to ring before answer'),
+                .withDescription('Time to ring before answer').withValueMin(0).withValueMax(600),
             exposes.numeric('time_talk', ea.ALL).withUnit('sec')
-                .withDescription('Time to hold before open'),
+                .withDescription('Time to hold before open').withValueMin(0).withValueMax(600),
             exposes.numeric('time_open', ea.ALL).withUnit('sec')
-                .withDescription('Time to open before end'),
+                .withDescription('Time to open before end').withValueMin(0).withValueMax(600),
             exposes.numeric('time_bell', ea.ALL).withUnit('sec')
-                .withDescription('Time after last bell to finish ring'),
+                .withDescription('Time after last bell to finish ring').withValueMin(0).withValueMax(600),
             exposes.numeric('time_report', ea.ALL).withUnit('min')
-                .withDescription('Reporting interval'),
+                .withDescription('Reporting interval').withValueMin(0).withValueMax(1440),
             e.battery(),
         ],
     },

package/devices/fantem.js

@@ -29,10 +29,14 @@ module.exports = [
         fromZigbee: [fz.battery, fz.ignore_basic_report, fz.illuminance, fz.ZB003X, fz.ZB003X_attr, fz.ZB003X_occupancy],
         toZigbee: [tz.ZB003X],
         exposes: [e.occupancy(), e.tamper(), e.battery(), e.illuminance(), e.illuminance_lux().withUnit('lx'), e.temperature(),
-            e.humidity(), exposes.numeric('reporting_time', ea.STATE_SET).withDescription('Reporting interval in minutes'),
-            exposes.numeric('temperature_calibration', ea.STATE_SET).withDescription('Temperature calibration'),
-            exposes.numeric('humidity_calibration', ea.STATE_SET).withDescription('Humidity calibration'),
-            exposes.numeric('illuminance_calibration', ea.STATE_SET).withDescription('Illuminance calibration'),
+            e.humidity(), exposes.numeric('reporting_time', ea.STATE_SET).withDescription('Reporting interval in minutes')
+                .withValueMin(0).withValueMax(1440),
+            exposes.numeric('temperature_calibration', ea.STATE_SET).withDescription('Temperature calibration')
+                .withValueMin(-20).withValueMax(20),
+            exposes.numeric('humidity_calibration', ea.STATE_SET).withDescription('Humidity calibration')
+                .withValueMin(-50).withValueMax(50),
+            exposes.numeric('illuminance_calibration', ea.STATE_SET).withDescription('Illuminance calibration')
+                .withValueMin(-10000).withValueMax(10000),
             exposes.binary('pir_enable', ea.STATE_SET, true, false).withDescription('Enable PIR sensor'),
             exposes.binary('led_enable', ea.STATE_SET, true, false).withDescription('Enabled LED'),
             exposes.binary('reporting_enable', ea.STATE_SET, true, false).withDescription('Enabled reporting'),

package/devices/gledopto.js

@@ -39,6 +39,27 @@ const gledoptoExtend = {
             [tz.gledopto_light_onoff_brightness, tz.gledopto_light_color_colortemp],
         ),
     }),
+    switch: (options={}) => ({
+        ...extend.switch(options),
+        onEvent: async (type, data, device) => {
+            // This device doesn't support reporting.
+            // Therefore we read the on/off state every 5 seconds.
+            // This is the same way as the Hue bridge does it.
+            if (type === 'stop') {
+                clearInterval(globalStore.getValue(device, 'interval'));
+                globalStore.clearValue(device, 'interval');
+            } else if (!globalStore.hasValue(device, 'interval')) {
+                const interval = setInterval(async () => {
+                    try {
+                        await device.endpoints[0].read('genOnOff', ['onOff']);
+                    } catch (error) {
+                        // Do nothing
+                    }
+                }, 5000);
+                globalStore.putValue(device, 'interval', interval);
+            }
+        },
+    }),
 };
 
 module.exports = [
@@ -580,32 +601,21 @@ module.exports = [
         zigbeeModel: ['GL-G-007Z'],
         model: 'GL-G-007Z',
         vendor: 'Gledopto',
-        description: 'Zigbee 9W Garden Lamp RGB+CCT',
+        description: 'Zigbee 9W garden lamp RGB+CCT',
         extend: gledoptoExtend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['GL-W-001Z'],
         model: 'GL-W-001Z',
         vendor: 'Gledopto',
-        description: 'Zigbee On/Off Wall Switch',
-        extend: extend.switch(),
-        onEvent: async (type, data, device) => {
-            // This device doesn't support reporting.
-            // Therefore we read the on/off state every 5 seconds.
-            // This is the same way as the Hue bridge does it.
-            if (type === 'stop') {
-                clearInterval(globalStore.getValue(device, 'interval'));
-                globalStore.clearValue(device, 'interval');
-            } else if (!globalStore.hasValue(device, 'interval')) {
-                const interval = setInterval(async () => {
-                    try {
-                        await device.endpoints[0].read('genOnOff', ['onOff']);
-                    } catch (error) {
-                        // Do nothing
-                    }
-                }, 5000);
-                globalStore.putValue(device, 'interval', interval);
-            }
-        },
+        description: 'Zigbee on/off wall switch',
+        extend: gledoptoExtend.switch(),
+    },
+    {
+        zigbeeModel: ['GL-SD-002'],
+        model: 'GL-SD-002',
+        vendor: 'Gledopto',
+        description: 'Zigbee 3.0 smart home switch',
+        extend: gledoptoExtend.switch(),
     },
 ];

package/devices/hive.js

@@ -183,8 +183,9 @@ module.exports = [
             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 at every 100 ' +
-                    'value change. Resets every 3hours to standard. e.g. 21C = 2100 (-8000=undefined).'),
+                .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'),
@@ -203,7 +204,8 @@ module.exports = [
                 .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'),
+                .withDescription('Mean radiator load for room calculated by gateway for load balancing purposes (-8000=undefined)')
+                .withValueMin(-8000).withValueMax(100),
             exposes.numeric('load_estimate', ea.STATE_GET)
                 .withDescription('Load estimate on this radiator')],
         configure: async (device, coordinatorEndpoint, logger) => {

package/devices/immax.js

@@ -148,10 +148,14 @@ module.exports = [
         fromZigbee: [fz.battery, fz.ignore_basic_report, fz.illuminance, fz.ZB003X, fz.ZB003X_attr, fz.ZB003X_occupancy],
         toZigbee: [tz.ZB003X],
         exposes: [e.occupancy(), e.tamper(), e.battery(), e.illuminance(), e.illuminance_lux().withUnit('lx'), e.temperature(),
-            e.humidity(), exposes.numeric('reporting_time', ea.STATE_SET).withDescription('Reporting interval in minutes'),
-            exposes.numeric('temperature_calibration', ea.STATE_SET).withDescription('Temperature calibration'),
-            exposes.numeric('humidity_calibration', ea.STATE_SET).withDescription('Humidity calibration'),
-            exposes.numeric('illuminance_calibration', ea.STATE_SET).withDescription('Illuminance calibration'),
+            e.humidity(), exposes.numeric('reporting_time', ea.STATE_SET).withDescription('Reporting interval in minutes')
+                .withValueMin(0).withValueMax(1440),
+            exposes.numeric('temperature_calibration', ea.STATE_SET).withDescription('Temperature calibration')
+                .withValueMin(-20).withValueMax(20),
+            exposes.numeric('humidity_calibration', ea.STATE_SET).withDescription('Humidity calibration')
+                .withValueMin(-50).withValueMax(50),
+            exposes.numeric('illuminance_calibration', ea.STATE_SET).withDescription('Illuminance calibration')
+                .withValueMin(-10000).withValueMax(10000),
             exposes.binary('pir_enable', ea.STATE_SET, true, false).withDescription('Enable PIR sensor'),
             exposes.binary('led_enable', ea.STATE_SET, true, false).withDescription('Enabled LED'),
             exposes.binary('reporting_enable', ea.STATE_SET, true, false).withDescription('Enabled reporting'),

package/devices/javis.js

@@ -31,6 +31,7 @@ module.exports = [
             exposes.enum('keep_time', ea.STATE_SET, ['0', '1', '2', '3', '4', '5', '6', '7'])
                 .withDescription('PIR keep time 0:5s|1:30s|2:60s|3:180s|4:300s|5:600s|6:1200s|7:1800s'),
             exposes.enum('sensitivity', ea.STATE_SET, ['25', '50', '75', '100']),
-            exposes.numeric('illuminance_calibration', ea.STATE_SET).withDescription('Illuminance calibration')],
+            exposes.numeric('illuminance_calibration', ea.STATE_SET).withDescription('Illuminance calibration')
+                .withValueMin(-10000).withValueMax(10000)],
     },
 ];

package/devices/lidl.js

@@ -417,6 +417,7 @@ module.exports = [
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);
+            await reporting.batteryPercentageRemaining(endpoint);
         },
     },
     {
@@ -609,7 +610,7 @@ module.exports = [
         toZigbee: [tz.on_off, tz.lidl_watering_timer],
         onEvent: tuya.onEventSetTime,
         configure: async (device, coordinatorEndpoint, logger) => {},
-        exposes: [e.switch(), exposes.numeric('timer', ea.SET).withValueMin(1)
+        exposes: [e.switch(), exposes.numeric('timer', ea.SET).withValueMin(1).withValueMax(10000)
             .withUnit('min').withDescription('Auto off after specific time.')],
     },
     {
@@ -655,8 +656,8 @@ module.exports = [
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_chyvmhay'}],
         model: '368308_2010',
         vendor: 'Lidl',
-        description: 'Silvercrest rdiator valve with thermostat',
-        fromZigbee: [fz.ignore_tuya_set_time, fzLocal.zs_thermostat, fz.tuya_data_point_dump],
+        description: 'Silvercrest radiator valve with thermostat',
+        fromZigbee: [fz.ignore_tuya_set_time, fzLocal.zs_thermostat],
         toZigbee: [tzLocal.zs_thermostat_current_heating_setpoint, tzLocal.zs_thermostat_child_lock,
             tzLocal.zs_thermostat_comfort_temp, tzLocal.zs_thermostat_eco_temp, tzLocal.zs_thermostat_preset_mode,
             tzLocal.zs_thermostat_system_mode, tzLocal.zs_thermostat_local_temperature_calibration,
@@ -676,8 +677,10 @@ module.exports = [
                 .withLocalTemperature(ea.STATE).withLocalTemperatureCalibration(-20, 20, 1, ea.STATE_SET)
                 .withSystemMode(['off', 'heat', 'auto'], ea.STATE_SET)
                 .withPreset(['schedule', 'manual', 'holiday', 'boost']),
-            exposes.numeric('detectwindow_temperature', ea.STATE_SET).withUnit('°C').withDescription('Open window detection temperature'),
-            exposes.numeric('detectwindow_timeminute', ea.STATE_SET).withUnit('min').withDescription('Open window time in minute'),
+            exposes.numeric('detectwindow_temperature', ea.STATE_SET).withUnit('°C').withDescription('Open window detection temperature')
+                .withValueMin(-10).withValueMax(35),
+            exposes.numeric('detectwindow_timeminute', ea.STATE_SET).withUnit('min').withDescription('Open window time in minute')
+                .withValueMin(0).withValueMax(1000),
             exposes.binary('binary_one', ea.STATE_SET, 'ON', 'OFF').withDescription('Unknown binary one'),
             exposes.binary('binary_two', ea.STATE_SET, 'ON', 'OFF').withDescription('Unknown binary two'),
             exposes.binary('away_mode', ea.STATE, 'ON', 'OFF').withDescription('Away mode'),

package/devices/moes.js

@@ -225,9 +225,10 @@ module.exports = [
                 'You can set up to 4 stages of temperature every for WEEKDAY ➀➁➂➃➄,  SATURDAY ➅ and SUNDAY ➆.'),
             exposes.binary('boost_heating', ea.STATE_SET, 'ON', 'OFF').withDescription('Boost Heating: press and hold "+" for 3 seconds, ' +
                 'the device will enter the boost heating mode, and the ▷╵◁ will flash. The countdown will be displayed in the APP'),
-            exposes.numeric('boost_heating_countdown', ea.STATE_SET).withUnit('min').withDescription('Countdown in minutes'),
+            exposes.numeric('boost_heating_countdown', ea.STATE_SET).withUnit('min').withDescription('Countdown in minutes')
+                .withValueMin(0).withValueMax(15),
             exposes.numeric('boost_heating_countdown_time_set', ea.STATE_SET).withUnit('second')
-                .withDescription('Boost Time Setting 100 sec - 900 sec, (default = 300 sec)')],
+                .withDescription('Boost Time Setting 100 sec - 900 sec, (default = 300 sec)').withValueMin(100).withValueMax(900)],
     },
     {
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_la2c2uo9'}],
@@ -285,34 +286,7 @@ module.exports = [
         supports: 'open, close, stop, position',
         fromZigbee: [fz.tuya_cover_options, fz.cover_position_tilt],
         toZigbee: [tz.cover_state, tz.moes_cover_calibration, tz.cover_position_tilt, tz.tuya_cover_reversal],
-        exposes: [e.cover_position(), exposes.numeric('calibration_time', ea.ALL), exposes.enum('moving', ea.STATE, ['UP', 'STOP', 'DOWN']),
-            exposes.binary('motor_reversal', ea.ALL, 'ON', 'OFF')],
-    },
-    {
-        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_e9ba97vf'},
-            {modelID: 'TS0601', manufacturerName: '_TZE200_husqqvux'}],
-        model: 'TV01-ZB',
-        vendor: 'Moes',
-        description: 'Thermostat radiator valve',
-        fromZigbee: [fz.moes_thermostat_tv, fz.ignore_tuya_set_time],
-        whiteLabel: [{vendor: 'Tesla Smart', model: 'TSL-TRV-TV01ZG'}],
-        toZigbee: [tz.moes_thermostat_tv],
-        exposes: [
-            e.battery(), e.child_lock(), e.window_detection(),
-            exposes.binary('frost_detection', ea.STATE_SET, true, false).withDescription('Enables/disables frost detection on the device'),
-            exposes.binary('heating_stop', ea.STATE_SET, true, false).withDescription('Stop heating'),
-            exposes.numeric('holiday_temperature', ea.STATE_SET).withDescription('Holiday mode temperature'),
-            exposes.numeric('comfort_temperature', ea.STATE_SET).withDescription('Comfort mode temperature'),
-            exposes.numeric('eco_temperature', ea.STATE_SET).withDescription('Eco mode temperature'),
-            exposes.numeric('open_window_temperature', ea.STATE_SET).withDescription('Open window mode temperature'),
-            exposes.numeric('boost_heating_countdown', ea.STATE).withDescription('Boost heating countdown'),
-            exposes.numeric('error_status', ea.STATE).withDescription('Error status'),
-            // exposes.binary('boost_mode', ea.STATE_SET).withDescription('Enables/disables boost mode'),
-            exposes.climate().withSetpoint('current_heating_setpoint', 5, 29.5, 1, ea.STATE_SET)
-                .withLocalTemperature(ea.STATE).withLocalTemperatureCalibration(-20, 20, 1, ea.STATE_SET)
-                .withSystemMode(Object.values(tuya.tvThermostatMode), ea.STATE_SET)
-                .withPreset(Object.values(tuya.tvThermostatPreset)),
-        ],
-        onEvent: tuya.onEventSetLocalTime,
+        exposes: [e.cover_position(), exposes.numeric('calibration_time', ea.ALL).withValueMin(0).withValueMax(100),
+            exposes.enum('moving', ea.STATE, ['UP', 'STOP', 'DOWN']), exposes.binary('motor_reversal', ea.ALL, 'ON', 'OFF')],
     },
 ];

package/devices/neo.js

@@ -19,11 +19,11 @@ module.exports = [
             exposes.binary('temperature_alarm', ea.STATE_SET, true, false),
             exposes.binary('alarm', ea.STATE_SET, true, false),
             exposes.enum('melody', ea.STATE_SET, Array.from(Array(18).keys()).map((x)=>(x+1).toString())),
-            exposes.numeric('duration', ea.STATE_SET).withUnit('second'),
-            exposes.numeric('temperature_min', ea.STATE_SET).withUnit('°C'),
-            exposes.numeric('temperature_max', ea.STATE_SET).withUnit('°C'),
-            exposes.numeric('humidity_min', ea.STATE_SET).withUnit('%'),
-            exposes.numeric('humidity_max', ea.STATE_SET).withUnit('%'),
+            exposes.numeric('duration', ea.STATE_SET).withUnit('second').withValueMin(0).withValueMax(1000),
+            exposes.numeric('temperature_min', ea.STATE_SET).withUnit('°C').withValueMin(-10).withValueMax(35),
+            exposes.numeric('temperature_max', ea.STATE_SET).withUnit('°C').withValueMin(-10).withValueMax(35),
+            exposes.numeric('humidity_min', ea.STATE_SET).withUnit('%').withValueMin(0).withValueMax(100),
+            exposes.numeric('humidity_max', ea.STATE_SET).withUnit('%').withValueMin(0).withValueMax(100),
             exposes.enum('volume', ea.STATE_SET, ['low', 'medium', 'high']),
             exposes.enum('power_type', ea.STATE, ['battery_full', 'battery_high', 'battery_medium', 'battery_low', 'usb']),
         ],

package/devices/philips.js

@@ -243,12 +243,12 @@ module.exports = [
         ota: ota.zigbeeOTA,
     },
     {
-        zigbeeModel: ['LCP001', 'LCP002', '4090331P9_01', '4090331P9_02'],
+        zigbeeModel: ['LCP001', 'LCP002', '4090331P9_01', '4090331P9_02', '929003053301_01', '929003053301_02'],
         model: '4090331P9',
         vendor: 'Philips',
-        description: 'Hue Ensis',
+        description: 'Hue Ensis (white)',
         meta: {turnsOffAtBrightness1: true},
-        extend: hueExtend.light_onoff_brightness_colortemp_color(),
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
         ota: ota.zigbeeOTA,
     },
     {

package/devices/popp.js

@@ -42,8 +42,9 @@ module.exports = [
             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 at every 100 ' +
-                    'value change. Resets every 3hours to standard. e.g. 21C = 2100 (-8000=undefined).'),
+                .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'),
@@ -62,7 +63,8 @@ module.exports = [
                 .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'),
+                .withDescription('Mean radiator load for room calculated by gateway for load balancing purposes (-8000=undefined)')
+                .withValueMin(-8000).withValueMax(100),
             exposes.numeric('load_estimate', ea.STATE_GET)
                 .withDescription('Load estimate on this radiator')],
         ota: ota.zigbeeOTA,

package/devices/shinasystem.js

@@ -282,4 +282,21 @@ module.exports = [
             await reporting.batteryVoltage(endpoint, {min: 30, max: 21600, change: 1});
         },
     },
+    {
+        zigbeeModel: ['PMM-300Z1'],
+        model: 'PMM-300Z1',
+        vendor: 'ShinaSystem',
+        description: 'SiHAS energy monitor',
+        fromZigbee: [fz.electrical_measurement, fz.metering],
+        toZigbee: [tz.electrical_measurement_power],
+        exposes: [e.power().withAccess(ea.STATE_GET), e.energy()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['haElectricalMeasurement', 'seMetering']);
+            await reporting.activePower(endpoint, {min: 1, max: 600, change: 5});
+            await reporting.instantaneousDemand(endpoint, {min: 1, max: 600, change: 1});
+            endpoint.saveClusterAttributeKeyValue('seMetering', {multiplier: 1, divisor: 1000});
+            await reporting.currentSummDelivered(endpoint, {min: 1, max: 600, change: 5});
+        },
+    },
 ];

package/devices/sunricher.js

@@ -234,4 +234,22 @@ module.exports = [
             await reporting.currentPositionLiftPercentage(endpoint);
         },
     },
+    {
+        fingerprint: [{modelID: 'GreenPower_2', ieeeAddr: /^0x00000000010.....$/}],
+        model: 'SR-ZGP2801K2-DIM',
+        vendor: 'Sunricher',
+        description: 'Pushbutton transmitter module',
+        fromZigbee: [fz.sunricher_switch2801K2],
+        toZigbee: [],
+        exposes: [e.action(['press_on', 'press_off', 'hold_on', 'hold_off', 'release'])],
+    },
+    {
+        fingerprint: [{modelID: 'GreenPower_2', ieeeAddr: /^0x000000005d5.....$/}],
+        model: 'SR-ZGP2801K4-DIM',
+        vendor: 'Sunricher',
+        description: 'Pushbutton transmitter module',
+        fromZigbee: [fz.sunricher_switch2801K4],
+        toZigbee: [],
+        exposes: [e.action(['press_on', 'press_off', 'press_high', 'press_low', 'hold_high', 'hold_low', 'release'])],
+    },
 ];

package/devices/sylvania.js

@@ -189,4 +189,12 @@ module.exports = [
         extend: extend.ledvance.light_onoff_brightness(),
         ota: ota.ledvance,
     },
+    {
+        zigbeeModel: ['A19 G2 RGBW'],
+        model: '75564',
+        vendor: 'Sylvania',
+        description: 'Smart+ adjustable white and full color bulb A19',
+        extend: extend.ledvance.light_onoff_brightness_colortemp_color({colorTempRange: [142, 555]}),
+        ota: ota.ledvance,
+    },
 ];