zigbee-herdsman-converters 14.0.641 → 14.0.642

package/converters/fromZigbee.js

@@ -3937,20 +3937,44 @@ const converters = {
             switch (dp) {
             case tuya.dataPoints.moesSchedule:
                 return {
-                    program: [
-                        {weekdays_p1: value[0] + 'h:' + value[1] + 'm ' + value[2]/2 + '°C'},
-                        {weekdays_p2: value[3] + 'h:' + value[4] + 'm ' + value[5]/2 + '°C'},
-                        {weekdays_p3: value[6] + 'h:' + value[7] + 'm ' + value[8]/2 + '°C'},
-                        {weekdays_p4: value[9] + 'h:' + value[10] + 'm ' + value[11]/2 + '°C'},
-                        {saturday_p1: value[12] + 'h:' + value[13] + 'm ' + value[14]/2+ '°C'},
-                        {saturday_p2: value[15] + 'h:' + value[16] + 'm ' + value[17]/2 + '°C'},
-                        {saturday_p3: value[18] + 'h:' + value[19] + 'm ' + value[20]/2 + '°C'},
-                        {saturday_p4: value[21] + 'h:' + value[22] + 'm ' + value[23]/2 + '°C'},
-                        {sunday_p1: value[24] + 'h:' + value[25] + 'm ' + value[26]/2 + '°C'},
-                        {sunday_p2: value[27] + 'h:' + value[28] + 'm ' + value[29]/2 + '°C'},
-                        {sunday_p3: value[30] + 'h:' + value[31] + 'm ' + value[32]/2 + '°C'},
-                        {sunday_p4: value[33] + 'h:' + value[34] + 'm ' + value[35]/2 + '°C'},
-                    ],
+                    program: {
+                        weekdays_p1_hour: value[0],
+                        weekdays_p1_minute: value[1],
+                        weekdays_p1_temperature: value[2] / 2,
+                        weekdays_p2_hour: value[3],
+                        weekdays_p2_minute: value[4],
+                        weekdays_p2_temperature: value[5] / 2,
+                        weekdays_p3_hour: value[6],
+                        weekdays_p3_minute: value[7],
+                        weekdays_p3_temperature: value[8] / 2,
+                        weekdays_p4_hour: value[9],
+                        weekdays_p4_minute: value[10],
+                        weekdays_p4_temperature: value[11] / 2,
+                        saturday_p1_hour: value[12],
+                        saturday_p1_minute: value[13],
+                        saturday_p1_temperature: value[14] / 2,
+                        saturday_p2_hour: value[15],
+                        saturday_p2_minute: value[16],
+                        saturday_p2_temperature: value[17] / 2,
+                        saturday_p3_hour: value[18],
+                        saturday_p3_minute: value[19],
+                        saturday_p3_temperature: value[20] / 2,
+                        saturday_p4_hour: value[21],
+                        saturday_p4_minute: value[22],
+                        saturday_p4_temperature: value[23] / 2,
+                        sunday_p1_hour: value[24],
+                        sunday_p1_minute: value[25],
+                        sunday_p1_temperature: value[26] / 2,
+                        sunday_p2_hour: value[27],
+                        sunday_p2_minute: value[28],
+                        sunday_p2_temperature: value[29] / 2,
+                        sunday_p3_hour: value[30],
+                        sunday_p3_minute: value[31],
+                        sunday_p3_temperature: value[32] / 2,
+                        sunday_p4_hour: value[33],
+                        sunday_p4_minute: value[34],
+                        sunday_p4_temperature: value[35] / 2,
+                    },
                 };
             case tuya.dataPoints.state: // Thermostat on standby = OFF, running = ON
                 if (model.model === 'BAC-002-ALZB') {

package/converters/toZigbee.js

@@ -3369,6 +3369,61 @@ const converters = {
             await tuya.sendDataPointBool(entity, tuya.dataPoints.state, value === 'heat');
         },
     },
+    moes_thermostat_program_schedule: {
+        key: ['program'],
+        convertSet: async (entity, key, value, meta) => {
+            if (!meta.state.program) {
+                meta.logger.warn(`zigbee-herdsman-converters:Moes BHT-002: existing program state not set.`);
+                return;
+            }
+
+            /* Merge modified value into existing state and send all over in one go */
+            const newProgram = {
+                ...meta.state.program,
+                ...value,
+            };
+
+            const payload = [
+                Math.floor(newProgram.weekdays_p1_hour),
+                Math.floor(newProgram.weekdays_p1_minute),
+                Math.round(newProgram.weekdays_p1_temperature * 2),
+                Math.floor(newProgram.weekdays_p2_hour),
+                Math.floor(newProgram.weekdays_p2_minute),
+                Math.round(newProgram.weekdays_p2_temperature * 2),
+                Math.floor(newProgram.weekdays_p3_hour),
+                Math.floor(newProgram.weekdays_p3_minute),
+                Math.round(newProgram.weekdays_p3_temperature * 2),
+                Math.floor(newProgram.weekdays_p4_hour),
+                Math.floor(newProgram.weekdays_p4_minute),
+                Math.round(newProgram.weekdays_p4_temperature * 2),
+                Math.floor(newProgram.saturday_p1_hour),
+                Math.floor(newProgram.saturday_p1_minute),
+                Math.round(newProgram.saturday_p1_temperature * 2),
+                Math.floor(newProgram.saturday_p2_hour),
+                Math.floor(newProgram.saturday_p2_minute),
+                Math.round(newProgram.saturday_p2_temperature * 2),
+                Math.floor(newProgram.saturday_p3_hour),
+                Math.floor(newProgram.saturday_p3_minute),
+                Math.round(newProgram.saturday_p3_temperature * 2),
+                Math.floor(newProgram.saturday_p4_hour),
+                Math.floor(newProgram.saturday_p4_minute),
+                Math.round(newProgram.saturday_p4_temperature * 2),
+                Math.floor(newProgram.sunday_p1_hour),
+                Math.floor(newProgram.sunday_p1_minute),
+                Math.round(newProgram.sunday_p1_temperature * 2),
+                Math.floor(newProgram.sunday_p2_hour),
+                Math.floor(newProgram.sunday_p2_minute),
+                Math.round(newProgram.sunday_p2_temperature * 2),
+                Math.floor(newProgram.sunday_p3_hour),
+                Math.floor(newProgram.sunday_p3_minute),
+                Math.round(newProgram.sunday_p3_temperature * 2),
+                Math.floor(newProgram.sunday_p4_hour),
+                Math.floor(newProgram.sunday_p4_minute),
+                Math.round(newProgram.sunday_p4_temperature * 2),
+            ];
+            return tuya.sendDataPointRaw(entity, tuya.dataPoints.moesSchedule, payload);
+        },
+    },
     moesS_thermostat_system_mode: {
         key: ['preset'],
         convertSet: async (entity, key, value, meta) => {

package/devices/hzc_electric.js

@@ -1,6 +1,7 @@
 const reporting = require('../lib/reporting');
 const extend = require('../lib/extend');
 const exposes = require('../lib/exposes');
+const fz = require('../converters/fromZigbee');
 const e = exposes.presets;
 
 module.exports = [
@@ -26,4 +27,13 @@ module.exports = [
             return {l1: 1, l2: 2};
         },
     },
+    {
+        zigbeeModel: ['TempAndHumSensor-ZB3.0'],
+        model: 'S093TH-ZG',
+        vendor: 'HZC Electric',
+        description: 'Temperature and humidity sensor',
+        fromZigbee: [fz.temperature, fz.humidity, fz.linkquality_from_basic],
+        toZigbee: [],
+        exposes: [e.temperature(), e.humidity()], // Unfortunately, battery percentage is not reported by this device
+    },
 ];

package/devices/legrand.js

@@ -107,6 +107,7 @@ module.exports = [
             // support binary report on moving state (supposed)
             fz.legrand_binary_input_moving, fz.cover_position_tilt],
         toZigbee: [tz.cover_state, tz.cover_position_tilt, tz.legrand_identify, tz.legrand_settingEnableLedInDark],
+        meta: {coverInverted: true},
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genBinaryInput', 'closuresWindowCovering', 'genIdentify']);

package/devices/moes.js

@@ -80,6 +80,13 @@ const tzLocal = {
     },
 };
 
+const exposesLocal = {
+    hour: (name) => exposes.numeric(name, ea.STATE_SET).withUnit('h').withValueMin(0).withValueMax(23),
+    minute: (name) => exposes.numeric(name, ea.STATE_SET).withUnit('m').withValueMin(0).withValueMax(59),
+    program_temperature: (name) => exposes.numeric(name, ea.STATE_SET).withUnit('°C')
+        .withValueMin(5).withValueMax(35).withValueStep(0.5),
+};
+
 module.exports = [
     {
         fingerprint: [{modelID: 'TS011F', manufacturerName: '_TZ3000_cymsnfvf'},
@@ -181,13 +188,52 @@ module.exports = [
         fromZigbee: [fz.moes_thermostat],
         toZigbee: [tz.moes_thermostat_child_lock, tz.moes_thermostat_current_heating_setpoint, tz.moes_thermostat_mode,
             tz.moes_thermostat_standby, tz.moes_thermostat_sensor, tz.moes_thermostat_calibration,
-            tz.moes_thermostat_deadzone_temperature, tz.moes_thermostat_max_temperature_limit, tz.moes_thermostat_min_temperature_limit],
+            tz.moes_thermostat_deadzone_temperature, tz.moes_thermostat_max_temperature_limit, tz.moes_thermostat_min_temperature_limit,
+            tz.moes_thermostat_program_schedule],
         exposes: [e.child_lock(), e.deadzone_temperature(), e.max_temperature_limit(), e.min_temperature_limit(),
             exposes.climate().withSetpoint('current_heating_setpoint', 5, 30, 1, ea.STATE_SET)
                 .withLocalTemperature(ea.STATE).withLocalTemperatureCalibration(-30, 30, 0.1, ea.STATE_SET)
                 .withSystemMode(['off', 'heat'], ea.STATE_SET).withRunningState(['idle', 'heat', 'cool'], ea.STATE)
                 .withPreset(['hold', 'program']),
-            e.temperature_sensor_select(['IN', 'AL', 'OU'])],
+            e.temperature_sensor_select(['IN', 'AL', 'OU']),
+            exposes.composite('program', 'program').withDescription('Time of day and setpoint to use when in program mode')
+                .withFeature(exposesLocal.hour('weekdays_p1_hour'))
+                .withFeature(exposesLocal.minute('weekdays_p1_minute'))
+                .withFeature(exposesLocal.program_temperature('weekdays_p1_temperature'))
+                .withFeature(exposesLocal.hour('weekdays_p2_hour'))
+                .withFeature(exposesLocal.minute('weekdays_p2_minute'))
+                .withFeature(exposesLocal.program_temperature('weekdays_p2_temperature'))
+                .withFeature(exposesLocal.hour('weekdays_p3_hour'))
+                .withFeature(exposesLocal.minute('weekdays_p3_minute'))
+                .withFeature(exposesLocal.program_temperature('weekdays_p3_temperature'))
+                .withFeature(exposesLocal.hour('weekdays_p4_hour'))
+                .withFeature(exposesLocal.minute('weekdays_p4_minute'))
+                .withFeature(exposesLocal.program_temperature('weekdays_p4_temperature'))
+                .withFeature(exposesLocal.hour('saturday_p1_hour'))
+                .withFeature(exposesLocal.minute('saturday_p1_minute'))
+                .withFeature(exposesLocal.program_temperature('saturday_p1_temperature'))
+                .withFeature(exposesLocal.hour('saturday_p2_hour'))
+                .withFeature(exposesLocal.minute('saturday_p2_minute'))
+                .withFeature(exposesLocal.program_temperature('saturday_p2_temperature'))
+                .withFeature(exposesLocal.hour('saturday_p3_hour'))
+                .withFeature(exposesLocal.minute('saturday_p3_minute'))
+                .withFeature(exposesLocal.program_temperature('saturday_p3_temperature'))
+                .withFeature(exposesLocal.hour('saturday_p4_hour'))
+                .withFeature(exposesLocal.minute('saturday_p4_minute'))
+                .withFeature(exposesLocal.program_temperature('saturday_p4_temperature'))
+                .withFeature(exposesLocal.hour('sunday_p1_hour'))
+                .withFeature(exposesLocal.minute('sunday_p1_minute'))
+                .withFeature(exposesLocal.program_temperature('sunday_p1_temperature'))
+                .withFeature(exposesLocal.hour('sunday_p2_hour'))
+                .withFeature(exposesLocal.minute('sunday_p2_minute'))
+                .withFeature(exposesLocal.program_temperature('sunday_p2_temperature'))
+                .withFeature(exposesLocal.hour('sunday_p3_hour'))
+                .withFeature(exposesLocal.minute('sunday_p3_minute'))
+                .withFeature(exposesLocal.program_temperature('sunday_p3_temperature'))
+                .withFeature(exposesLocal.hour('sunday_p4_hour'))
+                .withFeature(exposesLocal.minute('sunday_p4_minute'))
+                .withFeature(exposesLocal.program_temperature('sunday_p4_temperature')),
+        ],
         onEvent: tuya.onEventSetLocalTime,
     },
     {

package/devices/philips.js

@@ -2834,4 +2834,11 @@ module.exports = [
         description: 'Hue white ambiance pendant white Enrave',
         extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
     },
+    {
+        zigbeeModel: ['929003054601'],
+        model: '929003054601',
+        vendor: 'Philips',
+        description: 'Hue white ambiance Fair ceiling with Bluetooth white',
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+    },
 ];

package/devices/tuya.js

@@ -21,7 +21,8 @@ const TS011Fplugs = ['_TZ3000_5f43h46b', '_TZ3000_cphmq0q7', '_TZ3000_dpo1ysak',
     '_TZ3000_1h2x4akh', '_TZ3000_9vo5icau', '_TZ3000_cehuw1lw', '_TZ3000_ko6v90pg', '_TZ3000_f1bapcit', '_TZ3000_cjrngdr3',
     '_TZ3000_zloso4jk', '_TZ3000_r6buo8ba', '_TZ3000_iksasdbv', '_TZ3000_idrffznf', '_TZ3000_okaz9tjs', '_TZ3210_q7oryllx',
     '_TZ3000_ss98ec5d', '_TZ3000_gznh2xla', '_TZ3000_hdopuwv6', '_TZ3000_gvn91tmx', '_TZ3000_dksbtrzs', '_TZ3000_b28wrpvx',
-    '_TZ3000_aim0ztek', '_TZ3000_mlswgkc3', '_TZ3000_7dndcnnb', '_TZ3000_waho4jtj', '_TZ3000_nmsciidq', '_TZ3000_jtgxgmks'];
+    '_TZ3000_aim0ztek', '_TZ3000_mlswgkc3', '_TZ3000_7dndcnnb', '_TZ3000_waho4jtj', '_TZ3000_nmsciidq', '_TZ3000_jtgxgmks',
+    '_TZ3000_rdfh8cfs'];
 
 const tzLocal = {
     SA12IZL_silence_siren: {
@@ -1990,12 +1991,14 @@ module.exports = [
             {modelID: 'TS0601', manufacturerName: '_TZE200_mudxchsu'}, /* model: 'TV05-ZG curve', vendor: 'TuYa' */
             {modelID: 'TS0601', manufacturerName: '_TZE200_7yoranx2'}, /* model: 'TV01-ZB', vendor: 'Moes' */
             {modelID: 'TS0601', manufacturerName: '_TZE200_kds0pmmv'}, /* model: 'TV01-ZB', vendor: 'Moes' */
+            {modelID: 'TS0601', manufacturerName: '_TZE200_bvu2wnxz'}, /* model: 'TRV06', vendor: 'AVATTO' */
         ],
         model: 'TV02-Zigbee',
         vendor: 'TuYa',
         description: 'Thermostat radiator valve',
         whiteLabel: [
             {vendor: 'Moes', model: 'TV01-ZB'},
+            {vendor: 'AVATTO', model: 'TRV06'},
             {vendor: 'Tesla Smart', model: 'TSL-TRV-TV01ZG'},
             {vendor: 'Unknown/id3.pl', model: 'GTZ08'},
         ],
@@ -2676,7 +2679,8 @@ module.exports = [
         },
     },
     {
-        fingerprint: [{modelID: 'TS0006', manufacturerName: '_TYZB01_ltundz9m'}],
+        fingerprint: [{modelID: 'TS0006', manufacturerName: '_TYZB01_ltundz9m'},
+            {modelID: 'TS0006', manufacturerName: '_TZ3000_jyupj3fw'}],
         model: 'TS0006',
         vendor: 'TuYa',
         description: '6 gang switch module with neutral wire',

package/devices/xiaomi.js

@@ -2403,4 +2403,15 @@ module.exports = [
             await endpoint.read('aqaraOpple', [0x040a], {manufacturerCode: 0x115f});
         },
     },
+    {
+        zigbeeModel: ['lumi.remote.acn007'],
+        model: 'WXKG20LM',
+        vendor: 'Xiaomi',
+        description: 'Aqara E1 wireless mini switch',
+        fromZigbee: [fz.battery, fz.aqara_opple_multistate, fz.aqara_opple],
+        toZigbee: [],
+        meta: {battery: {voltageToPercentage: '3V_2850_3000'}},
+        exposes: [e.battery(), e.battery_voltage(), e.action(['single', 'double', 'hold', 'release']),
+            e.device_temperature(), e.power_outage_count()],
+    },
 ];

package/package.json

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