zigbee-herdsman-converters 14.0.334 → 14.0.335

package/converters/fromZigbee.js

@@ -1757,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'],

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/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/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'}],
@@ -1517,7 +1526,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/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 = {

package/npm-shrinkwrap.json

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

package/package.json

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