From 007bc42bf7d92074210ff50f8a7d88f005dde62c Mon Sep 17 00:00:00 2001 From: Koen Kanters Date: Mon, 23 Sep 2019 23:57:41 +0200 Subject: [PATCH] Update zigbee-shepherd-converters. --- lib/extension/homeassistant.js | 4 ++- npm-shrinkwrap.json | 59 +++++++++++++++------------------- package.json | 2 +- test/bridgeConfig.test.js | 2 +- 4 files changed, 31 insertions(+), 36 deletions(-) diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js index 092b4382..8e1b4d1b 100644 --- a/lib/extension/homeassistant.js +++ b/lib/extension/homeassistant.js @@ -634,7 +634,7 @@ const mapping = { ], 'IM-Z3.0-DIM': [cfg.light_brightness], 'E1746': [], - 'LED1836G9': [configurations.light_brightness], + 'LED1836G9': [cfg.light_brightness], 'YRD426NRSC': [cfg.lock, cfg.sensor_battery], 'E1743': [cfg.sensor_click, cfg.sensor_battery], 'LED1732G11': [cfg.light_brightness_colortemp], @@ -871,6 +871,7 @@ const mapping = { cfg.sensor_temperature, cfg.binary_sensor_water_leak, cfg.sensor_battery, ], 'HS1CG-M': [cfg.binary_sensor_gas], + 'HS1CG_M': [cfg.binary_sensor_gas], 'LVS-SN10ZW_SN11': [cfg.sensor_battery, cfg.binary_sensor_occupancy], 'B00TN589ZG': [cfg.light_brightness], 'PSB19-SW27': [cfg.light_brightness], @@ -897,6 +898,7 @@ const mapping = { '2AJZ4KPBS': [cfg.sensor_battery, cfg.binary_sensor_occupancy, cfg.binary_sensor_battery_low], '2AJZ4KPDR': [cfg.sensor_battery, cfg.binary_sensor_contact, cfg.binary_sensor_battery_low], '6717-84': [cfg.switch], + 'ICZB-KPD18S': [cfg.sensor_click], }; Object.keys(mapping).forEach((key) => { diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 9746b2fb..68d9901c 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -14,17 +14,17 @@ } }, "@babel/core": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.6.0.tgz", - "integrity": "sha512-FuRhDRtsd6IptKpHXAa+4WPZYY2ZzgowkbLBecEDDSje1X/apG7jQM33or3NdOmjXBKWGOg4JmSiRfUfuTtHXw==", + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.6.2.tgz", + "integrity": "sha512-l8zto/fuoZIbncm+01p8zPSDZu/VuuJhAfA7d/AbzM09WR7iVhavvfNDYCNpo1VvLk6E6xgAoP9P+/EMJHuRkQ==", "dev": true, "requires": { "@babel/code-frame": "^7.5.5", - "@babel/generator": "^7.6.0", - "@babel/helpers": "^7.6.0", - "@babel/parser": "^7.6.0", + "@babel/generator": "^7.6.2", + "@babel/helpers": "^7.6.2", + "@babel/parser": "^7.6.2", "@babel/template": "^7.6.0", - "@babel/traverse": "^7.6.0", + "@babel/traverse": "^7.6.2", "@babel/types": "^7.6.0", "convert-source-map": "^1.1.0", "debug": "^4.1.0", @@ -50,16 +50,15 @@ } }, "@babel/generator": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.6.0.tgz", - "integrity": "sha512-Ms8Mo7YBdMMn1BYuNtKuP/z0TgEIhbcyB8HVR6PPNYp4P61lMsABiS4A3VG1qznjXVCf3r+fVHhm4efTYVsySA==", + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.6.2.tgz", + "integrity": "sha512-j8iHaIW4gGPnViaIHI7e9t/Hl8qLjERI6DcV9kEpAIDJsAOrcnXqRS7t+QbhL76pwbtqP+QCQLL0z1CyVmtjjQ==", "dev": true, "requires": { "@babel/types": "^7.6.0", "jsesc": "^2.5.1", "lodash": "^4.17.13", - "source-map": "^0.5.0", - "trim-right": "^1.0.1" + "source-map": "^0.5.0" }, "dependencies": { "source-map": { @@ -106,13 +105,13 @@ } }, "@babel/helpers": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.6.0.tgz", - "integrity": "sha512-W9kao7OBleOjfXtFGgArGRX6eCP0UEcA2ZWEWNkJdRZnHhW4eEbeswbG3EwaRsnQUAEGWYgMq1HsIXuNNNy2eQ==", + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.6.2.tgz", + "integrity": "sha512-3/bAUL8zZxYs1cdX2ilEE0WobqbCmKWr/889lf2SS0PpDcpEIY8pb1CCyz0pEcX3pEb+MCbks1jIokz2xLtGTA==", "dev": true, "requires": { "@babel/template": "^7.6.0", - "@babel/traverse": "^7.6.0", + "@babel/traverse": "^7.6.2", "@babel/types": "^7.6.0" } }, @@ -128,9 +127,9 @@ } }, "@babel/parser": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.6.0.tgz", - "integrity": "sha512-+o2q111WEx4srBs7L9eJmcwi655eD8sXniLqMB93TBK9GrNzGrxDWSjiqz2hLU0Ha8MTXFIP0yd9fNdP+m43ZQ==", + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.6.2.tgz", + "integrity": "sha512-mdFqWrSPCmikBoaBYMuBulzTIKuXVPtEISFbRRVNwMWpCms/hmE2kRq0bblUHaNRKrjRlmVbx1sDHmjmRgD2Xg==", "dev": true }, "@babel/plugin-syntax-object-rest-spread": { @@ -154,16 +153,16 @@ } }, "@babel/traverse": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.6.0.tgz", - "integrity": "sha512-93t52SaOBgml/xY74lsmt7xOR4ufYvhb5c5qiM6lu4J/dWGMAfAh6eKw4PjLes6DI6nQgearoxnFJk60YchpvQ==", + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.6.2.tgz", + "integrity": "sha512-8fRE76xNwNttVEF2TwxJDGBLWthUkHWSldmfuBzVRmEDWOtu4XdINTgN7TDWzuLg4bbeIMLvfMFD9we5YcWkRQ==", "dev": true, "requires": { "@babel/code-frame": "^7.5.5", - "@babel/generator": "^7.6.0", + "@babel/generator": "^7.6.2", "@babel/helper-function-name": "^7.1.0", "@babel/helper-split-export-declaration": "^7.4.4", - "@babel/parser": "^7.6.0", + "@babel/parser": "^7.6.2", "@babel/types": "^7.6.0", "debug": "^4.1.0", "globals": "^11.1.0", @@ -5526,12 +5525,6 @@ "punycode": "^2.1.0" } }, - "trim-right": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", - "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", - "dev": true - }, "tslib": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", @@ -12899,9 +12892,9 @@ } }, "zigbee-herdsman-converters": { - "version": "11.1.4", - "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-11.1.4.tgz", - "integrity": "sha512-fN36sasvt7aORBv28QSaXM7m1stOGxSI0RAWborkhsUbV1eNnF7Lh7mYZcWRpJcyESr5FrClcp0sWmI3M6kFfQ==", + "version": "11.1.5", + "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-11.1.5.tgz", + "integrity": "sha512-XTi0BauWupzfTo+30Qv8/lX6D/38nfuj532VMLc+znklmSeRwvnB7qIJ0k633AJtUvkbIN/yVGYHgKtSDgd4Og==", "requires": { "debounce": "^1.2.0" } diff --git a/package.json b/package.json index cf947128..550fe62d 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "semver": "*", "winston": "2.4.2", "zigbee-herdsman": "0.7.0", - "zigbee-herdsman-converters": "11.1.4" + "zigbee-herdsman-converters": "11.1.5" }, "devDependencies": { "eslint": "*", diff --git a/test/bridgeConfig.test.js b/test/bridgeConfig.test.js index e623b333..bac22f0a 100644 --- a/test/bridgeConfig.test.js +++ b/test/bridgeConfig.test.js @@ -27,7 +27,7 @@ describe('Bridge config', () => { it('Should publish bridge configuration on startup', async () => { expect(MQTT.publish).toHaveBeenCalledWith( 'zigbee2mqtt/bridge/config', - JSON.stringify({"version":this.version.version,"commit":this.version.commitHash,"coordinator":{"type":"z-Stack","meta":{"version":1}},"log_level":1,"permit_join":false}), + JSON.stringify({"version":this.version.version,"commit":this.version.commitHash,"coordinator":{"type":"z-Stack","meta":{"version":1, "revision": 20190425}},"log_level":1,"permit_join":false}), { retain: true, qos: 0 }, expect.any(Function) );