From 33201367f1eb0cf5abfc88d836af65ac11c93d14 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Thu, 5 Dec 2019 21:33:28 +0100
Subject: [PATCH] Update herdsman and converters.

---
 lib/extension/homeassistant.js |  1 +
 npm-shrinkwrap.json            |  6 +++---
 package.json                   |  2 +-
 test/entityPublish.test.js     | 11 +++++++++++
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js
index 258b57850..7da613c8a 100644
--- a/lib/extension/homeassistant.js
+++ b/lib/extension/homeassistant.js
@@ -1001,6 +1001,7 @@ const mapping = {
     '9290022230': [cfg.sensor_action, cfg.sensor_battery],
     'GL-D-004ZS': [cfg.light_brightness_colortemp_colorxy],
     'AC10787': [cfg.light_brightness_colortemp],
+    'F-APP-UK-V2': [cfg.switch],
 };
 
 Object.keys(mapping).forEach((key) => {
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index c66acfad9..5dccc8abe 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -12735,9 +12735,9 @@
       }
     },
     "zigbee-herdsman-converters": {
-      "version": "11.1.53",
-      "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-11.1.53.tgz",
-      "integrity": "sha512-AUU/A2SECbMMvN97kCIPpdG3P1J+Y1KqkUYwI7i1Nv+eKKaJCAhh3We/pmrbST/xIBq7M8/omIm9GQyHAEdrdA=="
+      "version": "11.1.54",
+      "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-11.1.54.tgz",
+      "integrity": "sha512-PjZaf280EaeFpndlJ1/lXpgUvLJiV4GSlvGfnRTjJlrWXsUVc6SWfDARg5IKtp3Y08ndVOLtiEeiIOUlQrFtmg=="
     }
   }
 }
diff --git a/package.json b/package.json
index 090c4f37b..fa693cfa1 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "semver": "*",
     "winston": "*",
     "zigbee-herdsman": "0.12.17",
-    "zigbee-herdsman-converters": "11.1.53"
+    "zigbee-herdsman-converters": "11.1.54"
   },
   "devDependencies": {
     "eslint": "*",
diff --git a/test/entityPublish.test.js b/test/entityPublish.test.js
index 82c92d8e3..583fac302 100644
--- a/test/entityPublish.test.js
+++ b/test/entityPublish.test.js
@@ -661,6 +661,17 @@ describe('Entity publish', () => {
         expect(endpoint.command.mock.calls[0]).toEqual(["genOnOff", "off", {}, {}]);
     });
 
+    it('Should allow to set color via hue and saturation', async () => {
+        const device = zigbeeHerdsman.devices.bulb_color_2;
+        const endpoint = device.getEndpoint(1);
+        const payload = {"color":{"hue":250, "saturation":50}};
+        await MQTT.events.message('zigbee2mqtt/bulb_color_2/set', JSON.stringify(payload));
+        await flushPromises();
+        expect(endpoint.command).toHaveBeenCalledTimes(1);
+        expect(endpoint.command.mock.calls[0]).toEqual(["lightingColorCtrl", "enhancedMoveToHueAndSaturation", {"direction": 0, "enhancehue": 45510.416666666664, "saturation": 127, "transtime": 0,}, {}]);
+        expect(MQTT.publish).toHaveBeenCalledTimes(0);
+    });
+
     it('ZNCLDJ11LM open', async () => {
         const device = zigbeeHerdsman.devices.ZNCLDJ11LM;
         const endpoint = device.getEndpoint(1);