zigbee-herdsman-converters 14.0.319 → 14.0.320

package/converters/fromZigbee.js

@@ -1574,6 +1574,10 @@ const converters = {
             const result = {};
             const data = msg.data;
 
+            if (data.hasOwnProperty(0x0401)) { // Load
+                result.load = data[0x0401];
+            }
+
             if (data.hasOwnProperty(0x0402)) { // Display text
                 result.display_text = data[0x0402];
             }
@@ -3551,24 +3555,6 @@ const converters = {
                 return {child_lock: value ? 'LOCK' : 'UNLOCK'};
             case tuya.dataPoints.moesSbattery:
                 return {battery: value};
-            case tuya.dataPoints.moesSschedule:
-                return {
-                    program_weekday:
-                        {weekday: ' ' + value[0] + 'h:' + value[1] + 'm ' + value[2]/2 + '°C' +
-                                ',  ' + value[3] + 'h:' + value[4] + 'm ' + value[5]/2 + '°C' +
-                                ',  ' + value[6] + 'h:' + value[7] + 'm ' + value[8]/2 + '°C' +
-                                ',  ' + value[9] + 'h:' + value[10] + 'm ' + value[11]/2 + '°C '},
-                    program_saturday:
-                        {saturday: '' + value[12] + 'h:' + value[13] + 'm ' + value[14]/2 + '°C' +
-                                ',  ' + value[15] + 'h:' + value[16] + 'm ' + value[17]/2 + '°C' +
-                                ',   ' + value[18] + 'h:' + value[19] + 'm ' + value[20]/2 + '°C' +
-                                ',  ' + value[21] + 'h:' + value[22] + 'm ' + value[23]/2 + '°C '},
-                    program_sunday:
-                        {sunday: '  ' + value[24] + 'h:' + value[25] + 'm ' + value[26]/2 + '°C' +
-                                ',  ' + value[27] + 'h:' + value[28] + 'm ' + value[29]/2 + '°C' +
-                                ',  ' + value[30] + 'h:' + value[31] + 'm ' + value[32]/2 + '°C' +
-                                ',  ' + value[33] + 'h:' + value[34] + 'm ' + value[35]/2 + '°C '},
-                };
             case tuya.dataPoints.moesSboostHeatingCountdownTimeSet:
                 return {boost_heating_countdown_time_set: (value)};
             case tuya.dataPoints.moesSvalvePosition:
@@ -3583,6 +3569,18 @@ const converters = {
                 return {max_temperature: value};
             case tuya.dataPoints.moesSminTempSet:
                 return {min_temperature: value};
+            case tuya.dataPoints.moesSschedule: {
+                const items = [];
+                const pMode = [];
+                for (let i = 0; i < 12; i++) {
+                    const item = {h: value[i*3], m: value[i*3+1], temp: value[i*3+2] / 2};
+                    items[i] = item;
+                    pMode[i] = item['h'].toString().padStart(2, '0') + ':' +
+                        item['m'].toString().padStart(2, '0') + '/' +
+                        item['temp'] + '°C';
+                }
+                return {programming_mode: pMode.join('  ')};
+            }
             default:
                 meta.logger.warn(`zigbee-herdsman-converters:moesS_thermostat: NOT RECOGNIZED DP #${
                     dp} with data ${JSON.stringify(msg.data)}`);

package/converters/toZigbee.js

@@ -1379,6 +1379,16 @@ const converters = {
     // #endregion
 
     // #region Non-generic converters
+    elko_load: {
+        key: ['load'],
+        convertSet: async (entity, key, value, meta) => {
+            await entity.write('hvacThermostat', {'elkoLoad': value});
+            return {state: {load: value}};
+        },
+        convertGet: async (entity, key, meta) => {
+            await entity.read('hvacThermostat', ['elkoLoad']);
+        },
+    },
     elko_display_text: {
         key: ['display_text'],
         convertSet: async (entity, key, value, meta) => {
@@ -2830,6 +2840,25 @@ const converters = {
             await tuya.sendDataPointValue(entity, tuya.dataPoints.moesSminTempSet, temp);
         },
     },
+    moesS_thermostat_schedule_programming: {
+        key: ['programming_mode'],
+        convertSet: async (entity, key, value, meta) => {
+            const payload = [];
+            const items = value.split('  ');
+            for (let i = 0; i < 12; i++) {
+                const hourTemperature = items[i].split('/');
+                const hourMinute = hourTemperature[0].split(':', 2);
+                const h = parseInt(hourMinute[0]);
+                const m = parseInt(hourMinute[1]);
+                const temp = parseInt(hourTemperature[1]);
+                if (h < 0 || h >= 24 || m < 0 || m >= 60 || temp < 5 || temp >= 35) {
+                    throw new Error('Invalid hour, minute or temperature of:' + items[i]);
+                }
+                payload[i*3] = h; payload[i*3+1] = m; payload[i*3+2] = temp * 2;
+            }
+            return tuya.sendDataPointRaw(entity, tuya.dataPoints.moesSschedule, payload);
+        },
+    },
     tvtwo_thermostat: {
         key: [
             'window_detection', 'frost_protection', 'child_lock',

package/devices/elko.js

@@ -27,11 +27,15 @@ module.exports = [
         vendor: 'ELKO',
         description: 'ESH Plus Super TR RF PH',
         fromZigbee: [fz.elko_thermostat, fz.thermostat],
-        toZigbee: [tz.thermostat_occupied_heating_setpoint, tz.thermostat_occupied_heating_setpoint,
+        toZigbee: [tz.thermostat_occupied_heating_setpoint, tz.thermostat_occupied_heating_setpoint, tz.elko_load,
             tz.elko_display_text, tz.elko_power_status, tz.elko_external_temp, tz.elko_mean_power, tz.elko_child_lock, tz.elko_frost_guard,
             tz.elko_relay_state, tz.elko_sensor_mode, tz.elko_local_temperature_calibration, tz.elko_max_floor_temp,
             tz.elko_regulator_mode, tz.elko_regulator_time, tz.elko_night_switching],
         exposes: [exposes.text('display_text', ea.ALL).withDescription('Displayed text on thermostat display (zone). Max 14 characters'),
+            exposes.numeric('load', ea.ALL).withUnit('W')
+                .withDescription('Load in W when heating is on (between 0-2000 W). The thermostat uses the value as input to the ' +
+                'mean_power calculation.')
+                .withValueMin(0).withValueMax(2000),
             exposes.binary('regulator_mode', ea.ALL, 'regulator', 'thermostat')
                 .withDescription('Device in regulator or thermostat mode.'),
             exposes.numeric('regulator_time', ea.ALL).withUnit('min')
@@ -69,6 +73,13 @@ module.exports = [
             await reporting.thermostatOccupiedHeatingSetpoint(endpoint);
 
             // ELKO attributes
+            // Load value
+            await endpoint.configureReporting('hvacThermostat', [{
+                attribute: 'elkoLoad',
+                minimumReportInterval: 0,
+                maximumReportInterval: constants.repInterval.HOUR,
+                reportableChange: null,
+            }]);
             // Power status
             await endpoint.configureReporting('hvacThermostat', [{
                 attribute: 'elkoPowerStatus',

package/devices/keen_home.js

@@ -41,7 +41,7 @@ module.exports = [
         exposes: [e.cover_position().setAccess('state', ea.ALL), e.temperature(), e.battery(), e.pressure()],
     },
     {
-        zigbeeModel: ['SV02-410-MP-1.3', 'SV02-610-MP-1.3', 'SV02-612-MP-1.3', 'SV02-410-MP-1.0'],
+        zigbeeModel: ['SV02-410-MP-1.3', 'SV02-412-MP-1.3', 'SV02-610-MP-1.3', 'SV02-612-MP-1.3', 'SV02-410-MP-1.0'],
         model: 'SV02',
         vendor: 'Keen Home',
         description: 'Smart vent',

package/devices/moes.js

@@ -202,7 +202,8 @@ module.exports = [
             tz.moesS_thermostat_boost_heating_countdown, tz.moesS_thermostat_system_mode,
             tz.moesS_thermostat_boost_heating, tz.moesS_thermostat_boostHeatingCountdownTimeSet,
             tz.moesS_thermostat_eco_temperature, tz.moesS_thermostat_max_temperature,
-            tz.moesS_thermostat_min_temperature, tz.moesS_thermostat_moesSecoMode],
+            tz.moesS_thermostat_min_temperature, tz.moesS_thermostat_moesSecoMode,
+            tz.moesS_thermostat_schedule_programming],
         exposes: [
             e.battery(), e.child_lock(), e.eco_mode(), e.eco_temperature(), e.max_temperature(), e.min_temperature(),
             e.position(), e.window_detection(),
@@ -218,11 +219,9 @@ module.exports = [
                 'to 15 degrees Celsius. After 10 days, the device will automatically switch to programming mode. ' +
                 'TEMPORARY MANUAL MODE - In this mode, ☝ icon will flash. At this time, the device executes the manually set ' +
                 'temperature and returns to the weekly programming mode in the next time period. '),
-            exposes.composite('programming_mode').withDescription('PROGRAMMING MODE ⏱ - In this mode, ' +
-                'the device executes a preset week programming temperature time and temperature. ')
-                .withFeature(exposes.text('program_weekday', ea.STATE))
-                .withFeature(exposes.text('program_saturday', ea.STATE))
-                .withFeature(exposes.text('program_sunday', ea.STATE)),
+            exposes.text('programming_mode', ea.STATE_SET).withDescription('PROGRAMMING MODE ⏱ - In this mode, ' +
+                'the device executes a preset week programming temperature time and temperature. ' +
+                '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'),

package/devices/tuya.js

@@ -976,7 +976,8 @@ module.exports = [
             {modelID: 'TS011F', manufacturerName: '_TZ3000_ps3dmato'},
             {modelID: 'TS011F', manufacturerName: '_TZ3000_mraovvmm'},
             {modelID: 'TS011F', manufacturerName: '_TZ3000_jvzvulen'},
-            {modelID: 'TS011F', manufacturerName: '_TZ3000_w0qqde0g'}],
+            {modelID: 'TS011F', manufacturerName: '_TZ3000_w0qqde0g'},
+            {modelID: 'TS011F', manufacturerName: '_TZ3000_nfnmi125'}],
         model: 'TS011F_plug_1',
         description: 'Smart plug (with power monitoring)',
         vendor: 'TuYa',

package/devices/xiaomi.js

@@ -1357,7 +1357,7 @@ module.exports = [
             await reporting.batteryVoltage(endpoint);
             await reporting.illuminance(endpoint, {min: 15, max: constants.repInterval.HOUR, change: 500});
         },
-        exposes: [e.battery(), e.illuminance(), e.illuminance_lux()],
+        exposes: [e.battery(), e.battery_voltage(), e.illuminance(), e.illuminance_lux()],
     },
     {
         zigbeeModel: ['lumi.light.rgbac1'],

package/npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "14.0.319",
+  "version": "14.0.320",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

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