zigbee-herdsman-converters 14.0.510 → 14.0.511
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/converters/toZigbee.js +2 -1
- package/devices/awox.js +2 -0
- package/devices/ikea.js +11 -1
- package/devices/immax.js +5 -3
- package/devices/philips.js +9 -0
- package/package.json +1 -1
package/converters/toZigbee.js
CHANGED
|
@@ -2546,8 +2546,9 @@ const converters = {
|
|
|
2546
2546
|
key: ['state'],
|
|
2547
2547
|
convertSet: async (entity, key, value, meta) => {
|
|
2548
2548
|
const options = {disableDefaultResponse: true};
|
|
2549
|
+
value = value.toLowerCase();
|
|
2549
2550
|
utils.validateValue(value, ['toggle', 'off', 'on']);
|
|
2550
|
-
if (value
|
|
2551
|
+
if (value === 'toggle') {
|
|
2551
2552
|
if (!meta.state.hasOwnProperty('state')) {
|
|
2552
2553
|
throw new Error('Cannot toggle, state not known yet');
|
|
2553
2554
|
} else {
|
package/devices/awox.js
CHANGED
|
@@ -67,6 +67,7 @@ module.exports = [
|
|
|
67
67
|
vendor: 'AwoX',
|
|
68
68
|
description: 'LED white',
|
|
69
69
|
extend: extend.light_onoff_brightness(),
|
|
70
|
+
whiteLabel: [{vendor: 'EGLO', model: '12229'}],
|
|
70
71
|
},
|
|
71
72
|
{
|
|
72
73
|
fingerprint: [
|
|
@@ -248,6 +249,7 @@ module.exports = [
|
|
|
248
249
|
vendor: 'AwoX',
|
|
249
250
|
description: 'LED light with color temperature',
|
|
250
251
|
extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}),
|
|
252
|
+
whiteLabel: [{vendor: 'EGLO', model: '12239'}],
|
|
251
253
|
},
|
|
252
254
|
{
|
|
253
255
|
fingerprint: [
|
package/devices/ikea.js
CHANGED
|
@@ -13,11 +13,15 @@ const {
|
|
|
13
13
|
calibrateAndPrecisionRoundOptions, postfixWithEndpointName, getMetaValue,
|
|
14
14
|
} = require('../lib/utils');
|
|
15
15
|
|
|
16
|
-
const bulbOnEvent = async (type, data, device) => {
|
|
16
|
+
const bulbOnEvent = async (type, data, device, options, state) => {
|
|
17
17
|
/**
|
|
18
18
|
* IKEA bulbs lose their configured reportings when losing power.
|
|
19
19
|
* A deviceAnnounce indicates they are powered on again.
|
|
20
20
|
* Reconfigure the configured reoprting here.
|
|
21
|
+
*
|
|
22
|
+
* Additionally some other information is lost like
|
|
23
|
+
* color_options.execute_if_off. We also restore these.
|
|
24
|
+
*
|
|
21
25
|
* NOTE: binds are not lost so rebinding is not needed!
|
|
22
26
|
*/
|
|
23
27
|
if (type === 'deviceAnnounce') {
|
|
@@ -29,6 +33,12 @@ const bulbOnEvent = async (type, data, device) => {
|
|
|
29
33
|
}]);
|
|
30
34
|
}
|
|
31
35
|
}
|
|
36
|
+
|
|
37
|
+
// NOTE: execute_if_off default is false
|
|
38
|
+
// we only restore if true, to save unneeded network writes
|
|
39
|
+
if (state.color_options.execute_if_off === true) {
|
|
40
|
+
device.endpoints[0].write('lightingColorCtrl', {'options': 1});
|
|
41
|
+
}
|
|
32
42
|
}
|
|
33
43
|
};
|
|
34
44
|
|
package/devices/immax.js
CHANGED
|
@@ -66,16 +66,18 @@ module.exports = [
|
|
|
66
66
|
model: '07048L',
|
|
67
67
|
vendor: 'Immax',
|
|
68
68
|
description: 'NEO SMART plug',
|
|
69
|
-
fromZigbee: [fz.on_off, fz.electrical_measurement],
|
|
69
|
+
fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering],
|
|
70
70
|
toZigbee: [tz.on_off],
|
|
71
71
|
configure: async (device, coordinatorEndpoint, logger) => {
|
|
72
72
|
const endpoint = device.getEndpoint(1);
|
|
73
|
-
await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement']);
|
|
73
|
+
await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement', 'seMetering']);
|
|
74
74
|
await reporting.onOff(endpoint);
|
|
75
75
|
await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
|
|
76
|
+
await reporting.readMeteringMultiplierDivisor(endpoint);
|
|
77
|
+
await reporting.currentSummDelivered(endpoint);
|
|
76
78
|
await reporting.activePower(endpoint);
|
|
77
79
|
},
|
|
78
|
-
exposes: [e.switch(), e.power()],
|
|
80
|
+
exposes: [e.switch(), e.power(), e.energy()],
|
|
79
81
|
},
|
|
80
82
|
{
|
|
81
83
|
zigbeeModel: ['losfena'],
|
package/devices/philips.js
CHANGED
|
@@ -81,6 +81,15 @@ module.exports = [
|
|
|
81
81
|
extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
|
|
82
82
|
ota: ota.zigbeeOTA,
|
|
83
83
|
},
|
|
84
|
+
{
|
|
85
|
+
zigbeeModel: ['929003045501_01', '929003045501_02', '929003045501_03'],
|
|
86
|
+
model: '929003045501',
|
|
87
|
+
vendor: 'Philips',
|
|
88
|
+
description: 'Hue Centura recessed spotlight white and color ambiance GU10 (black)',
|
|
89
|
+
meta: {turnsOffAtBrightness1: true},
|
|
90
|
+
extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
|
|
91
|
+
ota: ota.zigbeeOTA,
|
|
92
|
+
},
|
|
84
93
|
{
|
|
85
94
|
zigbeeModel: ['929003047501'],
|
|
86
95
|
model: '929003047501',
|