From a13bd85ef3e67bb80d25af679071bb04d8124a58 Mon Sep 17 00:00:00 2001 From: Koen Kanters Date: Thu, 6 Dec 2018 21:09:21 +0100 Subject: [PATCH] Update zigbee-shepherd-converters to 7.0.1 --- docs/integrating-with-homeassistant.md | 38 +++++++++++++++++++++++++ docs/supported-devices.md | 5 +++- images/devices/3320-L.jpg | Bin 0 -> 2442 bytes images/devices/3326-L.jpg | Bin 0 -> 2928 bytes images/devices/AC01353010G.jpg | Bin 0 -> 3293 bytes lib/extension/devicePublish.js | 4 +-- lib/extension/homeassistant.js | 1 + npm-shrinkwrap.json | 36 +++++++++++------------ package.json | 2 +- test/devicePublish.test.js | 4 +-- 10 files changed, 66 insertions(+), 24 deletions(-) create mode 100644 images/devices/3320-L.jpg create mode 100644 images/devices/3326-L.jpg create mode 100644 images/devices/AC01353010G.jpg diff --git a/docs/integrating-with-homeassistant.md b/docs/integrating-with-homeassistant.md index d5b8fafd..68ec4fe6 100644 --- a/docs/integrating-with-homeassistant.md +++ b/docs/integrating-with-homeassistant.md @@ -1426,6 +1426,8 @@ light: command_topic: "zigbee2mqtt//set" ``` +### AC01353010G +```yaml ### HALIGHTDIMWWE27 ```yaml light: @@ -1976,6 +1978,42 @@ switch: command_topic: "zigbee2mqtt//set" ``` +### 3326-L +```yaml +binary_sensor: + - platform: "mqtt" + state_topic: "zigbee2mqtt/" + availability_topic: "zigbee2mqtt/bridge/state" + payload_on: true + payload_off: false + value_template: "{{ value_json.occupancy }}" + device_class: "motion" + +sensor: + - platform: "mqtt" + state_topic: "zigbee2mqtt/" + availability_topic: "zigbee2mqtt/bridge/state" + unit_of_measurement: "°C" + device_class: "temperature" + value_template: "{{ value_json.temperature }}" + json_attributes: + - "linkquality" + - "battery" + - "voltage" +``` + +### 3320-L +```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" +``` + ### KS-SM001 ```yaml switch: diff --git a/docs/supported-devices.md b/docs/supported-devices.md index ff4cb9e5..61e38401 100644 --- a/docs/supported-devices.md +++ b/docs/supported-devices.md @@ -1,6 +1,6 @@ *NOTE: This file has been generated, do not edit this file manually!* -Currently **134** devices are supported from **29** different vendors. +Currently **137** devices are supported from **29** different vendors. In case you own a Zigbee device which is **NOT** listed here, please see [How to support new devices](https://github.com/Koenkk/zigbee2mqtt/wiki/How-to-support-new-devices). @@ -130,6 +130,8 @@ In case you own a Zigbee device which is **NOT** listed here, please see | Model | Description | Picture | | ------------- | ------------- | -------------------------- | | 3210-L | Iris Smart plug (on/off) | ![https://github.com/Koenkk/zigbee2mqtt/raw/dev/images/devices/3210-L.jpg](https://github.com/Koenkk/zigbee2mqtt/raw/dev/images/devices/3210-L.jpg) | +| 3326-L | Iris Motion sensor (occupancy and temperature) | ![https://github.com/Koenkk/zigbee2mqtt/raw/dev/images/devices/3326-L.jpg](https://github.com/Koenkk/zigbee2mqtt/raw/dev/images/devices/3326-L.jpg) | +| 3320-L | Iris Contact sensor (contact) | ![https://github.com/Koenkk/zigbee2mqtt/raw/dev/images/devices/3320-L.jpg](https://github.com/Koenkk/zigbee2mqtt/raw/dev/images/devices/3320-L.jpg) | ### JIAWEN @@ -183,6 +185,7 @@ In case you own a Zigbee device which is **NOT** listed here, please see | 4058075036147 | OSRAM Smart+ Gardenpole RGBW (on/off, brightness, color temperature, color xy) | ![https://github.com/Koenkk/zigbee2mqtt/raw/dev/images/devices/4058075036147.jpg](https://github.com/Koenkk/zigbee2mqtt/raw/dev/images/devices/4058075036147.jpg) | | AB35996 | OSRAM Smart+ Spot GU10 Multicolor (on/off, brightness, color temperature, color xy) | ![https://github.com/Koenkk/zigbee2mqtt/raw/dev/images/devices/AB35996.jpg](https://github.com/Koenkk/zigbee2mqtt/raw/dev/images/devices/AB35996.jpg) | | AC08562 | OSRAM SMART+ Candle E14 Dimmable White (on/off, brightness) | ![https://github.com/Koenkk/zigbee2mqtt/raw/dev/images/devices/AC08562.jpg](https://github.com/Koenkk/zigbee2mqtt/raw/dev/images/devices/AC08562.jpg) | +| AC01353010G | OSRAM SMART+ Motion Sensor (occupancy and temperature) | ![https://github.com/Koenkk/zigbee2mqtt/raw/dev/images/devices/AC01353010G.jpg](https://github.com/Koenkk/zigbee2mqtt/raw/dev/images/devices/AC01353010G.jpg) | ### Paulmann diff --git a/images/devices/3320-L.jpg b/images/devices/3320-L.jpg new file mode 100644 index 0000000000000000000000000000000000000000..7b6e0849be9b501db55b64d52422cb18acff8ec1 GIT binary patch literal 2442 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 literal 0 HcmV?d00001 diff --git a/images/devices/3326-L.jpg b/images/devices/3326-L.jpg new file mode 100644 index 0000000000000000000000000000000000000000..955c1fa962df982dba3528c042c09137e9976672 GIT binary patch literal 2928 zcmbVOcT|(f7N0K#kc5(uAVp9*2urBa6oN=!kc47cm0cE*BB)eB5pV?&iCKsg5lCnv zh_Z-?pe`T?D+|&BN|9AjWWho&5%Rq+xJS=>@1J+xoilfSXTE#y+~1r#^9}qQehDO< z>>TX?1OecHGyuN>@wO)e`~Yxq0b2n8A^-ys0UALN(f}j}u01j)(S8zEK0z`_NGlLg*;&;@ruR&% z8v2Bu-5@HxQASoyOaAPVOF_UVHZL+yArgVZS5(0fAxR z5s^_Rqho$KmzZ=u`9exM>vBeBR`!*g!lL4mYo*uA%5PWSskvKwude=4bIaq_wm+V< z_x5r72cA729D4P7?9JQpcN2e4&dkouFDx!CukZxCkp28Z3(;Sg{Rb}s!V87LpfSP% zUJxouK%9WVD(MRmt!ctPosd#CNDv|IOe?5r+Mr@cpCLKFCiu-Atf#@E=3ZTkPs)y5s4%sQBGNgjEIb~;ud*%`7MfS zYRbxLY7~kNh4MAVHuwcnmZIIzpTxAZ^6nl8S>n$WbsTeF>G72|da(R3&c>d-v2r5rQMGgJ z5Gb1PH7;er2coZOky-lJ<`X1)ym6nefQ z@6%*JaeC+myt&>>W{EUT-oq>Q;R;^4u2CbA#j$Mb9*8%J*DOo{f)00oNw;!)Q>aDM z(qfrf?8P?s-fG|2w&&p-Xr$`N^|_Rzw=wj#8oG(jyGn(!)P{OiggdeJrbhPY9Vp7k zuPmA|WgWS|!POP3mqjzDoF6h{!2KLUkN({Jnm|iCF@P`N-oU3+m5$as=-hI3gn_%# zN8xF9%(+yLjWk)6_UWlPl^8iNkw~_8`hDZwrmGi(H56hz((k%>*0FrQKQ&KkrPZ@fy^QVYEx?Rl&1JdLsKl~Tcdxv& zF>b&WtIq4Jwjd7fU1(2v`P!pB7NX_TJ9ew)Un?6qQ2f-={Vkr+ zvPtU0Zc{G{d()LFw_`s^Z=37QPOd!qVZi|-rSGkoRCDi;T9WmWFN0YyX-?R0PF@{K zyc%19ZKz4RS?L)gD~VF2J$ES9c+rSjNHWj>P$5_kP*SaaL2Fx9Sr385)U6I>idL zGb^GpSL$p@bTr(z(4I84wwDJ3h70Wg^Tp<)n+M_zh8N2B+_$2D*L{Ue zdy-ibk)J&!?wm~BrueAU5C%Iiv%jrMwQqi!uyH&cw^#N4gV@Y&v0jT!c=2X#4zroo zK_8>l*(kJ@P=@d>&Gw4jX?E5VJAuQ3F@1-@;Eu`qwGxz10$4 z8eE_HQxe5{?n3*eGd{;k99>u$RyI^w%0PCY{nYnH zjpZ}1s)usR^0)fby=LPNbnACFcc*zB7ba<ROhCOOrD$Xbo&o0dga5q4euVrExm`q zjAzKFw;AUjdW~4P%e=_)o*T9LycoA!zU^RKmp=?X4Z`5{-%<2W99@&c&sGSj^`51p|-u+Pq z7j)LL=Xxoh-!`w>zRF|nK+az69D?U6g9W;&4* zTO@ePOeFEr<0g;ET`T$9VZf1t!OLB7WA<0Zx_D42A7jrq@)x#tKCsMciwcBQO!lQ*>k6neV`hz>Z-s%j;3+x1gqdW3~G~M(8@rKuaV=`X1Zd< z;-;0YW=f;;O^{`fauF#h`XAYFa*eZ8d2Nh5m4==I)HB^mZM($=D<2co0W!BzR;GK{0X6xpUX( zZr{wZRD4IOgT}AauDM$&&zkGAX^V_}7?>Dk%WL0ID&hA#-IPw6wDd8g$N8{n)Xm5* awtW3XAb1u0cgOcQI%$H!l=Y5=2mb}QPzd+{ literal 0 HcmV?d00001 diff --git a/images/devices/AC01353010G.jpg b/images/devices/AC01353010G.jpg new file mode 100644 index 0000000000000000000000000000000000000000..2b51e4e1621f4dccdb760d413398d7d25e2514c5 GIT binary patch literal 3293 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 literal 0 HcmV?d00001 diff --git a/lib/extension/devicePublish.js b/lib/extension/devicePublish.js index 2907c1cf..30c19614 100644 --- a/lib/extension/devicePublish.js +++ b/lib/extension/devicePublish.js @@ -115,14 +115,14 @@ class DevicePublish { // For each key in the JSON message find the matching converter. Object.keys(json).forEach((key) => { - const converter = model.toZigbee.find((c) => c.key === key); + const converter = model.toZigbee.find((c) => c.key.includes(key)); if (!converter) { logger.error(`No converter available for '${key}' (${json[key]})`); return; } // Converter didn't return a result, skip - const converted = converter.convert(json[key], json, topic.type); + const converted = converter.convert(key, json[key], json, topic.type); if (!converted) { return; } diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js index 813d7ec2..faab5d6a 100644 --- a/lib/extension/homeassistant.js +++ b/lib/extension/homeassistant.js @@ -403,6 +403,7 @@ const mapping = { 'PSS-23ZBS': [configurations.switch], 'HS1SA': [configurations.binary_sensor_smoke], 'Z01-A19NAE26': [configurations.light_brightness_colortemp], + 'AC01353010G': [configurations.binary_sensor_occupancy, configurations.sensor_temperature], }; /** diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 0e4d85d8..bf586f50 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -14,12 +14,12 @@ } }, "@babel/generator": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.1.6.tgz", - "integrity": "sha512-brwPBtVvdYdGxtenbQgfCdDPmtkmUBZPjUoK5SXJEBuHaA5BCubh9ly65fzXz7R6o5rA76Rs22ES8Z+HCc0YIQ==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.2.0.tgz", + "integrity": "sha512-BA75MVfRlFQG2EZgFYIwyT1r6xSkwfP2bdkY/kLZusEYWiJs4xCowab/alaEaT0wSvmVuXGqiefeBlP+7V1yKg==", "dev": true, "requires": { - "@babel/types": "^7.1.6", + "@babel/types": "^7.2.0", "jsesc": "^2.5.1", "lodash": "^4.17.10", "source-map": "^0.5.0", @@ -67,9 +67,9 @@ } }, "@babel/parser": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.1.6.tgz", - "integrity": "sha512-dWP6LJm9nKT6ALaa+bnL247GHHMWir3vSlZ2+IHgHgktZQx0L3Uvq2uAWcuzIe+fujRsYWBW2q622C5UvGK9iQ==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.2.0.tgz", + "integrity": "sha512-M74+GvK4hn1eejD9lZ7967qAwvqTZayQa3g10ag4s9uewgR7TKjeaT0YMyoq+gVfKYABiWZ4MQD701/t5e1Jhg==", "dev": true }, "@babel/template": { @@ -118,9 +118,9 @@ } }, "@babel/types": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.6.tgz", - "integrity": "sha512-DMiUzlY9DSjVsOylJssxLHSgj6tWM9PRFJOGW/RaOglVOK9nzTxoOMfTfRQXGUCUQ/HmlG2efwC+XqUEJ5ay4w==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.2.0.tgz", + "integrity": "sha512-b4v7dyfApuKDvmPb+O488UlGuR1WbwMXFsO/cyqMrnfvRAChZKJAYeeglWTjUO1b9UghKKgepAQM5tsvBJca6A==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -1887,7 +1887,7 @@ }, "json2yaml": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/json2yaml/-/json2yaml-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/json2yaml/-/json2yaml-1.1.0.tgz", "integrity": "sha1-VBTZB/mBZYa4DFE+wuOusquBmmw=", "requires": { "remedial": "1.x" @@ -3650,9 +3650,9 @@ "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" }, "progress": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.1.tgz", - "integrity": "sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", "dev": true }, "promirepl": { @@ -4621,7 +4621,7 @@ }, "underscore": { "version": "1.4.4", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz", + "resolved": "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz", "integrity": "sha1-YaajIBBiKvoHljvzJSA88SI51gQ=" }, "unique-stream": { @@ -4821,9 +4821,9 @@ } }, "zigbee-shepherd-converters": { - "version": "6.0.7", - "resolved": "https://registry.npmjs.org/zigbee-shepherd-converters/-/zigbee-shepherd-converters-6.0.7.tgz", - "integrity": "sha512-/LudDhZMQHG1XByAIX+y/BtJI/W2C02cnTMmqm0Sq8Oy3swQnVuy1ETdwMEqGINWbWhcLmKXne0PN1ywnzELxw==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/zigbee-shepherd-converters/-/zigbee-shepherd-converters-7.0.1.tgz", + "integrity": "sha512-VQfwtzfIrwzYbuU1oSpsBpx6bp6qshSPZO+Z9jTIGYu/xzjMStv93JeMk2n26cQvrhmh2fx8NH9+D+dFVaxqzA==", "requires": { "debounce": "*", "debug": "3.2.6", diff --git a/package.json b/package.json index 0b81d3a1..d6608a46 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "rimraf": "*", "winston": "2.4.2", "zigbee-shepherd": "git+https://github.com/Koenkk/zigbee-shepherd.git#ce52ac4131e2a505af6197b4a26d2b5360e4eb80", - "zigbee-shepherd-converters": "6.0.7", + "zigbee-shepherd-converters": "7.0.1", "ziee": "*", "zive": "*" }, diff --git a/test/devicePublish.test.js b/test/devicePublish.test.js index 80713169..7549844c 100644 --- a/test/devicePublish.test.js +++ b/test/devicePublish.test.js @@ -53,7 +53,7 @@ describe('DevicePublish', () => { it('Should publish messages to zigbee devices when brightness is in %', () => { zigbee.publish.resetHistory(); zigbee.getDevice = sinon.fake.returns({modelId: 'TRADFRI bulb E27 CWS opal 600lm'}); - devicePublish.onMQTTMessage('zigbee2mqtt/0x12345678/set', JSON.stringify({brightness: '92%'})); + devicePublish.onMQTTMessage('zigbee2mqtt/0x12345678/set', JSON.stringify({brightness_percent: '92'})); chai.assert.isTrue(zigbee.publish.calledOnce); chai.assert.strictEqual(zigbee.publish.getCall(0).args[0], '0x12345678'); chai.assert.strictEqual(zigbee.publish.getCall(0).args[1], 'genLevelCtrl'); @@ -95,7 +95,7 @@ describe('DevicePublish', () => { it('Should publish messages to zigbee devices with color_temp in %', () => { zigbee.publish.resetHistory(); zigbee.getDevice = sinon.fake.returns({modelId: 'TRADFRI bulb E27 CWS opal 600lm'}); - devicePublish.onMQTTMessage('zigbee2mqtt/0x12345678/set', JSON.stringify({color_temp: '100%'})); + devicePublish.onMQTTMessage('zigbee2mqtt/0x12345678/set', JSON.stringify({color_temp_percent: '100'})); chai.assert.isTrue(zigbee.publish.calledOnce); chai.assert.strictEqual(zigbee.publish.getCall(0).args[0], '0x12345678'); chai.assert.strictEqual(zigbee.publish.getCall(0).args[1], 'lightingColorCtrl');