zigbee-herdsman-converters 14.0.573 → 14.0.576

package/devices/bitron.js

@@ -186,7 +186,8 @@ module.exports = [
         vendor: 'SMaBiT (Bitron Video)',
         description: 'Wireless wall thermostat with relay',
         fromZigbee: [fz.legacy.bitron_thermostat_att_report, fz.battery, fz.hvac_user_interface],
-        toZigbee: [tz.thermostat_occupied_heating_setpoint, tz.thermostat_local_temperature_calibration, tz.thermostat_local_temperature,
+        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],
         exposes: [e.battery(), exposes.climate().withSetpoint('occupied_heating_setpoint', 7, 30, 0.5).withLocalTemperature()
             .withSystemMode(['off', 'auto', 'heat']).withRunningState(['idle', 'heat', 'cool'])
@@ -201,6 +202,7 @@ module.exports = [
             await reporting.thermostatTemperature(endpoint);
             await reporting.thermostatTemperatureCalibration(endpoint);
             await reporting.thermostatOccupiedHeatingSetpoint(endpoint);
+            await reporting.thermostatOccupiedCoolingSetpoint(endpoint);
             await reporting.thermostatRunningState(endpoint);
             await reporting.batteryAlarmState(endpoint);
             await reporting.batteryVoltage(endpoint);

package/devices/custom_devices_diy.js

@@ -435,19 +435,25 @@ module.exports = [
         zigbeeModel: ['EFEKTA_PWS'],
         model: 'EFEKTA_PWS',
         vendor: 'Custom devices (DiY)',
-        description: '[Plant Wattering Sensor]',
-        fromZigbee: [fz.temperature, fz.soil_moisture, fz.battery],
-        toZigbee: [tz.factory_reset],
+        description: '[Plant Wattering Sensor, CR2450, CR2477 batteries, temperature ]',
+        fromZigbee: [fz.temperature, fz.humidity, fz.illuminance, fz.soil_moisture, fz.battery, fzLocal.node_config],
+        toZigbee: [tz.factory_reset, tzLocal.node_config],
         configure: async (device, coordinatorEndpoint, logger) => {
             const firstEndpoint = device.getEndpoint(1);
-            await reporting.bind(firstEndpoint, coordinatorEndpoint, ['genPowerCfg', 'msTemperatureMeasurement', 'msSoilMoisture']);
+            await reporting.bind(firstEndpoint, coordinatorEndpoint, [
+                'genPowerCfg', 'msTemperatureMeasurement', 'msSoilMoisture']);
             const overides = {min: 0, max: 21600, change: 0};
             await reporting.batteryVoltage(firstEndpoint, overides);
             await reporting.batteryPercentageRemaining(firstEndpoint, overides);
             await reporting.temperature(firstEndpoint, overides);
             await reporting.soil_moisture(firstEndpoint, overides);
+            const payload1 = [{attribute: {ID: 0x0201, type: 0x21},
+                minimumReportInterval: 0, maximumReportInterval: 21600, reportableChange: 0}];
+            await firstEndpoint.configureReporting('genPowerCfg', payload1);
         },
-        exposes: [e.soil_moisture(), e.battery(), e.temperature()],
+        exposes: [e.soil_moisture(), e.battery(), e.temperature(),
+            exposes.numeric('report_delay', ea.STATE_SET).withUnit('Minutes').withValueMin(1).withValueMax(240)
+                .withDescription('Adjust Report Delay. Setting the time in minutes, by default 15 minutes')],
     },
     {
         zigbeeModel: ['EFEKTA_THP_LR'],

package/devices/dresden_elektronik.js

@@ -23,4 +23,12 @@ module.exports = [
         description: 'ZigBee Light Link wireless electronic ballast color temperature',
         extend: extend.light_onoff_brightness_colortemp(),
     },
+    {
+        zigbeeModel: ['Kobold'],
+        model: 'BN-600110',
+        vendor: 'Dresden Elektronik',
+        description: 'Zigbee 3.0 dimm actuator',
+        extend: extend.light_onoff_brightness(),
+        ota: ota.zigbeeOTA,
+    },
 ];

package/devices/heiman.js

@@ -699,4 +699,21 @@ module.exports = [
         },
         exposes: [e.battery(), e.action(['pressed']), e.battery_low(), e.tamper()],
     },
+    {
+        zigbeeModel: ['HS3AQ-EFA-3.0'],
+        model: 'HS3AQ',
+        vendor: 'HEIMAN',
+        description: 'Smart air quality monitor',
+        fromZigbee: [fz.co2, fz.humidity, fz.battery, fz.temperature],
+        toZigbee: [],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['msRelativeHumidity', 'genPowerCfg', 'msTemperatureMeasurement', 'msCO2']);
+            await reporting.batteryPercentageRemaining(endpoint);
+            await reporting.temperature(endpoint, {min: 1, max: constants.repInterval.MINUTES_5, change: 10}); // 0.1 degree change
+            await reporting.humidity(endpoint, {min: 1, max: constants.repInterval.MINUTES_5, change: 10}); // 0.1 % change
+            await reporting.co2(endpoint, {min: 5, max: constants.repInterval.MINUTES_5, change: 0.00005}); // 50 ppm change
+        },
+        exposes: [e.co2(), e.battery(), e.humidity(), e.temperature()],
+    },
 ];

package/devices/kurvia.js

@@ -0,0 +1,21 @@
+const tz = require('../converters/toZigbee');
+const exposes = require('../lib/exposes');
+const extend = require('../lib/extend');
+const e = exposes.presets;
+
+const extendData = extend.light_onoff_brightness_colortemp_color({colorTempRange: [250, 454]});
+
+
+module.exports = [
+    {
+        zigbeeModel: ['ZB-CL01'],
+        model: 'ZB-CL01',
+        vendor: 'KURVIA',
+        description: 'GU10 GRBWC built from AliExpress',
+        exposes: extendData.exposes.concat(e.power_on_behavior()),
+        toZigbee: [tz.on_off].concat(extendData.toZigbee),
+        fromZigbee: extendData.fromZigbee,
+        meta: {applyRedFix: true, enhancedHue: false},
+    },
+];
+

package/devices/led_trading.js

@@ -21,6 +21,31 @@ const fzLocal = {
             }
         },
     },
+    led_trading_9125: {
+        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 === 104) return; // Skip commisioning command.
+
+            // Button 1: A0 (top left)
+            // Button 2: A1 (bottom left)
+            // Button 3: B0 (top right)
+            // Button 4: B1 (bottom right)
+            const lookup = {
+                0x10: 'press_1', 0x14: 'release_1', 0x11: 'press_2', 0x15: 'release_2', 0x13: 'press_3', 0x17: 'release_3',
+                0x12: 'press_4', 0x16: 'release_4', 0x64: 'press_1_and_3', 0x65: 'release_1_and_3', 0x62: 'press_2_and_4',
+                0x63: 'release_2_and_4',
+            };
+
+            if (!lookup.hasOwnProperty(commandID)) {
+                meta.logger.error(`LED Trading 9125: missing command '${commandID}'`);
+            } else {
+                return {action: lookup[commandID]};
+            }
+        },
+    },
 };
 
 module.exports = [
@@ -66,4 +91,15 @@ module.exports = [
             await reporting.bind(device.getEndpoint(5), coordinatorEndpoint, ['genOnOff']);
         },
     },
+    {
+        fingerprint: [{modelID: 'GreenPower_2', ieeeAddr: /^0x00000000017.....$/, manufId: null}],
+        model: '9125',
+        vendor: 'LED Trading',
+        description: 'FOH smart switch',
+        whiteLabel: [{vendor: 'Sunricher', model: 'SR-ZGP2801K4-FOH-E'}],
+        fromZigbee: [fzLocal.led_trading_9125],
+        toZigbee: [],
+        exposes: [e.action(['press_1', 'release_1', 'press_2', 'release_2', 'press_3', 'release_3', 'press_4', 'release_4',
+            'press_1_and_3', 'release_1_and_3', 'press_2_and_4', 'release_2_and_4'])],
+    },
 ];

package/devices/lupus.js

@@ -28,7 +28,7 @@ module.exports = [
         ota: ota.zigbeeOTA,
     },
     {
-        zigbeeModel: ['PSMP5_00.00.03.11TC'],
+        zigbeeModel: ['PSMP5_00.00.03.11TC', 'PSMP5_00.00.05.12TC'],
         model: '12050',
         vendor: 'Lupus',
         description: 'LUPUSEC mains socket with power meter',

package/devices/osram.js

@@ -83,7 +83,7 @@ module.exports = [
         model: 'AC03642',
         vendor: 'OSRAM',
         description: 'SMART+ CLASSIC A 60 TW',
-        extend: extend.ledvance.light_onoff_brightness_colortemp(),
+        extend: extend.ledvance.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}),
         ota: ota.ledvance,
     },
     {

package/devices/philips.js

@@ -951,6 +951,13 @@ module.exports = [
         description: 'Hue white ambiance Adore wall light',
         extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
     },
+    {
+        zigbeeModel: ['929003056001'],
+        model: '929003056001',
+        vendor: 'Philips',
+        description: 'Hue white ambiance Adore bathroom mirror light with Bluetooth',
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
+    },
     {
         zigbeeModel: ['LTW015'],
         model: '9290011998B',
@@ -2448,6 +2455,13 @@ module.exports = [
         description: 'Akari downlight',
         extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
+    {
+        zigbeeModel: ['LCD004'],
+        model: '8719514382350',
+        vendor: 'Philips',
+        description: 'Akari downlight',
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+    },
     {
         zigbeeModel: ['LCD006'],
         model: '9290031346',

package/devices/tuya.js

@@ -467,6 +467,10 @@ module.exports = [
             return {'l1': 1, 'l2': 2};
         },
         meta: {multiEndpoint: true},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await endpoint.read('genBasic', ['manufacturerName', 'zclVersion', 'appVersion', 'modelId', 'powerSource', 0xfffe]);
+        },
     },
     {
         fingerprint: [{modelID: 'TS011F', manufacturerName: '_TZ3000_rk2yzt0u'},
@@ -904,8 +908,7 @@ module.exports = [
     },
     {
         fingerprint: [{modelID: 'TS0215A', manufacturerName: '_TZ3000_4fsgukof'},
-            {modelID: 'TS0215A', manufacturerName: '_TZ3000_wr2ucaj9'},
-            {modelID: 'TS0215A', manufacturerName: '_TZ3000_tj4pwzzm'}],
+            {modelID: 'TS0215A', manufacturerName: '_TZ3000_wr2ucaj9'}],
         model: 'TS0215A_sos',
         vendor: 'TuYa',
         description: 'SOS button',
@@ -915,6 +918,7 @@ module.exports = [
     },
     {
         fingerprint: [{modelID: 'TS0215A', manufacturerName: '_TZ3000_p6ju8myv'},
+            {modelID: 'TS0215A', manufacturerName: '_TZ3000_tj4pwzzm'},
             {modelID: 'TS0215A', manufacturerName: '_TZ3000_fsiepnrh'}],
         model: 'TS0215A_remote',
         vendor: 'TuYa',
@@ -1022,8 +1026,8 @@ module.exports = [
         fingerprint: [
             {modelID: 'TS0201', manufacturerName: '_TZ3000_bguser20'},
             {modelID: 'TS0201', manufacturerName: '_TZ3000_fllyghyj'},
-            {modelID: 'TS0201', manufacturerName: '_TZ3000_dowj6gyi'},
             {modelID: 'TS0201', manufacturerName: '_TZ3000_yd2e749y'},
+            {modelID: 'TS0201', manufacturerName: '_TZ3000_6uzkisv2'},
         ],
         model: 'WSD500A',
         vendor: 'TuYa',
@@ -1036,6 +1040,21 @@ module.exports = [
             await endpoint.read('genBasic', ['manufacturerName', 'zclVersion', 'appVersion', 'modelId', 'powerSource', 0xfffe]);
         },
     },
+    {
+        fingerprint: [
+            {modelID: 'TS0201', manufacturerName: '_TZ3000_dowj6gyi'},
+        ],
+        model: 'IH-K009',
+        vendor: 'TuYa',
+        description: 'Temperature & humidity sensor',
+        fromZigbee: [fzLocal.TS0201_battery, fz.temperature, fz.humidity],
+        toZigbee: [],
+        exposes: [e.battery(), e.temperature(), e.humidity(), e.battery_voltage()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await endpoint.read('genBasic', ['manufacturerName', 'zclVersion', 'appVersion', 'modelId', 'powerSource', 0xfffe]);
+        },
+    },
     {
         fingerprint: [{modelID: 'SM0201', manufacturerName: '_TYZB01_cbiezpds'}],
         model: 'SM0201',

package/lib/ota/ubisys.js

@@ -1,5 +1,5 @@
-const firmwareHtmlPageUrl = 'https://www.ubisys.de/en/support/firmware/';
-const imageRegex = /[^"\s]*\/10F2-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{8})\S*ota1?\.zigbee/gi;
+const firmwareHtmlPageUrl = 'http://fwu.ubisys.de/smarthome/OTA/release/index';
+const imageRegex = /10F2-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{8})\S*ota1?\.zigbee/gi;
 const assert = require('assert');
 const url = require('url');
 const common = require('./common');

package/lib/reporting.js

@@ -94,6 +94,10 @@ module.exports = {
         const p = payload('measuredValue', 10, repInterval.HOUR, 100, overrides);
         await endpoint.configureReporting('msTemperatureMeasurement', p);
     },
+    co2: async (endpoint, overrides) => {
+        const p = payload('measuredValue', 10, repInterval.HOUR, 1, overrides);
+        await endpoint.configureReporting('msCO2', p);
+    },
     deviceTemperature: async (endpoint, overrides) => {
         const p = payload('currentTemperature', 300, repInterval.HOUR, 1, overrides);
         await endpoint.configureReporting('genDeviceTempCfg', p);

package/package.json

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