zigbee-herdsman-converters 14.0.332 → 14.0.336

package/converters/fromZigbee.js

@@ -596,7 +596,7 @@ const converters = {
             // handle color property sync
             // NOTE: this should the last thing we do, as we need to have processed all attributes,
             //       we use assign here so we do not lose other attributes.
-            return Object.assign(result, libColor.syncColorState(result, meta.state, options));
+            return Object.assign(result, libColor.syncColorState(result, meta.state, msg.endpoint, options, meta.logger));
         },
     },
     metering_datek: {
@@ -668,6 +668,10 @@ const converters = {
                         constants.develcoInterfaceMode[msg.data['develcoInterfaceMode']] :
                         msg.data['develcoInterfaceMode'];
             }
+            if (msg.data.hasOwnProperty('status')) {
+                result['battery_low'] = (msg.data.status & 2) > 0;
+                result['check_meter'] = (msg.data.status & 1) > 0;
+            }
 
             return result;
         },
@@ -1753,6 +1757,29 @@ const converters = {
             }
         },
     },
+    tuya_illuminance_temperature_humidity_sensor: {
+        cluster: 'manuSpecificTuya',
+        type: ['commandSetDataResponse', 'commandGetData'],
+        options: [exposes.options.precision('temperature'), exposes.options.calibration('temperature'),
+            exposes.options.precision('humidity'), exposes.options.calibration('humidity')],
+        convert: (model, msg, publish, options, meta) => {
+            const dp = msg.data.dp;
+            const value = tuya.getDataValue(msg.data.datatype, msg.data.data);
+            switch (dp) {
+            case tuya.dataPoints.thitTemperature:
+                return {temperature: calibrateAndPrecisionRoundOptions(value / 10, options, 'temperature')};
+            case tuya.dataPoints.thitHumidity:
+                return {humidity: calibrateAndPrecisionRoundOptions(value, options, 'humidity')};
+            case tuya.dataPoints.thitBatteryPercentage:
+                return {battery: value};
+            case tuya.dataPoints.thitIlluminanceLux:
+                return {illuminance_lux: value};
+            default:
+                meta.logger.warn(`zigbee-herdsman-converters:tuya_illuminance_temperature_humidity_sensor: NOT RECOGNIZED ` +
+                    `DP #${dp} with data ${JSON.stringify(msg.data)}`);
+            }
+        },
+    },
     ts0201_temperature_humidity_alarm: {
         cluster: 'manuSpecificTuya_2',
         type: ['attributeReport', 'readResponse'],
@@ -1958,7 +1985,7 @@ const converters = {
                 result.color.s = result.color.saturation;
             }
 
-            return Object.assign(result, libColor.syncColorState(result, meta.state, options));
+            return Object.assign(result, libColor.syncColorState(result, meta.state, msg.endpoint, options, meta.logger));
         },
     },
     tuya_cover: {
@@ -2444,7 +2471,7 @@ const converters = {
                 buttonMapping = {1: '1', 2: '2'};
             } else if (model.model === 'TS0043') {
                 buttonMapping = {1: '1', 2: '2', 3: '3'};
-            } else if (['TS0044', 'YSR-MINI-Z'].includes(model.model)) {
+            } else if (['TS0044', 'YSR-MINI-Z', 'TS004F'].includes(model.model)) {
                 buttonMapping = {1: '1', 2: '2', 3: '3', 4: '4'};
             }
             const button = buttonMapping ? `${buttonMapping[msg.endpoint.ID]}_` : '';

package/converters/toZigbee.js

@@ -913,8 +913,8 @@ const converters = {
             const payload = {colortemp: value, transtime: utils.getTransition(entity, key, meta).time};
             await entity.command('lightingColorCtrl', 'moveToColorTemp', payload, utils.getOptions(meta.mapped, entity));
             return {
-                state: libColor.syncColorState({'color_mode': constants.colorMode[2], 'color_temp': value}, meta.state, meta.options),
-                readAfterWriteTime: payload.transtime * 100,
+                state: libColor.syncColorState({'color_mode': constants.colorMode[2], 'color_temp': value}, meta.state,
+                    entity, meta.options, meta.logger), readAfterWriteTime: payload.transtime * 100,
             };
         },
         convertGet: async (entity, key, meta) => {
@@ -1030,7 +1030,8 @@ const converters = {
             }
 
             await entity.command('lightingColorCtrl', command, zclData, utils.getOptions(meta.mapped, entity));
-            return {state: libColor.syncColorState(newState, meta.state, meta.options), readAfterWriteTime: zclData.transtime * 100};
+            return {state: libColor.syncColorState(newState, meta.state, entity, meta.options, meta.logger),
+                readAfterWriteTime: zclData.transtime * 100};
         },
         convertGet: async (entity, key, meta) => {
             await entity.read('lightingColorCtrl', light.readColorAttributes(entity, meta));
@@ -3023,7 +3024,8 @@ const converters = {
                     color_temp: meta.message.color_temp,
                 };
 
-                return {state: libColor.syncColorState(newState, meta.state, meta.options), readAfterWriteTime: zclData.transtime * 100};
+                return {state: libColor.syncColorState(newState, meta.state, entity, meta.options, meta.logger),
+                    readAfterWriteTime: zclData.transtime * 100};
             }
 
             if (key === 'color_temp') {
@@ -3040,7 +3042,8 @@ const converters = {
                     color_temp: value,
                 };
 
-                return {state: libColor.syncColorState(newState, meta.state, meta.options), readAfterWriteTime: zclData.transtime * 100};
+                return {state: libColor.syncColorState(newState, meta.state, entity, meta.options, meta.logger),
+                    readAfterWriteTime: zclData.transtime * 100};
             }
 
             const zclData = {
@@ -3104,7 +3107,8 @@ const converters = {
                 color_mode: constants.colorMode[0],
             };
 
-            return {state: libColor.syncColorState(newState, meta.state, meta.options), readAfterWriteTime: zclData.transtime * 100};
+            return {state: libColor.syncColorState(newState, meta.state, entity, meta.options, meta.logger),
+                readAfterWriteTime: zclData.transtime * 100};
         },
         convertGet: async (entity, key, meta) => {
             await entity.read('lightingColorCtrl', [
@@ -5063,7 +5067,7 @@ const converters = {
                             recalledState = addColorMode(recalledState);
                         }
 
-                        Object.assign(recalledState, libColor.syncColorState(recalledState, meta.state, meta.options));
+                        Object.assign(recalledState, libColor.syncColorState(recalledState, meta.state, entity, meta.options, meta.logger));
                         membersState[member.getDevice().ieeeAddr] = recalledState;
                     } else {
                         meta.logger.warn(`Unknown scene was recalled for ${member.getDevice().ieeeAddr}, can't restore state.`);
@@ -5080,7 +5084,7 @@ const converters = {
                         recalledState = addColorMode(recalledState);
                     }
 
-                    Object.assign(recalledState, libColor.syncColorState(recalledState, meta.state, meta.options));
+                    Object.assign(recalledState, libColor.syncColorState(recalledState, meta.state, entity, meta.options, meta.logger));
                     meta.logger.info('Successfully recalled scene');
                     return {state: recalledState};
                 } else {

package/devices/casaia.js

@@ -2,6 +2,7 @@ const exposes = require('../lib/exposes');
 const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/legacy').fromZigbee};
 const reporting = require('../lib/reporting');
 const e = exposes.presets;
+const tz = require('../converters/toZigbee');
 
 module.exports = [
     {
@@ -22,4 +23,21 @@ module.exports = [
         },
         exposes: [e.temperature(), e.battery_low(), e.battery()],
     },
+    {
+        zigbeeModel: ['CCB432'],
+        model: 'CCB432',
+        vendor: 'CASAIA',
+        description: 'Rail-Din relay and energy meter',
+        fromZigbee: [fz.electrical_measurement, fz.metering, fz.on_off],
+        toZigbee: [tz.on_off],
+        exposes: [e.switch(), e.power(), e.energy()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement', 'seMetering']);
+            await reporting.onOff(endpoint);
+            await reporting.readMeteringMultiplierDivisor(endpoint);
+            await reporting.instantaneousDemand(endpoint);
+            await reporting.currentSummDelivered(endpoint);
+        },
+    },
 ];

package/devices/danfoss.js

@@ -42,8 +42,8 @@ module.exports = [
             exposes.climate().withSetpoint('occupied_heating_setpoint', 5, 32, 0.5).withLocalTemperature().withPiHeatingDemand()
                 .withSystemMode(['heat']).withRunningState(['idle', 'heat'], ea.STATE),
             exposes.numeric('external_measured_room_sensor', ea.ALL)
-                .withDescription('Set at maximum 3 hours interval but not more often than every 30 minutes at every 100 ' +
-                    'value change. Resets every 3hours to standard. e.g. 21C = 2100 (-8000=undefined).'),
+                .withDescription('Set at maximum 3 hours interval but not more often than every 30 minutes and 0.1 ' +
+                    'degrees difference. Resets every 3hours to standard. e.g. 21C = 2100 (-8000=undefined).'),
             exposes.numeric('window_open_internal', ea.STATE_GET).withValueMin(0).withValueMax(4)
                 .withDescription('0=Quarantine, 1=Windows are closed, 2=Hold - Windows are maybe about to open, ' +
                     '3=Open window detected, 4=In window open state from external but detected closed locally'),

package/devices/develco.js

@@ -311,6 +311,7 @@ module.exports = [
         exposes: [
             e.power(),
             e.energy(),
+            e.battery_low(),
             exposes.numeric('pulse_configuration', ea.ALL).withValueMin(0).withValueMax(65535)
                 .withDescription('Pulses per kwh. Default 1000 imp/kWh. Range 0 to 65535'),
             exposes.enum('interface_mode', ea.ALL,
@@ -318,6 +319,8 @@ module.exports = [
                 .withDescription('Operating mode/probe'),
             exposes.numeric('current_summation', ea.SET)
                 .withDescription('Current summation value sent to the display. e.g. 570 = 0,570 kWh'),
+            exposes.binary('check_meter', ea.STATE, true, false)
+                .withDescription('Is true if communication problem with meter is experienced'),
         ],
     },
     {

package/devices/hive.js

@@ -183,8 +183,8 @@ module.exports = [
             exposes.climate().withSetpoint('occupied_heating_setpoint', 5, 32, 0.5).withLocalTemperature().withPiHeatingDemand()
                 .withSystemMode(['heat']).withRunningState(['idle', 'heat'], ea.STATE),
             exposes.numeric('external_measured_room_sensor', ea.ALL)
-                .withDescription('Set at maximum 3 hours interval but not more often than every 30 minutes at every 100 ' +
-                    'value change. Resets every 3hours to standard. e.g. 21C = 2100 (-8000=undefined).'),
+                .withDescription('Set at maximum 3 hours interval but not more often than every 30 minutes and 0.1 ' +
+                    'degrees difference. Resets every 3hours to standard. e.g. 21C = 2100 (-8000=undefined).'),
             exposes.numeric('window_open_internal', ea.STATE_GET).withValueMin(0).withValueMax(4)
                 .withDescription('0=Quarantine, 1=Windows are closed, 2=Hold - Windows are maybe about to open, ' +
                     '3=Open window detected, 4=In window open state from external but detected closed locally'),

package/devices/icasa.js

@@ -81,6 +81,7 @@ module.exports = [
         model: 'ICZB-RM11S',
         vendor: 'iCasa',
         description: 'Zigbee 3.0 remote control',
+        meta: {battery: {dontDividePercentage: true}},
         fromZigbee: [fz.command_recall, fz.command_on, fz.command_off, fz.command_move, fz.command_stop, fz.battery],
         exposes: [e.battery(), e.action(['recall_*', 'on', 'off', 'brightness_stop', 'brightness_move_up', 'brightness_move_down'])],
         toZigbee: [],

package/devices/ikea.js

@@ -146,10 +146,12 @@ const ikea = {
             convertSet: async (entity, key, value, meta) => {
                 if (key == 'fan_state' && value.toLowerCase() == 'on') {
                     value = getMetaValue(entity, meta.mapped, 'fanStateOn', 'allEqual', 'on');
+                } else {
+                    value = value.toString().toLowerCase();
                 }
 
                 let fanMode;
-                switch (value.toLowerCase()) {
+                switch (value) {
                 case 'off':
                     fanMode = 0;
                     break;
@@ -161,7 +163,7 @@ const ikea = {
                 }
 
                 await entity.write('manuSpecificIkeaAirPurifier', {'fanMode': fanMode}, manufacturerOptions.ikea);
-                return {state: {fan_mode: value.toLowerCase(), fan_state: value.toLowerCase() === 'off' ? 'OFF' : 'ON'}};
+                return {state: {fan_mode: value, fan_state: value === 'off' ? 'OFF' : 'ON'}};
             },
             convertGet: async (entity, key, meta) => {
                 await entity.read('manuSpecificIkeaAirPurifier', ['fanMode']);

package/devices/immax.js

@@ -140,4 +140,23 @@ module.exports = [
         description: 'Neo RECUADRO SMART, color temp, dimmable, Zigbee 3.0',
         extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}),
     },
+    {
+        fingerprint: [{modelID: 'TS0202', manufacturerName: '_TZ3210_jijr1sss'}],
+        model: '07502L',
+        vendor: 'Immax',
+        description: '4 in 1 multi sensor',
+        fromZigbee: [fz.battery, fz.ignore_basic_report, fz.illuminance, fz.ZB003X, fz.ZB003X_attr, fz.ZB003X_occupancy],
+        toZigbee: [tz.ZB003X],
+        exposes: [e.occupancy(), e.tamper(), e.battery(), e.illuminance(), e.illuminance_lux().withUnit('lx'), e.temperature(),
+            e.humidity(), exposes.numeric('reporting_time', ea.STATE_SET).withDescription('Reporting interval in minutes'),
+            exposes.numeric('temperature_calibration', ea.STATE_SET).withDescription('Temperature calibration'),
+            exposes.numeric('humidity_calibration', ea.STATE_SET).withDescription('Humidity calibration'),
+            exposes.numeric('illuminance_calibration', ea.STATE_SET).withDescription('Illuminance calibration'),
+            exposes.binary('pir_enable', ea.STATE_SET, true, false).withDescription('Enable PIR sensor'),
+            exposes.binary('led_enable', ea.STATE_SET, true, false).withDescription('Enabled LED'),
+            exposes.binary('reporting_enable', ea.STATE_SET, true, false).withDescription('Enabled reporting'),
+            exposes.enum('sensitivity', ea.STATE_SET, ['low', 'medium', 'high']).withDescription('PIR sensor sensitivity'),
+            // eslint-disable-next-line
+            exposes.enum('keep_time', ea.STATE_SET, ['0', '30', '60', '120', '240']).withDescription('PIR keep time in seconds')],
+    },
 ];

package/devices/leedarson.js

@@ -85,7 +85,7 @@ module.exports = [
         extend: extend.light_onoff_brightness_colortemp(),
     },
     {
-        zigbeeModel: ['ZHA-PIRSensor'],
+        fingerprint: [{modelID: 'ZHA-PIRSensor', manufacturerName: 'Leedarson'}],
         model: '5AA-SS-ZA-H0',
         vendor: 'Leedarson',
         description: 'Motion sensor',

package/devices/lidl.js

@@ -655,7 +655,7 @@ module.exports = [
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_chyvmhay'}],
         model: '368308_2010',
         vendor: 'Lidl',
-        description: 'Silvercrest rdiator valve with thermostat',
+        description: 'Silvercrest radiator valve with thermostat',
         fromZigbee: [fz.ignore_tuya_set_time, fzLocal.zs_thermostat, fz.tuya_data_point_dump],
         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,

package/devices/moes.js

@@ -76,7 +76,8 @@ module.exports = [
     },
     {
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_aoclfnxz'},
-            {modelID: 'TS0601', manufacturerName: '_TZE200_ztvwu4nk'}],
+            {modelID: 'TS0601', manufacturerName: '_TZE200_ztvwu4nk'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_u9bfwha0'}],
         model: 'BHT-002-GCLZB',
         vendor: 'Moes',
         description: 'Moes BHT series Thermostat',

package/devices/owon.js

@@ -83,4 +83,23 @@ module.exports = [
             await reporting.thermostatAcLouverPosition(endpoint);
         },
     },
+    {
+        zigbeeModel: ['THS317'],
+        model: 'THS317',
+        vendor: 'OWON',
+        description: 'Temperature and humidity sensor',
+        fromZigbee: [fz.temperature, fz.humidity, fz.battery],
+        toZigbee: [],
+        exposes: [e.battery(), e.temperature(), e.humidity()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(2);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['msTemperatureMeasurement', 'msRelativeHumidity', 'genPowerCfg']);
+            await reporting.temperature(endpoint);
+            await reporting.humidity(endpoint);
+            await reporting.batteryVoltage(endpoint);
+            await reporting.batteryPercentageRemaining(endpoint);
+            device.powerSource = 'Battery';
+            device.save();
+        },
+    },
 ];

package/devices/perenio.js

@@ -33,4 +33,19 @@ module.exports = [
             await reporting.batteryPercentageRemaining(endpoint);
         },
     },
+    {
+        fingerprint: [{modelID: 'ZHA-PirSensor', manufacturerName: 'LDS'}],
+        model: 'PECMS01',
+        vendor: 'Perenio',
+        description: 'Motion sensor',
+        fromZigbee: [fz.battery, fz.ias_occupancy_alarm_1],
+        toZigbee: [],
+        meta: {battery: {dontDividePercentage: true}},
+        exposes: [e.occupancy(), e.battery_low(), e.tamper(), e.battery()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);
+            await reporting.batteryPercentageRemaining(endpoint);
+        },
+    },
 ];

package/devices/philips.js

@@ -2244,6 +2244,15 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
         ota: ota.zigbeeOTA,
     },
+    {
+        zigbeeModel: ['5047230P6', '5047230P6'],
+        model: '5047230P6',
+        vendor: 'Philips',
+        description: 'Hue White ambiance Buckram double spotlight',
+        meta: {turnsOffAtBrightness1: true},
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+        ota: ota.zigbeeOTA,
+    },
     {
         zigbeeModel: ['5047430P6'],
         model: '5047430P6',

package/devices/popp.js

@@ -42,8 +42,8 @@ module.exports = [
             exposes.climate().withSetpoint('occupied_heating_setpoint', 5, 32, 0.5).withLocalTemperature().withPiHeatingDemand()
                 .withSystemMode(['heat']).withRunningState(['idle', 'heat'], ea.STATE),
             exposes.numeric('external_measured_room_sensor', ea.ALL)
-                .withDescription('Set at maximum 3 hours interval but not more often than every 30 minutes at every 100 ' +
-                    'value change. Resets every 3hours to standard. e.g. 21C = 2100 (-8000=undefined).'),
+                .withDescription('Set at maximum 3 hours interval but not more often than every 30 minutes and 0.1 ' +
+                    'degrees difference. Resets every 3hours to standard. e.g. 21C = 2100 (-8000=undefined).'),
             exposes.numeric('window_open_internal', ea.STATE_GET).withValueMin(0).withValueMax(4)
                 .withDescription('0=Quarantine, 1=Windows are closed, 2=Hold - Windows are maybe about to open, ' +
                     '3=Open window detected, 4=In window open state from external but detected closed locally'),

package/devices/shinasystem.js

@@ -282,4 +282,21 @@ module.exports = [
             await reporting.batteryVoltage(endpoint, {min: 30, max: 21600, change: 1});
         },
     },
+    {
+        zigbeeModel: ['PMM-300Z1'],
+        model: 'PMM-300Z1',
+        vendor: 'ShinaSystem',
+        description: 'SiHAS energy monitor',
+        fromZigbee: [fz.electrical_measurement, fz.metering],
+        toZigbee: [tz.electrical_measurement_power],
+        exposes: [e.power().withAccess(ea.STATE_GET), e.energy()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['haElectricalMeasurement', 'seMetering']);
+            await reporting.activePower(endpoint, {min: 1, max: 600, change: 5});
+            await reporting.instantaneousDemand(endpoint, {min: 1, max: 600, change: 1});
+            endpoint.saveClusterAttributeKeyValue('seMetering', {multiplier: 1, divisor: 1000});
+            await reporting.currentSummDelivered(endpoint, {min: 1, max: 600, change: 5});
+        },
+    },
 ];

package/devices/tuya.js

@@ -36,6 +36,15 @@ module.exports = [
         toZigbee: [],
         exposes: [e.temperature(), e.humidity(), e.battery()],
     },
+    {
+        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_vzqtvljm'}],
+        model: 'TS0601_illuminance_temperature_humidity_sensor',
+        vendor: 'TuYa',
+        description: 'Illuminance, temperature & humidity sensor',
+        fromZigbee: [fz.tuya_illuminance_temperature_humidity_sensor],
+        toZigbee: [],
+        exposes: [e.temperature(), e.humidity(), e.illuminance_lux(), e.battery()],
+    },
     {
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_8ygsuhe1'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_yvx5lh6k'}, {modelID: 'TS0601', manufacturerName: '_TZE200_ryfmq5rl'}],
@@ -115,8 +124,8 @@ module.exports = [
         model: 'TS0505B',
         vendor: 'TuYa',
         description: 'Zigbee RGB+CCT light',
-        whiteLabel: [{vendor: 'Mercator ikuü', model: 'SMD4106W-RGB-ZB'},
-            {vendor: 'TuYa', model: 'A5C-21F7-01'}, {vendor: 'Mercator ikuü', model: 'S9E27LED9W-RGB-Z'}],
+        whiteLabel: [{vendor: 'Mercator Ikuü', model: 'SMD4106W-RGB-ZB'},
+            {vendor: 'TuYa', model: 'A5C-21F7-01'}, {vendor: 'Mercator Ikuü', model: 'S9E27LED9W-RGB-Z'}],
         extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
         meta: {applyRedFix: true, enhancedHue: false},
     },
@@ -241,7 +250,7 @@ module.exports = [
             {vendor: 'Earda', model: 'EDM-1ZAA-EU'},
             {vendor: 'Earda', model: 'EDM-1ZAB-EU'},
             {vendor: 'Earda', model: 'EDM-1ZBA-EU'},
-            {vendor: 'Mercator ikuü', model: 'SSWD01'},
+            {vendor: 'Mercator Ikuü', model: 'SSWD01'},
         ],
     },
     {
@@ -437,7 +446,7 @@ module.exports = [
         model: 'TS0502B',
         vendor: 'TuYa',
         description: 'Light controller',
-        whiteLabel: [{vendor: 'Mercator ikuü', model: 'SMI7040', description: 'Ford Batten Light'}],
+        whiteLabel: [{vendor: 'Mercator Ikuü', model: 'SMI7040', description: 'Ford Batten Light'}],
         extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 500]}),
     },
     {
@@ -545,16 +554,24 @@ module.exports = [
         model: 'TS004F',
         vendor: 'TuYa',
         description: 'Wireless switch with 4 buttons',
-        exposes: [e.battery(), e.action(
-            ['on', 'off', 'brightness_move_up', 'brightness_step_up', 'brightness_step_down', 'brightness_move_down', 'brightness_stop'])],
-        fromZigbee: [fz.battery, fz.command_on, fz.command_off, fz.command_step, fz.command_move, fz.command_stop],
-        toZigbee: [],
+        exposes: [e.battery(), e.action(['1_single', '1_double', '1_hold', '2_single', '2_double', '2_hold',
+            '3_single', '3_double', '3_hold', '4_single', '4_double', '4_hold'])],
+        fromZigbee: [fz.battery, fz.tuya_on_off_action],
+        toZigbee: [tz.tuya_operation_mode],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
-            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);
+            await endpoint.read('genBasic', [0x0004, 0x000, 0x0001, 0x0005, 0x0007, 0xfffe]);
+            await endpoint.write('genOnOff', {'tuyaOperationMode': 1});
+            await endpoint.read('genOnOff', ['tuyaOperationMode']);
             try {
-                await reporting.batteryPercentageRemaining(endpoint);
-            } catch (error) {/* Fails for some*/}
+                await endpoint.read(0xE001, [0xD011]);
+            } catch (err) {/* do nothing */}
+            await endpoint.read('genPowerCfg', ['batteryVoltage', 'batteryPercentageRemaining']);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);
+            await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
+            await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff']);
+            await reporting.bind(device.getEndpoint(3), coordinatorEndpoint, ['genOnOff']);
+            await reporting.bind(device.getEndpoint(4), coordinatorEndpoint, ['genOnOff']);
         },
     },
     {
@@ -1185,7 +1202,7 @@ module.exports = [
             {vendor: 'Vrey', model: 'VR-X712U-0013'},
             {vendor: 'TUYATEC', model: 'GDKES-01TZXD'},
             {vendor: 'Lonsonho', model: 'QS-Zigbee-S05-L', description: '1 gang smart switch module without neutral wire'},
-            {vendor: 'Mercator ikuü', model: 'SSW01'},
+            {vendor: 'Mercator Ikuü', model: 'SSW01'},
         ],
         configure: async (device, coordinatorEndpoint, logger) => {
             await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
@@ -1318,7 +1335,7 @@ module.exports = [
     {
         fingerprint: [{modelID: 'TS0014', manufacturerName: '_TZ3000_jr2atpww'}, {modelID: 'TS0014', manufacturerName: '_TYZB01_dvakyzhd'},
             {modelID: 'TS0014', manufacturerName: '_TZ3210_w3hl6rao'}, {modelID: 'TS0014', manufacturerName: '_TYZB01_bagt1e4o'},
-            {modelID: 'TS0014', manufacturerName: '_TZ3000_r0pmi2p3'}],
+            {modelID: 'TS0014', manufacturerName: '_TZ3000_r0pmi2p3'}, {modelID: 'TS0014', manufacturerName: '_TZ3000_fxjdcikv'}],
         model: 'TS0014',
         vendor: 'TuYa',
         description: 'Smart light switch - 4 gang without neutral wire',
@@ -1329,7 +1346,7 @@ module.exports = [
             return {'l1': 1, 'l2': 2, 'l3': 3, 'l4': 4};
         },
         whiteLabel: [{vendor: 'TUYATEC', model: 'GDKES-04TZXD'}, {vendor: 'Vizo', model: 'VZ-222S'},
-            {vendor: 'MakeGood', model: 'MG-ZG04W/B/G'}],
+            {vendor: 'MakeGood', model: 'MG-ZG04W/B/G'}, {vendor: 'Mercator Ikuü', model: 'SSW04'}],
         meta: {multiEndpoint: true},
         configure: async (device, coordinatorEndpoint, logger) => {
             try {
@@ -1517,7 +1534,8 @@ module.exports = [
         exposes: [e.battery(), e.illuminance(), e.illuminance_lux()],
     },
     {
-        fingerprint: [{modelID: 'TS0210', manufacturerName: '_TYZB01_3zv6oleo'}],
+        fingerprint: [{modelID: 'TS0210', manufacturerName: '_TYZB01_3zv6oleo'},
+            {modelID: 'TS0210', manufacturerName: '_TYZB01_j9xxahcl'}],
         model: 'TS0210',
         vendor: 'TuYa',
         description: 'Vibration sensor',

package/devices/xiaomi.js

@@ -1772,6 +1772,21 @@ module.exports = [
             await endpoint1.write('aqaraOpple', {'mode': 1}, {manufacturerCode: 0x115f, disableResponse: true});
         },
     },
+    {
+        zigbeeModel: ['lumi.remote.acn003'],
+        model: 'WXKG16LM',
+        vendor: 'Xiaomi',
+        description: 'Aqara wireless remote switch E1 (single rocker)',
+        fromZigbee: [fz.xiaomi_multistate_action, fz.aqara_opple],
+        toZigbee: [tz.xiaomi_switch_click_mode],
+        exposes: [e.battery(), e.battery_voltage(), e.action(['single', 'double', 'hold']),
+            exposes.enum('click_mode', ea.SET, ['fast', 'multi'])
+                .withDescription('Click mode, fast: only supports single click which will be send immediately after clicking.' +
+                    'multi: supports more events like double and hold')],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await device.getEndpoint(1).write('aqaraOpple', {0x0125: {value: 0x02, type: 0x20}}, {manufacturerCode: 0x115f});
+        },
+    },
     {
         zigbeeModel: ['lumi.remote.acn004'],
         model: 'WXKG17LM',

package/lib/color.js

@@ -1,5 +1,6 @@
 const kelvinToXyLookup = require('./kelvinToXy');
 const {precisionRound} = require('./utils');
+const {findColorTempRange, clampColorTemp} = require('./light');
 
 /**
  * Color represented in HSV space
@@ -637,14 +638,17 @@ class Color {
  * NOTE: behavior can be disable by setting the 'color_sync' device/group option
  * @param {Object} newState state with only the changed attributes set
  * @param {Object} oldState state from the cache with all the old attributes set
+ * @param {Object} endpoint with lightingColorCtrl cluster
  * @param {Object} options meta.options for the device or group
+ * @param {Object} logger used for logging
  * @return {Object} state with color, color_temp, and color_mode set and syncronized from newState's attributes
  *                  (other attributes are not included make sure to merge yourself)
  */
-function syncColorState(newState, oldState, options) {
+function syncColorState(newState, oldState, endpoint, options, logger) {
     const colorTargets = [];
     const colorSync = (options && options.hasOwnProperty('color_sync')) ? options.color_sync : true;
     const result = {};
+    const [colorTempMin, colorTempMax] = findColorTempRange(endpoint, logger);
 
     // check if color sync is enabled
     if (!colorSync) {
@@ -704,7 +708,8 @@ function syncColorState(newState, oldState, options) {
         if (result.color.hasOwnProperty('hue') && result.color.hasOwnProperty('saturation')) {
             const hsv = new ColorHSV(result.color.hue, result.color.saturation);
             if (colorTargets.includes('color_temp')) {
-                result.color_temp = precisionRound(hsv.toMireds(), 0);
+                result.color_temp = clampColorTemp(precisionRound(hsv.toMireds(), 0),
+                    colorTempMin, colorTempMax, logger);
             }
             if (colorTargets.includes('xy')) {
                 Object.assign(result.color, hsv.toXY().rounded(4).toObject());
@@ -726,7 +731,8 @@ function syncColorState(newState, oldState, options) {
         if (result.color.hasOwnProperty('x') && result.color.hasOwnProperty('y')) {
             const xy = new ColorXY(result.color.x, result.color.y);
             if (colorTargets.includes('color_temp')) {
-                result.color_temp = precisionRound(xy.toMireds(), 0);
+                result.color_temp = clampColorTemp(precisionRound(xy.toMireds(), 0),
+                    colorTempMin, colorTempMax, logger);
             }
             if (colorTargets.includes('hs')) {
                 Object.assign(result.color, xy.toHSV().rounded(0).toObject(false, false));

package/lib/tuya.js

@@ -471,6 +471,12 @@ const dataPoints = {
     hochTotalReverseActivePower: 117,
     hochHistoricalVoltage: 118,
     hochHistoricalCurrent: 119,
+
+    // TUYA / HUMIDITY/ILLUMINANCE/TEMPERATURE SENSOR
+    thitBatteryPercentage: 3,
+    thitIlluminanceLux: 7,
+    thitHumidity: 9,
+    thitTemperature: 8,
 };
 
 const thermostatWeekFormat = {