diff --git a/docs/images/devices/GL-S-003Z.jpg b/docs/images/devices/GL-S-003Z.jpg new file mode 100644 index 000000000..30691250a Binary files /dev/null and b/docs/images/devices/GL-S-003Z.jpg differ diff --git a/docs/images/devices/HS1DS-E.jpg b/docs/images/devices/HS1DS-E.jpg new file mode 100644 index 000000000..b89a58c1e Binary files /dev/null and b/docs/images/devices/HS1DS-E.jpg differ 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": {