From 247c49919ab0a4f1047c4530c55cc42356efb4c8 Mon Sep 17 00:00:00 2001
From: Jan Scheiper <janscheiper95@gmail.com>
Date: Wed, 29 Jul 2020 18:01:13 +0200
Subject: [PATCH] updated magic-home to latest version and added suport for the
 new command_timeout parameter

---
 HCMagicHome.js    |  1 +
 README.md         |  4 +++-
 package-lock.json | 10 +++++-----
 package.json      |  4 ++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/HCMagicHome.js b/HCMagicHome.js
index 0d2023c..00e0b20 100644
--- a/HCMagicHome.js
+++ b/HCMagicHome.js
@@ -17,6 +17,7 @@ class HCMagicHome extends HCColorLamp {
 			ack: (this._configuration.ack !== undefined) ? Control.ackMask(this._configuration.ack) : true,
 			log_all_received: (this._configuration.logall !== undefined) ? this._configuration.logall : false,
 			connect_timeout: (this._configuration.connect_timeout !== undefined) ? this._configuration.connect_timeout : 10000,
+			command_timeout: (this._configuration.command_timeout !== undefined) ? this._configuration.command_timeout : 5000,
 		};
 
 		this._control = new Control(this._configuration.address, opts);
diff --git a/README.md b/README.md
index b2b292c..d0c4ae5 100644
--- a/README.md
+++ b/README.md
@@ -5,4 +5,6 @@ Bitmask to set `ack` in the constructor.
 - `logall`  
 Sets `log_all_received` in the constructor.
 - `connect_timeout`  
-Sets `connect_timeout` in the constructor. (Default: 10000)
\ No newline at end of file
+Sets `connect_timeout` in the constructor. (Default: 10000)
+- `command_timeout`
+Sets `command_timeout` in the constructor. (Default: 5000)
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 319151d..0f18576 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "hc-magichome",
-  "version": "1.1.0",
+  "version": "1.3.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -10,7 +10,7 @@
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
     },
     "homecontrol-control-base": {
-      "version": "git+https://git.literalchaos.de/jan/homecontrol-control-base.git#c37d47a85bc9f08cba7f4c8aa36ae6c6232800bd",
+      "version": "git+https://git.literalchaos.de/jan/homecontrol-control-base.git#b2bf9ba767050ec1581dd3641885fe1132ac45aa",
       "from": "git+https://git.literalchaos.de/jan/homecontrol-control-base.git",
       "requires": {
         "merge-options": "^1.0.1",
@@ -23,9 +23,9 @@
       "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4="
     },
     "magic-home": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/magic-home/-/magic-home-2.3.0.tgz",
-      "integrity": "sha512-Qycy4vzAzDbjr0Ic1zBJ2OzCaHKIkNDIMHGli8ea3HmWwdSKiCcDPgIB5gpyPWxCHg0wcpPPOTd/XLOWyIq4wQ==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/magic-home/-/magic-home-2.6.0.tgz",
+      "integrity": "sha512-UNHYmbgm/GsS82JurRjPKOkmVj8dAGUK2Cq6/gAHL22yP7y1R/F4Zyqtb1zzI79QALiYzg9AW80KPbUuX/TbKg==",
       "requires": {
         "commander": "^2.20.0",
         "merge-options": "^1.0.1"
diff --git a/package.json b/package.json
index 1ebf6ba..962f532 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hc-magichome",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Magic Home Plugin for Homecontrol",
   "main": "HCMagicHome.js",
   "scripts": {
@@ -14,6 +14,6 @@
   "license": "UNLICENSED",
   "dependencies": {
     "homecontrol-control-base": "git+https://git.literalchaos.de/jan/homecontrol-control-base.git",
-    "magic-home": "^2.3.0"
+    "magic-home": "^2.6.0"
   }
 }