zigbee-herdsman-converters 15.0.79 → 15.0.81

package/devices/bitron.js

@@ -5,6 +5,55 @@ const reporting = require('../lib/reporting');
 const extend = require('../lib/extend');
 const e = exposes.presets;
 const ea = exposes.access;
+const herdsman = require('zigbee-herdsman');
+
+const manufacturerOptions = {manufacturerCode: herdsman.Zcl.ManufacturerCode._4_NOKS};
+
+const bitron = {
+    fz: {
+        thermostat_hysteresis: {
+            cluster: 'hvacThermostat',
+            type: ['attributeReport', 'readResponse'],
+            convert: (model, msg, publish, options, meta) => {
+                const result = {};
+
+                if (msg.data.hasOwnProperty('fourNoksHysteresisHigh')) {
+                    if (!result.hasOwnProperty('hysteresis')) result.hysteresis = {};
+                    result.hysteresis.high = msg.data.fourNoksHysteresisHigh;
+                }
+
+                if (msg.data.hasOwnProperty('fourNoksHysteresisLow')) {
+                    if (!result.hasOwnProperty('hysteresis')) result.hysteresis = {};
+                    result.hysteresis.low = msg.data.fourNoksHysteresisLow;
+                }
+
+                return result;
+            },
+        },
+    },
+    tz: {
+        thermostat_hysteresis: {
+            key: ['hysteresis', 'hysteresis'],
+            convertSet: async (entity, key, value, meta) => {
+                const result = {state: {hysteresis: {}}};
+                if (value.hasOwnProperty('high')) {
+                    await entity.write('hvacThermostat', {'fourNoksHysteresisHigh': value.high}, manufacturerOptions);
+                    result.state.hysteresis.high = value.high;
+                }
+
+                if (value.hasOwnProperty('low')) {
+                    await entity.write('hvacThermostat', {'fourNoksHysteresisLow': value.low}, manufacturerOptions);
+                    result.state.hysteresis.low = value.low;
+                }
+
+                return result;
+            },
+            convertGet: async (entity, key, meta) => {
+                await entity.read('hvacThermostat', ['fourNoksHysteresisHigh', 'fourNoksHysteresisLow'], manufacturerOptions);
+            },
+        },
+    },
+};
 
 module.exports = [
     {
@@ -190,12 +239,12 @@ module.exports = [
         model: 'AV2010/32',
         vendor: 'SMaBiT (Bitron Video)',
         description: 'Wireless wall thermostat with relay',
-        fromZigbee: [fz.legacy.thermostat_att_report, fz.battery, fz.hvac_user_interface],
+        fromZigbee: [fz.legacy.thermostat_att_report, fz.battery, fz.hvac_user_interface, bitron.fz.thermostat_hysteresis],
         toZigbee: [
             tz.thermostat_control_sequence_of_operation, tz.thermostat_occupied_heating_setpoint,
             tz.thermostat_occupied_cooling_setpoint, tz.thermostat_local_temperature_calibration,
             tz.thermostat_local_temperature, tz.thermostat_running_state, tz.thermostat_temperature_display_mode,
-            tz.thermostat_keypad_lockout, tz.thermostat_system_mode, tz.battery_voltage,
+            tz.thermostat_keypad_lockout, tz.thermostat_system_mode, tz.battery_voltage, bitron.tz.thermostat_hysteresis,
         ],
         exposes: (device, options) => {
             const dynExposes = [];
@@ -214,6 +263,11 @@ module.exports = [
                 modes.push('cool');
             }
 
+            const hysteresisExposes = exposes.composite('hysteresis', 'hysteresis', ea.ALL)
+                .withFeature(exposes.numeric('low', ea.SET))
+                .withFeature(exposes.numeric('high', ea.SET))
+                .withDescription('Set thermostat hysteresis low and high trigger values. (1 = 0.01ºC)');
+
             dynExposes.push(exposes.climate()
                 .withSetpoint('occupied_heating_setpoint', 7, 30, 0.5)
                 .withLocalTemperature()
@@ -222,9 +276,11 @@ module.exports = [
                 .withLocalTemperatureCalibration()
                 .withControlSequenceOfOperation(['heating_only', 'cooling_only'], ea.ALL));
             dynExposes.push(e.keypad_lockout());
+            dynExposes.push(hysteresisExposes);
             dynExposes.push(e.battery().withAccess(ea.STATE_GET));
             dynExposes.push(e.battery_low());
             dynExposes.push(e.linkquality());
+
             return dynExposes;
         },
         meta: {battery: {voltageToPercentage: '3V_2500'}},
@@ -241,6 +297,7 @@ module.exports = [
             await reporting.batteryAlarmState(endpoint);
             await reporting.batteryVoltage(endpoint);
             await endpoint.read('hvacThermostat', ['ctrlSeqeOfOper', 'localTemperatureCalibration']);
+            await endpoint.read('hvacThermostat', ['fourNoksHysteresisHigh', 'fourNoksHysteresisLow'], manufacturerOptions);
         },
     },
     {

package/devices/essentialb.js

@@ -10,7 +10,7 @@ module.exports = [
         model: 'EB-E14-P45-RGBW',
         vendor: 'EssentielB',
         description: 'Smart LED bulb',
-        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}),
+        extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 370]}),
     },
     {
         zigbeeModel: ['EB-E14-FLA-CCT'],

package/devices/gledopto.js

@@ -451,6 +451,13 @@ module.exports = [
         description: 'Zigbee 6W E26/E27 Bulb RGB+CCT',
         extend: gledoptoExtend.light_onoff_brightness_colortemp_color(),
     },
+    {
+        zigbeeModel: ['GL-C-103P'],
+        model: 'GL-C-103P',
+        vendor: 'Gledopto',
+        description: 'Zigbee LED controller (pro)',
+        extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [158, 495]}),
+    },
     {
         zigbeeModel: ['GL-G-004P'],
         model: 'GL-G-004P',

package/devices/ledvance.js

@@ -198,7 +198,7 @@ module.exports = [
         zigbeeModel: ['CLA60 RGBW JP'],
         model: 'SMARTZBA60RGBW',
         vendor: 'LEDVANCE',
-        description: 'SMART+ lamp E26 RGBW',
+        description: 'SMART+ lamp B22D RGBTW',
         extend: extend.ledvance.light_onoff_brightness_colortemp_color({colorTempRange: [153, 526]}),
         ota: ota.ledvance,
     },

package/devices/owon.js

@@ -282,7 +282,7 @@ module.exports = [
         ],
     },
     {
-        zigbeeModel: ['PCT504'],
+        zigbeeModel: ['PCT504', 'PCT504-E'],
         model: 'PCT504',
         vendor: 'OWON',
         description: 'HVAC fan coil',

package/devices/philips.js

@@ -887,9 +887,9 @@ module.exports = [
     },
     {
         zigbeeModel: ['LCA006'],
-        model: '9290024689',
+        model: '9290024688',
         vendor: 'Philips',
-        description: 'Hue white and color ambiance B22 1100lm',
+        description: 'Hue white and color ambiance E27 1100lm',
         extend: philips.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
     {

package/devices/tuya.js

@@ -1491,8 +1491,7 @@ module.exports = [
         },
     },
     {
-        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_aqnazj70'}, {modelID: 'TS0601', manufacturerName: '_TZE200_k6jhsr0q'},
-            {modelID: 'TS0601', manufacturerName: '_TZE200_di3tfv5b'}],
+        fingerprint: tuya.fingerprint('TS0601', ['_TZE200_aqnazj70', '_TZE200_k6jhsr0q', '_TZE200_di3tfv5b', '_TZE200_mexisfik']),
         model: 'TS0601_switch_4_gang',
         vendor: 'TuYa',
         description: '4 gang switch',
@@ -2665,6 +2664,26 @@ module.exports = [
                 [66, 100, 160].includes(device.applicationVersion), // polling for energy
             ),
     },
+    {
+        fingerprint: [{modelID: 'TS011F', manufacturerName: '_TZ3000_wbloefbf'}],
+        model: 'TS011F_switch_5_gang',
+        description: '2 gang 2 usb 1 wall ac outlet',
+        whiteLabel: [{vendor: 'Milfra', model: 'M11Z'}],
+        vendor: 'TuYa',
+        extend: tuya.extend.switch({powerOutageMemory: true, childLock: true, endpoints: ['l1', 'l2', 'l3', 'l4', 'l5']}),
+        endpoint: (device) => {
+            return {l1: 1, l2: 2, l3: 3, l4: 4, l5: 5};
+        },
+        meta: {multiEndpoint: true},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await tuya.configureMagicPacket(device, coordinatorEndpoint, logger);
+            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']);
+            await reporting.bind(device.getEndpoint(5), coordinatorEndpoint, ['genOnOff']);
+        },
+    },
     {
         fingerprint: tuya.fingerprint('TS0601', ['_TZE200_ntcy3xu1', '_TZE200_ytibqbra']),
         model: 'TS0601_smoke_1',

package/devices/ubisys.js

@@ -925,4 +925,14 @@ module.exports = [
         },
         ota: ota.ubisys,
     },
+    {
+        zigbeeModel: ['R0 (5501)'],
+        model: 'R0',
+        vendor: 'Ubisys',
+        description: 'Zigbee Router',
+        fromZigbee: [fz.linkquality_from_basic],
+        toZigbee: [],
+        exposes: [],
+        ota: ota.ubisys,
+    },
 ];

package/lib/tuya.js

@@ -1245,6 +1245,14 @@ const valueConverter = {
     divideBy10: valueConverterBasic.divideBy(10),
     divideBy1000: valueConverterBasic.divideBy(1000),
     raw: valueConverterBasic.raw(),
+    coverPosition: {
+        to: async (v, meta) => {
+            return meta.options.invert_cover ? 100 - v : v;
+        },
+        from: (v, meta, options) => {
+            return options.invert_cover ? 100 - v : v;
+        },
+    },
     plus1: {
         from: (v) => v + 1,
         to: (v) => v - 1,
@@ -1824,9 +1832,9 @@ const tuyaFz = {
                 if (dpEntry) {
                     const value = getDataValue(dpValue);
                     if (dpEntry[1]) {
-                        result[dpEntry[1]] = dpEntry[2].from(value, meta);
+                        result[dpEntry[1]] = dpEntry[2].from(value, meta, options);
                     } else if (dpEntry[2]) {
-                        result = {...result, ...dpEntry[2].from(value, meta)};
+                        result = {...result, ...dpEntry[2].from(value, meta, options)};
                     }
                 } else {
                     meta.logger.debug(`Datapoint ${dpId} not defined for '${meta.device.manufacturerName}' ` +

package/package.json

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