zigbee-herdsman-converters 15.0.32 → 15.0.34

package/converters/fromZigbee.js

@@ -6111,6 +6111,7 @@ const converters = {
             let result = null;
 
             if (value === 0) result = {action: 'shake'};
+            else if (value === 1) result = {action: 'throw'};
             else if (value === 2) result = {action: 'wakeup'};
             else if (value === 3) result = {action: 'fall'};
             else if (value >= 512) result = {action: 'tap', side: value-512};

package/devices/bitron.js

@@ -194,8 +194,8 @@ module.exports = [
             tz.thermostat_occupied_cooling_setpoint, tz.thermostat_local_temperature_calibration, tz.thermostat_local_temperature,
             tz.thermostat_running_state, tz.thermostat_temperature_display_mode, tz.thermostat_keypad_lockout, tz.thermostat_system_mode],
         exposes: [e.battery(), exposes.climate().withSetpoint('occupied_heating_setpoint', 7, 30, 0.5).withLocalTemperature()
-            .withSystemMode(['off', 'heat']).withRunningState(['idle', 'heat', 'cool'])
-            .withLocalTemperatureCalibration(-30, 30, 0.1), e.keypad_lockout()],
+            .withSystemMode(['off', 'heat']).withRunningState(['idle', 'heat'])
+            .withLocalTemperatureCalibration(), e.keypad_lockout()],
         meta: {battery: {voltageToPercentage: '3V_2500_3200'}},
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);

package/devices/bosch.js

@@ -202,8 +202,22 @@ const tzLocal = {
 };
 
 
-// Radiator Thermostat II
 const fzLocal = {
+    bosch_contact: {
+        cluster: 'ssIasZone',
+        type: 'commandStatusChangeNotification',
+        convert: (model, msg, publish, options, meta) => {
+            const zoneStatus = msg.data.zonestatus;
+            const lookup = {0: 'none', 1: 'single', 2: 'long'};
+            const result = {
+                contact: !((zoneStatus & 1) > 0),
+                battery_low: (zoneStatus & 1<<3) > 0,
+                action: lookup[(zoneStatus >> 11) & 3],
+            };
+            if (result.action === 'none') delete result.action;
+            return result;
+        },
+    },
     bosch_thermostat: {
         cluster: 'hvacThermostat',
         type: ['attributeReport', 'readResponse'],
@@ -528,6 +542,15 @@ const definition = [
         },
         exposes: [e.switch(), e.power_on_behavior(), e.power(), e.energy()],
     },
+    {
+        zigbeeModel: ['RBSH-SWD-ZB'],
+        model: 'BSEN-C2',
+        vendor: 'Bosch',
+        description: 'Door/window contact II',
+        fromZigbee: [fzLocal.bosch_contact],
+        toZigbee: [],
+        exposes: [e.battery_low(), e.contact(), e.action(['single', 'long'])],
+    },
     {
         zigbeeModel: ['RBSH-SP-ZB-FR'],
         model: 'BSP-EZ2',

package/devices/ecozy.js

@@ -19,7 +19,7 @@ module.exports = [
             tz.thermostat_pi_heating_demand, tz.thermostat_running_state],
         exposes: [e.battery(), exposes.climate().withSetpoint('occupied_heating_setpoint', 7, 30, 1).withLocalTemperature()
             .withSystemMode(['off', 'auto', 'heat']).withRunningState(['idle', 'heat'])
-            .withLocalTemperatureCalibration(-30, 30, 0.1)
+            .withLocalTemperatureCalibration()
             .withPiHeatingDemand(ea.STATE_GET)],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(3);

package/devices/elko.js

@@ -60,7 +60,7 @@ module.exports = [
                 '(quick) wooden floors.'),
             exposes.climate().withSetpoint('occupied_heating_setpoint', 5, 50, 1)
                 .withLocalTemperature(ea.STATE)
-                .withLocalTemperatureCalibration(-30, 30, 0.1)
+                .withLocalTemperatureCalibration()
                 .withSystemMode(['off', 'heat']).withRunningState(['idle', 'heat']),
             e.temperature_sensor_select(['air', 'floor', 'supervisor_floor']),
             exposes.numeric('floor_temp', ea.STATE_GET).withUnit('°C')

package/devices/enbrighten.js

@@ -148,4 +148,16 @@ module.exports = [
             await reporting.onOff(endpoint);
         },
     },
+    {
+        zigbeeModel: ['43109'],
+        model: '43109',
+        vendor: 'Enbrighten',
+        description: 'Zigbee in-wall smart switch',
+        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/eurotronic.js

@@ -20,7 +20,7 @@ module.exports = [
             tz.eurotronic_current_heating_setpoint, tz.eurotronic_trv_mode, tz.eurotronic_valve_position],
         exposes: [e.battery(), exposes.climate().withSetpoint('occupied_heating_setpoint', 5, 30, 0.5).withLocalTemperature()
             .withSystemMode(['off', 'auto', 'heat']).withRunningState(['idle', 'heat'])
-            .withLocalTemperatureCalibration(-30, 30, 0.1)
+            .withLocalTemperatureCalibration()
             .withPiHeatingDemand(),
         exposes.enum('trv_mode', exposes.access.ALL, [1, 2])
             .withDescription('Select between direct control of the valve via the `valve_position` or automatic control of the '+

package/devices/frankever.js

@@ -7,7 +7,8 @@ const ea = exposes.access;
 module.exports = [
     {
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_wt9agwf3'},
-            {modelID: 'TS0601', manufacturerName: '_TZE200_5uodvhgc'}],
+            {modelID: 'TS0601', manufacturerName: '_TZE200_5uodvhgc'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_1n2zev06'}],
         model: 'FK_V02',
         vendor: 'FrankEver',
         description: 'Zigbee smart water valve',

package/devices/heiman.js

@@ -475,6 +475,25 @@ module.exports = [
             await reporting.batteryPercentageRemaining(endpoint, {min: constants.repInterval.MINUTES_5, max: constants.repInterval.HOUR});
         },
     },
+    {
+        zigbeeModel: ['HS3HT-EFA-3.0'],
+        model: 'HS3HT',
+        vendor: 'HEIMAN',
+        description: 'Temperature & humidity sensor with display',
+        fromZigbee: [fz.temperature, fz.humidity, fz.battery],
+        toZigbee: [],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint1 = device.getEndpoint(1);
+            await reporting.bind(endpoint1, coordinatorEndpoint, ['msTemperatureMeasurement', 'genPowerCfg']);
+            await reporting.temperature(endpoint1);
+            await reporting.batteryPercentageRemaining(endpoint1);
+            await endpoint1.read('genPowerCfg', ['batteryPercentageRemaining']);
+            const endpoint2 = device.getEndpoint(2);
+            await reporting.bind(endpoint2, coordinatorEndpoint, ['msRelativeHumidity']);
+            await reporting.humidity(endpoint2);
+        },
+        exposes: [e.battery(), e.temperature(), e.humidity()],
+    },
     {
         zigbeeModel: ['GASSensor-EM', '358e4e3e03c644709905034dae81433e'],
         model: 'HS1CG-E',

package/devices/leviton.js

@@ -111,7 +111,7 @@ module.exports = [
             exposes.climate().withSetpoint('occupied_heating_setpoint', 10, 30, 1).withLocalTemperature()
                 .withSystemMode(['off', 'auto', 'heat', 'cool']).withFanMode(['auto', 'on', 'smart'])
                 .withSetpoint('occupied_cooling_setpoint', 10, 30, 1)
-                .withLocalTemperatureCalibration(-30, 30, 0.1).withPiHeatingDemand()],
+                .withLocalTemperatureCalibration().withPiHeatingDemand()],
     },
     {
         // Reference from a similar switch: https://gist.github.com/nebhead/dc5a0a827ec14eef6196ded4be6e2dd0

package/devices/lonsonho.js

@@ -119,7 +119,7 @@ module.exports = [
         exposes: [e.light_brightness().withMinBrightness()],
     },
     {
-        fingerprint: [{modelID: 'TS110F', manufacturerName: '_TYZB01_v8gtiaed'}, {modelID: 'TS110E', manufacturerName: '_TZ3210_pagajpog'}],
+        fingerprint: [{modelID: 'TS110F', manufacturerName: '_TYZB01_v8gtiaed'}],
         model: 'QS-Zigbee-D02-TRIAC-2C-LN',
         vendor: 'Lonsonho',
         description: '2 gang smart dimmer switch module with neutral',
@@ -139,7 +139,7 @@ module.exports = [
         },
     },
     {
-        fingerprint: [{modelID: 'TS110F', manufacturerName: '_TZ3000_92chsky7'}, {modelID: 'TS110E', manufacturerName: '_TZ3210_4ubylghk'}],
+        fingerprint: [{modelID: 'TS110F', manufacturerName: '_TZ3000_92chsky7'}],
         model: 'QS-Zigbee-D02-TRIAC-2C-L',
         vendor: 'Lonsonho',
         description: '2 gang smart dimmer switch module without neutral',

package/devices/paulmann.js

@@ -9,7 +9,7 @@ module.exports = [
         model: '501.34',
         vendor: 'Paulmann',
         description: 'Smart switch 4 buttons white',
-        fromZigbee: [fz.command_on, fz.command_off, fz.battery],
+        fromZigbee: [fz.command_on, fz.command_off, fz.battery, fz.command_move, fz.command_stop],
         toZigbee: [],
         exposes: [e.battery(), e.action(['on_1', 'off_1', 'on_2', 'off_2', 'brightness_move_up_1', 'brightness_move_down_1',
             'brightness_move_stop_1', 'brightness_move_up_2', 'brightness_move_down_2', 'brightness_move_stop_2'])],

package/devices/philips.js

@@ -815,7 +815,7 @@ module.exports = [
         model: '8718699688882',
         vendor: 'Philips',
         description: 'Hue white Filament bulb G93 E27 bluetooth',
-        extend: philips.extend.light_onoff_brightness(),
+        extend: philips.extend.light_onoff_brightness({disableHueEffects: false}),
     },
     {
         zigbeeModel: ['LST001'],

package/devices/schneider_electric.js

@@ -704,7 +704,7 @@ module.exports = [
             exposes.climate()
                 .withSetpoint('occupied_heating_setpoint', 7, 30, 0.5, ea.STATE_SET)
                 .withLocalTemperature(ea.STATE)
-                .withLocalTemperatureCalibration(-30, 30, 0.1, ea.STATE_SET)
+                .withLocalTemperatureCalibration(-12.8, 12.7, 0.1, ea.STATE_SET)
                 .withPiHeatingDemand()],
         meta: {battery: {voltageToPercentage: '3V_2500'}},
         configure: async (device, coordinatorEndpoint, logger) => {

package/devices/sonoff.js

@@ -1,5 +1,6 @@
 const exposes = require('../lib/exposes');
 const fz = require('../converters/fromZigbee');
+const tz = require('../converters/toZigbee');
 const constants = require('../lib/constants');
 const reporting = require('../lib/reporting');
 const extend = require('../lib/extend');
@@ -246,4 +247,13 @@ module.exports = [
             device.save();
         },
     },
+    {
+        zigbeeModel: ['ZBCurtain'],
+        model: 'ZBCurtain',
+        vendor: 'SONOFF',
+        description: 'Zigbee smart curtain motor',
+        fromZigbee: [fz.cover_position_tilt, fz.battery],
+        toZigbee: [tz.cover_state, tz.cover_position_tilt],
+        exposes: [e.cover_position(), e.battery()],
+    },
 ];

package/devices/third_reality.js

@@ -15,7 +15,12 @@ module.exports = [
         ota: ota.zigbeeOTA,
         fromZigbee: [fz.on_off, fz.battery],
         toZigbee: [tz.on_off, tz.ignore_transition],
-        exposes: [e.switch(), e.battery_voltage()],
+        meta: {battery: {dontDividePercentage: true}},
+        exposes: [e.switch(), e.battery(), e.battery_voltage()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            device.powerSource = 'Battery';
+            device.save();
+        },
     },
     {
         zigbeeModel: ['3RSS008Z'],

package/devices/tuya.js

@@ -3886,7 +3886,7 @@ module.exports = [
     },
     {
         fingerprint: [{modelID: 'TS110E', manufacturerName: '_TZ3210_wdexaypg'}, {modelID: 'TS110E', manufacturerName: '_TZ3210_3mpwqzuu'}],
-        model: 'TS110E_2gang',
+        model: 'TS110E_2gang_1',
         vendor: 'TuYa',
         description: '2 channel dimmer',
         fromZigbee: extend.light_onoff_brightness({disablePowerOnBehavior: true, disableMoveStep: true, disableTransition: true})
@@ -3911,6 +3911,28 @@ module.exports = [
             return {l1: 1, l2: 2};
         },
     },
+    {
+        fingerprint: tuya.fingerprint('TS110E', ['_TZ3210_pagajpog', '_TZ3210_4ubylghk']),
+        model: 'TS110E_2gang_2',
+        vendor: 'TuYa',
+        description: '2 channel dimmer',
+        fromZigbee: [fzLocal.TS110E, fzLocal.TS110E_light_type, tuya.fz.power_on_behavior, fz.on_off],
+        toZigbee: [tzLocal.TS110E_onoff_brightness, tzLocal.TS110E_options, tuya.tz.power_on_behavior, tz.light_brightness_move],
+        meta: {multiEndpoint: true},
+        exposes: [
+            e.light_brightness().withMinBrightness().withMaxBrightness().withEndpoint('l1'),
+            e.light_brightness().withMinBrightness().withMaxBrightness().withEndpoint('l2'),
+            e.power_on_behavior().withAccess(ea.ALL)],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await tuya.configureMagicPacket(device, coordinatorEndpoint, logger);
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'genLevelCtrl']);
+            await reporting.onOff(endpoint);
+        },
+        endpoint: (device) => {
+            return {l1: 1, l2: 2};
+        },
+    },
     {
         fingerprint: tuya.fingerprint('TS0601', ['_TZE200_nslr42tt']),
         model: 'TS0601_3_phase_clamp_meter',

package/devices/xiaomi.js

@@ -1782,7 +1782,7 @@ module.exports = [
         fromZigbee: [fz.xiaomi_basic, fz.MFKZQ01LM_action_multistate, fz.MFKZQ01LM_action_analog],
         exposes: [e.battery(), e.battery_voltage(), e.angle('action_angle'), e.device_temperature(), e.power_outage_count(false),
             e.cube_side('action_from_side'), e.cube_side('action_side'), e.cube_side('action_to_side'), e.cube_side('side'),
-            e.action(['shake', 'wakeup', 'fall', 'tap', 'slide', 'flip180', 'flip90', 'rotate_left', 'rotate_right'])],
+            e.action(['shake', 'throw', 'wakeup', 'fall', 'tap', 'slide', 'flip180', 'flip90', 'rotate_left', 'rotate_right'])],
         toZigbee: [],
     },
     {

package/devices/zen.js

@@ -18,7 +18,7 @@ module.exports = [
         exposes: [exposes.climate().withSetpoint('occupied_heating_setpoint', 10, 30, 0.5)
             .withSetpoint('occupied_cooling_setpoint', 10, 31, 0.5).withLocalTemperature()
             .withSystemMode(['off', 'auto', 'heat', 'cool']).withRunningState(['idle', 'heat', 'cool'])
-            .withLocalTemperatureCalibration(-30, 30, 0.1).withPiHeatingDemand()],
+            .withLocalTemperatureCalibration().withPiHeatingDemand()],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(3) || device.getEndpoint(1);
             const binds = ['genBasic', 'genIdentify', 'genPowerCfg', 'genTime', 'hvacThermostat', 'hvacUserInterfaceCfg'];

package/lib/exposes.js

@@ -391,7 +391,8 @@ class Climate extends Base {
         return this;
     }
 
-    withLocalTemperatureCalibration(min, max, step, access=a.ALL) {
+    withLocalTemperatureCalibration(min=-12.8, max=12.7, step=0.1, access=a.ALL) {
+        // For devices following the ZCL local_temperature_calibration is an int8, so min = -12.8 and max 12.7
         assert(!this.endpoint, 'Cannot add feature after adding endpoint');
         this.features.push(new Numeric('local_temperature_calibration', access)
             .withValueMin(min).withValueMax(max).withValueStep(step).withUnit('°C').withDescription('Offset to be used in the local_temperature'));

package/lib/zosung.js

@@ -10,8 +10,9 @@ function nextSeq(entity) {
 
 function messagesGet(entity, seq) {
     const info = entity.irMessageInfo;
-    if (info.seq!=seq) {
-        throw new Error(`Unexpected sequence value (expected: ${info.seq} current: ${seq}).`);
+    const expected = (info&&info.seq) || 0;
+    if (expected!==seq) {
+        throw new Error(`Unexpected sequence value (expected: ${expected} current: ${seq}).`);
     }
     return info.data;
 }
@@ -21,18 +22,19 @@ function messagesSet(entity, seq, data) {
 
 function messagesClear(entity, seq) {
     const info = entity.irMessageInfo;
-    if (info.seq!=seq) {
-        throw new Error(`Unexpected sequence value (expected: ${info.seq} current: ${seq}).`);
+    const expected = (info&&info.seq) || 0;
+    if (expected!==seq) {
+        throw new Error(`Unexpected sequence value (expected: ${expected} current: ${seq}).`);
     }
     delete entity.irMessageInfo;
 }
 
 function calcArrayCrc(values) {
-    return Array.from(values.values()).reduce((a, b)=>a+b)%0x100;
+    return Array.from(values.values()).reduce((a, b)=>a+b, 0)%0x100;
 }
 
 function calcStringCrc(str) {
-    return str.split('').map((x)=>x.charCodeAt(0)).reduce((a, b)=>a+b)%0x100;
+    return str.split('').map((x)=>x.charCodeAt(0)).reduce((a, b)=>a+b, 0)%0x100;
 }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "15.0.32",
+  "version": "15.0.34",
   "description": "Collection of device converters to be used with zigbee-herdsman",
   "main": "index.js",
   "files": [
@@ -34,7 +34,7 @@
   },
   "homepage": "https://github.com/Koenkk/zigbee-herdsman-converters",
   "dependencies": {
-    "axios": "^1.2.3",
+    "axios": "^1.2.6",
     "buffer-crc32": "^0.2.13",
     "https-proxy-agent": "^5.0.1",
     "tar-stream": "^3.0.0",