From 520f59f47cb5954917fb9dd31a200911a658feb6 Mon Sep 17 00:00:00 2001 From: Koen Kanters Date: Mon, 11 May 2020 18:35:45 +0200 Subject: [PATCH] Update converters --- lib/extension/homeassistant.js | 15 +++++++++------ lib/util/utils.js | 2 +- npm-shrinkwrap.json | 27 ++++++++++++--------------- package.json | 4 ++-- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js index c95770a77..44cbfcf26 100644 --- a/lib/extension/homeassistant.js +++ b/lib/extension/homeassistant.js @@ -866,7 +866,7 @@ const mapping = { '7299355PH': [cfg.light_brightness_colorxy], '45857GE': [cfg.light_brightness], 'A6121': [cfg.sensor_lock], - '433714': [cfg.light_brightness], + '433714': [cfg.light_brightness_colortemp], '3261030P7': [cfg.light_brightness_colortemp], '3216431P5': [cfg.light_brightness_colortemp], 'DJT11LM': [cfg.sensor_action, cfg.sensor_battery, cfg.sensor_sensitivity, cfg.sensor_strength], @@ -948,8 +948,10 @@ const mapping = { 'E1524/E1810': [cfg.sensor_action, cfg.sensor_battery], 'GL-C-006': [cfg.light_brightness_colortemp], 'GL-C-007-1ID': [cfg.light_brightness_colortemp_colorxy], - 'GL-C-007-2ID': [lightEndpoint('light_brightness_colorxy', 'rgb'), - lightEndpoint('light_brightness_colortemp', 'white')], + 'GL-C-007-2ID': [lightEndpoint('light_brightness_colortemp_colorxy', 'rgb'), + lightEndpoint('light_brightness', 'white')], + 'GL-C-008-2ID': [lightEndpoint('light_brightness_colorxy', 'rgb'), + lightEndpoint('light_brightness_colortemp', 'cct')], 'GL-C-007S': [cfg.light_brightness_colorxy_white], 'GL-C-007/GL-C-008': [cfg.light_brightness_colortemp_colorxy_white], '100.424.11': [cfg.light_brightness_colortemp], @@ -1142,7 +1144,7 @@ const mapping = { 'ZigUP': [cfg.switch], 'YRD256HA20BP': [cfg.sensor_battery, cfg.lock], 'SZ-ESW01-AU': [cfg.sensor_power, cfg.switch], - 'PSM-29ZBSR': [cfg.switch], + 'PSM-29ZBSR': [cfg.switch, cfg.sensor_power], 'ZM350STW1TCF': [cfg.light_brightness_colortemp], 'M350STW1': [cfg.light_brightness], 'A806S-Q1R': [cfg.light_brightness], @@ -1427,7 +1429,7 @@ const mapping = { '1744130P7': [cfg.light_brightness_colortemp_colorxy], '1743130P7': [cfg.light_brightness_colortemp_colorxy], '100.110.51': [cfg.light_brightness_colortemp], - 'ZL1000100-CCT-US-V1A02': [cfg.light_brightness], + 'ZL1000100-CCT-US-V1A02': [cfg.light_brightness_colortemp], 'ZL1000701-27-EU-V1A02': [cfg.light_brightness], 'HGZB-DLC4-N12B': [cfg.light_brightness_colortemp_colorxy], 'U86KCJ-ZP': [cfg.sensor_action], @@ -1592,7 +1594,7 @@ const mapping = { '676-00301024955Z': [cfg.light_brightness], '1743030P7': [cfg.light_brightness_colortemp_colorxy], 'XBee': [], - 'ZBHT-1': [cfg.sensor_temperature, cfg.sensor_humidity, cfg.sensor_battery], + 'ZBHT-1': [cfg.sensor_temperature, cfg.sensor_humidity, cfg.sensor_battery], 'rgbw2.zbee27': [cfg.light_brightness_colortemp_colorxy], 'MCLH-05': [cfg.binary_sensor_occupancy, cfg.sensor_battery], '5045148P7': [cfg.light_brightness_colortemp_colorxy], @@ -1617,6 +1619,7 @@ const mapping = { 'HGZB-14A': [cfg.binary_sensor_water_leak, cfg.sensor_battery], 'TERNCY-DC01': [cfg.sensor_temperature, cfg.binary_sensor_contact], 'ZS110050078': [cfg.binary_sensor_contact, cfg.binary_sensor_battery_low], + 'HGZB-DLC4-N15B': [cfg.light_brightness_colortemp_colorxy], }; /** diff --git a/lib/util/utils.js b/lib/util/utils.js index de5a1d665..a6def62a1 100644 --- a/lib/util/utils.js +++ b/lib/util/utils.js @@ -29,7 +29,7 @@ function toLocalISOString(dDate) { const endpointNames = [ 'left', 'right', 'center', 'bottom_left', 'bottom_right', 'default', - 'top_left', 'top_right', 'white', 'rgb', 'system', 'top', 'bottom', 'center_left', 'center_right', + 'top_left', 'top_right', 'white', 'rgb', 'cct', 'system', 'top', 'bottom', 'center_left', 'center_right', 'ep1', 'ep2', 'row_1', 'row_2', 'row_3', 'row_4', 'relay', 'l1', 'l2', 'l3', 'l4', 'l5', 'l6', 'l7', 'l8', ]; diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 3d0cfa7e4..7c808cd05 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -3041,15 +3041,12 @@ "dev": true }, "istanbul-lib-instrument": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz", - "integrity": "sha512-imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz", + "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==", "dev": true, "requires": { "@babel/core": "^7.7.5", - "@babel/parser": "^7.7.5", - "@babel/template": "^7.7.4", - "@babel/traverse": "^7.7.4", "@istanbuljs/schema": "^0.1.2", "istanbul-lib-coverage": "^3.0.0", "semver": "^6.3.0" @@ -3656,9 +3653,9 @@ }, "dependencies": { "ws": { - "version": "7.2.5", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.5.tgz", - "integrity": "sha512-C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.0.tgz", + "integrity": "sha512-iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w==", "dev": true } } @@ -6066,9 +6063,9 @@ } }, "zigbee-herdsman": { - "version": "0.12.86", - "resolved": "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.12.86.tgz", - "integrity": "sha512-2Nlb05s7bpPTdfzscoS8+ccOo1wXyFhyfqDVif+pMQaBVZ4+DdOmktAy4QtKBWR+i0SAEo7vtfLb97hM5Q9Mjg==", + "version": "0.12.87", + "resolved": "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.12.87.tgz", + "integrity": "sha512-AXwJ1U65Qr6CEQiWryty894GNKRWeQ4RU7XVKfCcMM6erfg0jTKEYFg9G9HvKognuiHTbJy+uRJFygw0Kss1dQ==", "requires": { "debug": "^4.1.1", "fast-deep-equal": "^2.0.1", @@ -14151,9 +14148,9 @@ } }, "zigbee-herdsman-converters": { - "version": "12.0.87", - "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.87.tgz", - "integrity": "sha512-twjt82RpJC85RzfCN2+LK69GYaWF8KmlZJbUy7XW2e57UGVfJCl0mAYlB52xvypuTgc/moUUQNnn+S5aKY+Oew==", + "version": "12.0.88", + "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.88.tgz", + "integrity": "sha512-udnsqt1Qe/umTpaSciUjyatBcxsRD/a8z2+pFHWLWCubL/tO/jpHuRE8NX1R2fntv/EGPlc8Z8Y2dQbK49dMVQ==", "requires": { "axios": "*", "tar-stream": "*" diff --git a/package.json b/package.json index 5252e466e..128cf8a7c 100644 --- a/package.json +++ b/package.json @@ -45,8 +45,8 @@ "rimraf": "*", "semver": "*", "winston": "*", - "zigbee-herdsman": "0.12.86", - "zigbee-herdsman-converters": "12.0.87" + "zigbee-herdsman": "0.12.87", + "zigbee-herdsman-converters": "12.0.88" }, "devDependencies": { "eslint": "*",