From e33b49e2ff449fe72008be11fa86e098ca042dd2 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Tue, 12 Nov 2019 19:40:52 +0100
Subject: [PATCH] Update herdsman and converters.

---
 npm-shrinkwrap.json         | 12 ++++++------
 package.json                |  4 ++--
 test/entityPublish.test.js  | 12 ++++++++++++
 test/stub/data.js           |  3 +++
 test/stub/zigbeeHerdsman.js |  1 +
 5 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 57afabaa..68516b85 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -6158,9 +6158,9 @@
       }
     },
     "zigbee-herdsman": {
-      "version": "0.12.4",
-      "resolved": "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.12.4.tgz",
-      "integrity": "sha512-4YxAvEeiJsxamMQvY4t5+59ssFGg+ggZSJ4nUjkkRwJp3owDpdiRsKdZ6zdJzTwM3sHeSSuXyXR3CHAlah7juA==",
+      "version": "0.12.5",
+      "resolved": "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.12.5.tgz",
+      "integrity": "sha512-guUFauBHHHvCdmF7D8f4U21nk6RR8wfcerXCM6aCxHxfYyGrQczwNZ+o32cnvG/O8f/JQtGxBhLHPclYr1dlGQ==",
       "requires": {
         "debug": "^4.1.1",
         "fast-deep-equal": "^2.0.1",
@@ -12664,9 +12664,9 @@
       }
     },
     "zigbee-herdsman-converters": {
-      "version": "11.1.41",
-      "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-11.1.41.tgz",
-      "integrity": "sha512-zNcpbpSOzVaLyWWApKOB+qkNeIzRY2bjTLRVULiX/InvFnY51VupxPF5bw+Ul3kXCZOXcDftBADxQ57WeTpSnQ=="
+      "version": "11.1.42",
+      "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-11.1.42.tgz",
+      "integrity": "sha512-TtV7eg9Ao6teCQNO+I0td8Y/1iMBsL+1HgGtbBT8BrKsz/1ZmHRBBFLAUiIMU9FrrEj23jl0PO7RpOxIWwrZ8A=="
     }
   }
 }
diff --git a/package.json b/package.json
index e4cf4d8b..39e94e16 100644
--- a/package.json
+++ b/package.json
@@ -45,8 +45,8 @@
     "rimraf": "*",
     "semver": "*",
     "winston": "*",
-    "zigbee-herdsman": "0.12.4",
-    "zigbee-herdsman-converters": "11.1.41"
+    "zigbee-herdsman": "0.12.5",
+    "zigbee-herdsman-converters": "11.1.42"
   },
   "devDependencies": {
     "eslint": "*",
diff --git a/test/entityPublish.test.js b/test/entityPublish.test.js
index d344f0cb..bb794571 100644
--- a/test/entityPublish.test.js
+++ b/test/entityPublish.test.js
@@ -852,4 +852,16 @@ describe('Entity publish', () => {
         await flushPromises();
         expectNothingPublished();
     });
+
+    it('Should publish state to roller shutter', async () => {
+        const endpoint = zigbeeHerdsman.devices.roller_shutter.getEndpoint(1);
+        await MQTT.events.message('zigbee2mqtt/roller_shutter/set', JSON.stringify({state: 'OPEN'}));
+        await flushPromises();
+        expect(endpoint.command).toHaveBeenCalledTimes(1);
+        expect(endpoint.command).toHaveBeenCalledWith("genLevelCtrl", "currentLevel", {"level": "255", "transtime": 0}, {});
+        expect(MQTT.publish).toHaveBeenCalledTimes(1);
+        expect(MQTT.publish.mock.calls[0][0]).toStrictEqual('zigbee2mqtt/roller_shutter');
+        expect(JSON.parse(MQTT.publish.mock.calls[0][1])).toStrictEqual({position: 100});
+        expect(MQTT.publish.mock.calls[0][2]).toStrictEqual({"qos": 0, "retain": false});
+    });
 });
diff --git a/test/stub/data.js b/test/stub/data.js
index 0bed9f47..fa6722ff 100644
--- a/test/stub/data.js
+++ b/test/stub/data.js
@@ -129,6 +129,9 @@ function writeDefaultConfiguration() {
             '0x90fd9ffffe4b64ae': {
                 retain: false,
                 friendly_name: 'tradfri_remote',
+            },
+            '0x90fd9ffffe4b64af': {
+                friendly_name: 'roller_shutter',
             }
         },
         groups: {
diff --git a/test/stub/zigbeeHerdsman.js b/test/stub/zigbeeHerdsman.js
index 4795ecdb..fd36c8bc 100644
--- a/test/stub/zigbeeHerdsman.js
+++ b/test/stub/zigbeeHerdsman.js
@@ -128,6 +128,7 @@ const devices = {
     'CC2530_ROUTER': new Device('Router', '0x0017880104e45559', 6540,4151, [new Endpoint(1, [0, 6], [])], true, "Mains (single phase)", 'lumi.router'),
     'LIVOLO': new Device('Router', '0x0017880104e45560', 6541,4152, [new Endpoint(6, [0, 6], [])], true, "Mains (single phase)", 'TI0001          '),
     'tradfri_remote': new Device('EndDevice', '0x90fd9ffffe4b64ae', 33906, 4476, [new Endpoint(1, [0], [0,3,4,6,8,5], '0x90fd9ffffe4b64ae')], true, "Battery", "TRADFRI remote control"),
+    'roller_shutter': new Device('EndDevice', '0x90fd9ffffe4b64af', 33906, 4476, [new Endpoint(1, [0], [0,3,4,6,8,5], '0x90fd9ffffe4b64af')], true, "Battery", "SCM-R_00.00.03.15TC"),
 }
 
 const groups = {