zigbee-herdsman-converters 15.0.19 → 15.0.20

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;
             }
         },
     },

package/devices/philips.js

@@ -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',
@@ -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,46 @@ 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: ['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/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'),

package/package.json

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