zigbee-herdsman-converters 14.0.554 → 14.0.557

package/converters/toZigbee.js

@@ -73,7 +73,7 @@ const converters = {
             }
 
             if (isNotification) {
-                entity.commandResponse('ssIasAce', 'armRsp', {armnotification: mode}, {}, value.transaction);
+                await entity.commandResponse('ssIasAce', 'armRsp', {armnotification: mode}, {}, value.transaction);
 
                 // Do not update PanelStatus after confirming transaction.
                 // Instead the server should send an arm_mode command with the necessary state.
@@ -88,7 +88,7 @@ const converters = {
 
             globalStore.putValue(entity, 'panelStatus', panelStatus);
             const payload = {panelstatus: panelStatus, secondsremain: 0, audiblenotif: 0, alarmstatus: 0};
-            entity.commandResponse('ssIasAce', 'panelStatusChanged', payload);
+            await entity.commandResponse('ssIasAce', 'panelStatusChanged', payload);
         },
     },
     battery_percentage_remaining: {
@@ -2577,17 +2577,7 @@ const converters = {
             return {state: {power_outage_memory: value}};
         },
     },
-    tuya_switch_power_outage_memory: {
-        key: ['power_outage_memory'],
-        convertSet: async (entity, key, value, meta) => {
-            value = value.toLowerCase();
-            const lookup = {'off': 0x00, 'on': 0x01, 'restore': 0x02};
-            utils.validateValue(value, Object.keys(lookup));
-            const payload = lookup[value];
-            await entity.write('genOnOff', {0x8002: {value: payload, type: 0x30}});
-            return {state: {power_outage_memory: value}};
-        },
-    },
+
     tuya_relay_din_led_indicator: {
         key: ['indicator_mode'],
         convertSet: async (entity, key, value, meta) => {
@@ -3580,6 +3570,17 @@ const converters = {
             await tuya.sendDataPointBool(entity, tuya.dataPoints.state, value === 'cool');
         },
     },
+    tuya_switch_power_outage_memory: {
+        key: ['power_outage_memory'],
+        convertSet: async (entity, key, value, meta) => {
+            value = value.toLowerCase();
+            const lookup = {'off': 0x00, 'on': 0x01, 'restore': 0x02};
+            utils.validateValue(value, Object.keys(lookup));
+            const payload = lookup[value];
+            await entity.write('genOnOff', {0x8002: {value: payload, type: 0x30}});
+            return {state: {power_outage_memory: value}};
+        },
+    },
     moes_power_on_behavior: {
         key: ['power_on_behavior'],
         convertSet: async (entity, key, value, meta) => {

package/devices/RMC002.js

@@ -0,0 +1,17 @@
+const reporting = require('../lib/reporting');
+const extend = require('../lib/extend');
+
+module.exports = [
+    {
+        zigbeeModel: ['Bouffalolab'],
+        model: 'RMC002',
+        vendor: 'Bouffalolab',
+        description: 'US plug smart socket',
+        extend: extend.switch(),
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(endpoint);
+        },
+    },
+];

package/devices/giex.js

@@ -0,0 +1,132 @@
+const exposes = require('../lib/exposes');
+const tuya = require('../lib/tuya');
+const e = exposes.presets;
+const ea = exposes.access;
+
+const dataPoints = {
+    // GIEX Water Valve
+    giexWaterValveState: 2,
+    giexWaterValveMode: 1,
+    giexWaterValveIrrigationTarget: 104,
+    giexWaterValveWaterConsumed: 111,
+    giexWaterValveIrrigationStartTime: 101,
+    giexWaterValveIrrigationEndTime: 102,
+    giexWaterValveLastIrrigationDuration: 114,
+    giexWaterValveBattery: 108,
+    giexWaterValveCycleIrrigationNumTimes: 103,
+    giexWaterValveCycleIrrigationInterval: 105,
+    giexWaterValveCurrentTempurature: 106,
+};
+
+const fzLocal = {
+    giex_water_valve:
+    {
+        cluster: 'manuSpecificTuya',
+        type: ['commandDataResponse', 'commandDataReport'],
+        convert: (model, msg, publish, options, meta) => {
+            for (const dpValue of msg.data.dpValues) {
+                const value = tuya.getDataValue(dpValue);
+                const dp = dpValue.dp;
+                switch (dp) {
+                case dataPoints.giexWaterValveState: {
+                    return {state: value ? 'ON': 'OFF'};
+                }
+                case dataPoints.giexWaterValveMode: {
+                    return {mode: value ? 'capacity': 'duration'};
+                }
+                case dataPoints.giexWaterValveIrrigationTarget: {
+                    return {irrigation_target: value};
+                }
+                case dataPoints.giexWaterValveCycleIrrigationNumTimes: {
+                    return {cycle_irrigation_num_times: value};
+                }
+                case dataPoints.giexWaterValveCycleIrrigationInterval: {
+                    return {cycle_irrigation_interval: value};
+                }
+                case dataPoints.giexWaterValveWaterConsumed: {
+                    return {water_consumed: value};
+                }
+                case dataPoints.giexWaterValveIrrigationStartTime: {
+                    return {irrigation_start_time: value};
+                }
+                case dataPoints.giexWaterValveIrrigationEndTime: {
+                    return {irrigation_end_time: value};
+                }
+                case dataPoints.giexWaterValveLastIrrigationDuration: {
+                    return {last_irrigation_duration: value};
+                }
+                case dataPoints.giexWaterValveBattery: {
+                    return {battery: value};
+                }
+                case dataPoints.giexWaterValveCurrentTempurature: {
+                    return; // Do Nothing - value ignored because isn't a valid tempurature reading.  Misdocumented and usage unclear
+                }
+                default: {
+                    meta.logger.warn(`fz:giex_water_valve: NOT RECOGNIZED DP #${dp} with VALUE = ${value}`);
+                }
+                }
+            }
+        },
+    },
+};
+
+const tzLocal = {
+    giex_water_valve:
+    {
+        key: ['mode', 'irrigation_target', 'state', 'cycle_irrigation_num_times', 'cycle_irrigation_interval'],
+        convertSet: async (entity, key, value, meta) => {
+            switch (key) {
+            case 'mode': {
+                let mode = 0;
+                if (value === 'duration') mode = 0;
+                else if (value === 'capacity') mode = 1;
+                await tuya.sendDataPointBool(entity, dataPoints.giexWaterValveMode, mode);
+                return {state: {mode: value}};
+            }
+            case 'irrigation_target':
+                await tuya.sendDataPointValue(entity, dataPoints.giexWaterValveIrrigationTarget, value);
+                return {state: {irrigation_target: value}};
+            case 'state':
+                await tuya.sendDataPointBool(entity, dataPoints.giexWaterValveState, value === 'ON');
+                break;
+            case 'cycle_irrigation_num_times':
+                await tuya.sendDataPointValue(entity, dataPoints.giexWaterValveCycleIrrigationNumTimes, value);
+                return {state: {cycle_irrigation_num_times: value}};
+            case 'cycle_irrigation_interval':
+                await tuya.sendDataPointValue(entity, dataPoints.giexWaterValveCycleIrrigationInterval, value);
+                return {state: {cycle_irrigation_interval: value}};
+            default: // Unknown key warning
+                meta.logger.warn(`tz.GIEX_water_valve: Unhandled key ${key}`);
+            }
+        },
+    },
+};
+
+module.exports = [
+    {
+        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_sh1btabb'}],
+        model: 'QT06',
+        vendor: 'GiEX',
+        description: 'Water irrigation valve',
+        onEvent: tuya.onEventSetLocalTime,
+        fromZigbee: [fzLocal.giex_water_valve],
+        toZigbee: [tzLocal.giex_water_valve],
+        exposes: [
+            e.battery(),
+            exposes.binary('state', ea.STATE_SET, 'ON', 'OFF').withDescription('State'),
+            exposes.enum('mode', ea.STATE_SET, ['duration', 'capacity']).withDescription('Irrigation mode'),
+            exposes.numeric('irrigation_target', exposes.access.STATE_SET).withValueMin(0).withValueMax(1440).withUnit('mintues or Litres')
+                .withDescription('Irrigation Target, duration in minutes or capacity in Liters (depending on mode)'),
+            exposes.numeric('cycle_irrigation_num_times', exposes.access.STATE_SET).withValueMin(0).withValueMax(100).withUnit('#')
+                .withDescription('Number of cycle irrigation times, set to 0 for single cycle'),
+            exposes.numeric('cycle_irrigation_interval', exposes.access.STATE_SET).withValueMin(0).withValueMax(1440).withUnit('min')
+                .withDescription('Cycle irrigation interval'),
+            exposes.numeric('irrigation_start_time', ea.STATE).withUnit('GMT+8').withDescription('Irrigation start time'),
+            exposes.numeric('irrigation_end_time', ea.STATE).withUnit('GMT+8').withDescription('Irrigation end time'),
+            exposes.numeric('last_irrigation_duration', exposes.access.STATE).withUnit('min')
+                .withDescription('Last irrigation duration'),
+            exposes.numeric('water_consumed', exposes.access.STATE).withUnit('L')
+                .withDescription('Water consumed (Litres)'),
+        ],
+    },
+];

package/devices/ikea.js

@@ -46,7 +46,7 @@ const bulbOnEvent = async (type, data, device, options, state) => {
 };
 
 const configureRemote = async (device, coordinatorEndpoint, logger) => {
-    // Firmware 2.3.75 >= only supports binding to endpoint, before only to group
+    // Firmware 2.3.075 >= only supports binding to endpoint, before only to group
     // - https://github.com/Koenkk/zigbee2mqtt/issues/2772#issuecomment-577389281
     // - https://github.com/Koenkk/zigbee2mqtt/issues/7716
     const endpoint = device.getEndpoint(1);
@@ -292,7 +292,8 @@ module.exports = [
         extend: tradfriExtend.light_onoff_brightness_colortemp(),
     },
     {
-        zigbeeModel: ['TRADFRIbulbE27WSglobeopal1055lm', 'TRADFRIbulbE26WSglobeopal1100lm', 'TRADFRIbulbE26WSglobeopal1160lm'],
+        zigbeeModel: ['TRADFRIbulbE27WSglobeopal1055lm', 'TRADFRIbulbE26WSglobeopal1100lm', 'TRADFRIbulbE26WSglobeopal1160lm',
+            'TRADFRIbulbE26WSglobeopal1055lm'],
         model: 'LED2003G10',
         vendor: 'IKEA',
         description: 'TRADFRI LED bulb E26/27 1100/1055/1160 lumen, dimmable, white spectrum, opal white',

package/devices/lidl.js

@@ -486,14 +486,6 @@ module.exports = [
             device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});
         },
     },
-    {
-        fingerprint: [{modelID: 'TS0505B', manufactureName: '_TZ3210_umi6vbsz'}],
-        model: '100341862',
-        vendor: 'Lidl',
-        description: 'Livarno Home LED-Flooder',
-        extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500], disableColorTempStartup: true}),
-        meta: {applyRedFix: true, enhancedHue: false},
-    },
     {
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_s8gkrkxk'}],
         model: 'HG06467',
@@ -614,6 +606,17 @@ module.exports = [
             device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});
         },
     },
+    {
+        fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3000_q50zhdsc'}],
+        model: 'HG08131C',
+        vendor: 'Lidl',
+        description: 'Livarno Home outdoor E27 bulb in set with flare',
+        ...extend.light_onoff_brightness_colortemp_color({disableColorTempStartup: true, colorTempRange: [153, 500]}),
+        meta: {applyRedFix: true, enhancedHue: false},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            device.getEndpoint(1).saveClusterAttributeKeyValue('lightingColorCtrl', {colorCapabilities: 29});
+        },
+    },
     {
         fingerprint: [{modelID: 'TS0505A', manufacturerName: '_TZ3000_kdpxju99'}],
         model: 'HG06106A',

package/devices/niko.js

@@ -96,7 +96,7 @@ const local = {
 module.exports = [
     {
         zigbeeModel: ['Connected socket outlet'],
-        model: '170-33505',
+        model: '170-33505/170-34605',
         vendor: 'Niko',
         description: 'Connected socket outlet',
         fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, local.fz.outlet],

package/devices/paulmann.js

@@ -64,6 +64,14 @@ module.exports = [
         extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 370]}),
     },
     {
+        fingerprint: [{modelID: 'RGBW Controller', manufacturerName: 'Paulmann Licht'}],
+        model: '94191',
+        vendor: 'Paulmann',
+        description: 'Plug & shine LED strip',
+        extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 370]}),
+    },
+    {
+        fingerprint: [{modelID: 'CCT Light', manufacturerName: 'Paulmann lamp'}],
         zigbeeModel: ['CCT light', 'CCT_light', 'CCT light '],
         model: '50064',
         vendor: 'Paulmann',