zigbee-herdsman-converters 15.0.26 → 15.0.28

package/converters/toZigbee.js

@@ -3271,7 +3271,12 @@ const converters = {
     moes_thermostat_current_heating_setpoint: {
         key: ['current_heating_setpoint'],
         convertSet: async (entity, key, value, meta) => {
-            await tuya.sendDataPointValue(entity, tuya.dataPoints.moesHeatingSetpoint, value);
+            if (meta.device.manufacturerName === '_TZE200_5toc8efa') {
+                const temp = Math.round(value*10);
+                await tuya.sendDataPointValue(entity, tuya.dataPoints.moesHeatingSetpoint, temp);
+            } else {
+                await tuya.sendDataPointValue(entity, tuya.dataPoints.moesHeatingSetpoint, value);
+            }
         },
     },
     moes_thermostat_deadzone_temperature: {

package/devices/bankamp.js

@@ -0,0 +1,11 @@
+const extend = require('../lib/extend');
+
+module.exports = [
+    {
+        zigbeeModel: ['Bankamp Dimm-Leuchte'],
+        model: '2189/1-xx',
+        vendor: 'Bankamp',
+        description: 'Grazia ceiling light',
+        extend: extend.light_onoff_brightness(),
+    },
+];

package/devices/datek.js

@@ -28,6 +28,7 @@ module.exports = [
             await reporting.activePower(endpoint);
             await reporting.temperature(endpoint);
         },
+        ota: ota.zigbeeOTA,
         exposes: [e.power(), e.current(), e.voltage(), e.switch(), e.temperature(), e.power_on_behavior()],
     },
     {

package/devices/ikea.js

@@ -556,7 +556,9 @@ module.exports = [
         model: 'ICPSHC24-30-IL44-1',
         vendor: 'IKEA',
         description: 'SILVERGLANS IP44 LED driver for wireless control (30 watt)',
+        whiteLabel: [{vendor: 'IKEA', model: 'T2030', description: 'PILSKOTT LED pendant lamp'}],
         extend: tradfriExtend.light_onoff_brightness(),
+        meta: {turnsOffAtBrightness1: true},
     },
     {
         zigbeeModel: ['FLOALT panel WS 30x30'],

package/devices/legrand.js

@@ -446,6 +446,52 @@ module.exports = [
             await reporting.activePower(endpoint);
         },
     },
+    {
+        zigbeeModel: ['Hospitality on off switch'],
+        model: 'WNAL10/WNRL10',
+        vendor: 'Legrand',
+        description: 'Smart switch with Netatmo',
+        fromZigbee: [fz.on_off, fz.legrand_binary_input_on_off, fz.legrand_cluster_fc01],
+        toZigbee: [tz.on_off, tz.legrand_settingEnableLedInDark, tz.legrand_settingEnableLedIfOn],
+        exposes: [e.switch(),
+            exposes.binary('led_in_dark', ea.ALL, 'ON', 'OFF').withDescription(`Enables the LED when the light is turned off, allowing to` +
+                ` see the switch in the dark`),
+            exposes.binary('led_if_on', ea.ALL, 'ON', 'OFF').withDescription('Enables the LED when the light is turned on')],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(endpoint);
+        },
+    },
+    {
+        zigbeeModel: ['Hospitality dimmer switch'],
+        model: 'WNAL50/WNRL50',
+        vendor: 'Legrand',
+        description: 'Smart dimmer switch with Netatmo',
+        extend: extend.light_onoff_brightness({noConfigure: true}),
+        fromZigbee: [fz.brightness, fz.identify, fz.on_off, fz.lighting_ballast_configuration, fz.legrand_cluster_fc01,
+            fz.power_on_behavior],
+        toZigbee: [tz.light_onoff_brightness, tz.legrand_settingEnableLedInDark, tz.legrand_settingEnableLedIfOn,
+            tz.legrand_deviceMode, tz.legrand_identify, tz.ballast_config, tz.power_on_behavior],
+        exposes: [e.light_brightness(),
+            exposes.numeric('ballast_minimum_level', ea.ALL).withValueMin(1).withValueMax(254)
+                .withDescription('Specifies the minimum brightness value'),
+            exposes.numeric('ballast_maximum_level', ea.ALL).withValueMin(1).withValueMax(254)
+                .withDescription('Specifies the maximum brightness value'),
+            exposes.binary('device_mode', ea.ALL, 'dimmer_on', 'dimmer_off').withDescription('Allow the device to change brightness'),
+            exposes.binary('led_in_dark', ea.ALL, 'ON', 'OFF').withDescription(`Enables the LED when the light is turned off, allowing to` +
+                ` see the switch in the dark`),
+            exposes.binary('led_if_on', ea.ALL, 'ON', 'OFF').withDescription('Enables the LED when the light is turned on'),
+            e.power_on_behavior()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await extend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genIdentify', 'genOnOff', 'genLevelCtrl',
+                'genBinaryInput', 'lightingBallastCfg']);
+            await reporting.onOff(endpoint);
+            await reporting.brightness(endpoint);
+        },
+    },
     {
         zigbeeModel: ['Remote dimmer switch'],
         model: 'WNAL63',

package/devices/moes.js

@@ -291,9 +291,9 @@ module.exports = [
             e.valve_state(), e.position(), e.window_detection(),
             exposes.binary('window', ea.STATE, 'OPEN', 'CLOSED').withDescription('Window status closed or open '),
             exposes.climate()
-                .withLocalTemperature(ea.STATE).withSetpoint('current_heating_setpoint', 5, 45, 0.5, ea.STATE_SET)
+                .withLocalTemperature(ea.STATE).withSetpoint('current_heating_setpoint', 5, 35, 1, ea.STATE_SET)
                 .withLocalTemperatureCalibration(-9, 9, 1, ea.STATE_SET)
-                .withSystemMode(['off', 'heat'], ea.STATE_SET)
+                .withSystemMode(['heat'], ea.STATE_SET)
                 .withRunningState(['idle', 'heat'], ea.STATE)
                 .withPreset(['programming', 'manual', 'temporary_manual', 'holiday'],
                     'MANUAL MODE ☝ - In this mode, the device executes manual temperature setting. '+

package/devices/philips.js

@@ -73,6 +73,13 @@ module.exports = [
         description: 'Hue Centura recessed spotlight white and color ambiance GU10 (black)',
         extend: philips.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
+    {
+        zigbeeModel: ['929003047601'],
+        model: '929003047601',
+        vendor: 'Philips',
+        description: 'Hue White and Color Ambiance GU10 (Centura)',
+        extend: philips.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+    },
     {
         zigbeeModel: ['929003047501'],
         model: '929003047501',
@@ -2264,7 +2271,7 @@ module.exports = [
         model: '046677551780',
         vendor: 'Philips',
         description: 'Hue white filament Edison ST19 LED',
-        extend: philips.extend.light_onoff_brightness(),
+        extend: philips.extend.light_onoff_brightness({disableHueEffects: false}),
     },
     {
         zigbeeModel: ['LWV003'],
@@ -3020,4 +3027,18 @@ module.exports = [
         description: 'Hue Perifo Wall Light, 3 spotlights (white)',
         extend: philips.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
+    {
+        zigbeeModel: ['915005988101'],
+        model: '915005988101',
+        vendor: 'Philips',
+        description: 'Hue Gradient light tube large',
+        extend: philips.extend.light_onoff_brightness_colortemp_color_gradient({disableHueEffects: false, colorTempRange: [153, 500]}),
+    },
+    {
+        zigbeeModel: ['915005987901'],
+        model: '915005987901',
+        vendor: 'Philips',
+        description: 'Hue Gradient light tube compact',
+        extend: philips.extend.light_onoff_brightness_colortemp_color_gradient({disableHueEffects: false, colorTempRange: [153, 500]}),
+    },
 ];

package/devices/schneider_electric.js

@@ -735,7 +735,7 @@ module.exports = [
         fromZigbee: [fz.ignore_basic_report, fz.ignore_genOta, fz.ignore_zclversion_read, fz.battery, fz.hvac_user_interface,
             fz.wiser_smart_thermostat_client, fz.wiser_smart_setpoint_command_client, fz.schneider_temperature],
         toZigbee: [tz.wiser_sed_zone_mode, tz.wiser_sed_occupied_heating_setpoint],
-        exposes: [e.battery(), e.temperature(),
+        exposes: [e.battery(),
             exposes.climate().withSetpoint('occupied_heating_setpoint', 7, 30, 0.5, ea.STATE_SET)
                 .withLocalTemperature(ea.STATE),
             exposes.enum('zone_mode',

package/devices/solaredge.js

@@ -0,0 +1,11 @@
+const extend = require('../lib/extend');
+
+module.exports = [
+    {
+        zigbeeModel: ['SE-SW'],
+        model: 'SEHAZB-DR-SWITCH-2',
+        vendor: 'SolarEdge',
+        description: 'Smart energy switch',
+        extend: extend.switch(),
+    },
+];

package/devices/tuya.js

@@ -1104,6 +1104,7 @@ module.exports = [
             {modelID: 'TS0202', manufacturerName: '_TYZB01_zwvaj5wy'},
             {modelID: 'TS0202', manufacturerName: '_TZ3000_bsvqrxru'},
             {modelID: 'TS0202', manufacturerName: '_TYZB01_tv3wxhcz'},
+            {modelID: 'TS0202', manufacturerName: '_TYZB01_rwb0hxtf'},
             {modelID: 'TS0202', manufacturerName: '_TYZB01_hqbdru35'},
             {modelID: 'TS0202', manufacturerName: '_TZ3000_otvn3lne'},
             {modelID: 'TS0202', manufacturerName: '_TZ3000_tiwq83wk'},
@@ -2114,6 +2115,7 @@ module.exports = [
             {modelID: 'TS0601', manufacturerName: '_TZE200_zuz7f94z'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_68nvbio9'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_3ylew7b4'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_llm0epxg'},
         ],
         model: 'TS0601_cover',
         vendor: 'TuYa',

package/devices/xiaomi.js

@@ -11,7 +11,7 @@ const globalStore = require('../lib/store');
 const xiaomi = require('../lib/xiaomi');
 const utils = require('../lib/utils');
 const {printNumberAsHex, printNumbersAsHexSequence} = utils;
-const {fp1, manufacturerCode} = xiaomi;
+const {fp1, manufacturerCode, trv} = xiaomi;
 
 const xiaomiExtend = {
     light_onoff_brightness_colortemp: (options={disableColorTempStartup: true}) => ({
@@ -87,7 +87,7 @@ const fzLocal = {
                     result['system_mode'] = {1: 'heat', 0: 'off'}[value];
                     break;
                 case 0x0272:
-                    result['preset'] = {2: 'away', 1: 'auto', 0: 'manual'}[value];
+                    Object.assign(result, trv.decodePreset(value));
                     break;
                 case 0x0273:
                     result['window_detection'] = {1: 'ON', 0: 'OFF'}[value];
@@ -116,9 +116,26 @@ const fzLocal = {
                 case 0x0275:
                     result['valve_alarm'] = {1: true, 0: false}[value];
                     break;
+                case 247: {
+                    const heartbeat = trv.decodeHeartbeat(meta, model, value);
+
+                    meta.logger.debug(`${model.zigbeeModel}: Processed heartbeat message into payload ${JSON.stringify(heartbeat)}`);
+
+                    if (heartbeat.firmware_version) {
+                        // Overwrite the "placeholder" version `0.0.0_0025` advertised by `genBasic`
+                        // with the correct version from the heartbeat.
+                        // This is not reflected in the frontend unless the device is reconfigured
+                        // or the whole service restarted.
+                        // See https://github.com/Koenkk/zigbee-herdsman-converters/pull/5363#discussion_r1081477047
+                        meta.device.softwareBuildID = heartbeat.firmware_version;
+                        delete heartbeat.firmware_version;
+                    }
+
+                    Object.assign(result, heartbeat);
+                    break;
+                }
                 case 0xfff2:
                 case 0x00ff: // 4e:27:49:bb:24:b6:30:dd:74:de:53:76:89:44:c4:81
-                case 0x00f7: // 03:28:1f:05:21:01:00:0a:21:00:00:0d:23:19:08:00:00:11:23...
                 case 0x0276: // 04:3e:01:e0:00:00:09:60:04:38:00:00:06:a4:05:64:00:00:08:98:81:e0:00:00:08:98
                 case 0x027c: // 0x00
                 case 0x027d: // 0x00
@@ -2889,9 +2906,11 @@ module.exports = [
         fromZigbee: [fzLocal.aqara_trv, fz.thermostat, fz.battery],
         toZigbee: [tzLocal.aqara_trv, tz.thermostat_occupied_heating_setpoint],
         exposes: [
+            exposes.binary('setup', ea.STATE, true, false)
+                .withDescription('Indicates if the device is in setup mode (E11)'),
             exposes.climate()
                 .withSetpoint('occupied_heating_setpoint', 5, 30, 0.5)
-                .withLocalTemperature(ea.STATE)
+                .withLocalTemperature(ea.STATE, 'Current temperature measured by the internal or external sensor')
                 .withSystemMode(['off', 'heat'], ea.ALL)
                 .withPreset(['manual', 'away', 'auto']).setAccess('preset', ea.ALL),
             e.temperature_sensor_select(['internal', 'external']).withAccess(ea.ALL),
@@ -2900,15 +2919,24 @@ module.exports = [
             e.child_lock().setAccess('state', ea.ALL),
             e.window_detection().setAccess('state', ea.ALL),
             exposes.binary('window_open', ea.STATE, true, false),
-            e.valve_detection().setAccess('state', ea.ALL),
+            e.valve_detection().setAccess('state', ea.ALL)
+                .withDescription('Determines if temperature control abnormalities should be detected'),
+            exposes.binary('valve_alarm', ea.STATE, true, false)
+                .withDescription('Notifies of a temperature control abnormality if valve detection is enabled ' +
+                    '(e.g., thermostat not installed correctly, valve failure or incorrect calibration, ' +
+                    'incorrect link to external temperature sensor)'),
             e.away_preset_temperature().withAccess(ea.ALL),
             e.battery_voltage(),
             e.battery(),
+            e.power_outage_count(),
+            e.device_temperature(),
         ],
-        meta: {battery: {voltageToPercentage: '3V_2850_3000'}},
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
+
+            // Initialize battery percentage and voltage
             await endpoint.read('aqaraOpple', [0x040a], {manufacturerCode: 0x115f});
+            await endpoint.read('genPowerCfg', ['batteryVoltage']);
 
             // This cluster is not discovered automatically and needs to be explicitly attached to enable OTA
             utils.attachOutputCluster(device, 'genOta');

package/lib/exposes.js

@@ -385,7 +385,7 @@ class Climate extends Base {
         return this;
     }
 
-    withLocalTemperature(access=a.STATE_GET) {
+    withLocalTemperature(access=a.STATE_GET, description='Current temperature measured on the device') {
         assert(!this.endpoint, 'Cannot add feature after adding endpoint');
         this.features.push(new Numeric('local_temperature', access).withUnit('°C').withDescription('Current temperature measured on the device'));
         return this;

package/lib/xiaomi.js

@@ -861,6 +861,81 @@ const fp1 = {
     },
 };
 
+const trv = {
+    decodeFirmwareVersionString(value) {
+        // Add prefix to follow Aqara's versioning schema: https://www.aqara.com/en/version/radiator-thermostat-e1
+        const firmwareVersionPrefix = '0.0.0_';
+
+        // Reinterpret from LE integer to byte sequence(e.g., `[25,8,0,0]` corresponds to 0.0.0_0825)
+        const buffer = Buffer.alloc(4);
+        buffer.writeUInt32LE(value);
+        const firmwareVersionNumber = buffer.reverse().subarray(1).join('');
+
+        return firmwareVersionPrefix + firmwareVersionNumber;
+    },
+
+    decodePreset(value) {
+        // Setup mode is the initial device state after powering it ("F11" on display) and not a real preset that can be deliberately
+        // set by users, therefore it is exposed as a separate flag.
+        return {
+            setup: value === 3,
+            preset: {2: 'away', 1: 'auto', 0: 'manual'}[value],
+        };
+    },
+
+    decodeHeartbeat(meta, model, messageBuffer) {
+        const data = buffer2DataObject(meta, model, messageBuffer);
+        const payload = {};
+
+        Object.entries(data).forEach(([key, value]) => {
+            switch (parseInt(key)) {
+            case 3:
+                payload.device_temperature = value;
+                break;
+            case 5:
+                payload.power_outage_count = value - 1;
+                break;
+            case 10:
+                // unidentified number, e.g. 32274, 3847
+                break;
+            case 13:
+                payload.firmware_version = trv.decodeFirmwareVersionString(value);
+                break;
+            case 17:
+                // unidentified flag/enum, e.g. 1
+                break;
+            case 101:
+                Object.assign(payload, trv.decodePreset(value));
+                break;
+            case 102:
+                payload.local_temperature = value / 100;
+                break;
+            case 103:
+                // This takes the following values:
+                //  - `occupied_heating_setpoint` if `system_mode` is `heat` and `preset` is `manual`
+                //  - `away_preset_temperature` if `system_mode` is `heat` and `preset` is `away`
+                //  - `5` if `system_mode` is `off`
+                // It thus behaves similar to `occupied_heating_setpoint` except in `off` mode. Due to this difference,
+                // this value is written to another property to avoid an inconsistency of the `occupied_heating_setpoint`.
+                // TODO How to handle this value? Find better name?
+                payload.internal_heating_setpoint = value / 100;
+                break;
+            case 104:
+                payload.valve_alarm = value === 1;
+                break;
+            case 105:
+                payload.battery = value;
+                break;
+            case 106:
+                // unidentified flag/enum, e.g. 0
+                break;
+            }
+        });
+
+        return payload;
+    },
+};
+
 module.exports = {
     buffer2DataObject,
     numericAttributes2Payload,
@@ -868,4 +943,5 @@ module.exports = {
     VOCKQJK11LMDisplayUnit,
     fp1,
     manufacturerCode: 0x115f,
+    trv,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "15.0.26",
+  "version": "15.0.28",
   "description": "Collection of device converters to be used with zigbee-herdsman",
   "main": "index.js",
   "files": [