zigbee-herdsman-converters 14.0.538 → 14.0.541

package/converters/fromZigbee.js

@@ -2257,11 +2257,9 @@ const converters = {
             const value = tuya.getDataValue(dpValue);
 
             switch (dp) {
-            case tuya.dataPoints.coverPosition: { // Started moving to position (triggered from Zigbee)
-                return {running: true};
-            }
+            case tuya.dataPoints.coverPosition: // Started moving to position (triggered from Zigbee)
             case tuya.dataPoints.coverArrived: { // Arrived at position
-                const running = dp === tuya.dataPoints.coverArrived ? false : true;
+                const running = dp === tuya.dataPoints.coverPosition;
                 const invert = tuya.isCoverInverted(meta.device.manufacturerName) ? !options.invert_cover : options.invert_cover;
                 const position = invert ? 100 - (value & 0xFF) : (value & 0xFF);
 
@@ -7308,7 +7306,7 @@ const converters = {
             case 4:
                 return {battery: value};
             case 1:
-                return {battery_low: value.toFixed(1)};
+                return {battery_low: value === 1};
             default:
                 meta.logger.warn(`s_lux_zb_illuminance: NOT RECOGNIZED DP #${dp} with data ${JSON.stringify(dpValue)}`);
             }

package/devices/lellki.js

@@ -23,6 +23,9 @@ module.exports = [
             return {l1: 1, l2: 2, l3: 3, l4: 4, l5: 5};
         },
         configure: async (device, coordinatorEndpoint, logger) => {
+            await device.getEndpoint(1).read('genBasic', [
+                'manufacturerName', 'zclVersion', 'appVersion', 'modelId', 'powerSource', 0xfffe]);
+
             for (const ID of [1, 2, 3, 4, 5]) {
                 await reporting.bind(device.getEndpoint(ID), coordinatorEndpoint, ['genOnOff']);
             }

package/devices/lonsonho.js

@@ -109,7 +109,7 @@ module.exports = [
         extend: extend.light_onoff_brightness(),
     },
     {
-        fingerprint: [{modelID: 'TS110F', manufacturerName: '_TYZB01_v8gtiaed'}],
+        fingerprint: [{modelID: 'TS110F', manufacturerName: '_TYZB01_v8gtiaed'}, {modelID: 'TS110E', manufacturerName: '_TZ3210_pagajpog'}],
         model: 'QS-Zigbee-D02-TRIAC-2C-LN',
         vendor: 'Lonsonho',
         description: '2 gang smart dimmer switch module with neutral',

package/devices/niko.js

@@ -227,5 +227,11 @@ module.exports = [
         fromZigbee: [fz.on_off, fz.brightness, fz.level_config, fz.command_move, fz.command_stop],
         toZigbee: [tz.light_onoff_brightness, tz.level_config],
         exposes: [e.light_brightness().withLevelConfig()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'genLevelCtrl']);
+            await reporting.onOff(endpoint);
+            await reporting.brightness(endpoint);
+        },
     },
 ];

package/devices/owon.js

@@ -4,7 +4,78 @@ const tz = require('../converters/toZigbee');
 const constants = require('../lib/constants');
 const reporting = require('../lib/reporting');
 const e = exposes.presets;
+const ea = exposes.access;
 
+const fzLocal = {
+    PC321_metering: {
+        cluster: 'seMetering',
+        type: ['attributeReport', 'readResponse'],
+        convert: (model, msg, publish, options, meta) => {
+            const payload = {};
+            if (msg.data.hasOwnProperty('owonL1Energy')) {
+                payload.energy_l1 = msg.data['owonL1Energy'][1] / 1000.0;
+            }
+            if (msg.data.hasOwnProperty('owonL2Energy')) {
+                payload.energy_l2 = msg.data['owonL2Energy'][1] / 1000.0;
+            }
+            if (msg.data.hasOwnProperty('owonL3Energy')) {
+                payload.energy_l3 = msg.data['owonL3Energy'][1] / 1000.0;
+            }
+            if (msg.data.hasOwnProperty('owonL1ReactiveEnergy')) {
+                payload.reactive_energy_l1 = msg.data['owonL1ReactiveEnergy'][1] / 1000.0;
+            }
+            if (msg.data.hasOwnProperty('owonL2ReactiveEnergy')) {
+                payload.reactive_energy_l2 = msg.data['owonL2ReactiveEnergy'][1] / 1000.0;
+            }
+            if (msg.data.hasOwnProperty('owonL3ReactiveEnergy')) {
+                payload.reactive_energy_l3 = msg.data['owonL3ReactiveEnergy'][1] / 1000.0;
+            }
+            if (msg.data.hasOwnProperty('owonL1PhasePower')) {
+                payload.power_l1 = msg.data['owonL1PhasePower'];
+            }
+            if (msg.data.hasOwnProperty('owonL2PhasePower')) {
+                payload.power_l2 = msg.data['owonL2PhasePower'];
+            }
+            if (msg.data.hasOwnProperty('owonL3PhasePower')) {
+                payload.power_l3 = msg.data['owonL3PhasePower'];
+            }
+            if (msg.data.hasOwnProperty('owonL1PhaseReactivePower')) {
+                payload.reactive_power_l1 = msg.data['owonL1PhaseReactivePower'];
+            }
+            if (msg.data.hasOwnProperty('owonL2PhaseReactivePower')) {
+                payload.reactive_power_l2 = msg.data['owonL2PhaseReactivePower'];
+            }
+            if (msg.data.hasOwnProperty('owonL3PhaseReactivePower')) {
+                payload.reactive_power_l3 = msg.data['owonL3PhaseReactivePower'];
+            }
+            if (msg.data.hasOwnProperty('owonL1PhaseVoltage')) {
+                payload.voltage_l1 = msg.data['owonL1PhaseVoltage'] / 10.0;
+            }
+            if (msg.data.hasOwnProperty('owonL2PhaseVoltage')) {
+                payload.voltage_l2 = msg.data['owonL2PhaseVoltage'] / 10.0;
+            }
+            if (msg.data.hasOwnProperty('owonL3PhaseVoltage')) {
+                payload.voltage_l3 = msg.data['owonL3PhaseVoltage'] / 10.0;
+            }
+            if (msg.data.hasOwnProperty('owonL1PhaseCurrent')) {
+                payload.current_l1 = msg.data['owonL1PhaseCurrent'] / 1000.0;
+            }
+            if (msg.data.hasOwnProperty('owonL2PhaseCurrent')) {
+                payload.current_l2 = msg.data['owonL2PhaseCurrent'] / 1000.0;
+            }
+            if (msg.data.hasOwnProperty('owonL3PhaseCurrent')) {
+                payload.current_l3 = msg.data['owonL3PhaseCurrent'] / 1000.0;
+            }
+            if (msg.data.hasOwnProperty('owonFrequency')) {
+                payload.frequency = msg.data['owonFrequency'];
+            }
+            if (msg.data.hasOwnProperty('owonReactiveEnergySum')) {
+                payload.reactive_energy_sum = msg.data['owonReactiveEnergySum'];
+            }
+            return payload;
+        },
+    },
+};
 module.exports = [
     {
         zigbeeModel: ['WSP404'],
@@ -119,4 +190,41 @@ module.exports = [
             device.save();
         },
     },
+    {
+        zigbeeModel: ['PC321'],
+        model: 'PC321',
+        vendor: 'OWON',
+        description: '3-Phase clamp power meter',
+        fromZigbee: [fz.metering, fzLocal.PC321_metering],
+        toZigbee: [],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['seMetering']);
+            await reporting.readMeteringMultiplierDivisor(endpoint);
+            if (device.powerSource === 'Unknown') {
+                device.powerSource = 'Mains (single phase)';
+                device.save();
+            }
+        },
+        exposes: [e.energy(),
+            exposes.numeric('voltage_l1', ea.STATE).withUnit('V').withDescription('Phase 1 voltage'),
+            exposes.numeric('voltage_l2', ea.STATE).withUnit('V').withDescription('Phase 2 voltage'),
+            exposes.numeric('voltage_l3', ea.STATE).withUnit('V').withDescription('Phase 3 voltage'),
+            exposes.numeric('current_l1', ea.STATE).withUnit('A').withDescription('Phase 1 current'),
+            exposes.numeric('current_l2', ea.STATE).withUnit('A').withDescription('Phase 2 current'),
+            exposes.numeric('current_l3', ea.STATE).withUnit('A').withDescription('Phase 3 current'),
+            exposes.numeric('energy_l1', ea.STATE).withUnit('kWh').withDescription('Phase 1 energy'),
+            exposes.numeric('energy_l2', ea.STATE).withUnit('kWh').withDescription('Phase 2 energy'),
+            exposes.numeric('energy_l3', ea.STATE).withUnit('kWh').withDescription('Phase 3 energy'),
+            exposes.numeric('reactive_energy_l1', ea.STATE).withUnit('kVArh').withDescription('Phase 1 reactive energy'),
+            exposes.numeric('reactive_energy_l2', ea.STATE).withUnit('kVArh').withDescription('Phase 2 reactive energy'),
+            exposes.numeric('reactive_energy_l3', ea.STATE).withUnit('kVArh').withDescription('Phase 3 reactive energy'),
+            exposes.numeric('power_l1', ea.STATE).withUnit('W').withDescription('Phase 1 power'),
+            exposes.numeric('power_l2', ea.STATE).withUnit('W').withDescription('Phase 2 power'),
+            exposes.numeric('power_l3', ea.STATE).withUnit('W').withDescription('Phase 3 power'),
+            exposes.numeric('reactive_power_l1', ea.STATE).withUnit('VAr').withDescription('Phase 1 reactive power'),
+            exposes.numeric('reactive_power_l2', ea.STATE).withUnit('VAr').withDescription('Phase 2 reactive power'),
+            exposes.numeric('reactive_power_l3', ea.STATE).withUnit('VAr').withDescription('Phase 3 reactive power'),
+        ],
+    },
 ];

package/devices/paulmann.js

@@ -22,7 +22,7 @@ module.exports = [
         extend: extend.light_onoff_brightness_colortemp_color(),
     },
     {
-        zigbeeModel: ['Switch Controller '],
+        zigbeeModel: ['Switch Controller'],
         model: '50043',
         vendor: 'Paulmann',
         description: 'SmartHome Zigbee Cephei Switch Controller',
@@ -36,7 +36,7 @@ module.exports = [
         extend: extend.switch(),
     },
     {
-        zigbeeModel: ['Dimmablelight '],
+        zigbeeModel: ['Dimmablelight'],
         model: '50044/50045',
         vendor: 'Paulmann',
         description: 'SmartHome Zigbee Dimmer or LED-stripe',
@@ -50,7 +50,7 @@ module.exports = [
         extend: extend.light_onoff_brightness_colortemp_color(),
     },
     {
-        zigbeeModel: ['RGBW light', '500.49'],
+        zigbeeModel: ['RGBW light', '500.49', 'RGBW_light'],
         model: '50049/500.63',
         vendor: 'Paulmann',
         description: 'Smart Home Zigbee YourLED RGB Controller max. 60W / Smart Home Zigbee LED Reflektor 3,5W GU10 RGBW dimmbar',
@@ -64,7 +64,7 @@ module.exports = [
         extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 370]}),
     },
     {
-        zigbeeModel: ['CCT light'],
+        zigbeeModel: ['CCT light', 'CCT_light'],
         model: '50064',
         vendor: 'Paulmann',
         description: 'SmartHome led spot',
@@ -127,7 +127,7 @@ module.exports = [
         extend: extend.light_onoff_brightness(),
     },
     {
-        zigbeeModel: ['RemoteControl '],
+        zigbeeModel: ['RemoteControl'],
         model: '500.67',
         vendor: 'Paulmann',
         description: 'RGB remote control',

package/devices/philips.js

@@ -1671,9 +1671,9 @@ module.exports = [
         zigbeeModel: ['929002376801'],
         model: '929002376801',
         vendor: 'Philips',
-        description: 'Hue Iris (generation 4)',
+        description: 'Hue Iris kobber limited edition (generation 4)',
         meta: {turnsOffAtBrightness1: true},
-        extend: hueExtend.light_onoff_brightness_color(),
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
         ota: ota.zigbeeOTA,
     },
     {
@@ -3042,4 +3042,13 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [222, 454]}),
         ota: ota.zigbeeOTA,
     },
+    {
+        zigbeeModel: ['LWB016'],
+        model: '9290018609',
+        vendor: 'Philips',
+        description: 'Hue White E26 806 lumen',
+        meta: {turnsOffAtBrightness1: true},
+        extend: hueExtend.light_onoff_brightness(),
+        ota: ota.zigbeeOTA,
+    },
 ];

package/devices/sengled.js

@@ -237,7 +237,6 @@ module.exports = [
             await reporting.instantaneousDemand(endpoint);
         },
         exposes: [e.switch(), e.power(), e.energy()],
-        ota: ota.zigbeeOTA,
     },
     {
         zigbeeModel: ['E1E-G7F'],

package/devices/sunricher.js

@@ -3,8 +3,41 @@ const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/lega
 const tz = require('../converters/toZigbee');
 const reporting = require('../lib/reporting');
 const extend = require('../lib/extend');
+const utils = require('../lib/utils');
 const e = exposes.presets;
 
+const fzLocal = {
+    sunricher_SRZGP2801K45C: {
+        cluster: 'greenPower',
+        type: ['commandNotification', 'commandCommisioningNotification'],
+        convert: (model, msg, publish, options, meta) => {
+            const commandID = msg.data.commandID;
+            if (utils.hasAlreadyProcessedMessage(msg, msg.data.frameCounter, `${msg.device.ieeeAddr}_${commandID}`)) return;
+            if (commandID === 224) return;
+            const lookup = {
+                0x21: 'press_on',
+                0x20: 'press_off',
+                0x37: 'press_high',
+                0x38: 'press_low',
+                0x35: 'hold_high',
+                0x36: 'hold_low',
+                0x34: 'high_low_release',
+                0x63: 'cw_ww_release',
+                0x62: 'cw_dec_ww_inc',
+                0x64: 'ww_inc_cw_dec',
+                0x41: 'r_g_b',
+                0x42: 'b_g_r',
+                0x40: 'rgb_release',
+            };
+            if (!lookup.hasOwnProperty(commandID)) {
+                meta.logger.error(`Sunricher: missing command '0x${commandID.toString(16)}'`);
+            } else {
+                return {action: lookup[commandID]};
+            }
+        },
+    },
+};
+
 module.exports = [
     {
         zigbeeModel: ['SR-ZG9023A-EU'],
@@ -300,4 +333,14 @@ module.exports = [
         toZigbee: [],
         exposes: [e.action(['press_on', 'press_off', 'press_high', 'press_low', 'hold_high', 'hold_low', 'release'])],
     },
+    {
+        fingerprint: [{modelID: 'GreenPower_2', ieeeAddr: /^0x00000000aaf.....$/}],
+        model: 'SR-ZGP2801K-5C',
+        vendor: 'Sunricher',
+        description: 'Pushbutton transmitter module',
+        fromZigbee: [fzLocal.sunricher_SRZGP2801K45C],
+        toZigbee: [],
+        exposes: [e.action(['press_on', 'press_off', 'press_high', 'press_low', 'hold_high', 'hold_low', 'high_low_release',
+            'cw_ww_release', 'cw_dec_ww_inc', 'ww_inc_cw_dec', 'r_g_b', 'b_g_r', 'rgb_release'])],
+    },
 ];

package/devices/tuya.js

@@ -14,7 +14,7 @@ const TS011Fplugs = ['_TZ3000_5f43h46b', '_TZ3000_cphmq0q7', '_TZ3000_dpo1ysak',
     '_TZ3000_jvzvulen', '_TZ3000_mraovvmm', '_TZ3000_nfnmi125', '_TZ3000_ps3dmato', '_TZ3000_w0qqde0g', '_TZ3000_u5u4cakc',
     '_TZ3000_rdtixbnu', '_TZ3000_typdpbpg', '_TZ3000_kx0pris5', '_TZ3000_amdymr7l', '_TZ3000_z1pnpsdo', '_TZ3000_ksw8qtmt',
     '_TZ3000_nzkqcvvs', '_TZ3000_1h2x4akh', '_TZ3000_9vo5icau', '_TZ3000_cehuw1lw', '_TZ3000_ko6v90pg', '_TZ3000_f1bapcit',
-    '_TZ3000_cjrngdr3', '_TZ3000_zloso4jk', '_TZ3000_r6buo8ba'];
+    '_TZ3000_cjrngdr3', '_TZ3000_zloso4jk', '_TZ3000_r6buo8ba', '_TZ3000_iksasdbv', '_TZ3000_dd8wwzcy'];
 
 const tzLocal = {
     TS0504B_color: {
@@ -247,7 +247,7 @@ const fzLocal = {
                 case 116: // report confirmation
                     break;
                 case 121: // running state
-                    result.running_state = {0: 'OPENING', 1: 'STOPPED', 2: 'CLOSING'}[value];
+                    result.motor_state = {0: 'OPENING', 1: 'STOPPED', 2: 'CLOSING'}[value];
                     result.running = (value !== 1) ? true : false;
                     break;
                 default: // Unknown code
@@ -716,13 +716,7 @@ module.exports = [
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genBasic']);
         },
-        exposes: (device, options) => {
-            if (device && device.manufacturerName === '_TZE200_pisltm67') {
-                return [e.illuminance_lux(), e.linkquality()];
-            } else {
-                return [e.battery(), e.illuminance_lux(), e.battery_low(), e.linkquality()];
-            }
-        },
+        exposes: [e.battery(), e.illuminance_lux(), e.battery_low(), e.linkquality()],
     },
     {
         zigbeeModel: ['TS130F'],
@@ -2598,7 +2592,7 @@ module.exports = [
         exposes: [
             e.cover_position().setAccess('position', ea.STATE_SET),
             exposes.enum('goto_positon', ea.SET, ['25', '50', '75', 'FAVORITE']),
-            exposes.enum('running_state', ea.STATE, ['OPENING', 'CLOSING', 'STOPPED']),
+            exposes.enum('motor_state', ea.STATE, ['OPENING', 'CLOSING', 'STOPPED']),
             exposes.numeric('active_power', ea.STATE).withDescription('Active power').withUnit('mWt'),
             exposes.numeric('cycle_count', ea.STATE).withDescription('Cycle count'),
             exposes.numeric('cycle_time', ea.STATE).withDescription('Cycle time').withUnit('ms'),

package/devices/zemismart.js

@@ -144,6 +144,9 @@ module.exports = [
         },
         meta: {multiEndpoint: true},
         configure: async (device, coordinatorEndpoint, logger) => {
+            await device.getEndpoint(1).read('genBasic', [
+                'manufacturerName', 'zclVersion', 'appVersion', 'modelId', 'powerSource', 0xfffe]);
+
             await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
             await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff']);
             await reporting.onOff(device.getEndpoint(1));

package/lib/ota/inovelli.js

@@ -18,8 +18,8 @@ async function getImageMeta(current, logger, device) {
         .sort((a, b) => {
             const aRadix = a.version.match(/[A-F]/) ? 16 : 10;
             const bRadix = b.version.match(/[A-F]/) ? 16 : 10;
-            const aVersion = parseInt(a.version.replace(/\./g, ''), aRadix);
-            const bVersion = parseInt(b.version.replace(/\./g, ''), bRadix);
+            const aVersion = parseFloat(a.version, aRadix);
+            const bVersion = parseFloat(b.version, bRadix);
             // doesn't matter which order they are in
             if (aVersion < bVersion) {
                 return -1;
@@ -37,7 +37,7 @@ async function getImageMeta(current, logger, device) {
     }
     // version in the firmare removes the zero padding and support hex versioning
     return {
-        fileVersion: parseInt(image.version, image.version.match(/[A-F]/) ? 16 : 10),
+        fileVersion: parseFloat(image.version, image.version.match(/[A-F]/) ? 16 : 10),
         url: image.firmware,
     };
 }

package/package.json

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