zigbee-herdsman-converters 14.0.608 → 14.0.609

package/devices/niko.js

@@ -61,9 +61,8 @@ const local = {
                 if (!operationModeLookup.hasOwnProperty(value)) {
                     throw new Error(`operation_mode was called with an invalid value (${value})`);
                 } else {
-                    const operationModeProperty = `operation_mode${meta.endpoint_name ? `_${meta.endpoint_name}` : ''}`;
                     await entity.write('manuSpecificNiko1', {'switchOperationMode': operationModeLookup[value]});
-                    return {state: {[operationModeProperty]: value.toLowerCase()}};
+                    return {state: {operation_mode: value.toLowerCase()}};
                 }
             },
             convertGet: async (entity, key, meta) => {

package/devices/onesti.js

@@ -8,7 +8,7 @@ const constants = require('../lib/constants');
 
 module.exports = [
     {
-        zigbeeModel: ['easyCodeTouch_v1', 'EasyCodeTouch'],
+        zigbeeModel: ['easyCodeTouch_v1', 'EasyCodeTouch', 'EasyFingerTouch'],
         model: 'easyCodeTouch_v1',
         vendor: 'Onesti Products AS',
         description: 'Zigbee module for EasyAccess code touch series',
@@ -21,6 +21,8 @@ module.exports = [
             await reporting.lockState(endpoint);
             await reporting.batteryPercentageRemaining(endpoint);
             await endpoint.read('closuresDoorLock', ['lockState', 'soundVolume']);
+            device.powerSource = 'Battery';
+            device.save();
         },
         exposes: [e.lock(), e.battery(), e.sound_volume(),
             e.lock_action_source_name(), e.lock_action_user(),

package/devices/perenio.js

@@ -59,15 +59,30 @@ const fzPerenio = {
         type: ['attributeReport', 'readResponse'],
         convert: (model, msg, publish, options, meta) => {
             const result = {};
+            if (msg.data.hasOwnProperty(2)) {
+                result['rms_current'] = msg.data[2];
+            }
             if (msg.data.hasOwnProperty(3)) {
                 result['rms_voltage'] = msg.data[3];
             }
+            if (msg.data.hasOwnProperty(4)) {
+                result['voltage_min'] = msg.data[4];
+            }
+            if (msg.data.hasOwnProperty(5)) {
+                result['voltage_max'] = msg.data[5];
+            }
             if (msg.data.hasOwnProperty(10)) {
                 result['active_power'] = msg.data[10];
             }
+            if (msg.data.hasOwnProperty(11)) {
+                result['power_max'] = msg.data[11];
+            }
             if (msg.data.hasOwnProperty(14)) {
                 result['consumed_energy'] = msg.data[14];
             }
+            if (msg.data.hasOwnProperty(15)) {
+                result['consumed_energy_limit'] = msg.data[15];
+            }
             if (msg.data.hasOwnProperty(24)) {
                 result['rssi'] = msg.data[24];
             }
@@ -84,6 +99,7 @@ const fzPerenio = {
                     result['alarm_voltage_min'] = false;
                     result['alarm_voltage_max'] = false;
                     result['alarm_power_max'] = false;
+                    result['alarm_consumed_energy'] = false;
                 } else {
                     if (msg.data[1] & 1) {
                         result['alarm_voltage_min'] = true;
@@ -94,6 +110,9 @@ const fzPerenio = {
                     if (msg.data[1] & 4) {
                         result['alarm_power_max'] = true;
                     }
+                    if (msg.data[1] & 8) {
+                        result['alarm_consumed_energy'] = true;
+                    }
                 }
             }
             return result;
@@ -135,15 +154,51 @@ const tzPerenio = {
         },
     },
     alarms_reset: {
-        key: ['alarm_voltage_min', 'alarm_voltage_max', 'alarm_power_max'],
+        key: ['alarm_voltage_min', 'alarm_voltage_max', 'alarm_power_max', 'alarm_consumed_energy'],
         convertSet: async (entity, key, val, meta) => {
             await entity.write(64635, {1: {value: 0, type: 0x20}}, {manufacturerCode: 0x007B});
-            return {state: {alarm_voltage_min: false, alarm_voltage_max: false, alarm_power_max: false}};
+            return {state: {alarm_voltage_min: false, alarm_voltage_max: false, alarm_power_max: false, alarm_consumed_energy: false}};
         },
         convertGet: async (entity, key, meta) => {
             await entity.read(64635, [1]);
         },
     },
+    alarms_limits: {
+        key: ['voltage_min', 'voltage_max', 'power_max', 'consumed_energy_limit'],
+        convertSet: async (entity, key, val, meta) => {
+            switch (key) {
+            case 'voltage_min':
+                await entity.write(64635, {4: {value: val, type: 0x21}}, {manufacturerCode: 0x007B});
+                break;
+            case 'voltage_max':
+                await entity.write(64635, {5: {value: val, type: 0x21}}, {manufacturerCode: 0x007B});
+                break;
+            case 'power_max':
+                await entity.write(64635, {11: {value: val, type: 0x21}}, {manufacturerCode: 0x007B});
+                break;
+            case 'consumed_energy_limit':
+                await entity.write(64635, {15: {value: val, type: 0x21}}, {manufacturerCode: 0x007B});
+                break;
+            }
+            return {state: {[key]: val}};
+        },
+        convertGet: async (entity, key, meta) => {
+            switch (key) {
+            case 'voltage_min':
+                await entity.read(64635, [4]);
+                break;
+            case 'voltage_max':
+                await entity.read(64635, [5]);
+                break;
+            case 'power_max':
+                await entity.read(64635, [11]);
+                break;
+            case 'consumed_energy_limit':
+                await entity.read(64635, [15]);
+                break;
+            }
+        },
+    },
     on_off_mod: {
         key: ['state', 'on_time', 'off_wait_time'],
         convertSet: async (entity, key, value, meta) => {
@@ -291,8 +346,8 @@ module.exports = [
         model: 'PEHPL0X',
         vendor: 'Perenio',
         description: 'Power link',
-        fromZigbee: [fz.on_off, fzPerenio.smart_plug],
-        toZigbee: [tzPerenio.on_off_mod, tzPerenio.default_state, tzPerenio.alarms_reset],
+        fromZigbee: [fz.on_off, fzPerenio.smart_plug, fz.metering],
+        toZigbee: [tzPerenio.on_off_mod, tzPerenio.default_state, tzPerenio.alarms_reset, tzPerenio.alarms_limits],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 64635]);
@@ -303,7 +358,26 @@ module.exports = [
                 reportableChange: 0,
             }];
             await endpoint.configureReporting('genOnOff', payload);
-            await endpoint.read(64635, [0, 1]);
+            await endpoint.configureReporting(64635, [{
+                attribute: {ID: 0x000a, type: 0x21},
+                minimumReportInterval: 5,
+                maximumReportInterval: 60,
+                reportableChange: 0,
+            }]);
+            await endpoint.configureReporting(64635, [{
+                attribute: {ID: 0x000e, type: 0x23},
+                minimumReportInterval: 5,
+                maximumReportInterval: 60,
+                reportableChange: 0,
+            }]);
+            await endpoint.configureReporting(64635, [{
+                attribute: {ID: 0x0003, type: 0x21},
+                minimumReportInterval: 5,
+                maximumReportInterval: 5,
+                reportableChange: 0,
+            }]);
+            await endpoint.read(64635, [0, 1, 2, 3]);
+            await endpoint.read(64635, [4, 5, 11, 15]);
         },
         exposes: [
             e.switch(),
@@ -317,6 +391,17 @@ module.exports = [
                 .withDescription('Indicates if the alarm is triggered on the voltage rise above the limit, allows to reset alarms'),
             exposes.binary('alarm_power_max', ea.ALL, true, false)
                 .withDescription('Indicates if the alarm is triggered on the active power rise above the limit, allows to reset alarms'),
+            exposes.binary('alarm_consumed_energy', ea.ALL, true, false)
+                .withDescription(
+                    'Indicates if the alarm is triggered when the consumption energy limit is reached, allows to reset alarms'),
+            exposes.numeric('voltage_min', ea.ALL).withValueMin(0).withValueMax(253)
+                .withDescription('Minimum allowable voltage limit for alarms.'),
+            exposes.numeric('voltage_max', ea.ALL).withValueMin(0).withValueMax(253)
+                .withDescription('Maximum allowable voltage limit for alarms.'),
+            exposes.numeric('power_max', ea.ALL).withValueMin(0).withValueMax(65534)
+                .withDescription('Maximum allowable power limit for alarms.'),
+            exposes.numeric('consumed_energy_limit', ea.ALL).withValueMin(0).withValueMax(65534)
+                .withDescription('Limit of electric energy consumption in kW*h. 0 value represents no limit'),
             exposes.numeric('rssi', ea.STATE).withUnit('dB')
                 .withDescription('RSSI seen by the device').withValueMin(-128).withValueMax(127),
         ],

package/devices/qoto.js

@@ -0,0 +1,113 @@
+const fz = require('../converters/fromZigbee');
+const exposes = require('../lib/exposes');
+const tuya = require('../lib/tuya');
+const e = exposes.presets;
+const ea = exposes.access;
+
+const dataPoints = {
+    valve_state_auto_shutdown: 2,
+    water_flow: 3,
+    shutdown_timer: 11,
+    remaining_watering_time: 101,
+    valve_state: 102,
+    last_watering_duration: 107,
+    battery: 110,
+};
+
+const fzLocal = {
+    watering_timer: {
+        cluster: 'manuSpecificTuya',
+        type: ['commandDataReport'],
+        convert: (model, msg, publish, options, meta) => {
+            const result = {};
+            for (const dpValue of msg.data.dpValues) {
+                const dp = dpValue.dp; // First we get the data point ID
+                const value = tuya.getDataValue(dpValue); // This function will take care of converting the data to proper JS type
+                switch (dp) {
+                case dataPoints.water_flow: {
+                    result.water_flow = value;
+                    break;
+                }
+                case dataPoints.remaining_watering_time: {
+                    result.remaining_watering_time = value;
+                    break;
+                }
+                case dataPoints.last_watering_duration: {
+                    result.last_watering_duration = value;
+                    break;
+                }
+
+                case dataPoints.valve_state: {
+                    result.valve_state = value;
+                    break;
+                }
+
+                case dataPoints.shutdown_timer: {
+                    result.shutdown_timer = value;
+                    break;
+                }
+                case dataPoints.valve_state_auto_shutdown: {
+                    result.valve_state_auto_shutdown = value;
+                    result.valve_state = value;
+                    break;
+                }
+
+                case dataPoints.battery: {
+                    result.battery = value;
+                    break;
+                }
+                default: {
+                    meta.logger.debug(`>>> UNKNOWN DP #${dp} with data "${JSON.stringify(dpValue)}"`);
+                }
+                }
+            }
+            return result;
+        },
+    },
+};
+
+const tzLocal = {
+    valve_state: {
+        key: ['valve_state'],
+        convertSet: async (entity, key, value, meta) => {
+            await tuya.sendDataPointValue(entity, dataPoints.valve_state, value);
+        },
+    },
+    shutdown_timer: {
+        key: ['shutdown_timer'],
+        convertSet: async (entity, key, value, meta) => {
+            await tuya.sendDataPointValue(entity, dataPoints.shutdown_timer, value);
+        },
+    },
+    valve_state_auto_shutdown: {
+        key: ['valve_state_auto_shutdown'],
+        convertSet: async (entity, key, value, meta) => {
+            await tuya.sendDataPointValue(entity, dataPoints.valve_state_auto_shutdown, value);
+        },
+    },
+};
+
+module.exports = [
+    {
+        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_arge1ptm'}],
+        model: 'QT-05M',
+        vendor: 'QOTO',
+        description: 'Solar powered garden watering timer',
+        fromZigbee: [fz.ignore_basic_report, fz.ignore_tuya_set_time, fz.ignore_onoff_report, fzLocal.watering_timer],
+        toZigbee: [tzLocal.valve_state, tzLocal.shutdown_timer, tzLocal.valve_state_auto_shutdown],
+        exposes: [
+            exposes.numeric('water_flow', ea.STATE).withUnit('%').withValueMin(0).withDescription('Current water flow in %.'),
+            exposes.numeric('last_watering_duration', ea.STATE).withUnit('sec').withValueMin(0)
+                .withDescription('Last watering duration in seconds.'),
+            exposes.numeric('remaining_watering_time', ea.STATE).withUnit('sec').withValueMin(0)
+                .withDescription('Remaning watering time (for auto shutdown). Updates every minute, and every 10s in the last minute.'),
+            exposes.numeric('valve_state', ea.STATE_SET).withValueMin(0).withValueMax(100).withValueStep(5).withUnit('%')
+                .withDescription('Set valve to %.'),
+            exposes.numeric('shutdown_timer', ea.STATE_SET).withValueMin(0).withValueMax(14400).withUnit('sec')
+                .withDescription('Auto shutdown in seconds.'),
+            exposes.numeric('valve_state_auto_shutdown', ea.STATE_SET).withValueMin(0).withValueMax(100).withValueStep(5).withUnit('%')
+                .withDescription('Set valve to % with auto shutdown.'),
+            e.battery(),
+        ],
+    },
+];

package/devices/tuya.js

@@ -20,7 +20,7 @@ const TS011Fplugs = ['_TZ3000_5f43h46b', '_TZ3000_cphmq0q7', '_TZ3000_dpo1ysak',
     '_TZ3000_rdtixbnu', '_TZ3000_typdpbpg', '_TZ3000_kx0pris5', '_TZ3000_amdymr7l', '_TZ3000_z1pnpsdo', '_TZ3000_ksw8qtmt',
     '_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_ss98ec5d', '_TZ3000_gznh2xla', '_TZ3000_hdopuwv6'];
 
 const tzLocal = {
     hpsz: {

package/package.json

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