diff --git a/docs/images/devices/3216431P5.jpg b/docs/images/devices/3216431P5.jpg new file mode 100644 index 00000000..02e1215b Binary files /dev/null and b/docs/images/devices/3216431P5.jpg differ diff --git a/docs/images/devices/3261331P7.jpg b/docs/images/devices/3261331P7.jpg new file mode 100644 index 00000000..815d28a0 Binary files /dev/null and b/docs/images/devices/3261331P7.jpg differ diff --git a/docs/images/devices/464800.jpg b/docs/images/devices/464800.jpg new file mode 100644 index 00000000..0ffd1c4e Binary files /dev/null and b/docs/images/devices/464800.jpg differ diff --git a/docs/images/devices/AV2010-25.jpg b/docs/images/devices/AV2010-25.jpg new file mode 100644 index 00000000..3b567f72 Binary files /dev/null and b/docs/images/devices/AV2010-25.jpg differ diff --git a/docs/images/devices/GL-B-008Z.jpg b/docs/images/devices/GL-B-008Z.jpg new file mode 100644 index 00000000..12a47277 Binary files /dev/null and b/docs/images/devices/GL-B-008Z.jpg differ diff --git a/docs/information/supported_devices.md b/docs/information/supported_devices.md index dd1e1ace..d4df8255 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 **154** devices are supported from **32** different vendors. +Currently **159** devices are supported from **32** 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). @@ -19,11 +19,12 @@ In case you own a Zigbee device which is **NOT** listed here, please see | ------------- | ------------- | -------------------------- | | F7C033 | Belkin WeMo smart LED bulb (on/off, brightness) | ![../images/devices/F7C033.jpg](../images/devices/F7C033.jpg) | -### Bitron Home +### Bitron | Model | Description | Picture | | ------------- | ------------- | -------------------------- | -| AV2010/22 | Bitron Home Wireless motion detector (occupancy) | ![../images/devices/AV2010-22.jpg](../images/devices/AV2010-22.jpg) | +| AV2010/22 | Bitron Wireless motion detector (occupancy) | ![../images/devices/AV2010-22.jpg](../images/devices/AV2010-22.jpg) | +| AV2010/25 | Bitron Video wireless socket (on/off, power measurement) | ![../images/devices/AV2010-25.jpg](../images/devices/AV2010-25.jpg) | ### Calex @@ -91,6 +92,7 @@ In case you own a Zigbee device which is **NOT** listed here, please see | ------------- | ------------- | -------------------------- | | GL-C-008 | Gledopto Zigbee LED controller RGB + CCT / RGBW / WWCW / Dimmer (on/off, brightness, color temperature, color xy) | ![../images/devices/GL-C-008.jpg](../images/devices/GL-C-008.jpg) | | 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) | ### HEIMAN @@ -237,11 +239,14 @@ In case you own a Zigbee device which is **NOT** listed here, please see | 9290002579A | Philips Hue white and color ambiance BR30 (on/off, brightness, color temperature, color xy) | ![../images/devices/9290002579A.jpg](../images/devices/9290002579A.jpg) | | 8718696485880 | Philips Hue white and color ambiance GU10 (on/off, brightness, color temperature, color xy) | ![../images/devices/8718696485880.jpg](../images/devices/8718696485880.jpg) | | 915005733701 | Philips Hue White and color ambiance Play Lightbar (on/off, brightness, color temperature, color xy) | ![../images/devices/915005733701.jpg](../images/devices/915005733701.jpg) | +| 464800 | Philips Hue white ambiance BR30 flood light (on/off, brightness, color temperature) | ![../images/devices/464800.jpg](../images/devices/464800.jpg) | | 8718696695203 | Philips Hue white ambiance E14 (on/off, brightness, color temperature) | ![../images/devices/8718696695203.jpg](../images/devices/8718696695203.jpg) | | 8718696598283 | Philips Hue white ambiance GU10 (on/off, brightness, color temperature) | ![../images/devices/8718696598283.jpg](../images/devices/8718696598283.jpg) | | 8718696548738 | Philips Hue white ambiance E26/E27 (on/off, brightness, color temperature) | ![../images/devices/8718696548738.jpg](../images/devices/8718696548738.jpg) | | 3261030P7 | Philips Hue Being (on/off, brightness, color temperature) | ![../images/devices/3261030P7.jpg](../images/devices/3261030P7.jpg) | -| 3216331P5 | Philips Philips Hue White ambiance Aurelle Rectangle Panel Light (on/off, brightness, color temperature) | ![../images/devices/3216331P5.jpg](../images/devices/3216331P5.jpg) | +| 3261331P7 | Philips Hue white ambiance Still (on/off, brightness, color temperature) | ![../images/devices/3261331P7.jpg](../images/devices/3261331P7.jpg) | +| 3216331P5 | Philips Hue white ambiance Aurelle rectangle panel light (on/off, brightness, color temperature) | ![../images/devices/3216331P5.jpg](../images/devices/3216331P5.jpg) | +| 3216431P5 | Philips Hue white ambiance Aurelle round panel light (on/off, brightness, color temperature) | ![../images/devices/3216431P5.jpg](../images/devices/3216431P5.jpg) | | 7199960PH | Philips Hue Iris (on/off, brightness, color xy) | ![../images/devices/7199960PH.jpg](../images/devices/7199960PH.jpg) | | 324131092621 | Philips Hue dimmer switch (on/off) | ![../images/devices/324131092621.jpg](../images/devices/324131092621.jpg) | | 9290012607 | Philips Hue motion sensor (occupancy, temperature, illuminance) | ![../images/devices/9290012607.jpg](../images/devices/9290012607.jpg) | diff --git a/docs/integration/home_assistant.md b/docs/integration/home_assistant.md index d63f8a6b..91ee27a5 100644 --- a/docs/integration/home_assistant.md +++ b/docs/integration/home_assistant.md @@ -1283,6 +1283,20 @@ light: ``` {% endraw %} +### 464800 +{% raw %} +```yaml +light: + - platform: "mqtt" + state_topic: "zigbee2mqtt/" + availability_topic: "zigbee2mqtt/bridge/state" + brightness: true + color_temp: true + schema: "json" + command_topic: "zigbee2mqtt//set" +``` +{% endraw %} + ### 8718696695203 {% raw %} ```yaml @@ -1339,6 +1353,20 @@ light: ``` {% endraw %} +### 3261331P7 +{% raw %} +```yaml +light: + - platform: "mqtt" + state_topic: "zigbee2mqtt/" + availability_topic: "zigbee2mqtt/bridge/state" + brightness: true + color_temp: true + schema: "json" + command_topic: "zigbee2mqtt//set" +``` +{% endraw %} + ### 3216331P5 {% raw %} ```yaml @@ -1353,6 +1381,20 @@ light: ``` {% endraw %} +### 3216431P5 +{% raw %} +```yaml +light: + - platform: "mqtt" + state_topic: "zigbee2mqtt/" + availability_topic: "zigbee2mqtt/bridge/state" + brightness: true + color_temp: true + schema: "json" + command_topic: "zigbee2mqtt//set" +``` +{% endraw %} + ### 7199960PH {% raw %} ```yaml @@ -2571,6 +2613,21 @@ light: ``` {% endraw %} +### GL-B-008Z +{% 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 %} + ### STSS-MULT-001 {% raw %} ```yaml @@ -2747,6 +2804,36 @@ sensor: ``` {% endraw %} +### AV2010/25 +{% raw %} +```yaml +switch: + - platform: "mqtt" + state_topic: "zigbee2mqtt/" + availability_topic: "zigbee2mqtt/bridge/state" + payload_off: "OFF" + payload_on: "ON" + value_template: "{{ value_json.state }}" + command_topic: "zigbee2mqtt//set" + +sensor: + - platform: "mqtt" + state_topic: "zigbee2mqtt/" + availability_topic: "zigbee2mqtt/bridge/state" + unit_of_measurement: "Watt" + icon: "mdi:flash" + value_template: "{{ value_json.power }}" + json_attributes: + - "linkquality" + - "voltage" + - "temperature" + - "consumption" + - "current" + - "power_factor" + - "last_seen" +``` +{% endraw %} + ### 3210-L {% raw %} ```yaml diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js index 342a236b..57a8c7f4 100644 --- a/lib/extension/homeassistant.js +++ b/lib/extension/homeassistant.js @@ -456,6 +456,10 @@ const mapping = { 'GL-S-007Z': [configurations.light_brightness_colortemp_colorxy], '3325-S': [configurations.sensor_temperature, configurations.binary_sensor_occupancy], '4713407': [configurations.light_brightness], + '464800': [configurations.light_brightness_colortemp], + '3261331P7': [configurations.light_brightness_colortemp], + 'GL-B-008Z': [configurations.light_brightness_colortemp_colorxy], + 'AV2010/25': [configurations.switch, configurations.sensor_power], }; /** diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index cd7724eb..c6e398a1 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -320,7 +320,7 @@ }, "ansi-colors": { "version": "0.2.0", - "resolved": "http://registry.npmjs.org/ansi-colors/-/ansi-colors-0.2.0.tgz", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-0.2.0.tgz", "integrity": "sha1-csMd4qDZoszQysMMyYI+6y9kNLU=", "requires": { "ansi-bgblack": "^0.1.1", @@ -370,7 +370,7 @@ }, "ansi-escapes": { "version": "3.1.0", - "resolved": "http://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz", "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==", "dev": true }, @@ -567,7 +567,7 @@ }, "async": { "version": "1.0.0", - "resolved": "http://registry.npmjs.org/async/-/async-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz", "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=" }, "async-limiter": { @@ -595,7 +595,7 @@ }, "bl": { "version": "1.2.2", - "resolved": "http://registry.npmjs.org/bl/-/bl-1.2.2.tgz", + "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz", "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==", "requires": { "readable-stream": "^2.3.5", @@ -666,7 +666,7 @@ }, "callsites": { "version": "0.2.0", - "resolved": "http://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz", "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=", "dev": true }, @@ -829,7 +829,7 @@ }, "colors": { "version": "1.0.3", - "resolved": "http://registry.npmjs.org/colors/-/colors-1.0.3.tgz", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz", "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=" }, "commander": { @@ -858,7 +858,7 @@ }, "concat-stream": { "version": "1.6.2", - "resolved": "http://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", "requires": { "buffer-from": "^1.0.0", @@ -907,7 +907,7 @@ }, "d": { "version": "1.0.0", - "resolved": "http://registry.npmjs.org/d/-/d-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", "requires": { "es5-ext": "^0.10.9" @@ -991,7 +991,7 @@ "dependencies": { "bl": { "version": "0.7.0", - "resolved": "http://registry.npmjs.org/bl/-/bl-0.7.0.tgz", + "resolved": "https://registry.npmjs.org/bl/-/bl-0.7.0.tgz", "integrity": "sha1-P7BnBgKsKHjrdw3CA58YNr5irls=", "requires": { "readable-stream": "~1.0.2" @@ -2092,7 +2092,7 @@ "dependencies": { "commander": { "version": "2.15.1", - "resolved": "http://registry.npmjs.org/commander/-/commander-2.15.1.tgz", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==", "dev": true }, @@ -2208,7 +2208,7 @@ "dependencies": { "async": { "version": "0.2.10", - "resolved": "http://registry.npmjs.org/async/-/async-0.2.10.tgz", + "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz", "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=" } } @@ -4823,9 +4823,9 @@ } }, "zigbee-shepherd-converters": { - "version": "7.0.7", - "resolved": "https://registry.npmjs.org/zigbee-shepherd-converters/-/zigbee-shepherd-converters-7.0.7.tgz", - "integrity": "sha512-b877BWlhRV6PB+XjKXbQAdp32XjV7YxFXCXwlQVaSlJJ9Xx7BYHtvAXl67RZt2lqxfPbCe5NN4yTfjc0VRDZkw==", + "version": "7.0.9", + "resolved": "https://registry.npmjs.org/zigbee-shepherd-converters/-/zigbee-shepherd-converters-7.0.9.tgz", + "integrity": "sha512-LWPB6oGC1uXUl6gQuhf/8IZ4NcCKRAyX/Urf9JkXWt8g45IpX4WObPr5sa6l6zVKsF975ADvWnGXtWe5tg1o3Q==", "requires": { "debounce": "*", "debug": "3.2.6", diff --git a/package.json b/package.json index 3d5fff07..12286732 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#bc2445dc0bb7a2a1d5b4a461c231e28d07f517e7", - "zigbee-shepherd-converters": "7.0.7", + "zigbee-shepherd-converters": "7.0.9", "zive": "*" }, "devDependencies": {