zigbee-herdsman-converters 14.0.682 → 14.0.684

package/converters/fromZigbee.js

@@ -184,6 +184,10 @@ const converters = {
                 result.keypad_lockout = constants.keypadLockoutMode.hasOwnProperty(msg.data['keypadLockout']) ?
                     constants.keypadLockoutMode[msg.data['keypadLockout']] : msg.data['keypadLockout'];
             }
+            if (msg.data.hasOwnProperty('tempDisplayMode')) {
+                result.temperature_display_mode = constants.temperatureDisplayMode.hasOwnProperty(msg.data['tempDisplayMode']) ?
+                    constants.temperatureDisplayMode[msg.data['tempDisplayMode']] : msg.data['tempDisplayMode'];
+            }
             return result;
         },
     },
@@ -2805,6 +2809,8 @@ const converters = {
                 buttonMapping = {1: '1', 2: '2', 3: '3'};
             } else if (['TS0044', 'YSR-MINI-Z', 'TS004F'].includes(model.model)) {
                 buttonMapping = {1: '1', 2: '2', 3: '3', 4: '4'};
+            } else if (['TS0046'].includes(model.model)) {
+                buttonMapping = {1: '1', 2: '2', 3: '3', 4: '4', 5: '5', 6: '6'};
             }
             const button = buttonMapping ? `${buttonMapping[msg.endpoint.ID]}_` : '';
             // Since it is a non standard ZCL command, no default response is send from zigbee-herdsman
@@ -3416,45 +3422,6 @@ const converters = {
             return result;
         },
     },
-    sinope_TH1300ZB_specific: {
-        cluster: 'manuSpecificSinope',
-        type: ['attributeReport', 'readResponse'],
-        convert: (model, msg, publish, options, meta) => {
-            const lookup = {0: 'off', 1: 'on'};
-            const result = {};
-            if (msg.data.hasOwnProperty('GFCiStatus')) {
-                result.gfci_status = lookup[msg.data['GFCiStatus']];
-            }
-            if (msg.data.hasOwnProperty('floorLimitStatus')) {
-                result.floor_limit_status = lookup[msg.data['floorLimitStatus']];
-            }
-            return result;
-        },
-    },
-    sinope_thermostat: {
-        cluster: 'hvacThermostat',
-        type: ['readResponse'],
-        convert: (model, msg, publish, options, meta) => {
-            const result = {};
-            const cycleOutputLookup = {15: '15_sec', 300: '5_min', 600: '10_min',
-                900: '15_min', 1200: '20_min', 1800: '30_min', 65535: 'off'};
-            if (msg.data.hasOwnProperty('1024')) {
-                const lookup = {0: 'unoccupied', 1: 'occupied'};
-                result.thermostat_occupancy = lookup[msg.data['1024']];
-            }
-            if (msg.data.hasOwnProperty('1025')) {
-                result.main_cycle_output = cycleOutputLookup[msg.data['1025']];
-            }
-            if (msg.data.hasOwnProperty('1026')) {
-                const lookup = {0: 'on_demand', 1: 'sensing'};
-                result.backlight_auto_dim = lookup[msg.data['1026']];
-            }
-            if (msg.data.hasOwnProperty('1028')) {
-                result.aux_cycle_output = cycleOutputLookup[msg.data['1028']];
-            }
-            return result;
-        },
-    },
     danfoss_thermostat: {
         cluster: 'hvacThermostat',
         type: ['attributeReport', 'readResponse'],

package/converters/toZigbee.js

@@ -1247,6 +1247,10 @@ const converters = {
         convertSet: async (entity, key, value, meta) => {
             const tempDisplayMode = utils.getKey(constants.temperatureDisplayMode, value, value, Number);
             await entity.write('hvacUserInterfaceCfg', {tempDisplayMode});
+            return {readAfterWriteTime: 250, state: {temperature_display_mode: value}};
+        },
+        convertGet: async (entity, key, meta) => {
+            await entity.read('hvacUserInterfaceCfg', ['tempDisplayMode']);
         },
     },
     thermostat_keypad_lockout: {
@@ -4252,186 +4256,6 @@ const converters = {
             await entity.read('hvacThermostat', [0x4000], manufacturerOptions.eurotronic);
         },
     },
-    sinope_thermostat_occupancy: {
-        key: ['thermostat_occupancy'],
-        convertSet: async (entity, key, value, meta) => {
-            const sinopeOccupancy = {0: 'unoccupied', 1: 'occupied'};
-            const SinopeOccupancy = utils.getKey(sinopeOccupancy, value, value, Number);
-            await entity.write('hvacThermostat', {SinopeOccupancy});
-            return {state: {'thermostat_occupancy': value}};
-        },
-        convertGet: async (entity, key, meta) => {
-            await entity.read('hvacThermostat', ['SinopeOccupancy']);
-        },
-    },
-    sinope_thermostat_backlight_autodim_param: {
-        key: ['backlight_auto_dim'],
-        convertSet: async (entity, key, value, meta) => {
-            const sinopeBacklightParam = {0: 'on_demand', 1: 'sensing'};
-            const SinopeBacklight = utils.getKey(sinopeBacklightParam, value, value, Number);
-            await entity.write('hvacThermostat', {SinopeBacklight});
-            return {state: {'backlight_auto_dim': value}};
-        },
-        convertGet: async (entity, key, meta) => {
-            await entity.read('hvacThermostat', ['SinopeBacklight']);
-        },
-    },
-    sinope_thermostat_enable_outdoor_temperature: {
-        key: ['enable_outdoor_temperature'],
-        convertSet: async (entity, key, value, meta) => {
-            if (value.toLowerCase() == 'on') {
-                await entity.write('manuSpecificSinope', {outdoorTempToDisplayTimeout: 10800});
-            } else if (value.toLowerCase() == 'off') {
-                // set timer to 30sec in order to disable outdoor temperature
-                await entity.write('manuSpecificSinope', {outdoorTempToDisplayTimeout: 30});
-            }
-        },
-    },
-    sinope_thermostat_outdoor_temperature: {
-        key: ['thermostat_outdoor_temperature'],
-        convertSet: async (entity, key, value, meta) => {
-            if (value > -100 && value < 100) {
-                await entity.write('manuSpecificSinope', {outdoorTempToDisplay: value * 100});
-            }
-        },
-    },
-    sinope_thermostat_time: {
-        key: ['thermostat_time'],
-        convertSet: async (entity, key, value, meta) => {
-            if (value === '') {
-                const thermostatDate = new Date();
-                const thermostatTimeSec = thermostatDate.getTime() / 1000;
-                const thermostatTimezoneOffsetSec = thermostatDate.getTimezoneOffset() * 60;
-                const currentTimeToDisplay = Math.round(thermostatTimeSec - thermostatTimezoneOffsetSec - 946684800);
-                await entity.write('manuSpecificSinope', {currentTimeToDisplay});
-            } else if (value !== '') {
-                await entity.write('manuSpecificSinope', {currentTimeToDisplay: value});
-            }
-        },
-    },
-    sinope_floor_control_mode: {
-        // TH1300ZB specific
-        key: ['floor_control_mode'],
-        convertSet: async (entity, key, value, meta) => {
-            if (typeof value !== 'string') {
-                return;
-            }
-            const lookup = {'ambiant': 1, 'floor': 2};
-            value = value.toLowerCase();
-            if (lookup.hasOwnProperty(value)) {
-                await entity.write('manuSpecificSinope', {floorControlMode: lookup[value]});
-            }
-        },
-    },
-    sinope_ambiant_max_heat_setpoint: {
-        // TH1300ZB specific
-        key: ['ambiant_max_heat_setpoint'],
-        convertSet: async (entity, key, value, meta) => {
-            if (value >= 5 && value <= 36) {
-                await entity.write('manuSpecificSinope', {ambiantMaxHeatSetpointLimit: value * 100});
-            }
-        },
-    },
-    sinope_floor_min_heat_setpoint: {
-        // TH1300ZB specific
-        key: ['floor_min_heat_setpoint'],
-        convertSet: async (entity, key, value, meta) => {
-            if (value >= 5 && value <= 36) {
-                await entity.write('manuSpecificSinope', {floorMinHeatSetpointLimit: value * 100});
-            }
-        },
-    },
-    sinope_floor_max_heat_setpoint: {
-        // TH1300ZB specific
-        key: ['floor_max_heat_setpoint'],
-        convertSet: async (entity, key, value, meta) => {
-            if (value >= 5 && value <= 36) {
-                await entity.write('manuSpecificSinope', {floorMaxHeatSetpointLimit: value * 100});
-            }
-        },
-    },
-    sinope_temperature_sensor: {
-        // TH1300ZB specific
-        key: ['floor_temperature_sensor'],
-        convertSet: async (entity, key, value, meta) => {
-            if (typeof value !== 'string') {
-                return;
-            }
-            const lookup = {'10k': 0, '12k': 1};
-            value = value.toLowerCase();
-            if (lookup.hasOwnProperty(value)) {
-                await entity.write('manuSpecificSinope', {temperatureSensor: lookup[value]});
-            }
-        },
-        convertGet: async (entity, key, meta) => {
-            await entity.read('manuSpecificSinope', ['temperatureSensor']);
-        },
-    },
-    sinope_time_format: {
-        // TH1300ZB specific
-        key: ['time_format'],
-        convertSet: async (entity, key, value, meta) => {
-            if (typeof value !== 'string') {
-                return;
-            }
-            const lookup = {'24h': 0, '12h': 1};
-            value = value.toLowerCase();
-            if (lookup.hasOwnProperty(value)) {
-                await entity.write('manuSpecificSinope', {timeFormatToDisplay: lookup[value]});
-            }
-        },
-    },
-    sinope_led_intensity_on: {
-        // DM2500ZB and SW2500ZB
-        key: ['led_intensity_on'],
-        convertSet: async (entity, key, value, meta) => {
-            if (value >= 0 && value <= 100) {
-                await entity.write('manuSpecificSinope', {ledIntensityOn: value});
-            }
-        },
-    },
-    sinope_led_intensity_off: {
-        // DM2500ZB and SW2500ZB
-        key: ['led_intensity_off'],
-        convertSet: async (entity, key, value, meta) => {
-            if (value >= 0 && value <= 100) {
-                await entity.write('manuSpecificSinope', {ledIntensityOff: value});
-            }
-        },
-    },
-    sinope_led_color_on: {
-        // DM2500ZB and SW2500ZB
-        key: ['led_color_on'],
-        convertSet: async (entity, key, value, meta) => {
-            const r = (value.r >= 0 && value.r <= 255) ? value.r : 0;
-            const g = (value.g >= 0 && value.g <= 255) ? value.g : 0;
-            const b = (value.b >= 0 && value.b <= 255) ? value.b : 0;
-
-            const valueHex = r + g * 256 + (b * 256 ** 2);
-            await entity.write('manuSpecificSinope', {ledColorOn: valueHex});
-        },
-    },
-    sinope_led_color_off: {
-        // DM2500ZB and SW2500ZB
-        key: ['led_color_off'],
-        convertSet: async (entity, key, value, meta) => {
-            const r = (value.r >= 0 && value.r <= 255) ? value.r : 0;
-            const g = (value.g >= 0 && value.g <= 255) ? value.g : 0;
-            const b = (value.b >= 0 && value.b <= 255) ? value.b : 0;
-
-            const valueHex = r + g * 256 + b * 256 ** 2;
-            await entity.write('manuSpecificSinope', {ledColorOff: valueHex});
-        },
-    },
-    sinope_minimum_brightness: {
-        // DM2500ZB
-        key: ['minimum_brightness'],
-        convertSet: async (entity, key, value, meta) => {
-            if (value >= 0 && value <= 3000) {
-                await entity.write('manuSpecificSinope', {minimumBrightness: value});
-            }
-        },
-    },
     stelpro_thermostat_outdoor_temperature: {
         key: ['thermostat_outdoor_temperature'],
         convertSet: async (entity, key, value, meta) => {

package/devices/ecodim.js

@@ -3,6 +3,7 @@ const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/lega
 const e = exposes.presets;
 const reporting = require('../lib/reporting');
 const extend = require('../lib/extend');
+const ota = require('../lib/ota');
 
 module.exports = [
     {
@@ -48,6 +49,7 @@ module.exports = [
         model: 'Eco-Dim.07/Eco-Dim.10',
         vendor: 'EcoDim',
         description: 'Zigbee & Z-wave dimmer',
+        ota: ota.zigbeeOTA,
         extend: extend.light_onoff_brightness({noConfigure: true, disableEffect: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
             await extend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);

package/devices/ewelink.js

@@ -35,6 +35,21 @@ module.exports = [
             device.skipDefaultResponse = true;
         },
     },
+    {
+        zigbeeModel: ['SWITCH-ZR03-1'],
+        model: 'SWITCH-ZR03-1',
+        vendor: 'eWeLink',
+        description: 'Zigbee smart switch',
+        extend: extend.switch(),
+        fromZigbee: [fz.on_off_skip_duplicate_transaction],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
+        },
+        onEvent: async (type, data, device) => {
+            device.skipDefaultResponse = true;
+        },
+    },
     {
         zigbeeModel: ['ZB-SW01'],
         model: 'ZB-SW01',

package/devices/gledopto.js

@@ -335,6 +335,7 @@ module.exports = [
         zigbeeModel: ['GL-S-006P'],
         model: 'GL-S-006P',
         vendor: 'Gledopto',
+        ota: ota.zigbeeOTA,
         description: 'Zigbee GU10 LED lamp',
         extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [158, 495]}),
     },

package/devices/immax.js

@@ -34,7 +34,7 @@ module.exports = [
     },
     {
         zigbeeModel: ['IM-Z3.0-DIM'],
-        model: '07005B',
+        model: '07001L/07005B',
         vendor: 'Immax',
         description: 'Neo SMART LED E14 5W warm white, dimmable, Zigbee 3.0',
         extend: extend.light_onoff_brightness(),
@@ -182,4 +182,22 @@ module.exports = [
             // eslint-disable-next-line
             exposes.enum('keep_time', ea.STATE_SET, ['0', '30', '60', '120', '240']).withDescription('PIR keep time in seconds')],
     },
+    {
+        fingerprint: tuya.fingerprint('TS0601', ['_TZE200_n9clpsht']),
+        model: '07505L',
+        vendor: 'Immax',
+        description: 'Neo smart keypad',
+        fromZigbee: [tuya.fz.datapoints],
+        toZigbee: [],
+        exposes: [e.action(['disarm', 'arm_home', 'arm_away', 'sos']), e.tamper()],
+        meta: {
+            tuyaDatapoints: [
+                [24, 'tamper', tuya.valueConverter.trueFalse],
+                [26, 'action', tuya.valueConverter.static('disarm')],
+                [27, 'action', tuya.valueConverter.static('arm_away')],
+                [28, 'action', tuya.valueConverter.static('arm_home')],
+                [29, 'action', tuya.valueConverter.static('sos')],
+            ],
+        },
+    },
 ];

package/devices/iris.js

@@ -177,4 +177,20 @@ module.exports = [
             await reporting.batteryVoltage(endpoint);
         },
     },
+    {
+        zigbeeModel: ['3315-Geu'],
+        model: '3315-Geu',
+        vendor: 'Iris',
+        description: 'Water sensor',
+        fromZigbee: [fz.temperature, fz.ias_water_leak_alarm_1, fz.battery],
+        exposes: [e.temperature(), e.water_leak(), e.battery_low(), e.tamper(), e.battery()],
+        toZigbee: [],
+        meta: {battery: {voltageToPercentage: '3V_2500'}},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['msTemperatureMeasurement', 'genPowerCfg']);
+            await reporting.temperature(endpoint);
+            await reporting.batteryVoltage(endpoint);
+        },
+    },
 ];

package/devices/philips.js

@@ -330,7 +330,7 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
     },
     {
-        zigbeeModel: ['929003046001'],
+        zigbeeModel: ['929003046001', '929003045801'],
         model: '5309031P8',
         vendor: 'Philips',
         description: 'Hue White ambiance Runner spot white (1 spot)',
@@ -662,9 +662,16 @@ module.exports = [
         zigbeeModel: ['1740193P0'],
         model: '1740193P0',
         vendor: 'Philips',
-        description: 'Hue Lucca wall light',
+        description: 'Hue White Lucca wall light',
         extend: hueExtend.light_onoff_brightness(),
     },
+    {
+        zigbeeModel: ['929003089301'],
+        model: '929003089301',
+        vendor: 'Philips',
+        description: 'Hue White and Color Ambiance Lucca wall light',
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+    },
     {
         zigbeeModel: ['1740293P0'],
         model: '1740293P0',
@@ -2372,7 +2379,7 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
     {
-        zigbeeModel: ['5041131P9', '5041148P9'],
+        zigbeeModel: ['5041131P9', '5041148P9', '929003047301'],
         model: '5041131P9',
         vendor: 'Philips',
         description: 'Hue White ambiance Milliskin',
@@ -2955,4 +2962,18 @@ module.exports = [
             ...hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}).exposes],
         extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
+    {
+        zigbeeModel: ['929003526301'],
+        model: '929003526301',
+        vendor: 'Philips',
+        description: 'Hue White & Color Ambiance Xamento M',
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+    },
+    {
+        zigbeeModel: ['LWE008'],
+        model: '929003021301',
+        vendor: 'Philips',
+        description: 'Hue White E17 470 lumen',
+        extend: hueExtend.light_onoff_brightness(),
+    },
 ];

package/devices/saswell.js

@@ -15,18 +15,21 @@ module.exports = [
             {modelID: 'w7cahqs', manufacturerName: '_TYST11_yw7cahqs'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_c88teujp'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_yw7cahqs'},
+            {modelID: 'aj4jz0i\u0000', manufacturerName: '_TYST11_caj4jz0i'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_azqp6ssj'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_zuhszj9s'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_9gvruqf5'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_zr9c0day'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_0dvm9mva'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_h4cgnbzg'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_exfrnlow'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_9m4kmbfu'},
         ],
         model: 'SEA801-Zigbee/SEA802-Zigbee',
         vendor: 'Saswell',
         description: 'Thermostatic radiator valve',
         whiteLabel: [{vendor: 'HiHome', model: 'WZB-TRVL'}, {vendor: 'Hama', model: '00176592'},
-            {vendor: 'RTX', model: 'ZB-RT1'}],
+            {vendor: 'RTX', model: 'ZB-RT1'}, {vendor: 'SETTI+', model: 'TRV001'}],
         fromZigbee: [fz.saswell_thermostat, fz.ignore_tuya_set_time, fz.ignore_basic_report, fz.legacy.tuya_thermostat_weekly_schedule],
         toZigbee: [tz.saswell_thermostat_current_heating_setpoint, tz.saswell_thermostat_mode, tz.saswell_thermostat_away,
             tz.saswell_thermostat_child_lock, tz.saswell_thermostat_window_detection, tz.saswell_thermostat_frost_detection,

package/devices/schneider_electric.js

@@ -423,7 +423,7 @@ module.exports = [
         description: 'Odace connectable relay switch 10A',
         extend: extend.switch(),
         configure: async (device, coordinatorEndpoint, logger) => {
-            const endpoint = device.getEndpoint(10);
+            const endpoint = device.getEndpoint(21);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
             await reporting.onOff(endpoint);
         },