diff --git a/docs/images/devices/E1743.jpg b/docs/images/devices/E1743.jpg new file mode 100644 index 00000000..6811c598 Binary files /dev/null and b/docs/images/devices/E1743.jpg differ diff --git a/docs/images/devices/YRD426NRSC.jpg b/docs/images/devices/YRD426NRSC.jpg new file mode 100644 index 00000000..8627f198 Binary files /dev/null and b/docs/images/devices/YRD426NRSC.jpg differ diff --git a/docs/information/supported_devices.md b/docs/information/supported_devices.md index f42fa4d4..f376bd43 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 **202** devices are supported from **44** different vendors. +Currently **204** devices are supported from **45** 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). @@ -165,6 +165,7 @@ In case you own a Zigbee device which is **NOT** listed here, please see | L1531 | IKEA SURTE door light panel, dimmable, white spectrum (38x64 cm) (on/off, brightness, color temperature) | ![../images/devices/L1531.jpg](../images/devices/L1531.jpg) | | E1603 | IKEA TRADFRI control outlet (on/off) | ![../images/devices/E1603.jpg](../images/devices/E1603.jpg) | | E1524 | IKEA TRADFRI remote control (toggle, arrow left/right click/hold/release, brightness up/down click/hold/release (**[requires additional setup!](https://koenkk.github.io/zigbee2mqtt/getting_started/pairing_devices.html#ikea-tradfri)**)) | ![../images/devices/E1524.jpg](../images/devices/E1524.jpg) | +| E1743 | IKEA TRADFRI ON/OFF switch (on, off) | ![../images/devices/E1743.jpg](../images/devices/E1743.jpg) | | E1746 | IKEA TRADFRI signal repeater () | ![../images/devices/E1746.jpg](../images/devices/E1746.jpg) | ### Immax @@ -411,6 +412,12 @@ In case you own a Zigbee device which is **NOT** listed here, please see | DJT11LM | Xiaomi Aqara vibration sensor (drop, tilt and touch) | ![../images/devices/DJT11LM.jpg](../images/devices/DJT11LM.jpg) | | ZNCLDJ11LM | Xiaomi Aqara curtain motor (open, close, stop, position) | ![../images/devices/ZNCLDJ11LM.jpg](../images/devices/ZNCLDJ11LM.jpg) | +### Yale + +| Model | Description | Picture | +| ------------- | ------------- | -------------------------- | +| YRD426NRSC | Yale Assure lock (lock/unlock, battery) | ![../images/devices/YRD426NRSC.jpg](../images/devices/YRD426NRSC.jpg) | + ### eCozy | Model | Description | Picture | diff --git a/docs/integration/home_assistant.md b/docs/integration/home_assistant.md index 4c5764d7..16207257 100644 --- a/docs/integration/home_assistant.md +++ b/docs/integration/home_assistant.md @@ -1040,6 +1040,27 @@ sensor: ``` {% endraw %} +### E1743 +{% raw %} +```yaml +sensor: + - platform: "mqtt" + state_topic: "zigbee2mqtt/" + availability_topic: "zigbee2mqtt/bridge/state" + icon: "mdi:toggle-switch" + value_template: "{{ value_json.click }}" + force_update: true + +sensor: + - platform: "mqtt" + state_topic: "zigbee2mqtt/" + availability_topic: "zigbee2mqtt/bridge/state" + unit_of_measurement: "%" + device_class: "battery" + value_template: "{{ value_json.battery }}" +``` +{% endraw %} + ### E1746 {% raw %} ```yaml @@ -3472,4 +3493,24 @@ light: ``` {% endraw %} +### YRD426NRSC +{% raw %} +```yaml +lock: + - platform: "mqtt" + state_topic: "zigbee2mqtt/" + availability_topic: "zigbee2mqtt/bridge/state" + command_topic: "zigbee2mqtt//set" + value_template: "{{ value_json.state }}" + +sensor: + - platform: "mqtt" + state_topic: "zigbee2mqtt/" + availability_topic: "zigbee2mqtt/bridge/state" + unit_of_measurement: "%" + device_class: "battery" + value_template: "{{ value_json.battery }}" +``` +{% endraw %} + diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js index 814b64d5..f60e178d 100644 --- a/lib/extension/homeassistant.js +++ b/lib/extension/homeassistant.js @@ -254,6 +254,16 @@ const configurations = { optimistic: true, }, }, + + // Lock + 'lock': { + type: 'lock', + object_id: 'lock', + discovery_payload: { + command_topic: true, + value_template: '{{ value_json.state }}', + }, + }, }; const switchWithPostfix = (postfix) => { @@ -492,6 +502,8 @@ const mapping = { ], 'IM-Z3.0-DIM': [configurations.light_brightness], 'E1746': [], + 'YRD426NRSC': [configurations.lock, configurations.sensor_battery], + 'E1743': [configurations.sensor_click, configurations.sensor_battery], }; /** @@ -541,7 +553,7 @@ class HomeAssistant { // Set json_attributes_topic for types which support this // https://github.com/Koenkk/zigbee2mqtt/issues/840 - if (['binary_sensor', 'sensor'].includes(config.type)) { + if (['binary_sensor', 'sensor', 'lock'].includes(config.type)) { payload.json_attributes_topic = payload.state_topic; } diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index cbc6bf9e..a693fdcb 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1500,9 +1500,9 @@ } }, "globals": { - "version": "11.10.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.10.0.tgz", - "integrity": "sha512-0GZF1RiPKU97IHUO5TORo9w1PwrH/NBPl+fS7oMLdaTRiYmYbwK4NWoZWrAdd0/abG9R2BU+OiwyQpTpE6pdfQ==", + "version": "11.11.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.11.0.tgz", + "integrity": "sha512-WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw==", "dev": true }, "graceful-fs": { @@ -1998,9 +1998,9 @@ } }, "lolex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-3.0.0.tgz", - "integrity": "sha512-hcnW80h3j2lbUfFdMArd5UPA/vxZJ+G8vobd+wg3nVEQA0EigStbYcrG030FJxL6xiDDPEkoMatV9xIh5OecQQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-3.1.0.tgz", + "integrity": "sha512-zFo5MgCJ0rZ7gQg69S4pqBsLURbFw11X68C18OcJjJQbqaXm2NoTrGl1IMM3TIz0/BnN1tIs2tzmmqvCsOMMjw==", "dev": true }, "map-visit": { @@ -4725,9 +4725,9 @@ } }, "zigbee-shepherd-converters": { - "version": "7.1.7", - "resolved": "https://registry.npmjs.org/zigbee-shepherd-converters/-/zigbee-shepherd-converters-7.1.7.tgz", - "integrity": "sha512-KeMkwo3gVeFJ58aRmpRWv8ZvTVPnch+ZMKgbh5Aqqyo6rrLn4w+TNsvOtfuePc2ZvvfLMqWDZR3HCoWbThE4xw==", + "version": "7.1.8", + "resolved": "https://registry.npmjs.org/zigbee-shepherd-converters/-/zigbee-shepherd-converters-7.1.8.tgz", + "integrity": "sha512-iS4rKe3tEGlTsiH+BKA7V4CcxXavSBtUZdhgrLk36CxuLhqR9Qhvpvo65hBalKGKazwqjdCk6IGDI2uKYTk4Fw==", "requires": { "chai": "*", "debounce": "*", diff --git a/package.json b/package.json index eb813264..4db06714 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#76af47e307b1c6cfca49f51d35d7d2624a4fead9", - "zigbee-shepherd-converters": "7.1.7", + "zigbee-shepherd-converters": "7.1.8", "zive": "*" }, "devDependencies": {