zigbee-herdsman-converters 15.0.19 → 15.0.21

package/converters/fromZigbee.js

@@ -794,37 +794,58 @@ const converters = {
     on_off: {
         cluster: 'genOnOff',
         type: ['attributeReport', 'readResponse'],
+        options: [exposes.options.state_action()],
         convert: (model, msg, publish, options, meta) => {
             if (msg.data.hasOwnProperty('onOff')) {
+                const payload = {};
                 const property = postfixWithEndpointName('state', msg, model, meta);
-                return {[property]: msg.data['onOff'] === 1 ? 'ON' : 'OFF'};
+                const state = msg.data['onOff'] === 1 ? 'ON' : 'OFF';
+                payload[property] = state;
+                if (options && options.state_action) {
+                    payload['action'] = postfixWithEndpointName(state.toLowerCase(), msg, model, meta);
+                }
+                return payload;
             }
         },
     },
     on_off_force_multiendpoint: {
         cluster: 'genOnOff',
         type: ['attributeReport', 'readResponse'],
+        options: [exposes.options.state_action()],
         convert: (model, msg, publish, options, meta) => {
             // This converted is need instead of `fz.on_off` when no meta: {multiEndpoint: true} can be defined for this device
             // but it is needed for the `state`. E.g. when a switch has 3 channels (state_l1, state_l2, state_l3) but
             // has combined power measurements (power, energy))
             if (msg.data.hasOwnProperty('onOff')) {
+                const payload = {};
                 const endpointName = model.hasOwnProperty('endpoint') ?
                     utils.getKey(model.endpoint(meta.device), msg.endpoint.ID) : msg.endpoint.ID;
-                return {[`state_${endpointName}`]: msg.data['onOff'] === 1 ? 'ON' : 'OFF'};
+                const state = msg.data['onOff'] === 1 ? 'ON' : 'OFF';
+                payload[`state_${endpointName}`] = state;
+                if (options && options.state_action) {
+                    payload['action'] = `${state.toLowerCase()}_${endpointName}`;
+                }
+                return payload;
             }
         },
     },
     on_off_skip_duplicate_transaction: {
         cluster: 'genOnOff',
         type: ['attributeReport', 'readResponse'],
+        options: [exposes.options.state_action()],
         convert: (model, msg, publish, options, meta) => {
             // Device sends multiple messages with the same transactionSequenceNumber,
             // prevent that multiple messages get send.
             // https://github.com/Koenkk/zigbee2mqtt/issues/3687
             if (msg.data.hasOwnProperty('onOff') && !hasAlreadyProcessedMessage(msg, model)) {
+                const payload = {};
                 const property = postfixWithEndpointName('state', msg, model, meta);
-                return {[property]: msg.data['onOff'] === 1 ? 'ON' : 'OFF'};
+                const state = msg.data['onOff'] === 1 ? 'ON' : 'OFF';
+                payload[property] = state;
+                if (options && options.state_action) {
+                    payload['action'] = postfixWithEndpointName(state.toLowerCase(), msg, model, meta);
+                }
+                return payload;
             }
         },
     },
@@ -8291,6 +8312,15 @@ const converters = {
             return result;
         },
     },
+    hw_version: {
+        cluster: 'genBasic',
+        type: ['attributeReport', 'readResponse'],
+        convert: (model, msg, publish, options, meta) => {
+            const result = {};
+            if (msg.data.hasOwnProperty('hwVersion')) result['hw_version'] = msg.data.hwVersion;
+            return result;
+        },
+    },
     // #endregion
 
     // #region Ignore converters (these message dont need parsing).

package/devices/bosch.js

@@ -508,6 +508,26 @@ const definition = [
             exposes.enum('heartbeat', ea.ALL, Object.keys(stateOffOn)).withDescription('Enable/disable heartbeat'),
         ],
     },
+    {
+        zigbeeModel: ['RBSH-SP-ZB-EU'],
+        model: 'BSP-FZ2',
+        vendor: 'Bosch',
+        description: 'Plug compact EU',
+        fromZigbee: [fz.on_off, fz.power_on_behavior, fz.electrical_measurement, fz.metering],
+        toZigbee: [tz.on_off, tz.power_on_behavior],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await endpoint.read('genOnOff', ['onOff', 'startUpOnOff']);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['seMetering']);
+            await reporting.readMeteringMultiplierDivisor(endpoint);
+            await reporting.currentSummDelivered(endpoint, {change: [0, 1]});
+            await reporting.bind(endpoint, coordinatorEndpoint, ['haElectricalMeasurement']);
+            await endpoint.read('haElectricalMeasurement', ['acPowerMultiplier', 'acPowerDivisor']);
+            await reporting.activePower(endpoint);
+        },
+        exposes: [e.switch(), e.power_on_behavior(), e.power(), e.energy()],
+    },
 ];
 
 module.exports = definition;

package/devices/datek.js

@@ -10,7 +10,7 @@ const ea = exposes.access;
 
 module.exports = [
     {
-        zigbeeModel: ['PoP'],
+        fingerprint: [{modelID: 'PoP', manufacturerName: 'Eva'}],
         model: 'HLU2909K',
         vendor: 'Datek',
         description: 'APEX smart plug 16A',
@@ -31,21 +31,23 @@ module.exports = [
         exposes: [e.power(), e.current(), e.voltage(), e.switch(), e.temperature()],
     },
     {
-        zigbeeModel: ['Meter Reader'],
+        fingerprint: [{modelID: 'Meter Reader', manufacturerName: 'Eva'}],
         model: 'HSE2905E',
         vendor: 'Datek',
         description: 'Datek Eva AMS HAN power-meter sensor',
-        fromZigbee: [fz.metering_datek, fz.electrical_measurement, fz.temperature],
+        fromZigbee: [fz.metering_datek, fz.electrical_measurement, fz.temperature, fz.hw_version],
         toZigbee: [],
         ota: ota.zigbeeOTA,
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['haElectricalMeasurement', 'seMetering', 'msTemperatureMeasurement']);
+            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
             await reporting.readMeteringMultiplierDivisor(endpoint);
             try {
-                await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
-            } catch (error) {
-                /* fails for some: https://github.com/Koenkk/zigbee2mqtt/issues/11867 */
+                // hwVersion < 2 do not support hwVersion attribute, so we are testing if this is hwVersion 1 or 2
+                await endpoint.read('genBasic', ['hwVersion']);
+            } catch (e) {
+                e;
             }
             const payload = [{
                 attribute: 'rmsVoltagePhB',
@@ -78,8 +80,6 @@ module.exports = [
             await reporting.currentSummDelivered(endpoint, {min: 60, max: 3600, change: [1, 1]});
             await reporting.currentSummReceived(endpoint);
             await reporting.temperature(endpoint, {min: 60, max: 3600, change: 0});
-            device.powerSource = 'DC source';
-            device.save();
         },
         exposes: [e.power(), e.energy(), e.current(), e.voltage(), e.current_phase_b(), e.voltage_phase_b(), e.current_phase_c(),
             e.voltage_phase_c(), e.temperature()],
@@ -113,7 +113,7 @@ module.exports = [
             exposes.numeric('occupancy_timeout', ea.ALL).withUnit('seconds').withValueMin(0).withValueMax(65535)],
     },
     {
-        zigbeeModel: ['ID Lock 150'],
+        fingerprint: [{modelID: 'ID Lock 150', manufacturerName: 'Eva'}],
         model: '0402946',
         vendor: 'Datek',
         description: 'Zigbee module for ID lock 150',
@@ -187,7 +187,7 @@ module.exports = [
                 'random_pin_24_hours']).withDescription('Service Mode of the Lock')],
     },
     {
-        zigbeeModel: ['Water Sensor'],
+        fingerprint: [{modelID: 'Water Sensor', manufacturerName: 'Eva'}],
         model: 'HSE2919E',
         vendor: 'Datek',
         description: 'Eva water leak sensor',
@@ -228,6 +228,7 @@ module.exports = [
                 'brightness_move_down', 'brightness_move_up', 'brightness_stop'])],
     },
     {
+        fingerprint: [{modelID: 'Door/Window Sensor', manufacturerName: 'Eva'}],
         zigbeeModel: ['Door/Window Sensor'],
         model: 'HSE2920E',
         vendor: 'Datek',

package/devices/essentialb.js

@@ -0,0 +1,11 @@
+const extend = require('../lib/extend');
+
+module.exports = [
+    {
+        zigbeeModel: ['EB-E14-P45-RGBW'],
+        model: 'EB-E14-P45-RGBW',
+        vendor: 'EssentielB',
+        description: 'Smart LED bulb',
+        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}),
+    },
+];

package/devices/lidl.js

@@ -409,14 +409,15 @@ module.exports = [
         model: 'HG08164',
         vendor: 'Lidl',
         description: 'Silvercrest smart button',
-        fromZigbee: [fz.command_on, fz.command_off, fz.command_step, fz.command_stop, fz.battery],
+        fromZigbee: [fz.command_on, fz.command_off, fz.command_step, fz.command_stop, fz.battery, fz.tuya_on_off_action],
         toZigbee: [],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);
             await reporting.batteryPercentageRemaining(endpoint);
         },
-        exposes: [e.action(['on', 'off', 'brightness_stop', 'brightness_step_up', 'brightness_step_down']), e.battery()],
+        exposes: [e.action(
+            ['on', 'off', 'brightness_stop', 'brightness_step_up', 'brightness_step_down', 'single', 'double']), e.battery()],
     },
     {
         fingerprint: [{modelID: 'TS0211', manufacturerName: '_TZ1800_ladpngdx'}],

package/devices/namron.js

@@ -734,4 +734,25 @@ module.exports = [
         extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 555]}),
         meta: {turnsOffAtBrightness1: true},
     },
+    {
+        zigbeeModel: ['4512749'],
+        model: '4512749',
+        vendor: 'Namron',
+        description: 'Thermostat outlet socket',
+        fromZigbee: [fz.metering, fz.electrical_measurement, fz.on_off, fz.temperature],
+        toZigbee: [tz.on_off, tz.power_on_behavior],
+        exposes: [e.temperature(), e.power(), e.current(), e.voltage(), e.switch(), e.power_on_behavior()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement', 'msTemperatureMeasurement']);
+            await endpoint.read('haElectricalMeasurement', ['acVoltageMultiplier', 'acVoltageDivisor']);
+            await endpoint.read('haElectricalMeasurement', ['acPowerMultiplier', 'acPowerDivisor']);
+            await endpoint.read('haElectricalMeasurement', ['acCurrentMultiplier', 'acCurrentDivisor']);
+            await reporting.onOff(endpoint);
+            await reporting.temperature(endpoint);
+            await reporting.rmsVoltage(endpoint);
+            await reporting.rmsCurrent(endpoint);
+            await reporting.activePower(endpoint);
+        },
+    },
 ];

package/devices/nodon.js

@@ -51,6 +51,21 @@ module.exports = [
             return {default: 1};
         },
     },
+    {
+        zigbeeModel: ['SIN-4-1-20_PRO'],
+        model: 'SIN-4-1-20_PRO',
+        vendor: 'NodOn',
+        description: 'Single LED relay',
+        extend: extend.switch(),
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const ep = device.getEndpoint(1);
+            await reporting.bind(ep, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(ep);
+        },
+        endpoint: (device) => {
+            return {default: 1};
+        },
+    },
     {
         zigbeeModel: ['SIN-4-2-20'],
         model: 'SIN-4-2-20',
@@ -71,4 +86,24 @@ module.exports = [
             await reporting.onOff(ep2);
         },
     },
+    {
+        zigbeeModel: ['SIN-4-2-20_PRO'],
+        model: 'SIN-4-2-20_PRO',
+        vendor: 'NodOn',
+        description: 'Double LED relay',
+        exposes: [e.switch().withEndpoint('l1'), e.switch().withEndpoint('l2')],
+        extend: extend.switch(),
+        endpoint: (device) => {
+            return {'l1': 1, 'l2': 2};
+        },
+        meta: {multiEndpoint: true},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const ep1 = device.getEndpoint(1);
+            const ep2 = device.getEndpoint(2);
+            await reporting.bind(ep1, coordinatorEndpoint, ['genOnOff']);
+            await reporting.bind(ep2, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(ep1);
+            await reporting.onOff(ep2);
+        },
+    },
 ];

package/devices/philips.js

@@ -979,7 +979,7 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
     {
-        zigbeeModel: ['LCG002', '929003047701'],
+        zigbeeModel: ['LCG002', '929003047701', '929003047701'],
         model: '929001953101',
         vendor: 'Philips',
         description: 'Hue White and Color Ambiance GU10',
@@ -1288,7 +1288,7 @@ module.exports = [
         model: '1743930P7',
         vendor: 'Philips',
         description: 'Hue Outdoor Econic wall lantern',
-        extend: hueExtend.light_onoff_brightness_colortemp_color(),
+        extend: hueExtend.light_onoff_brightness_colortemp_color({disableHueEffects: false, colorTempRange: [153, 500]}),
     },
     {
         zigbeeModel: ['929003053001'],
@@ -1458,6 +1458,13 @@ module.exports = [
         description: 'Hue white ambiance E26 with Bluetooth',
         extend: hueExtend.light_onoff_brightness_colortemp(),
     },
+    {
+        zigbeeModel: ['LTO003'],
+        model: '9290024782',
+        vendor: 'Philips',
+        description: 'Hue G125 B22 White Ambiance filament bulb',
+        extend: hueExtend.light_onoff_brightness(),
+    },
     {
         zigbeeModel: ['LTW010', 'LTW001', 'LTW004'],
         model: '8718696548738',
@@ -1956,7 +1963,7 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness_colortemp_color_gradient({colorTempRange: [153, 500]}),
     },
     {
-        zigbeeModel: ['915005987701'],
+        zigbeeModel: ['929003479701'],
         model: '915005987701',
         vendor: 'Philips',
         description: 'Hue Gradient Signe floor lamp (wood)',
@@ -3021,6 +3028,13 @@ module.exports = [
         description: 'Hue White Ambiance E27 filament screw globe',
         extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [222, 454]}),
     },
+    {
+        zigbeeModel: ['LTA006'],
+        model: '8719514301443',
+        vendor: 'Philips',
+        description: 'Hue White Ambiance B22 filament screw globe',
+        extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [222, 454]}),
+    },
     {
         zigbeeModel: ['LWE006'],
         model: '929002294102',
@@ -3309,4 +3323,60 @@ module.exports = [
         description: 'Hue white ambiance extra bright high lumen dimmable LED smart retrofit recessed 6" downlight',
         extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 500]}),
     },
+    {
+        zigbeeModel: ['929003115801'],
+        model: '929003115801',
+        vendor: 'Philips',
+        description: 'Hue Perifo ceiling light, 1 pendant (white)',
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+    },
+    {
+        zigbeeModel: ['929003116201'],
+        model: '929003116201',
+        vendor: 'Philips',
+        description: 'Hue Perifo linear light bar',
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+    },
+    {
+        zigbeeModel: ['929003115901'],
+        model: '929003117101',
+        vendor: 'Philips',
+        description: 'Hue Perifo ceiling light, 3 pendant (black)',
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+    },
+    {
+        zigbeeModel: ['929003117201'],
+        model: '929003117201',
+        vendor: 'Philips',
+        description: 'Hue Perifo ceiling light, 3 pendant (white)',
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+    },
+    {
+        zigbeeModel: ['929003117301'],
+        model: '929003117301',
+        vendor: 'Philips',
+        description: 'Hue Perifo ceiling light, 4 spotlights (black)',
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+    },
+    {
+        zigbeeModel: ['929003117401'],
+        model: '929003117401',
+        vendor: 'Philips',
+        description: 'Hue Perifo ceiling light, 4 spotlights (white)',
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+    },
+    {
+        zigbeeModel: ['929003117701'],
+        model: '929003117701',
+        vendor: 'Philips',
+        description: 'Hue Perifo Wall Light, 3 spotlights (black)',
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+    },
+    {
+        zigbeeModel: ['929003117801'],
+        model: '929003117801',
+        vendor: 'Philips',
+        description: 'Hue Perifo Wall Light, 3 spotlights (white)',
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+    },
 ];

package/devices/sonoff.js

@@ -90,7 +90,7 @@ module.exports = [
         model: 'S31ZB',
         vendor: 'SONOFF',
         description: 'Zigbee smart plug (US version)',
-        extend: extend.switch(),
+        extend: extend.switch({disablePowerOnBehavior: true}),
         fromZigbee: [fz.on_off_skip_duplicate_transaction],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);

package/lib/exposes.js

@@ -521,6 +521,7 @@ module.exports = {
         legacy: () => new Binary(`legacy`, access.SET, true, false).withDescription(`Set to false to disable the legacy integration (highly recommended), will change structure of the published payload (default true).`),
         measurement_poll_interval: (extraNote='') => new Numeric(`measurement_poll_interval`, access.SET).withValueMin(-1).withDescription(`This device does not support reporting electric measurements so it is polled instead. The default poll interval is 60 seconds, set to -1 to disable.${extraNote}`),
         illuminance_below_threshold_check: () => new Binary(`illuminance_below_threshold_check`, access.SET, true, false).withDescription(`Set to false to also send messages when illuminance is above threshold in night mode (default true).`),
+        state_action: () => new Binary(`state_action`, access.SET, true, false).withDescription(`State actions will also be published as 'action' when true (default false).`),
     },
     presets: {
         ac_frequency: () => new Numeric('ac_frequency', access.STATE).withUnit('Hz').withDescription('Measured electrical AC frequency'),
@@ -534,7 +535,7 @@ module.exports = {
         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),
         away_preset_temperature: () => new Numeric('away_preset_temperature', access.STATE_SET).withUnit('°C').withDescription('Away preset temperature').withValueMin(-10).withValueMax(35),
-        battery: () => new Numeric('battery', access.STATE).withUnit('%').withDescription('Remaining battery in %').withValueMin(0).withValueMax(100),
+        battery: () => new Numeric('battery', access.STATE).withUnit('%').withDescription('Remaining battery in %, can take up to 24 hours before reported.').withValueMin(0).withValueMax(100),
         battery_low: () => new Binary('battery_low', access.STATE, true, false).withDescription('Indicates if the battery of this device is almost empty'),
         battery_voltage: () => new Numeric('voltage', access.STATE).withUnit('mV').withDescription('Voltage of the battery in millivolts'),
         boost_time: () => new Numeric('boost_time', access.STATE_SET).withUnit('s').withDescription('Boost time').withValueMin(0).withValueMax(900),

package/package.json

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