zigbee-herdsman-converters 14.0.336 → 14.0.337

package/converters/fromZigbee.js

@@ -7510,6 +7510,44 @@ const converters = {
             }
         },
     },
+    sunricher_switch2801K2: {
+        cluster: 'greenPower',
+        type: ['commandNotification', 'commandCommisioningNotification'],
+        convert: (model, msg, publish, options, meta) => {
+            const commandID = msg.data.commandID;
+            if (hasAlreadyProcessedMessage(msg, msg.data.frameCounter, `${msg.device.ieeeAddr}_${commandID}`)) return;
+            if (commandID === 224) return;
+            const lookup = {0x21: 'press_on', 0x20: 'press_off', 0x34: 'release', 0x35: 'hold_on', 0x36: 'hold_off'};
+            if (!lookup.hasOwnProperty(commandID)) {
+                meta.logger.error(`Sunricher: missing command '${commandID}'`);
+            } else {
+                return {action: lookup[commandID]};
+            }
+        },
+    },
+    sunricher_switch2801K4: {
+        cluster: 'greenPower',
+        type: ['commandNotification', 'commandCommisioningNotification'],
+        convert: (model, msg, publish, options, meta) => {
+            const commandID = msg.data.commandID;
+            if (hasAlreadyProcessedMessage(msg, msg.data.frameCounter, `${msg.device.ieeeAddr}_${commandID}`)) return;
+            if (commandID === 224) return;
+            const lookup = {
+                0x21: 'press_on',
+                0x20: 'press_off',
+                0x37: 'press_high',
+                0x38: 'press_low',
+                0x35: 'hold_high',
+                0x36: 'hold_low',
+                0x34: 'release',
+            };
+            if (!lookup.hasOwnProperty(commandID)) {
+                meta.logger.error(`Sunricher: missing command '${commandID}'`);
+            } else {
+                return {action: lookup[commandID]};
+            }
+        },
+    },
     // #endregion
 
     // #region Ignore converters (these message dont need parsing).

package/devices/acova.js

@@ -0,0 +1,34 @@
+const exposes = require('../lib/exposes');
+const fz = require('../converters/fromZigbee');
+const tz = require('../converters/toZigbee');
+const reporting = require('../lib/reporting');
+
+module.exports = [{
+    zigbeeModel: ['PERCALE2 D1.00P1.01Z1.00'],
+    model: 'PERCALE2',
+    vendor: 'Acova',
+    description: 'Percale 2 heater',
+    fromZigbee: [fz.thermostat, fz.hvac_user_interface],
+    toZigbee: [
+        tz.thermostat_local_temperature,
+        tz.thermostat_system_mode,
+        tz.thermostat_occupied_heating_setpoint,
+        tz.thermostat_unoccupied_heating_setpoint,
+        tz.thermostat_occupied_cooling_setpoint,
+        tz.thermostat_running_state,
+    ],
+    exposes: [
+        exposes.climate()
+            .withSetpoint('occupied_heating_setpoint', 7, 28, 0.5)
+            .withLocalTemperature()
+            .withSystemMode(['off', 'heat', 'auto'])
+            .withRunningState(['idle', 'heat']),
+    ],
+    configure: async (device, coordinatorEndpoint, logger) => {
+        const endpoint = device.getEndpoint(1);
+        await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg', 'hvacThermostat']);
+        await reporting.thermostatTemperature(endpoint);
+        await reporting.thermostatOccupiedHeatingSetpoint(endpoint);
+        await reporting.thermostatUnoccupiedHeatingSetpoint(endpoint);
+    },
+}];

package/devices/custom_devices_diy.js

@@ -233,4 +233,23 @@ module.exports = [
         },
         exposes: [e.soil_moisture(), e.battery(), e.temperature()],
     },
+    {
+        zigbeeModel: ['EFEKTA_eON213z'],
+        model: 'EFEKTA_eON213z',
+        vendor: 'Custom devices (DiY)',
+        description: '[Temperature and humidity sensor with e-ink2.13](http://efektalab.com/eON213z)',
+        fromZigbee: [fz.temperature, fz.humidity, fz.battery],
+        toZigbee: [tz.factory_reset],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, [
+                'genPowerCfg', 'msTemperatureMeasurement', 'msRelativeHumidity']);
+            const overides = {min: 0, max: 21600, change: 0};
+            await reporting.batteryVoltage(endpoint, overides);
+            await reporting.batteryPercentageRemaining(endpoint, overides);
+            await reporting.temperature(endpoint, overides);
+            await reporting.humidity(endpoint, overides);
+        },
+        exposes: [e.battery(), e.temperature(), e.humidity()],
+    },
 ];

package/devices/danfoss.js

@@ -34,7 +34,9 @@ module.exports = [
             exposes.binary('viewing_direction', ea.ALL, true, false)
                 .withDescription('Viewing/Display Direction. `false` Horizontal or `true` Vertical'),
             exposes.binary('heat_available', ea.ALL, true, false)
-                .withDescription('Not clear how this affects operation. `false` No Heat Available or `true` Heat Available'),
+                .withDescription('Not clear how this affects operation. However, it would appear that the device does not execute any ' +
+                    'motor functions if this is set to false. This may be a means to conserve battery during periods that the heating ' +
+                    'system is not energized (e.g. during summer). `false` No Heat Available or `true` Heat Available'),
             exposes.binary('heat_required', ea.STATE_GET, true, false)
                 .withDescription('Whether or not the unit needs warm water. `false` No Heat Request or `true` Heat Request'),
             exposes.enum('setpoint_change_source', ea.STATE, ['manual', 'schedule', 'externally'])

package/devices/gledopto.js

@@ -39,6 +39,27 @@ const gledoptoExtend = {
             [tz.gledopto_light_onoff_brightness, tz.gledopto_light_color_colortemp],
         ),
     }),
+    switch: (options={}) => ({
+        ...extend.switch(options),
+        onEvent: async (type, data, device) => {
+            // This device doesn't support reporting.
+            // Therefore we read the on/off state every 5 seconds.
+            // This is the same way as the Hue bridge does it.
+            if (type === 'stop') {
+                clearInterval(globalStore.getValue(device, 'interval'));
+                globalStore.clearValue(device, 'interval');
+            } else if (!globalStore.hasValue(device, 'interval')) {
+                const interval = setInterval(async () => {
+                    try {
+                        await device.endpoints[0].read('genOnOff', ['onOff']);
+                    } catch (error) {
+                        // Do nothing
+                    }
+                }, 5000);
+                globalStore.putValue(device, 'interval', interval);
+            }
+        },
+    }),
 };
 
 module.exports = [
@@ -580,32 +601,21 @@ module.exports = [
         zigbeeModel: ['GL-G-007Z'],
         model: 'GL-G-007Z',
         vendor: 'Gledopto',
-        description: 'Zigbee 9W Garden Lamp RGB+CCT',
+        description: 'Zigbee 9W garden lamp RGB+CCT',
         extend: gledoptoExtend.light_onoff_brightness_colortemp_color(),
     },
     {
         zigbeeModel: ['GL-W-001Z'],
         model: 'GL-W-001Z',
         vendor: 'Gledopto',
-        description: 'Zigbee On/Off Wall Switch',
-        extend: extend.switch(),
-        onEvent: async (type, data, device) => {
-            // This device doesn't support reporting.
-            // Therefore we read the on/off state every 5 seconds.
-            // This is the same way as the Hue bridge does it.
-            if (type === 'stop') {
-                clearInterval(globalStore.getValue(device, 'interval'));
-                globalStore.clearValue(device, 'interval');
-            } else if (!globalStore.hasValue(device, 'interval')) {
-                const interval = setInterval(async () => {
-                    try {
-                        await device.endpoints[0].read('genOnOff', ['onOff']);
-                    } catch (error) {
-                        // Do nothing
-                    }
-                }, 5000);
-                globalStore.putValue(device, 'interval', interval);
-            }
-        },
+        description: 'Zigbee on/off wall switch',
+        extend: gledoptoExtend.switch(),
+    },
+    {
+        zigbeeModel: ['GL-SD-002'],
+        model: 'GL-SD-002',
+        vendor: 'Gledopto',
+        description: 'Zigbee 3.0 smart home switch',
+        extend: gledoptoExtend.switch(),
     },
 ];

package/devices/lidl.js

@@ -417,6 +417,7 @@ module.exports = [
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);
+            await reporting.batteryPercentageRemaining(endpoint);
         },
     },
     {
@@ -656,7 +657,7 @@ module.exports = [
         model: '368308_2010',
         vendor: 'Lidl',
         description: 'Silvercrest radiator valve with thermostat',
-        fromZigbee: [fz.ignore_tuya_set_time, fzLocal.zs_thermostat, fz.tuya_data_point_dump],
+        fromZigbee: [fz.ignore_tuya_set_time, fzLocal.zs_thermostat],
         toZigbee: [tzLocal.zs_thermostat_current_heating_setpoint, tzLocal.zs_thermostat_child_lock,
             tzLocal.zs_thermostat_comfort_temp, tzLocal.zs_thermostat_eco_temp, tzLocal.zs_thermostat_preset_mode,
             tzLocal.zs_thermostat_system_mode, tzLocal.zs_thermostat_local_temperature_calibration,

package/devices/sunricher.js

@@ -234,4 +234,22 @@ module.exports = [
             await reporting.currentPositionLiftPercentage(endpoint);
         },
     },
+    {
+        fingerprint: [{modelID: 'GreenPower_2', ieeeAddr: /^0x00000000010.....$/}],
+        model: 'SR-ZGP2801K2-DIM',
+        vendor: 'Sunricher',
+        description: 'Pushbutton transmitter module',
+        fromZigbee: [fz.sunricher_switch2801K2],
+        toZigbee: [],
+        exposes: [e.action(['press_on', 'press_off', 'hold_on', 'hold_off', 'release'])],
+    },
+    {
+        fingerprint: [{modelID: 'GreenPower_2', ieeeAddr: /^0x000000005d5.....$/}],
+        model: 'SR-ZGP2801K4-DIM',
+        vendor: 'Sunricher',
+        description: 'Pushbutton transmitter module',
+        fromZigbee: [fz.sunricher_switch2801K4],
+        toZigbee: [],
+        exposes: [e.action(['press_on', 'press_off', 'press_high', 'press_low', 'hold_high', 'hold_low', 'release'])],
+    },
 ];

package/devices/sylvania.js

@@ -189,4 +189,12 @@ module.exports = [
         extend: extend.ledvance.light_onoff_brightness(),
         ota: ota.ledvance,
     },
+    {
+        zigbeeModel: ['A19 G2 RGBW'],
+        model: '75564',
+        vendor: 'Sylvania',
+        description: 'Smart+ adjustable white and full color bulb A19',
+        extend: extend.ledvance.light_onoff_brightness_colortemp_color({colorTempRange: [142, 555]}),
+        ota: ota.ledvance,
+    },
 ];

package/devices/tuya.js

@@ -66,7 +66,7 @@ module.exports = [
     },
     {
         fingerprint: [{modelID: 'TS0001', manufacturerName: '_TZ3000_hktqahrq'}, {manufacturerName: '_TZ3000_hktqahrq'},
-            {modelID: 'TS000F', manufacturerName: '_TZ3000_m9af2l6g'}],
+            {manufacturerName: '_TZ3000_q6a3tepg'}, {modelID: 'TS000F', manufacturerName: '_TZ3000_m9af2l6g'}],
         model: 'WHD02',
         vendor: 'TuYa',
         description: 'Wall switch module',
@@ -164,6 +164,8 @@ module.exports = [
             {modelID: 'TS0202', manufacturerName: '_TYZB01_dl7cejts'},
             {modelID: 'TS0202', manufacturerName: '_TYZB01_qjqgmqxr'},
             {modelID: 'TS0202', manufacturerName: '_TZ3000_mmtwjmaq'},
+            {modelID: 'TS0202', manufacturerName: '_TZ3000_mcxw5ehu'},
+            {modelID: 'TS0202', manufacturerName: '_TYZB01_hqbdru35'},
             {modelID: 'WHD02', manufacturerName: '_TZ3000_hktqahrq'}],
         model: 'TS0202',
         vendor: 'TuYa',
@@ -717,6 +719,7 @@ module.exports = [
             {modelID: 'TS0601', manufacturerName: '_TZE200_xuzcvlku'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_4vobcgd3'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_nogaemzt'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_r0jdjrvi'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_pk0sfzvr'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_fdtjuw7u'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_zpzndjez'},
@@ -726,6 +729,7 @@ module.exports = [
             {modelID: 'TS0601', manufacturerName: '_TZE200_nueqqe6k'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_xaabybja'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_rmymn92d'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_3i3exuay'},
             {modelID: 'zo2pocs\u0000', manufacturerName: '_TYST11_fzo2pocs'},
             // Roller blinds:
             {modelID: 'TS0601', manufacturerName: '_TZE200_sbordckq'},
@@ -1212,7 +1216,7 @@ module.exports = [
         },
     },
     {
-        fingerprint: [{modelID: 'TS0011', manufacturerName: '_TZ3000_ji4araar'}],
+        fingerprint: [{modelID: 'TS0011', manufacturerName: '_TZ3000_ji4araar'}, {modelID: 'TS0011', manufacturerName: '_TZ3000_qmi1cfuq'}],
         model: 'TS0011_switch_module',
         vendor: 'TuYa',
         description: '1 gang switch module - (without neutral)',
@@ -1251,7 +1255,7 @@ module.exports = [
         },
     },
     {
-        fingerprint: [{modelID: 'TS0012', manufacturerName: '_TZ3000_jl7qyupf'}],
+        fingerprint: [{modelID: 'TS0012', manufacturerName: '_TZ3000_jl7qyupf'}, {modelID: 'TS0012', manufacturerName: '_TZ3000_nPGIPl5D'}],
         model: 'TS0012_switch_module',
         vendor: 'TuYa',
         description: '2 gang switch module - (without neutral)',

package/devices/xiaomi.js

@@ -49,6 +49,15 @@ module.exports = [
         toZigbee: [],
         exposes: [e.contact(), e.battery(), e.battery_voltage()],
     },
+    {
+        zigbeeModel: ['lumi.magnet.ac01'],
+        model: 'MCCGQ13LM',
+        vendor: 'Xiaomi',
+        description: 'Aqara P1 door & window contact sensor',
+        fromZigbee: [fz.ias_contact_alarm_1, fz.aqara_opple],
+        toZigbee: [],
+        exposes: [e.contact(), e.battery(), e.battery_voltage()],
+    },
     {
         zigbeeModel: ['lumi.dimmer.rcbac1'],
         model: 'ZNDDMK11LM',

package/lib/exposes.js

@@ -511,7 +511,7 @@ module.exports = {
         battery: () => new Numeric('battery', access.STATE).withUnit('%').withDescription('Remaining battery in %').withValueMin(0).withValueMax(100),
         battery_low: () => new Binary('battery_low', access.STATE, true, false).withDescription('Indicates if the battery of this device is almost empty'),
         battery_voltage: () => new Numeric('voltage', access.STATE).withUnit('mV').withDescription('Voltage of the battery in millivolts'),
-        boost_time: () => new Numeric('boost_time', access.STATE_SET).withUnit('s').withDescription('Boost time').withValueMin(0).withValueMax(600),
+        boost_time: () => new Numeric('boost_time', access.STATE_SET).withUnit('s').withDescription('Boost time').withValueMin(0).withValueMax(900),
         button_lock: () => new Binary('button_lock', access.ALL, 'ON', 'OFF').withDescription('Disables the physical switch button'),
         carbon_monoxide: () => new Binary('carbon_monoxide', access.STATE, true, false).withDescription('Indicates if CO (carbon monoxide) is detected'),
         child_lock: () => new Lock().withState('child_lock', 'LOCK', 'UNLOCK', 'Enables/disables physical input on the device', access.STATE_SET),

package/npm-shrinkwrap.json

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

package/package.json

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