zigbee-herdsman-converters 15.0.67 → 15.0.69

package/converters/toZigbee.js

@@ -2271,7 +2271,7 @@ const converters = {
     xiaomi_auto_off: {
         key: ['auto_off'],
         convertSet: async (entity, key, value, meta) => {
-            if (['ZNCZ04LM', 'ZNCZ12LM'].includes(meta.mapped.model)) {
+            if (['ZNCZ04LM', 'ZNCZ12LM', 'SP-EUC01'].includes(meta.mapped.model)) {
                 await entity.write('aqaraOpple', {0x0202: {value: value ? 1 : 0, type: 0x10}}, manufacturerOptions.xiaomi);
             } else if (['ZNCZ11LM'].includes(meta.mapped.model)) {
                 const payload = value ?
@@ -2284,6 +2284,13 @@ const converters = {
             }
             return {state: {auto_off: value}};
         },
+        convertGet: async (entity, key, meta) => {
+            if (['ZNCZ04LM', 'ZNCZ12LM', 'SP-EUC01'].includes(meta.mapped.model)) {
+                await entity.read('aqaraOpple', [0x0202], manufacturerOptions.xiaomi);
+            } else {
+                throw new Error('Not supported');
+            }
+        },
     },
     GZCGQ11LM_detection_period: {
         key: ['detection_period'],
@@ -2356,7 +2363,7 @@ const converters = {
         convertSet: async (entity, key, value, meta) => {
             if (['ZNCZ04LM', 'ZNCZ12LM', 'ZNCZ15LM', 'QBCZ14LM', 'QBCZ15LM', 'QBKG19LM', 'QBKG20LM', 'QBKG25LM', 'QBKG26LM',
                 'QBKG28LM', 'QBKG31LM', 'QBKG34LM', 'DLKZMK11LM', 'SSM-U01', 'WS-EUK01', 'WS-EUK02',
-                'WS-EUK03', 'WS-EUK04'].includes(meta.mapped.model)) {
+                'WS-EUK03', 'WS-EUK04', 'SP-EUC01'].includes(meta.mapped.model)) {
                 await entity.write('aqaraOpple', {0x0203: {value: value ? 1 : 0, type: 0x10}}, manufacturerOptions.xiaomi);
             } else if (['ZNCZ11LM'].includes(meta.mapped.model)) {
                 const payload = value ?
@@ -2372,7 +2379,7 @@ const converters = {
         convertGet: async (entity, key, meta) => {
             if (['ZNCZ04LM', 'ZNCZ12LM', 'ZNCZ15LM', 'QBCZ15LM', 'QBCZ14LM', 'QBKG19LM', 'QBKG20LM', 'QBKG25LM', 'QBKG26LM',
                 'QBKG28LM', 'QBKG31LM', 'QBKG34LM', 'DLKZMK11LM', 'SSM-U01', 'WS-EUK01', 'WS-EUK02',
-                'WS-EUK03', 'WS-EUK04'].includes(meta.mapped.model)) {
+                'WS-EUK03', 'WS-EUK04', 'SP-EUC01'].includes(meta.mapped.model)) {
                 await entity.read('aqaraOpple', [0x0203], manufacturerOptions.xiaomi);
             } else {
                 throw new Error('Not supported');

package/devices/bosch.js

@@ -49,7 +49,7 @@ const displayOrientation = {
 // Radiator Thermostat II
 const tzLocal = {
     bosch_thermostat: {
-        key: ['window_open', 'boost', 'system_mode'],
+        key: ['window_open', 'boost', 'system_mode', 'pi_heating_demand'],
         convertSet: async (entity, key, value, meta) => {
             if (key === 'window_open') {
                 value = value.toUpperCase();
@@ -66,7 +66,7 @@ const tzLocal = {
                 return {state: {boost: value}};
             }
             if (key === 'system_mode') {
-                // Map system_mode (Off/Auto/Heat) to Boschg operating mode
+                // Map system_mode (Off/Auto/Heat) to Bosch operating mode
                 value = value.toLowerCase();
 
                 let opMode = operatingModes.manual; // OperatingMode 1 = Manual (Default)
@@ -79,6 +79,12 @@ const tzLocal = {
                 await entity.write('hvacThermostat', {0x4007: {value: opMode, type: herdsman.Zcl.DataType.enum8}}, boschManufacturer);
                 return {state: {system_mode: value}};
             }
+            if (key === 'pi_heating_demand') {
+                await entity.write('hvacThermostat',
+                    {0x4020: {value: value, type: herdsman.Zcl.DataType.enum8}},
+                    boschManufacturer);
+                return {state: {pi_heating_demand: value}};
+            }
         },
         convertGet: async (entity, key, meta) => {
             switch (key) {
@@ -91,6 +97,9 @@ const tzLocal = {
             case 'system_mode':
                 await entity.read('hvacThermostat', [0x4007], boschManufacturer);
                 break;
+            case 'pi_heating_demand':
+                await entity.read('hvacThermostat', [0x4020], boschManufacturer);
+                break;
 
             default: // Unknown key
                 throw new Error(`Unhandled key toZigbee.bosch_thermostat.convertGet ${key}`);
@@ -426,7 +435,7 @@ const definition = [
                 .withSetpoint('occupied_heating_setpoint', 5, 30, 0.5)
                 .withLocalTemperatureCalibration(-5, 5, 0.1)
                 .withSystemMode(['off', 'heat', 'auto'])
-                .withPiHeatingDemand(ea.STATE),
+                .withPiHeatingDemand(ea.ALL),
             exposes.binary('boost', ea.ALL, 'ON', 'OFF')
                 .withDescription('Activate Boost heating'),
             exposes.binary('window_open', ea.ALL, 'ON', 'OFF')
@@ -473,6 +482,13 @@ const definition = [
                 maximumReportInterval: constants.repInterval.HOUR,
                 reportableChange: 1,
             }], boschManufacturer);
+            // report boost as it's disabled by thermostat after some time
+            await endpoint.configureReporting('hvacThermostat', [{
+                attribute: {ID: 0x4043, type: herdsman.Zcl.DataType.enum8},
+                minimumReportInterval: 0,
+                maximumReportInterval: constants.repInterval.HOUR,
+                reportableChange: 1,
+            }], boschManufacturer);
 
             await endpoint.read('hvacThermostat', ['localTemperatureCalibration']);
             await endpoint.read('hvacThermostat', [0x4007, 0x4020, 0x4042, 0x4043], boschManufacturer);

package/devices/centralite.js

@@ -270,7 +270,7 @@ module.exports = [
         model: '4200-C',
         vendor: 'Centralite',
         description: 'Smart outlet',
-        extend: extend.switch(),
+        extend: extend.switch({disablePowerOnBehavior: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);

package/devices/ikea.js

@@ -365,6 +365,13 @@ module.exports = [
         description: 'TRADFRI LED bulb E26 250 lumen, wireless dimmable warm white/globe clear',
         extend: tradfriExtend.light_onoff_brightness(),
     },
+    {
+        zigbeeModel: ['TRADFRI bulb E27 WW G95 CL 470lm'],
+        model: 'LED2102G3',
+        vendor: 'IKEA',
+        description: 'TRADFRI bulb E27 WW 470 lumen, wireless dimmable warm white/globe clear',
+        extend: tradfriExtend.light_onoff_brightness(),
+    },
     {
         zigbeeModel: ['TRADFRIbulbG125E27WSopal470lm', 'TRADFRIbulbG125E26WSopal450lm'],
         model: 'LED1936G5',

package/devices/ledvance.js

@@ -8,7 +8,7 @@ module.exports = [
         model: '4058075208384',
         vendor: 'LEDVANCE',
         description: 'SMART+ Classic A60 E27 Tunable white',
-        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 370], disablePowerOnBehavior: true}),
+        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}),
         ota: ota.ledvance,
     },
     {
@@ -55,7 +55,7 @@ module.exports = [
         model: 'AC25697',
         vendor: 'LEDVANCE',
         description: 'SMART+ CLASSIC MULTICOLOUR 60 10W E27',
-        extend: extend.ledvance.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500], disablePowerOnBehavior: true}),
+        extend: extend.ledvance.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
         ota: ota.ledvance,
     },
     {

package/devices/osram.js

@@ -335,7 +335,7 @@ module.exports = [
         model: 'AC03648',
         vendor: 'OSRAM',
         description: 'SMART+ spot GU5.3 tunable white',
-        extend: extend.ledvance.light_onoff_brightness_colortemp({colorTempRange: [153, 370], disablePowerOnBehavior: true}),
+        extend: extend.ledvance.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}),
         ota: ota.ledvance,
     },
     {
@@ -412,7 +412,7 @@ module.exports = [
         model: '4062172044776_1',
         vendor: 'OSRAM',
         description: 'Zigbee 3.0 DALI CONV LI dimmer for DALI-based luminaires (only one device)',
-        extend: extend.ledvance.light_onoff_brightness({disablePowerOnBehavior: true}),
+        extend: extend.ledvance.light_onoff_brightness(),
         ota: ota.zigbeeOTA,
     },
     {
@@ -425,7 +425,7 @@ module.exports = [
             fz.command_toggle, fz.command_move, fz.command_stop],
         extend: extend.ledvance.light_onoff_brightness({noConfigure: true}),
         exposes: [e.action(['toggle', 'brightness_move_up', 'brightness_move_down', 'brightness_stop']),
-            ...extend.ledvance.light_onoff_brightness({noConfigure: true, disablePowerOnBehavior: true}).exposes],
+            ...extend.ledvance.light_onoff_brightness({noConfigure: true}).exposes],
         ota: ota.zigbeeOTA,
         configure: async (device, coordinatorEndpoint, logger) => {
             await reporting.bind(device.getEndpoint(10), coordinatorEndpoint, ['genLevelCtrl', 'genOnOff']);

package/devices/philips.js

@@ -10,6 +10,13 @@ const ea = exposes.access;
 const extend = {switch: require('../lib/extend').switch};
 
 module.exports = [
+    {
+        zigbeeModel: ['LWO007'],
+        model: '9290030521',
+        vendor: 'Philips',
+        description: 'Hue white G125 B22 LED bulb filament giant globe',
+        extend: philips.extend.light_onoff_brightness(),
+    },
     {
         zigbeeModel: ['929003055801'],
         model: '929003055801',
@@ -2806,7 +2813,7 @@ module.exports = [
         extend: philips.extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
     {
-        zigbeeModel: ['915005997501', '915005997401'],
+        zigbeeModel: ['915005997501', '915005997401', '929003542401'],
         model: '915005997501',
         vendor: 'Philips',
         description: 'Hue Bluetooth white & color ambiance ceiling lamp Infuse large',

package/devices/siterwell.js

@@ -7,7 +7,7 @@ const ea = exposes.access;
 
 module.exports = [
     {
-        zigbeeModel: ['ivfvd7h', 'eaxp72v\u0000', 'kfvq6avy\u0000', 'fvq6avy\u0000', 'fvq6avy', 'zk78ptr\u0000'],
+        zigbeeModel: ['ivfvd7h', 'eaxp72v\u0000', 'kfvq6avy\u0000', 'fvq6avy\u0000', 'fvq6avy', 'zk78ptr\u0000', '4yfvweb\u0000'],
         fingerprint: [
             {modelID: 'TS0601', manufacturerName: '_TZE200_zivfvd7h'},
             {modelId: 'TS0601', manufacturerName: '_TZE200_kfvq6avy'},

package/devices/smartwings.js

@@ -16,8 +16,8 @@ module.exports = [
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg', 'closuresWindowCovering']);
-            await reporting.batteryPercentageRemaining(endpoint);
-            await reporting.currentPositionLiftPercentage(endpoint);
+            device.powerSource = 'Mains (single phase)';
+            device.save();
         },
         exposes: [e.cover_position(), e.battery()],
     },

package/devices/xiaomi.js

@@ -1927,10 +1927,8 @@ module.exports = [
         exposes: [
             e.switch(), e.power().withAccess(ea.STATE_GET), e.energy(), e.device_temperature().withAccess(ea.STATE),
             e.voltage(), e.current(), e.consumer_connected(), e.led_disabled_night(),
-            e.power_outage_memory(), exposes.binary('auto_off', ea.STATE_SET, true, false)
-                .withDescription('Turn the device automatically off when attached device consumes less than 2W for 20 minutes'),
-            exposes.numeric('overload_protection', exposes.access.ALL).withValueMin(100).withValueMax(2300).withUnit('W')
-                .withDescription('Maximum allowed load, turns off if exceeded')],
+            e.power_outage_memory(), e.auto_off(20),
+            e.overload_protection(100, 2300)],
         ota: ota.zigbeeOTA,
     },
     {
@@ -1944,10 +1942,8 @@ module.exports = [
         exposes: [
             e.switch(), e.power().withAccess(ea.STATE_GET), e.energy(), e.device_temperature().withAccess(ea.STATE),
             e.voltage(), e.current(), e.consumer_connected(), e.led_disabled_night(),
-            e.power_outage_memory(), exposes.binary('auto_off', ea.STATE_SET, true, false)
-                .withDescription('Turn the device automatically off when attached device consumes less than 2W for 20 minutes'),
-            exposes.numeric('overload_protection', exposes.access.ALL).withValueMin(100).withValueMax(2300).withUnit('W')
-                .withDescription('Maximum allowed load, turns off if exceeded')],
+            e.power_outage_memory(), e.auto_off(20),
+            e.overload_protection(100, 2300)],
         ota: ota.zigbeeOTA,
     },
     {
@@ -1957,7 +1953,8 @@ module.exports = [
         vendor: 'Xiaomi',
         fromZigbee: [fz.on_off, fz.xiaomi_basic, fz.electrical_measurement, fz.metering,
             fz.aqara_opple, fz.xiaomi_power, fz.device_temperature],
-        toZigbee: [tz.on_off, tz.xiaomi_switch_power_outage_memory],
+        toZigbee: [tz.on_off, tz.xiaomi_switch_power_outage_memory, tz.xiaomi_led_disabled_night,
+            tz.xiaomi_overload_protection, tz.xiaomi_auto_off, tz.xiaomi_socket_button_lock],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
@@ -2006,9 +2003,10 @@ module.exports = [
                 globalStore.putValue(device, 'interval', interval);
             }
         },
-        exposes: [e.switch(), e.power(), e.energy(), e.power_outage_memory(),
-            e.voltage(), e.current(),
-            e.device_temperature().withDescription('Device temperature (polled every 30 min)')],
+        exposes: [e.switch(), e.power(), e.energy(), e.power_outage_memory(), e.voltage(), e.current(),
+            e.device_temperature().withDescription('Device temperature (polled every 30 min)'),
+            e.consumer_connected(), e.led_disabled_night(), e.overload_protection(100, 2300),
+            e.auto_off(20), e.button_lock()],
         ota: ota.zigbeeOTA,
     },
     {
@@ -2021,9 +2019,7 @@ module.exports = [
             tz.xiaomi_switch_power_outage_memory, tz.xiaomi_auto_off],
         exposes: [e.switch(), e.power().withAccess(ea.STATE_GET), e.energy(), e.device_temperature(), e.voltage(),
             e.power_outage_memory(), e.led_disabled_night(),
-            exposes.binary('auto_off', ea.STATE_SET, true, false)
-                .withDescription('If the power is constantly lower than 2W within half an hour, ' +
-                    'the plug will be automatically turned off')],
+            e.auto_off(30)],
         onEvent: async (type, data, device) => {
             device.skipTimeResponse = true;
             // According to the Zigbee the genTime.time should be the seconds since 1 January 2020 UTC
@@ -2829,8 +2825,7 @@ module.exports = [
         exposes: [e.switch(), e.power().withAccess(ea.STATE), e.energy(), e.device_temperature().withAccess(ea.STATE),
             e.voltage(), e.current(), e.consumer_connected().withAccess(ea.STATE),
             e.power_outage_memory(), e.led_disabled_night(), e.button_lock(),
-            exposes.numeric('overload_protection', exposes.access.ALL).withValueMin(100).withValueMax(2500).withUnit('W')
-                .withDescription('Maximum allowed load, turns off if exceeded')],
+            e.overload_protection(100, 2500)],
         ota: ota.zigbeeOTA,
     },
     {
@@ -2900,8 +2895,7 @@ module.exports = [
             e.current(), e.power_outage_memory(), e.led_disabled_night(), e.button_lock(),
             exposes.enum('button_switch_mode', exposes.access.ALL, ['relay', 'relay_and_usb'])
                 .withDescription('Control both relay and usb or only the relay with the physical switch button'),
-            exposes.numeric('overload_protection', exposes.access.ALL).withValueMin(100).withValueMax(2500).withUnit('W')
-                .withDescription('Maximum allowed load, turns off if exceeded')],
+            e.overload_protection(100, 2500)],
         ota: ota.zigbeeOTA,
     },
     {
@@ -2927,8 +2921,7 @@ module.exports = [
             e.switch(), e.power().withAccess(ea.STATE), e.energy(),
             e.device_temperature().withAccess(ea.STATE), e.voltage(),
             e.current(), e.power_outage_memory(), e.led_disabled_night(), e.button_lock(),
-            exposes.numeric('overload_protection', exposes.access.ALL).withValueMin(100).withValueMax(2500).withUnit('W')
-                .withDescription('Maximum allowed load, turns off if exceeded')],
+            e.overload_protection(100, 2500)],
         ota: ota.zigbeeOTA,
     },
     {

package/lib/exposes.js

@@ -541,6 +541,7 @@ module.exports = {
         angle_axis: (name) => new Numeric(name, access.STATE).withValueMin(-90).withValueMax(90).withUnit('°'),
         aqi: () => new Numeric('aqi', access.STATE).withDescription('Air quality index'),
         auto_lock: () => new Switch().withState('auto_lock', false, 'Enable/disable auto lock', access.STATE_SET, 'AUTO', 'MANUAL'),
+        auto_off: (offTime) => new Binary('auto_off', access.ALL, true, false).withDescription(`Turn the device automatically off when attached device consumes less than 2W for ${offTime} minutes`),
         auto_relock_time: () => new Numeric('auto_relock_time', access.ALL).withValueMin(0).withUnit('s').withDescription('The number of seconds to wait after unlocking a lock before it automatically locks again. 0=disabled'),
         away_mode: () => new Switch().withState('away_mode', false, 'Enable/disable away mode', access.STATE_SET),
         away_preset_days: () => new Numeric('away_preset_days', access.STATE_SET).withDescription('Away preset days').withValueMin(0).withValueMax(100),
@@ -615,6 +616,7 @@ module.exports = {
         occupancy_level: () => new Numeric('occupancy_level', access.STATE).withDescription('The measured occupancy value'),
         open_window: () => new Binary('open_window', access.STATE_SET, 'ON', 'OFF').withDescription('Enables/disables the status on the device'),
         open_window_temperature: () => new Numeric('open_window_temperature', access.STATE_SET).withUnit('°C').withDescription('Open window temperature').withValueMin(0).withValueMax(35),
+        overload_protection: (min, max) => new Numeric('overload_protection', access.ALL).withUnit('W').withValueMin(min).withValueMax(max).withDescription('Maximum allowed load, turns off if exceeded'),
         pm10: () => new Numeric('pm10', access.STATE).withUnit('µg/m³').withDescription('Measured PM10 (particulate matter) concentration'),
         pm25: () => new Numeric('pm25', access.STATE).withUnit('µg/m³').withDescription('Measured PM2.5 (particulate matter) concentration'),
         position: () => new Numeric('position', access.STATE).withUnit('%').withDescription('Position'),

package/lib/extend.js

@@ -144,24 +144,36 @@ const extend = {
 };
 {
     extend.ledvance = {
-        light_onoff_brightness: (options={}) => ({
-            ...extend.light_onoff_brightness(options),
-            toZigbee: extend.light_onoff_brightness(options).toZigbee.concat([tz.ledvance_commands]),
-        }),
-        light_onoff_brightness_colortemp: (options={}) => ({
-            ...extend.light_onoff_brightness_colortemp({disableColorTempStartup: true, ...options}),
-            toZigbee: extend.light_onoff_brightness_colortemp({disableColorTempStartup: true, ...options})
-                .toZigbee.concat([tz.ledvance_commands]),
-        }),
-        light_onoff_brightness_color: (options={}) => ({
-            ...extend.light_onoff_brightness_color({supportsHS: true, ...options}),
-            toZigbee: extend.light_onoff_brightness_color({supportsHS: true, ...options}).toZigbee.concat([tz.ledvance_commands]),
-        }),
-        light_onoff_brightness_colortemp_color: (options={}) => ({
-            ...extend.light_onoff_brightness_colortemp_color({supportsHS: true, disableColorTempStartup: true, ...options}),
-            toZigbee: extend.light_onoff_brightness_colortemp_color({supportsHS: true, disableColorTempStartup: true, ...options})
-                .toZigbee.concat([tz.ledvance_commands]),
-        }),
+        light_onoff_brightness: (options={}) => {
+            options = {disablePowerOnBehavior: true, ...options};
+            return {
+                ...extend.light_onoff_brightness(options),
+                toZigbee: extend.light_onoff_brightness(options).toZigbee.concat([tz.ledvance_commands]),
+            };
+        },
+        light_onoff_brightness_colortemp: (options={}) => {
+            options = {disablePowerOnBehavior: true, ...options};
+            return {
+                ...extend.light_onoff_brightness_colortemp({disableColorTempStartup: true, ...options}),
+                toZigbee: extend.light_onoff_brightness_colortemp({disableColorTempStartup: true, ...options})
+                    .toZigbee.concat([tz.ledvance_commands]),
+            };
+        },
+        light_onoff_brightness_color: (options={}) => {
+            options = {disablePowerOnBehavior: true, ...options};
+            return {
+                ...extend.light_onoff_brightness_color({supportsHS: true, ...options}),
+                toZigbee: extend.light_onoff_brightness_color({supportsHS: true, ...options}).toZigbee.concat([tz.ledvance_commands]),
+            };
+        },
+        light_onoff_brightness_colortemp_color: (options={}) => {
+            options = {disablePowerOnBehavior: true, ...options};
+            return {
+                ...extend.light_onoff_brightness_colortemp_color({supportsHS: true, disableColorTempStartup: true, ...options}),
+                toZigbee: extend.light_onoff_brightness_colortemp_color({supportsHS: true, disableColorTempStartup: true, ...options})
+                    .toZigbee.concat([tz.ledvance_commands]),
+            };
+        },
     };
 }
 

package/lib/xiaomi.js

@@ -552,7 +552,7 @@ const numericAttributes2Payload = async (msg, meta, model, options, dataObject)
             }
             break;
         case '512':
-            if (['ZNCZ15LM', 'QBCZ14LM', 'QBCZ15LM'].includes(model.model)) {
+            if (['ZNCZ15LM', 'QBCZ14LM', 'QBCZ15LM', 'SP-EUC01'].includes(model.model)) {
                 payload.button_lock = value === 1 ? 'OFF' : 'ON';
             } else {
                 const mode = {0x01: 'control_relay', 0x00: 'decoupled'}[value];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "15.0.67",
+  "version": "15.0.69",
   "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": "^3.0.0",
-    "zigbee-herdsman": "^0.14.97"
+    "zigbee-herdsman": "^0.14.98"
   },
   "devDependencies": {
     "eslint": "*",