From 9bbd17f9215f97c195df7f04e011f650bbb4ea22 Mon Sep 17 00:00:00 2001
From: bpohvoodoo <voodoo@bpoh.de>
Date: Sat, 26 Oct 2019 10:08:03 +0200
Subject: [PATCH] Version Bump to 3.1.0.BETA5

 * adressed issue: #44
 * known problems:
 * Homeassistant will allways use active segment
 * E1.31 is only working for one segment at the moment
---
 Arduino/McLighting/request_handlers.h | 24 ++++++++++++------------
 Arduino/McLighting/version.h          |  2 +-
 Arduino/McLighting/version_info.ino   |  7 +++++++
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/Arduino/McLighting/request_handlers.h b/Arduino/McLighting/request_handlers.h
index d5ee605..3e85956 100644
--- a/Arduino/McLighting/request_handlers.h
+++ b/Arduino/McLighting/request_handlers.h
@@ -799,18 +799,18 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
       }
       if (root.containsKey("color")) {
         JsonObject color = root["color"];
-        main_color.red = (uint8_t) color["r"];
-        main_color.green = (uint8_t) color["g"];
-        main_color.blue = (uint8_t) color["b"];
-        main_color.white = (uint8_t) color["w"];
-        back_color.red = (uint8_t) color["r2"];
-        back_color.green = (uint8_t) color["g2"];
-        back_color.blue = (uint8_t) color["b2"];
-        back_color.white = (uint8_t) color["w2"];
-        xtra_color.red = (uint8_t) color["r3"];
-        xtra_color.green = (uint8_t) color["g3"];
-        xtra_color.blue = (uint8_t) color["b3"];
-        xtra_color.white = (uint8_t) color["w3"];
+        if (color.containsKey("r")) { main_color.red = (uint8_t) color["r"]; }
+        if (color.containsKey("g")) { main_color.green = (uint8_t) color["g"]; }
+        if (color.containsKey("b")) { main_color.blue = (uint8_t) color["b"]; }
+        if (color.containsKey("w")) { main_color.white = (uint8_t) color["w"]; }
+        if (color.containsKey("r2")) { back_color.red = (uint8_t) color["r2"]; }
+        if (color.containsKey("g2")) { back_color.green = (uint8_t) color["g2"]; }
+        if (color.containsKey("b2")) { back_color.blue = (uint8_t) color["b2"]; }
+        if (color.containsKey("w2")) { back_color.white = (uint8_t) color["w2"]; }
+        if (color.containsKey("r3")) { xtra_color.red = (uint8_t) color["r3"]; }
+        if (color.containsKey("g3")) { xtra_color.green = (uint8_t) color["g3"]; }
+        if (color.containsKey("b3")) { xtra_color.blue = (uint8_t) color["b3"]; }
+        if (color.containsKey("w3")) { xtra_color.white = (uint8_t) color["w3"]; }
         _updateSegState = true;
       }
       
diff --git a/Arduino/McLighting/version.h b/Arduino/McLighting/version.h
index a3418d2..077c528 100644
--- a/Arduino/McLighting/version.h
+++ b/Arduino/McLighting/version.h
@@ -1 +1 @@
-#define SKETCH_VERSION "3.1.0.BETA4"
+#define SKETCH_VERSION "3.1.0.BETA5"
diff --git a/Arduino/McLighting/version_info.ino b/Arduino/McLighting/version_info.ino
index 35d84b4..26d37f9 100644
--- a/Arduino/McLighting/version_info.ino
+++ b/Arduino/McLighting/version_info.ino
@@ -230,4 +230,11 @@
  * adressed issue: #48
  * known problems: E1.31 is only working for one segment at the moment
  * 
+ * 26 October
+ * Version Bump to 3.1.0.BETA5
+ * adressed issue: #44
+ * known problems:
+ * Homeassistant will allways use active segment
+ * E1.31 is only working for one segment at the moment
+ * 
  */