From caf87e805df80f89ac551a716dc90a8e174e0a8a Mon Sep 17 00:00:00 2001 From: Koenkk Date: Thu, 5 Jul 2018 19:43:54 +0200 Subject: [PATCH 1/6] Update zcl-packet. https://github.com/Koenkk/zigbee2mqtt/issues/150 --- npm-shrinkwrap.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 0414ef018..33ac978a5 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -496,7 +496,7 @@ "es-to-primitive": "1.1.1", "function-bind": "1.1.1", "has": "1.0.3", - "is-callable": "1.1.3", + "is-callable": "1.1.4", "is-regex": "1.0.4" } }, @@ -506,7 +506,7 @@ "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=", "dev": true, "requires": { - "is-callable": "1.1.3", + "is-callable": "1.1.4", "is-date-object": "1.0.1", "is-symbol": "1.0.1" } @@ -918,9 +918,9 @@ "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" }, "is-callable": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz", - "integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI=", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz", + "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==", "dev": true }, "is-date-object": { @@ -2815,7 +2815,7 @@ } }, "zcl-packet": { - "version": "git+https://github.com/Koenkk/zcl-packet.git#360b9d2f02dc1bb40def40d03ac10175b93300e5", + "version": "git+https://github.com/Koenkk/zcl-packet.git#020f16b872292e8b5a0cfc9a2ff9b525a7cbea7b", "requires": { "concentrate": "0.2.3", "dissolve-chunks": "1.3.0", @@ -2843,7 +2843,7 @@ "proving": "0.1.0", "q": "1.5.1", "zcl-id": "0.3.2", - "zcl-packet": "git+https://github.com/Koenkk/zcl-packet.git#360b9d2f02dc1bb40def40d03ac10175b93300e5", + "zcl-packet": "git+https://github.com/Koenkk/zcl-packet.git#020f16b872292e8b5a0cfc9a2ff9b525a7cbea7b", "ziee": "0.3.0", "zive": "0.2.2", "zstack-constants": "0.2.0" From 0eee507edbaffef6b4485ebac681dbbe9a1845bc Mon Sep 17 00:00:00 2001 From: Koenkk Date: Thu, 5 Jul 2018 20:00:12 +0200 Subject: [PATCH 2/6] =?UTF-8?q?Travis.yml=20check=20if=20TRAVIS=5FTAG=20is?= =?UTF-8?q?=20set=20to=20=E2=80=9C=E2=80=9D.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis/docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/docker.sh b/.travis/docker.sh index d8951addf..15b046a9b 100755 --- a/.travis/docker.sh +++ b/.travis/docker.sh @@ -17,7 +17,7 @@ build_and_push() { # Only update Docker images for: # - dev branch # - version release -if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ ! -z ${TRAVIS_TAG+x} ] +if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ ! -z ${TRAVIS_TAG+x} ] && [ ! "$TRAVIS_TAG" = "" ] then echo "Updating docker images for master branch!" login From 389754136632429781bdb29ed7b2ec1a443006f0 Mon Sep 17 00:00:00 2001 From: Koenkk Date: Thu, 5 Jul 2018 20:06:38 +0200 Subject: [PATCH 3/6] Log zigbee-shepherd information on startup. #178 --- lib/zigbee.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/zigbee.js b/lib/zigbee.js index c3c3950a2..122eec8f5 100644 --- a/lib/zigbee.js +++ b/lib/zigbee.js @@ -47,13 +47,13 @@ class Zigbee { ); callback(error); } else { - logger.info('zigbee-shepherd started'); + this._logStartupInfo(); callback(null); } }); }, 60 * 1000); } else { - logger.info('zigbee-shepherd started'); + this._logStartupInfo(); callback(null); } }); @@ -66,6 +66,11 @@ class Zigbee { this.onMessage = onMessage; } + _logStartupInfo() { + logger.info('zigbee-shepherd started'); + logger.debug(`zigbee-shepherd info: ${JSON.stringify(this.shepherd.info())}`); + } + softReset(callback) { this.shepherd.reset('soft', callback); } From 51d8c79ef258b31f25f34f51b4d33f6a0ea579c0 Mon Sep 17 00:00:00 2001 From: Koenkk Date: Thu, 5 Jul 2018 21:23:30 +0200 Subject: [PATCH 4/6] Update zigbee-shepherd (includes firmware revision information). https://github.com/Koenkk/zigbee2mqtt/issues/178 --- npm-shrinkwrap.json | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 33ac978a5..dd9bc405f 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -205,9 +205,7 @@ "dev": true }, "cc-znp": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/cc-znp/-/cc-znp-0.4.2.tgz", - "integrity": "sha1-nKN8Zm0q5U56FFsWvFbV6t1VVIw=", + "version": "git+https://github.com/Koenkk/cc-znp.git#0445c554344421498c1721b4a7fc84531b222cbf", "requires": { "debug": "2.6.9", "enum": "2.5.0", @@ -2833,11 +2831,11 @@ } }, "zigbee-shepherd": { - "version": "git+https://github.com/Koenkk/zigbee-shepherd.git#65101146c480aa8f1ddb58046327e2a9a495cf04", + "version": "git+https://github.com/Koenkk/zigbee-shepherd.git#a2f4564cfd1d09a233c8dc46db579c5fa07f02f0", "requires": { "areq": "0.2.0", "busyman": "0.3.0", - "cc-znp": "0.4.2", + "cc-znp": "git+https://github.com/Koenkk/cc-znp.git#0445c554344421498c1721b4a7fc84531b222cbf", "debug": "2.6.9", "objectbox": "0.3.0", "proving": "0.1.0", From 8b5938f73f71a5c76124cddb76cfd3154148ec0e Mon Sep 17 00:00:00 2001 From: Koenkk Date: Sat, 7 Jul 2018 23:39:30 +0200 Subject: [PATCH 5/6] Update zigbee-shepherd-converters. --- lib/homeassistant.js | 3 +++ npm-shrinkwrap.json | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/homeassistant.js b/lib/homeassistant.js index 75bc2f0c4..4fcc6ff6c 100644 --- a/lib/homeassistant.js +++ b/lib/homeassistant.js @@ -288,6 +288,9 @@ const mapping = { 'NL08-0800': [configurations.light_brightness], '915005106701': [configurations.light_brightness_colortemp_xy], 'AB32840': [configurations.light_brightness_colortemp], + '8718696485880': [configurations.light_brightness_colortemp_xy], + '8718696598283': [configurations.light_brightness_colortemp], + '73693': [configurations.light_brightness_colortemp_xy], }; // A map of all discoverd devices diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index dd9bc405f..604a04285 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -2859,9 +2859,9 @@ } }, "zigbee-shepherd-converters": { - "version": "2.0.20", - "resolved": "https://registry.npmjs.org/zigbee-shepherd-converters/-/zigbee-shepherd-converters-2.0.20.tgz", - "integrity": "sha512-L8q7FkLlJluNDfcrmjvdf/CuQTo+2T75uQsznV1v1laDf5dh9x11iSGYSpzh4ou9iHIpTNkk+FQHDuIX/c17mw==", + "version": "2.0.22", + "resolved": "https://registry.npmjs.org/zigbee-shepherd-converters/-/zigbee-shepherd-converters-2.0.22.tgz", + "integrity": "sha512-YTki0D5hiA44+Snu95Lw880WF+w6bBR2/YpDOWgAkSPhMG8MwN/tReOghdD12+4K/BRfqxutexTD6SSJtaKXXQ==", "requires": { "debounce": "1.1.0" }, From 356ed9fa39edbc491ce9b1efb30fa050a38b9c6c Mon Sep 17 00:00:00 2001 From: Koenkk Date: Tue, 10 Jul 2018 18:43:31 +0200 Subject: [PATCH 6/6] Update zigbee-shepherd and zigbee-shepherd-conveters for 324131092621 support. #36 --- lib/homeassistant.js | 5 +++-- npm-shrinkwrap.json | 21 ++++++++++++++------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/lib/homeassistant.js b/lib/homeassistant.js index 4fcc6ff6c..e5cfff91e 100644 --- a/lib/homeassistant.js +++ b/lib/homeassistant.js @@ -122,9 +122,9 @@ const configurations = { type: 'sensor', object_id: 'action', discovery_payload: { - icon: 'mdi:cube', + icon: 'mdi:gesture-double-tap', value_template: '{{ value_json.action }}', - json_attributes: ['battery', 'voltage', 'angle', 'side', 'from_side', 'to_side'], + json_attributes: ['battery', 'voltage', 'angle', 'side', 'from_side', 'to_side', 'brightness'], }, }, 'sensor_brightness': { @@ -291,6 +291,7 @@ const mapping = { '8718696485880': [configurations.light_brightness_colortemp_xy], '8718696598283': [configurations.light_brightness_colortemp], '73693': [configurations.light_brightness_colortemp_xy], + '324131092621': [configurations.sensor_action], }; // A map of all discoverd devices diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 604a04285..2319d939b 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -516,9 +516,9 @@ "dev": true }, "eslint": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.0.1.tgz", - "integrity": "sha512-D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.1.0.tgz", + "integrity": "sha512-DyH6JsoA1KzA5+OSWFjg56DFJT+sDLO0yokaPZ9qY0UEmYrPA1gEX/G1MnVkmRDsksG4H1foIVz2ZXXM3hHYvw==", "dev": true, "requires": { "ajv": "6.5.2", @@ -528,6 +528,7 @@ "debug": "3.1.0", "doctrine": "2.1.0", "eslint-scope": "4.0.0", + "eslint-utils": "1.3.1", "eslint-visitor-keys": "1.0.0", "espree": "4.0.0", "esquery": "1.0.1", @@ -588,6 +589,12 @@ "estraverse": "4.2.0" } }, + "eslint-utils": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz", + "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==", + "dev": true + }, "eslint-visitor-keys": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz", @@ -2831,7 +2838,7 @@ } }, "zigbee-shepherd": { - "version": "git+https://github.com/Koenkk/zigbee-shepherd.git#a2f4564cfd1d09a233c8dc46db579c5fa07f02f0", + "version": "git+https://github.com/Koenkk/zigbee-shepherd.git#22f6a3b46a948e46b0ad6bab8c6b528fc4acbaea", "requires": { "areq": "0.2.0", "busyman": "0.3.0", @@ -2859,9 +2866,9 @@ } }, "zigbee-shepherd-converters": { - "version": "2.0.22", - "resolved": "https://registry.npmjs.org/zigbee-shepherd-converters/-/zigbee-shepherd-converters-2.0.22.tgz", - "integrity": "sha512-YTki0D5hiA44+Snu95Lw880WF+w6bBR2/YpDOWgAkSPhMG8MwN/tReOghdD12+4K/BRfqxutexTD6SSJtaKXXQ==", + "version": "2.0.23", + "resolved": "https://registry.npmjs.org/zigbee-shepherd-converters/-/zigbee-shepherd-converters-2.0.23.tgz", + "integrity": "sha512-wiBPcrOmnB4mH1UsbeF66D8tOqsLRt8W6xcXU79KC8qeLSkla2nfyK96onSVn0UEe4VrUkG/NCmbfYoIgpVwCg==", "requires": { "debounce": "1.1.0" },