zigbee-herdsman-converters 15.0.84 → 15.0.86

package/devices/bosch.js

@@ -46,6 +46,12 @@ const displayOrientation = {
     'flipped': 1,
 };
 
+// Radiator Thermostat II
+const displayedTemperature = {
+    'target': 0,
+    'measured': 1,
+};
+
 // Radiator Thermostat II
 const tzLocal = {
     bwa1: {
@@ -69,7 +75,7 @@ const tzLocal = {
         },
     },
     bosch_thermostat: {
-        key: ['window_open', 'boost', 'system_mode', 'pi_heating_demand'],
+        key: ['window_open', 'boost', 'system_mode', 'pi_heating_demand', 'remote_temperature'],
         convertSet: async (entity, key, value, meta) => {
             if (key === 'window_open') {
                 value = value.toUpperCase();
@@ -105,6 +111,12 @@ const tzLocal = {
                     boschManufacturer);
                 return {state: {pi_heating_demand: value}};
             }
+            if (key === 'remote_temperature') {
+                const remoteTemperature = (Math.round((value * 2).toFixed(1)) / 2).toFixed(1) * 100;
+                await entity.write('hvacThermostat',
+                    {0x4040: {value: remoteTemperature, type: herdsman.Zcl.DataType.int16}}, boschManufacturer);
+                return {state: {remote_temperature: value}};
+            }
         },
         convertGet: async (entity, key, meta) => {
             switch (key) {
@@ -120,6 +132,9 @@ const tzLocal = {
             case 'pi_heating_demand':
                 await entity.read('hvacThermostat', [0x4020], boschManufacturer);
                 break;
+            case 'remote_temperature':
+                await entity.read('hvacThermostat', [0x4040], boschManufacturer);
+                break;
 
             default: // Unknown key
                 throw new Error(`Unhandled key toZigbee.bosch_thermostat.convertGet ${key}`);
@@ -127,7 +142,7 @@ const tzLocal = {
         },
     },
     bosch_userInterface: {
-        key: ['display_orientation', 'display_ontime', 'display_brightness', 'child_lock'],
+        key: ['display_orientation', 'display_ontime', 'display_brightness', 'child_lock', 'displayed_temperature'],
         convertSet: async (entity, key, value, meta) => {
             if (key === 'display_orientation') {
                 const index = displayOrientation[value];
@@ -147,6 +162,11 @@ const tzLocal = {
                 await entity.write('hvacUserInterfaceCfg', {keypadLockout});
                 return {state: {child_lock: value}};
             }
+            if (key === 'displayed_temperature') {
+                const index = displayedTemperature[value];
+                await entity.write('hvacUserInterfaceCfg', {0x4039: {value: index, type: herdsman.Zcl.DataType.enum8}}, boschManufacturer);
+                return {state: {displayed_temperature: value}};
+            }
         },
         convertGet: async (entity, key, meta) => {
             switch (key) {
@@ -162,6 +182,9 @@ const tzLocal = {
             case 'child_lock':
                 await entity.read('hvacUserInterfaceCfg', ['keypadLockout']);
                 break;
+            case 'displayed_temperature':
+                await entity.read('hvacUserInterfaceCfg', [0x4039], boschManufacturer);
+                break;
             default: // Unknown key
                 throw new Error(`Unhandled key toZigbee.bosch_userInterface.convertGet ${key}`);
             }
@@ -281,6 +304,9 @@ const fzLocal = {
         convert: (model, msg, publish, options, meta) => {
             const result = {};
             const data = msg.data;
+            if (data.hasOwnProperty(0x4040)) {
+                result.remote_temperature = utils.precisionRound(data[0x4040], 2) / 100;
+            }
             if (data.hasOwnProperty(0x4042)) {
                 result.window_open = (Object.keys(stateOffOn)[data[0x4042]]);
             }
@@ -293,6 +319,7 @@ const fzLocal = {
             }
             if (data.hasOwnProperty(0x4020)) {
                 result.pi_heating_demand = data[0x4020];
+                result.running_state = result.pi_heating_demand >= 10 ? 'heat' : 'idle';
             }
 
             return result;
@@ -307,6 +334,9 @@ const fzLocal = {
             if (data.hasOwnProperty(0x400b)) {
                 result.display_orientation = (Object.keys(displayOrientation)[data[0x400b]]);
             }
+            if (data.hasOwnProperty(0x4039)) {
+                result.displayed_temperature = (Object.keys(displayedTemperature)[data[0x4039]]);
+            }
             if (data.hasOwnProperty(0x403a)) {
                 result.display_ontime = data[0x403a];
             }
@@ -529,13 +559,21 @@ const definition = [
                 .withSetpoint('occupied_heating_setpoint', 5, 30, 0.5)
                 .withLocalTemperatureCalibration(-5, 5, 0.1)
                 .withSystemMode(['off', 'heat', 'auto'])
-                .withPiHeatingDemand(ea.ALL),
+                .withPiHeatingDemand(ea.ALL)
+                .withRunningState(['idle', 'heat'], ea.STATE),
             exposes.binary('boost', ea.ALL, 'ON', 'OFF')
                 .withDescription('Activate Boost heating'),
             exposes.binary('window_open', ea.ALL, 'ON', 'OFF')
                 .withDescription('Window open'),
             exposes.enum('display_orientation', ea.ALL, Object.keys(displayOrientation))
                 .withDescription('Display orientation'),
+            exposes.numeric('remote_temperature', ea.ALL)
+                .withValueMin(0)
+                .withValueMax(30)
+                .withValueStep(0.1)
+                .withUnit('°C')
+                .withDescription('Input for remote temperature sensor. ' +
+                    'Setting this will disable the internal temperature sensor until batteries are removed!'),
             exposes.numeric('display_ontime', ea.ALL)
                 .withValueMin(5)
                 .withValueMax(30)
@@ -544,6 +582,8 @@ const definition = [
                 .withValueMin(0)
                 .withValueMax(10)
                 .withDescription('Specifies the brightness value of the display'),
+            exposes.enum('displayed_temperature', ea.ALL, Object.keys(displayedTemperature))
+                .withDescription('Temperature displayed on the thermostat'),
             e.child_lock().setAccess('state', ea.ALL),
             e.battery(),
         ],
@@ -585,10 +625,10 @@ const definition = [
             }], boschManufacturer);
 
             await endpoint.read('hvacThermostat', ['localTemperatureCalibration']);
-            await endpoint.read('hvacThermostat', [0x4007, 0x4020, 0x4042, 0x4043], boschManufacturer);
+            await endpoint.read('hvacThermostat', [0x4007, 0x4020, 0x4040, 0x4042, 0x4043], boschManufacturer);
 
             await endpoint.read('hvacUserInterfaceCfg', ['keypadLockout']);
-            await endpoint.read('hvacUserInterfaceCfg', [0x400b, 0x403a, 0x403b], boschManufacturer);
+            await endpoint.read('hvacUserInterfaceCfg', [0x400b, 0x4039, 0x403a, 0x403b], boschManufacturer);
         },
     },
     {

package/devices/moes.js

@@ -314,24 +314,6 @@ module.exports = [
                 .withDescription('Boost Time Setting 100 sec - 900 sec, (default = 300 sec)').withValueMin(100)
                 .withValueMax(900).withValueStep(100)],
     },
-    {
-        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_e3oitdyu'}],
-        model: 'MS-105B',
-        vendor: 'Moes',
-        description: 'Smart dimmer module (2 gang)',
-        fromZigbee: [fz.moes_105_dimmer, fz.ignore_basic_report],
-        toZigbee: [tz.moes_105_dimmer],
-        meta: {turnsOffAtBrightness1: true, multiEndpoint: true},
-        configure: async (device, coordinatorEndpoint, logger) => {
-            await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff', 'genLevelCtrl']);
-            if (device.getEndpoint(2)) await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff']);
-        },
-        exposes: [e.light_brightness().withEndpoint('l1').setAccess('state', ea.STATE_SET).setAccess('brightness', ea.STATE_SET),
-            e.light_brightness().withEndpoint('l2').setAccess('state', ea.STATE_SET).setAccess('brightness', ea.STATE_SET)],
-        endpoint: (device) => {
-            return {'l1': 1, 'l2': 1};
-        },
-    },
     {
         fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3000_7hcgjxpc'},
             {modelID: 'TS0505B', manufacturerName: '_TZ3210_rcggc0ys'}],

package/devices/namron.js

@@ -217,7 +217,16 @@ module.exports = [
         zigbeeModel: ['4512701'],
         model: '4512701',
         vendor: 'Namron',
-        description: 'Zigbee 1 channel switch K2',
+        description: 'Zigbee 1 channel switch K2 (White)',
+        fromZigbee: [fz.command_on, fz.command_off, fz.battery, fz.command_move, fz.command_stop],
+        exposes: [e.battery(), e.action(['on', 'off', 'brightness_move_up', 'brightness_move_down', 'brightness_stop'])],
+        toZigbee: [],
+    },
+    {
+        zigbeeModel: ['4512728'],
+        model: '4512728',
+        vendor: 'Namron',
+        description: 'Zigbee 1 channel switch K2 (Black)',
         fromZigbee: [fz.command_on, fz.command_off, fz.battery, fz.command_move, fz.command_stop],
         exposes: [e.battery(), e.action(['on', 'off', 'brightness_move_up', 'brightness_move_down', 'brightness_stop'])],
         toZigbee: [],

package/devices/philips.js

@@ -24,6 +24,13 @@ module.exports = [
         description: 'Hue white ambiance bathroom ceiling light Adore with Bluetooth',
         extend: philips.extend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
     },
+    {
+        zigbeeModel: ['929003056701'],
+        model: '929003056701',
+        vendor: 'Philips',
+        description: 'Hue white ambiance Adore ceiling light',
+        extend: philips.extend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+    },
     {
         zigbeeModel: ['929003045301_01', '929003045301_02', '929003045301_03'],
         model: '929003045301',

package/devices/schneider_electric.js

@@ -9,6 +9,11 @@ const ota = require('../lib/ota');
 const e = exposes.presets;
 const ea = exposes.access;
 
+const exposesLocal = {
+    indicator_mode: exposes.enum('indicator_mode', ea.ALL, ['consistent_with_load', 'reverse_with_load', 'always_off', 'always_on'])
+        .withDescription('Led Indicator Mode'),
+};
+
 const tzLocal = {
     lift_duration: {
         key: ['lift_duration'],
@@ -17,6 +22,20 @@ const tzLocal = {
             return {state: {lift_duration: value}};
         },
     },
+    indicator_mode: {
+        key: ['indicator_mode'],
+        convertSet: async (entity, key, value, meta) => {
+            const endpoint = entity.getDevice().getEndpoint(21);
+            const lookup = {'reverse_with_load': 2, 'consistent_with_load': 0, 'always_off': 3, 'always_on': 1};
+            utils.validateValue(value, Object.keys(lookup));
+            await endpoint.write(0xFF17, {0x0000: {value: lookup[value], type: 0x30}}, {manufacturerCode: 0x105e});
+            return {state: {indicator_mode: value}};
+        },
+        convertGet: async (entity, key, meta) => {
+            const endpoint = entity.getDevice().getEndpoint(21);
+            await endpoint.read(0xFF17, [0x0000], {manufacturerCode: 0x105e});
+        },
+    },
 };
 
 const fzLocal = {
@@ -170,6 +189,18 @@ const fzLocal = {
             return ret;
         },
     },
+    indicator_mode: {
+        cluster: 'clipsalWiserSwitchConfigurationClusterServer',
+        type: ['attributeReport', 'readResponse'],
+        convert: (model, msg, publish, options, meta) => {
+            const result = {};
+            const lookup = {0: 'consistent_with_load', 1: 'always_on', 2: 'reverse_with_load', 3: 'always_off'};
+            if ('indicator_mode' in msg.data) {
+                result.indicator_mode = lookup[msg.data['indicator_mode']];
+            }
+            return result;
+        },
+    },
 };
 
 module.exports = [
@@ -353,13 +384,14 @@ module.exports = [
         model: '41EPBDWCLMZ/354PBDMBTZ',
         vendor: 'Schneider Electric',
         description: 'Wiser 40/300-Series Module Dimmer',
-        fromZigbee: [fz.on_off, fz.brightness, fz.level_config, fz.lighting_ballast_configuration],
-        toZigbee: [tz.light_onoff_brightness, tz.level_config, tz.ballast_config],
+        fromZigbee: [fz.on_off, fz.brightness, fz.level_config, fz.lighting_ballast_configuration, fzLocal.indicator_mode],
+        toZigbee: [tz.light_onoff_brightness, tz.level_config, tz.ballast_config, tzLocal.indicator_mode],
         exposes: [e.light_brightness(),
             exposes.numeric('ballast_minimum_level', ea.ALL).withValueMin(1).withValueMax(254)
                 .withDescription('Specifies the minimum light output of the ballast'),
             exposes.numeric('ballast_maximum_level', ea.ALL).withValueMin(1).withValueMax(254)
-                .withDescription('Specifies the maximum light output of the ballast')],
+                .withDescription('Specifies the maximum light output of the ballast'),
+            exposesLocal.indicator_mode],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(3);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'genLevelCtrl', 'lightingBallastCfg']);
@@ -372,7 +404,12 @@ module.exports = [
         model: '41E2PBSWMZ/356PB2MBTZ',
         vendor: 'Schneider Electric',
         description: 'Wiser 40/300-Series module switch 2A',
-        extend: extend.switch(),
+        ota: ota.zigbeeOTA,
+        extend: extend.switch( {
+            exposes: [exposesLocal.indicator_mode],
+            fromZigbee: [fzLocal.indicator_mode],
+            toZigbee: [tzLocal.indicator_mode],
+        }),
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
@@ -384,7 +421,11 @@ module.exports = [
         model: '41E10PBSWMZ-VW',
         vendor: 'Schneider Electric',
         description: 'Wiser 40/300-Series module switch 10A with ControlLink',
-        extend: extend.switch(),
+        extend: extend.switch({
+            exposes: [exposesLocal.indicator_mode],
+            fromZigbee: [fzLocal.indicator_mode],
+            toZigbee: [tzLocal.indicator_mode],
+        }),
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);

package/devices/shenzhen_homa.js

@@ -18,7 +18,7 @@ module.exports = [
         extend: extend.light_onoff_brightness_colortemp(),
     },
     {
-        zigbeeModel: ['HOMA1002', 'HOMA0019', 'HOMA0006', 'HOMA000F', '019'],
+        zigbeeModel: ['HOMA1002', 'HOMA0019', 'HOMA0006', 'HOMA000F', '019', 'HOMA1004'],
         model: 'HLC610-Z',
         vendor: 'Shenzhen Homa',
         description: 'Wireless dimmable controller',

package/devices/tuya.js

@@ -854,7 +854,7 @@ module.exports = [
         exposes: [e.carbon_monoxide(), e.co()],
     },
     {
-        fingerprint: tuya.fingerprint('TS0601', ['_TZE200_ggev5fsl', '_TZE200_u319yc66']),
+        fingerprint: tuya.fingerprint('TS0601', ['_TZE200_ggev5fsl', '_TZE200_u319yc66', '_TZE204_yojqa8xn']),
         model: 'TS0601_gas_sensor_1',
         vendor: 'TuYa',
         description: 'Gas sensor',
@@ -1310,7 +1310,7 @@ module.exports = [
         ],
     },
     {
-        fingerprint: tuya.fingerprint('TS0601', ['_TZE200_fjjbhx9d']),
+        fingerprint: tuya.fingerprint('TS0601', ['_TZE200_fjjbhx9d', '_TZE200_e3oitdyu']),
         model: 'TS0601_dimmer_2',
         vendor: 'TuYa',
         description: '2 gang smart dimmer',
@@ -1343,6 +1343,7 @@ module.exports = [
         },
         whiteLabel: [
             {vendor: 'Moes', model: 'ZS-EUD_2gang'},
+            {vendor: 'Moes', model: 'MS-105B'}, // _TZE200_e3oitdyu
         ],
     },
     {
@@ -1450,7 +1451,7 @@ module.exports = [
         whiteLabel: [{vendor: 'LoraTap', model: 'SC400'}],
         exposes: [e.cover_position(), exposes.enum('moving', ea.STATE, ['UP', 'STOP', 'DOWN']),
             exposes.binary('calibration', ea.ALL, 'ON', 'OFF'), exposes.binary('motor_reversal', ea.ALL, 'ON', 'OFF'),
-            exposes.enum('backlight_mode', ea.ALL, ['LOW', 'MEDIUM', 'HIGH']),
+            exposes.enum('backlight_mode', ea.ALL, ['low', 'medium', 'high']),
             exposes.numeric('calibration_time', ea.STATE).withUnit('S').withDescription('Calibration time')],
     },
     {
@@ -1999,11 +2000,12 @@ module.exports = [
         },
     },
     {
-        fingerprint: tuya.fingerprint('TS0002', ['_TZ3000_01gpyda5', '_TZ3000_bvrlqyj7', '_TZ3000_7ed9cqgi', '_TZ3000_zmy4lslw']),
+        fingerprint: tuya.fingerprint('TS0002', ['_TZ3000_01gpyda5', '_TZ3000_bvrlqyj7', '_TZ3000_7ed9cqgi',
+            '_TZ3000_zmy4lslw', '_TZ3000_ruxexjfz']),
         model: 'TS0002_switch_module',
         vendor: 'TuYa',
         description: '2 gang switch module',
-        whiteLabel: [{vendor: 'OXT', model: 'SWTZ22'}],
+        whiteLabel: [{vendor: 'OXT', model: 'SWTZ22'}, {vendor: 'Nous', model: 'L13Z'}],
         extend: tuya.extend.switch({switchType: true, endpoints: ['l1', 'l2']}),
         endpoint: (device) => {
             return {'l1': 1, 'l2': 2};
@@ -3770,11 +3772,19 @@ module.exports = [
         fromZigbee: [fz.tuya_remote],
         toZigbee: [],
     },
+    {
+        zigbeeModel: ['TS0052'],
+        model: 'TS0052',
+        vendor: 'TuYa',
+        description: 'Zigbee dimmer module 1 channel',
+        extend: tuya.extend.light_onoff_brightness(),
+    },
     {
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_ikvncluo'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_lyetpprm'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_jva8ink8'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_holel4dk'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_xpq2rzhq'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_wukb7rhc'},
             {modelID: 'TS0601', manufacturerName: '_TZE204_ztc6ggyl'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_ztc6ggyl'}],

package/devices/xiaomi.js

@@ -2239,6 +2239,14 @@ module.exports = [
         vendor: 'Xiaomi',
         fromZigbee: [fz.xiaomi_basic, fz.xiaomi_curtain_position, fz.xiaomi_curtain_position_tilt],
         toZigbee: [tz.xiaomi_curtain_position_state, tz.xiaomi_curtain_options],
+        onEvent: async (type, data, device) => {
+            if (type === 'message' && data.type === 'attributeReport' && data.cluster === 'genBasic' &&
+                data.data.hasOwnProperty('1028') && data.data['1028'] == 0) {
+                // Try to read the position after the motor stops, the device occasionally report wrong data right after stopping
+                // Might need to add delay, seems to be working without one but needs more tests.
+                await device.getEndpoint(1).read('genAnalogOutput', ['presentValue']);
+            }
+        },
         exposes: [e.cover_position().setAccess('state', ea.ALL),
             exposes.binary('running', ea.STATE, true, false)
                 .withDescription('Whether the motor is moving or not'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "15.0.84",
+  "version": "15.0.86",
   "description": "Collection of device converters to be used with zigbee-herdsman",
   "main": "index.js",
   "files": [
@@ -34,11 +34,11 @@
   },
   "homepage": "https://github.com/Koenkk/zigbee-herdsman-converters",
   "dependencies": {
-    "axios": "^1.3.4",
+    "axios": "^1.3.5",
     "buffer-crc32": "^0.2.13",
     "https-proxy-agent": "^5.0.1",
     "tar-stream": "^3.0.0",
-    "zigbee-herdsman": "^0.14.103"
+    "zigbee-herdsman": "^0.14.105"
   },
   "devDependencies": {
     "eslint": "*",