From 16f3e884fc1e5e4ab62a3aaba6ea24fbf6770062 Mon Sep 17 00:00:00 2001 From: Koen Kanters Date: Sun, 27 Jan 2019 00:45:31 +0100 Subject: [PATCH] Update zigbee-shepherd-converters to 7.0.25. --- docs/images/devices/GL-S-003Z.jpg | Bin 0 -> 13022 bytes docs/images/devices/HS1DS-E.jpg | Bin 0 -> 26051 bytes docs/information/supported_devices.md | 4 +++- docs/integration/home_assistant.md | 29 ++++++++++++++++++++++++++ lib/extension/homeassistant.js | 2 ++ npm-shrinkwrap.json | 18 ++++++++-------- package.json | 2 +- 7 files changed, 44 insertions(+), 11 deletions(-) create mode 100644 docs/images/devices/GL-S-003Z.jpg create mode 100644 docs/images/devices/HS1DS-E.jpg diff --git a/docs/images/devices/GL-S-003Z.jpg b/docs/images/devices/GL-S-003Z.jpg new file mode 100644 index 0000000000000000000000000000000000000000..30691250a9d30eae75099be3b7f74bc491fe43b3 GIT binary patch literal 13022 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 literal 0 HcmV?d00001 diff --git a/docs/information/supported_devices.md b/docs/information/supported_devices.md index c384add91..cb199c038 100644 --- a/docs/information/supported_devices.md +++ b/docs/information/supported_devices.md @@ -2,7 +2,7 @@ *NOTE: This file has been generated, do not edit this file manually!* -Currently **184** devices are supported from **37** different vendors. +Currently **186** devices are supported from **37** different vendors. In case you own a Zigbee device which is **NOT** listed here, please see [How to support new devices](https://koenkk.github.io/zigbee2mqtt/how_tos/how_to_support_new_devices.html). @@ -100,6 +100,7 @@ In case you own a Zigbee device which is **NOT** listed here, please see | GL-S-007Z | Gledopto Smart RGBW GU10 (on/off, brightness, color temperature, color xy) | ![../images/devices/GL-S-007Z.jpg](../images/devices/GL-S-007Z.jpg) | | GL-B-008Z | Gledopto Smart 12W E27 RGB / CW LED bulb (on/off, brightness, color temperature, color xy) | ![../images/devices/GL-B-008Z.jpg](../images/devices/GL-B-008Z.jpg) | | GL-D-003Z | Gledopto LED RGB + CCT downlight (on/off, brightness, color temperature, color xy) | ![../images/devices/GL-D-003Z.jpg](../images/devices/GL-D-003Z.jpg) | +| GL-S-003Z | Gledopto Smart RGBW GU10 (on/off, brightness, color temperature, color xy) | ![../images/devices/GL-S-003Z.jpg](../images/devices/GL-S-003Z.jpg) | | GD-CZ-006 | Gledopto Zigbee LED Driver (on/off, brightness) | ![../images/devices/GD-CZ-006.jpg](../images/devices/GD-CZ-006.jpg) | ### HEIMAN @@ -109,6 +110,7 @@ In case you own a Zigbee device which is **NOT** listed here, please see | HS1SA | HEIMAN Smoke detector (smoke) | ![../images/devices/HS1SA.jpg](../images/devices/HS1SA.jpg) | | HS3SA | HEIMAN Smoke detector (smoke) | ![../images/devices/HS3SA.jpg](../images/devices/HS3SA.jpg) | | HS1DS | HEIMAN Door sensor (contact) | ![../images/devices/HS1DS.jpg](../images/devices/HS1DS.jpg) | +| HS1DS-E | HEIMAN Door sensor (contact) | ![../images/devices/HS1DS-E.jpg](../images/devices/HS1DS-E.jpg) | | HS1WL | HEIMAN Water leakage sensor (water leak) | ![../images/devices/HS1WL.jpg](../images/devices/HS1WL.jpg) | ### Hive diff --git a/docs/integration/home_assistant.md b/docs/integration/home_assistant.md index 0628a95fd..1ce72c2b1 100644 --- a/docs/integration/home_assistant.md +++ b/docs/integration/home_assistant.md @@ -2619,6 +2619,21 @@ light: ``` {% endraw %} +### GL-S-003Z +{% raw %} +```yaml +light: + - platform: "mqtt" + state_topic: "zigbee2mqtt/" + availability_topic: "zigbee2mqtt/bridge/state" + brightness: true + color_temp: true + xy: true + schema: "json" + command_topic: "zigbee2mqtt//set" +``` +{% endraw %} + ### GD-CZ-006 {% raw %} ```yaml @@ -3022,6 +3037,20 @@ binary_sensor: ``` {% endraw %} +### HS1DS-E +{% raw %} +```yaml +binary_sensor: + - platform: "mqtt" + state_topic: "zigbee2mqtt/" + availability_topic: "zigbee2mqtt/bridge/state" + payload_on: false + payload_off: true + value_template: "{{ value_json.contact }}" + device_class: "door" +``` +{% endraw %} + ### HS1WL {% raw %} ```yaml diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js index 3caa879fe..3538b3aa6 100644 --- a/lib/extension/homeassistant.js +++ b/lib/extension/homeassistant.js @@ -471,6 +471,8 @@ const mapping = { '71831': [configurations.light_brightness_colortemp], '404000/404005/404012': [configurations.light_brightness_colortemp_colorxy], '404006/404008/404004': [configurations.light_brightness_colortemp], + 'GL-S-003Z': [configurations.light_brightness_colortemp_colorxy], + 'HS1DS-E': [configurations.binary_sensor_contact], }; /** diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index d6462488e..c11a8d56d 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -2247,9 +2247,9 @@ } }, "node-abi": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.5.1.tgz", - "integrity": "sha512-oDbFc7vCFx0RWWCweTer3hFm1u+e60N5FtGnmRV6QqvgATGFH/XRR6vqWIeBVosCYCqt6YdIr2L0exLZuEdVcQ==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.6.0.tgz", + "integrity": "sha512-kCnEh6af6Z6DB7RFI/7LHNwqRjvJW7rgrv3lhIFoQ/+XhLPI/lJYwsk5vzvkldPWWgqnAMcuPF5S8/jj56kVOA==", "requires": { "semver": "^5.4.1" } @@ -4830,19 +4830,19 @@ } }, "zigbee-shepherd-converters": { - "version": "7.0.23", - "resolved": "https://registry.npmjs.org/zigbee-shepherd-converters/-/zigbee-shepherd-converters-7.0.23.tgz", - "integrity": "sha512-xaEkqwsBZpZi5JA0ZpuPi+nlaH+FVC1wrIiQKh4I+JJRtoDan0aHNXHZT/HyUeqpiBnv5h7E1iwFFlWGbQRTug==", + "version": "7.0.25", + "resolved": "https://registry.npmjs.org/zigbee-shepherd-converters/-/zigbee-shepherd-converters-7.0.25.tgz", + "integrity": "sha512-82MBsAlqtrQcyaBQIDdWvcIRq/vy5gz46u0pd+XSXXkAmI9GOrQq1+0jbq0IHd1lYTcnG2G/4Twc5uoUcI6sCQ==", "requires": { "chai": "*", "debounce": "*", "debug": "3.2.6", - "zcl-id": "git+https://github.com/Koenkk/zcl-id.git#509f77ab620ece6ad8e83a008283457a5280c8db" + "zcl-id": "https://github.com/koenkk/zcl-id/tarball/master" }, "dependencies": { "zcl-id": { - "version": "git+https://github.com/Koenkk/zcl-id.git#509f77ab620ece6ad8e83a008283457a5280c8db", - "from": "git+https://github.com/Koenkk/zcl-id.git#509f77ab620ece6ad8e83a008283457a5280c8db", + "version": "https://github.com/koenkk/zcl-id/tarball/master", + "integrity": "sha512-VzHMq1JqhdCVVLWBmCECLrkQMEY6DYL/0gp4GrsJbyQuBE4wcMGs0zAHhF9DxlWZ4eT6zkiH0e5z6hEhUSRLRA==", "requires": { "busyman": "^0.3.0", "enum": "^2.5.0" diff --git a/package.json b/package.json index 8156b2bc0..64a964a15 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "winston": "2.4.2", "ziee": "*", "zigbee-shepherd": "git+https://github.com/Koenkk/zigbee-shepherd.git#ab40740ed8b41636cb3de7aecb160eb34b14917a", - "zigbee-shepherd-converters": "7.0.23", + "zigbee-shepherd-converters": "7.0.25", "zive": "*" }, "devDependencies": {