zigbee-herdsman-converters 14.0.625 → 14.0.626

package/devices/develco.js

@@ -9,9 +9,9 @@ const e = exposes.presets;
 const ea = exposes.access;
 
 const fzLocal = {
-    // SPLZB-134 reports strange values sometimes
+    // SPLZB-134 and SPLZB-131 reports strange values sometimes
     // https://github.com/Koenkk/zigbee2mqtt/issues/13329
-    SPLZB134_electrical_measurement: {
+    develco_electrical_measurement: {
         ...fz.electrical_measurement,
         convert: (model, msg, publish, options, meta) => {
             if (msg.data.rmsVoltage !== 0xFFFF && msg.data.rmsCurrent !== 0xFFFF && msg.data.activePower !== -0x8000) {
@@ -19,7 +19,7 @@ const fzLocal = {
             }
         },
     },
-    SPLZB134_device_temperature: {
+    develco_device_temperature: {
         ...fz.device_temperature,
         convert: (model, msg, publish, options, meta) => {
             if (msg.data.currentTemperature !== -0x8000) {
@@ -27,7 +27,7 @@ const fzLocal = {
             }
         },
     },
-    SPLZB134_metering: {
+    develco_metering: {
         ...fz.metering,
         convert: (model, msg, publish, options, meta) => {
             if (msg.data.instantaneousDemand !== -0x800000) {
@@ -43,7 +43,7 @@ module.exports = [
         model: 'SPLZB-131',
         vendor: 'Develco',
         description: 'Power plug',
-        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering],
+        fromZigbee: [fz.on_off, fzLocal.develco_electrical_measurement, fzLocal.develco_metering],
         toZigbee: [tz.on_off],
         exposes: [e.switch(), e.power(), e.current(), e.voltage(), e.energy()],
         configure: async (device, coordinatorEndpoint, logger) => {
@@ -94,7 +94,7 @@ module.exports = [
         model: 'SPLZB-134',
         vendor: 'Develco',
         description: 'Power plug (type G)',
-        fromZigbee: [fz.on_off, fzLocal.SPLZB134_electrical_measurement, fzLocal.SPLZB134_metering, fzLocal.SPLZB134_device_temperature],
+        fromZigbee: [fz.on_off, fzLocal.develco_electrical_measurement, fzLocal.develco_metering, fzLocal.develco_device_temperature],
         toZigbee: [tz.on_off],
         exposes: [e.switch(), e.power(), e.current(), e.voltage(), e.energy(), e.device_temperature()],
         configure: async (device, coordinatorEndpoint, logger) => {
@@ -144,7 +144,7 @@ module.exports = [
         model: 'EMIZB-132',
         vendor: 'Develco',
         description: 'Wattle AMS HAN power-meter sensor',
-        fromZigbee: [fzLocal.SPLZB134_metering, fzLocal.SPLZB134_electrical_measurement, fz.develco_fw],
+        fromZigbee: [fzLocal.develco_metering, fzLocal.develco_electrical_measurement, fz.develco_fw],
         toZigbee: [tz.EMIZB_132_mode],
         ota: ota.zigbeeOTA,
         configure: async (device, coordinatorEndpoint, logger) => {

package/devices/ledvance.js

@@ -223,5 +223,30 @@ module.exports = [
         extend: extend.ledvance.light_onoff_brightness(),
         ota: ota.ledvance,
     },
-
+    {
+        zigbeeModel: ['PLUG COMPACT EU T'],
+        model: '4058075729322',
+        vendor: 'LEDVANCE',
+        description: 'SMART+ Compact Outdoor Plug EU',
+        extend: extend.switch(),
+        ota: ota.ledvance,
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(endpoint);
+        },
+    },
+    {
+        zigbeeModel: ['PLUG OUTDOOR EU T'],
+        model: '4058075729308',
+        vendor: 'LEDVANCE',
+        description: 'SMART+ Outdoor Plug EU',
+        extend: extend.switch(),
+        ota: ota.ledvance,
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(endpoint);
+        },
+    },
 ];

package/devices/philips.js

@@ -2756,8 +2756,8 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness(),
     },
     {
-        zigbeeModel: ['3402931P7'],
-        model: '3402931P7',
+        zigbeeModel: ['3402931P7', '3418231P6'],
+        model: '8718696175798',
         vendor: 'Philips',
         description: 'Philips Hue Adore Bathroom Mirror Light',
         extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),

package/devices/shinasystem.js

@@ -16,10 +16,12 @@ const fzLocal = {
         convert: (model, msg, publish, options, meta) => {
             const occupancyIn = msg.data.occupancy;
             globalStore.putValue(msg.endpoint, 'occupancy_in', occupancyIn);
-            const occupancy = occupancyIn | globalStore.getValue(msg.endpoint, 'occupancy_out', 0);
+            const occupancyOr = occupancyIn | globalStore.getValue(msg.endpoint, 'occupancy_out', 0);
+            const occupancyAnd = occupancyIn & globalStore.getValue(msg.endpoint, 'occupancy_out', 0);
             return {
                 occupancy_in: (occupancyIn & 1) > 0,
-                occupancy: (occupancy & 1) > 0,
+                occupancy_or: (occupancyOr & 1) > 0,
+                occupancy_and: (occupancyAnd & 1) > 0,
             };
         },
     },
@@ -29,15 +31,85 @@ const fzLocal = {
         convert: (model, msg, publish, options, meta) => {
             const occupancyOut = msg.data.zonestatus;
             globalStore.putValue(msg.endpoint, 'occupancy_out', occupancyOut);
-            const occupancy = occupancyOut | globalStore.getValue(msg.endpoint, 'occupancy_in', 0);
+            const occupancyOr = occupancyOut | globalStore.getValue(msg.endpoint, 'occupancy_in', 0);
+            const occupancyAnd = occupancyOut & globalStore.getValue(msg.endpoint, 'occupancy_in', 0);
             return {
                 occupancy_out: (occupancyOut & 1) > 0,
-                occupancy: (occupancy & 1) > 0,
+                occupancy_or: (occupancyOr & 1) > 0,
+                occupancy_and: (occupancyAnd & 1) > 0,
             };
         },
     },
 };
 
+const tzLocal = {
+    CSM300_SETUP: {
+        key: ['rf_pairing_on', 'counting_freeze', 'tof_init', 'led_state', 'rf_state', 'transation', 'fast_in', 'fast_out'],
+        convertSet: async (entity, key, value, meta) => {
+            let payload = null;
+            const endpoint = meta.device.endpoints.find((e) => e.supportsInputCluster('genAnalogInput'));
+            switch (key) {
+            case 'rf_pairing_on':
+                payload = {'presentValue': 81};
+                break;
+            case 'counting_freeze':
+                if (value.toLowerCase() === 'on') {
+                    payload = {'presentValue': 82};
+                } else if (value.toLowerCase() === 'off') {
+                    payload = {'presentValue': 84};
+                }
+                break;
+            case 'tof_init':
+                payload = {'presentValue': 83};
+                break;
+            case 'led_state':
+                if (value === 'enable') {
+                    payload = {'presentValue': 86};
+                } else if (value === 'disable') {
+                    payload = {'presentValue': 87};
+                }
+                break;
+            case 'rf_state':
+                if (value === 'enable') {
+                    payload = {'presentValue': 88};
+                } else if (value === 'disable') {
+                    payload = {'presentValue': 89};
+                }
+                break;
+            case 'transation':
+                if (value === '0ms') {
+                    payload = {'presentValue': 90};
+                } else if (value === '200ms') {
+                    payload = {'presentValue': 91};
+                } else if (value === '400ms') {
+                    payload = {'presentValue': 92};
+                } else if (value === '600ms') {
+                    payload = {'presentValue': 93};
+                } else if (value === '800ms') {
+                    payload = {'presentValue': 94};
+                } else if (value === '1,000ms') {
+                    payload = {'presentValue': 95};
+                }
+                break;
+            case 'fast_in':
+                if (value === 'enable') {
+                    payload = {'presentValue': 96};
+                } else if (value === 'disable') {
+                    payload = {'presentValue': 97};
+                }
+                break;
+            case 'fast_out':
+                if (value === 'enable') {
+                    payload = {'presentValue': 98};
+                } else if (value === 'disable') {
+                    payload = {'presentValue': 99};
+                }
+                break;
+            }
+            await endpoint.write('genAnalogInput', payload);
+        },
+    },
+};
 
 module.exports = [
     {
@@ -73,7 +145,7 @@ module.exports = [
         description: 'SiHAS multipurpose ToF sensor',
         meta: {battery: {voltageToPercentage: 'Add_1V_42V_CSM300z2v2'}},
         fromZigbee: [fz.battery, fz.sihas_people_cnt],
-        toZigbee: [tz.sihas_set_people],
+        toZigbee: [tz.sihas_set_people, tzLocal.CSM300_SETUP],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             const binds = ['genPowerCfg', 'genAnalogInput'];
@@ -84,7 +156,19 @@ module.exports = [
         },
         exposes: [e.battery(), e.battery_voltage(),
             exposes.enum('status', ea.STATE, ['idle', 'in', 'out']).withDescription('Currently status'),
-            exposes.numeric('people', ea.ALL).withValueMin(0).withValueMax(100).withDescription('People count')],
+            exposes.numeric('people', ea.ALL).withValueMin(0).withValueMax(100).withDescription('People count'),
+            exposes.enum('rf_pairing_on', ea.SET, ['run']).withDescription('Run RF pairing mode'),
+            exposes.binary('counting_freeze', ea.SET, 'ON', 'OFF')
+                .withDescription('Counting Freeze ON/OFF, not reporting people value when is ON'),
+            exposes.enum('tof_init', ea.SET, ['initial']).withDescription('ToF sensor initial'),
+            exposes.binary('led_state', ea.SET, 'enable', 'disable').withDescription('Indicate LED enable/disable, default : enable'),
+            exposes.binary('rf_state', ea.SET, 'enable', 'disable').withDescription('RF function enable/disable, default : disable'),
+            exposes.enum('transation', ea.SET, ['0ms', '200ms', '400ms', '600ms', '800ms', '1,000ms'])
+                .withDescription('Transation interval, default : 400ms'),
+            exposes.binary('fast_in', ea.SET, 'enable', 'disable')
+                .withDescription('Fast process enable/disable when people 0 to 1. default : enable'),
+            exposes.binary('fast_out', ea.SET, 'enable', 'disable')
+                .withDescription('Fast process enable/disable when people 1 to 0. default : enable')],
     },
     {
         zigbeeModel: ['USM-300Z'],
@@ -447,8 +531,10 @@ module.exports = [
                 .withDescription('Indicates whether "IN" Sensor of the device detected occupancy'),
             exposes.binary('occupancy_out', ea.STATE, true, false)
                 .withDescription('Indicates whether "OUT" Sensor of the device detected occupancy'),
-            exposes.binary('occupancy', ea.STATE, true, false)
+            exposes.binary('occupancy_or', ea.STATE, true, false)
                 .withDescription('Indicates whether "IN or OUT" Sensor of the device detected occupancy'),
+            exposes.binary('occupancy_and', ea.STATE, true, false)
+                .withDescription('Indicates whether "IN and OUT" Sensor of the device detected occupancy'),
             exposes.numeric('occupancy_timeout', ea.ALL).withUnit('second').withValueMin(0).withValueMax(3600)],
     },
     {

package/devices/xiaomi.js

@@ -550,6 +550,7 @@ module.exports = [
             // set "event" mode
             await endpoint1.write('aqaraOpple', {'mode': 1}, {manufacturerCode: 0x115f, disableResponse: true});
         },
+        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['lumi.switch.n2aeu1'],
@@ -1594,7 +1595,7 @@ module.exports = [
             e.battery_voltage().withAccess(ea.STATE_GET),
             e.device_temperature(),
             e.action(['manual_open', 'manual_close']),
-            exposes.enum('motor_state', ea.STATE, ['stopped', 'opening', 'closing'])
+            exposes.enum('motor_state', ea.STATE, ['stopped', 'opening', 'closing', 'pause'])
                 .withDescription('Motor state'),
             exposes.binary('running', ea.STATE, true, false)
                 .withDescription('Whether the motor is moving or not'),
@@ -2258,13 +2259,18 @@ module.exports = [
         model: 'SRTS-A01',
         vendor: 'Xiaomi',
         description: 'Aqara Smart Radiator Thermostat E1',
-        fromZigbee: [fzLocal.aqara_trv, fz.thermostat],
+        fromZigbee: [fzLocal.aqara_trv, fz.thermostat, fz.battery],
         toZigbee: [tzLocal.aqara_trv, tz.thermostat_occupied_heating_setpoint],
         exposes: [e.switch().setAccess('state', ea.STATE_SET),
             exposes.climate().withSetpoint('occupied_heating_setpoint', 5, 30, 0.5)
                 .withLocalTemperature(ea.STATE).withPreset(['manual', 'away', 'auto'], ea.STATE_SET),
             e.child_lock(), e.window_detection(), e.valve_detection(),
-            e.away_preset_temperature(),
+            e.away_preset_temperature(), e.battery_voltage(), e.battery(),
         ],
+        meta: {battery: {voltageToPercentage: '3V_2850_3000'}},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await endpoint.read('genPowerCfg', ['batteryVoltage']);
+        },
     },
 ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "14.0.625",
+  "version": "14.0.626",
   "description": "Collection of device converters to be used with zigbee-herdsman",
   "main": "index.js",
   "files": [
@@ -38,7 +38,7 @@
     "buffer-crc32": "^0.2.13",
     "https-proxy-agent": "^5.0.1",
     "tar-stream": "^2.2.0",
-    "zigbee-herdsman": "^0.14.54"
+    "zigbee-herdsman": "^0.14.55"
   },
   "devDependencies": {
     "eslint": "*",