diff --git a/docs/images/devices/1613V.jpg b/docs/images/devices/1613V.jpg new file mode 100644 index 000000000..ed6df69bc Binary files /dev/null and b/docs/images/devices/1613V.jpg differ diff --git a/docs/images/devices/SP600.jpg b/docs/images/devices/SP600.jpg new file mode 100644 index 000000000..e3a87158c Binary files /dev/null and b/docs/images/devices/SP600.jpg differ diff --git a/docs/images/devices/XVV-Mega23M12.jpg b/docs/images/devices/XVV-Mega23M12.jpg new file mode 100644 index 000000000..834ce11a9 Binary files /dev/null and b/docs/images/devices/XVV-Mega23M12.jpg differ diff --git a/docs/information/supported_devices.md b/docs/information/supported_devices.md index cb199c038..399ebc46b 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 **186** devices are supported from **37** different vendors. +Currently **189** devices are supported from **38** 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). @@ -67,6 +67,7 @@ In case you own a Zigbee device which is **NOT** listed here, please see | Model | Description | Picture | | ------------- | ------------- | -------------------------- | | Mega23M12 | Dresden Elektronik ZigBee Light Link wireless electronic ballast (on/off, brightness, color temperature, color xy) | ![../images/devices/Mega23M12.jpg](../images/devices/Mega23M12.jpg) | +| XVV-Mega23M12 | Dresden Elektronik ZigBee Light Link wireless electronic ballast color temperature (on/off, brightness, color temperature) | ![../images/devices/XVV-Mega23M12.jpg](../images/devices/XVV-Mega23M12.jpg) | ### EDP @@ -119,6 +120,7 @@ In case you own a Zigbee device which is **NOT** listed here, please see | ------------- | ------------- | -------------------------- | | HALIGHTDIMWWE27 | Hive Active smart bulb white LED (E27) (on/off, brightness) | ![../images/devices/HALIGHTDIMWWE27.jpg](../images/devices/HALIGHTDIMWWE27.jpg) | | HALIGHTDIMWWB22 | Hive Active smart bulb white LED (B22) (on/off, brightness) | ![../images/devices/HALIGHTDIMWWB22.jpg](../images/devices/HALIGHTDIMWWB22.jpg) | +| 1613V | Hive Active plug (on/off, power measurement) | ![../images/devices/1613V.jpg](../images/devices/1613V.jpg) | ### IKEA @@ -280,6 +282,12 @@ In case you own a Zigbee device which is **NOT** listed here, please see | 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) | +### Salus + +| Model | Description | Picture | +| ------------- | ------------- | -------------------------- | +| SP600 | Salus Smart plug (on/off, power measurement) | ![../images/devices/SP600.jpg](../images/devices/SP600.jpg) | + ### Sengled | Model | Description | Picture | diff --git a/docs/integration/home_assistant.md b/docs/integration/home_assistant.md index 1ce72c2b1..011835810 100644 --- a/docs/integration/home_assistant.md +++ b/docs/integration/home_assistant.md @@ -1895,6 +1895,28 @@ light: ``` {% endraw %} +### 1613V +{% 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 }}" +``` +{% endraw %} + ### RB 185 C {% raw %} ```yaml @@ -2959,6 +2981,20 @@ light: ``` {% endraw %} +### XVV-Mega23M12 +{% 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 %} + ### 4256251-RZHAC {% raw %} ```yaml @@ -3223,4 +3259,26 @@ light: ``` {% endraw %} +### SP600 +{% 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 }}" +``` +{% endraw %} + diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js index 62a71817f..b0fdc9bd9 100644 --- a/lib/extension/homeassistant.js +++ b/lib/extension/homeassistant.js @@ -474,6 +474,8 @@ const mapping = { 'GL-S-003Z': [configurations.light_brightness_colortemp_colorxy], 'HS1DS-E': [configurations.binary_sensor_contact], 'SP600': [configurations.switch, configurations.sensor_power], + '1613V': [configurations.switch, configurations.sensor_power], + 'XVV-Mega23M12': [configurations.light_brightness_colortemp], }; /** diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index c11a8d56d..b07a2ff9e 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -369,9 +369,9 @@ } }, "ansi-escapes": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz", - "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", + "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", "dev": true }, "ansi-gray": { @@ -4208,9 +4208,9 @@ } }, "slice-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.0.0.tgz", - "integrity": "sha512-4j2WTWjp3GsZ+AOagyzVbzp4vWGtZ0hEZ/gDY/uTvm6MTxUfTUIsnMIFb1bn8o0RuXiqUw15H1bue8f22Vw2oQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz", + "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==", "dev": true, "requires": { "ansi-styles": "^3.2.0", @@ -4385,14 +4385,14 @@ } }, "table": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/table/-/table-5.2.1.tgz", - "integrity": "sha512-qmhNs2GEHNqY5fd2Mo+8N1r2sw/rvTAAvBZTaTx+Y7PHLypqyrxr1MdIu0pLw6Xvl/Gi4ONu/sdceP8vvUjkyA==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/table/-/table-5.2.2.tgz", + "integrity": "sha512-f8mJmuu9beQEDkKHLzOv4VxVYlU68NpdzjbGPl69i4Hx0sTopJuNxuzJd17iV2h24dAfa93u794OnDA5jqXvfQ==", "dev": true, "requires": { "ajv": "^6.6.1", "lodash": "^4.17.11", - "slice-ansi": "2.0.0", + "slice-ansi": "^2.0.0", "string-width": "^2.1.1" }, "dependencies": { @@ -4830,9 +4830,9 @@ } }, "zigbee-shepherd-converters": { - "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==", + "version": "7.0.26", + "resolved": "https://registry.npmjs.org/zigbee-shepherd-converters/-/zigbee-shepherd-converters-7.0.26.tgz", + "integrity": "sha512-1nHl5HaaXdzdi59EesKtCWSBDtqGtmgFQLUQpqJpWyLkV5c5fstlQbtSWizblH6j2FjGarOasMJKADgoOqzDUA==", "requires": { "chai": "*", "debounce": "*", diff --git a/package.json b/package.json index 64a964a15..a6e854d24 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.25", + "zigbee-shepherd-converters": "7.0.26", "zive": "*" }, "devDependencies": {