zigbee-herdsman-converters 14.0.579 → 14.0.580

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/devices/adeo.js CHANGED
@@ -57,6 +57,13 @@ module.exports = [
57
57
  description: 'ENKI LEXMAN E27 LED white',
58
58
  extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
59
59
  },
60
+ {
61
+ zigbeeModel: ['ZBEK-14'],
62
+ model: 'IC-CDZFB2AC005HA-MZN',
63
+ vendor: 'ADEO',
64
+ description: 'ENKI LEXMAN E14 LED white',
65
+ extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
66
+ },
60
67
  {
61
68
  zigbeeModel: ['ZBEK-5'],
62
69
  model: 'IST-CDZFB2AS007NA-MZN-01',
@@ -0,0 +1,11 @@
1
+ const extend = require('../lib/extend');
2
+
3
+ module.exports = [
4
+ {
5
+ zigbeeModel: ['HA-ZM12/24-1K'],
6
+ model: 'HA-ZM12/24-1K',
7
+ vendor: 'Halemeier',
8
+ description: '1-channel smart receiver',
9
+ extend: extend.light_onoff_brightness(),
10
+ },
11
+ ];
@@ -1469,6 +1469,13 @@ module.exports = [
1469
1469
  description: 'Hue White and color ambiance Gradient Signe table lamp (white)',
1470
1470
  extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
1471
1471
  },
1472
+ {
1473
+ zigbeeModel: ['915005987001'],
1474
+ model: '915005987001',
1475
+ vendor: 'Philips',
1476
+ description: 'Hue White and color ambiance Gradient Signe table lamp (black)',
1477
+ extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
1478
+ },
1472
1479
  {
1473
1480
  zigbeeModel: ['5060730P7_01', '5060730P7_02', '5060730P7_03', '5060730P7_04', '5060730P7_05'],
1474
1481
  model: '5060730P7',
@@ -2139,7 +2146,7 @@ module.exports = [
2139
2146
  extend: hueExtend.light_onoff_brightness_colortemp(),
2140
2147
  },
2141
2148
  {
2142
- zigbeeModel: ['929003047101', '929003045101_03'],
2149
+ zigbeeModel: ['929003047101', '929003045101_03', '929003045101_01', '929003045101_02'],
2143
2150
  model: '929003047101',
2144
2151
  vendor: 'Philips',
2145
2152
  description: 'Hue White ambiance Milliskin (round)',
@@ -17,6 +17,7 @@ module.exports = [
17
17
  exposes: [],
18
18
  },
19
19
  {
20
+ zigbeeModel: ['MOT-C1Z06C\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000'],
20
21
  fingerprint: [{manufId: 4368, endpoints: [{ID: 1, profileID: 260, deviceID: 512,
21
22
  inputClusters: [0, 3, 4, 5, 6, 8, 10, 21, 256, 64544, 64545], outputClusters: [3, 64544]}]}],
22
23
  model: 'NSAV061',
@@ -137,13 +137,21 @@ module.exports = [
137
137
  model: 'E11-N1EA',
138
138
  vendor: 'Sengled',
139
139
  description: 'Element plus color (A19)',
140
- extend: extend.light_onoff_brightness_colortemp_color({noConfigure: true}),
140
+ fromZigbee: extend.light_onoff_brightness().fromZigbee.concat([fz.metering]),
141
+ toZigbee: extend.light_onoff_brightness().toZigbee,
141
142
  ota: ota.zigbeeOTA,
142
143
  configure: async (device, coordinatorEndpoint, logger) => {
143
144
  await extend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);
144
145
  device.powerSource = 'Mains (single phase)';
145
146
  device.save();
147
+
148
+ const endpoint = device.getEndpoint(1);
149
+ await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'seMetering']);
150
+ await reporting.readMeteringMultiplierDivisor(endpoint);
151
+ await reporting.currentSummDelivered(endpoint);
152
+ await reporting.instantaneousDemand(endpoint);
146
153
  },
154
+ exposes: extend.light_onoff_brightness().exposes.concat([e.power(), e.energy()]),
147
155
  },
148
156
  {
149
157
  zigbeeModel: ['E11-U2E'],
package/devices/tuya.js CHANGED
@@ -594,7 +594,8 @@ module.exports = [
594
594
  {modelID: 'TS0501B', manufacturerName: '_TZ3210_grnwgegn'},
595
595
  {modelID: 'TS0501B', manufacturerName: '_TZ3210_nehayyhx'},
596
596
  {modelID: 'TS0501B', manufacturerName: '_TZ3210_wuheofsg'},
597
- {modelID: 'TS0501B', manufacturerName: '_TZ3210_e5t9bfdv'}],
597
+ {modelID: 'TS0501B', manufacturerName: '_TZ3210_e5t9bfdv'},
598
+ {modelID: 'TS0501B', manufacturerName: '_TZ3210_19qb27da'}],
598
599
  model: 'TS0501B',
599
600
  description: 'Zigbee light',
600
601
  vendor: 'TuYa',
package/lib/ota/ubisys.js CHANGED
@@ -21,22 +21,25 @@ async function getImageMeta(current, logger, device) {
21
21
 
22
22
  imageRegex.lastIndex = 0; // reset (global) regex for next exec to match from the beginning again
23
23
  let imageMatch = imageRegex.exec(firmwarePageHtml);
24
+ let highestMatch = null;
24
25
  while (imageMatch != null) {
25
26
  logger.debug(`OTA ubisys: image found: ${imageMatch[0]}`);
26
27
  if (parseInt(imageMatch[1], 16) === imageType &&
27
28
  parseInt(imageMatch[2], 16) <= hardwareVersion && hardwareVersion <= parseInt(imageMatch[3], 16)) {
28
- break;
29
+ if (highestMatch === null || parseInt(highestMatch[4], 16) < parseInt(imageMatch[4], 16)) {
30
+ highestMatch = imageMatch;
31
+ }
29
32
  }
30
33
  imageMatch = imageRegex.exec(firmwarePageHtml);
31
34
  }
32
- assert(imageMatch !== null,
35
+ assert(highestMatch !== null,
33
36
  `No image available for imageType '0x${imageType.toString(16)}' with hardware version ${hardwareVersion}`);
34
37
 
35
38
  return {
36
- hardwareVersionMin: parseInt(imageMatch[2], 16),
37
- hardwareVersionMax: parseInt(imageMatch[3], 16),
38
- fileVersion: parseInt(imageMatch[4], 16),
39
- url: url.resolve(firmwareHtmlPageUrl, imageMatch[0]),
39
+ hardwareVersionMin: parseInt(highestMatch[2], 16),
40
+ hardwareVersionMax: parseInt(highestMatch[3], 16),
41
+ fileVersion: parseInt(highestMatch[4], 16),
42
+ url: url.resolve(firmwareHtmlPageUrl, highestMatch[0]),
40
43
  };
41
44
  }
42
45
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "zigbee-herdsman-converters",
3
- "version": "14.0.579",
3
+ "version": "14.0.580",
4
4
  "description": "Collection of device converters to be used with zigbee-herdsman",
5
5
  "main": "index.js",
6
6
  "files": [