From aa4e7fa5c8c2a94e715fc64eb9012df28d1cef80 Mon Sep 17 00:00:00 2001
From: bpohvoodoo <voodoo@bpoh.de>
Date: Mon, 16 Dec 2019 21:11:24 +0100
Subject: [PATCH] Bump to 2.2.8

 * Version Bump to 2.2.8 rgbw 3colors
 * Bugfixes
 * adressed issue #59
---
 Arduino/McLighting/McLighting.ino     | 1 +
 Arduino/McLighting/definitions.h      | 8 ++++----
 Arduino/McLighting/request_handlers.h | 1 +
 Arduino/McLighting/version.h          | 2 +-
 Arduino/McLighting/version_info.ino   | 5 +++++
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Arduino/McLighting/McLighting.ino b/Arduino/McLighting/McLighting.ino
index 5909938..d2b1b98 100644
--- a/Arduino/McLighting/McLighting.ino
+++ b/Arduino/McLighting/McLighting.ino
@@ -727,6 +727,7 @@ void loop() {
         WiFi.disconnect();
         WiFi.setSleepMode(WIFI_NONE_SLEEP);
         WiFi.mode(WIFI_STA);
+        WiFi.hostname(HOSTNAME); 
         WiFi.begin();
       } else {
         if ((strlen(mqtt_host) != 0) && (mqtt_port != 0) && (mqtt_reconnect_retries < MQTT_MAX_RECONNECT_TRIES)) {
diff --git a/Arduino/McLighting/definitions.h b/Arduino/McLighting/definitions.h
index 87c155e..c2c7705 100644
--- a/Arduino/McLighting/definitions.h
+++ b/Arduino/McLighting/definitions.h
@@ -171,10 +171,10 @@ bool updateState = false;
 // Button handling
 
 #if defined(ENABLE_BUTTON)
-//#define BTN_MODE_SHORT  "STA|mo|fxm|  h|  s| r1| g1| b1| w1| r2| g2| b2| w2| r3| g3| b3| w3"   // Example
-  #define BTN_MODE_SHORT  "STA| 5|  0|255|196|  0|  0|  0|255|  0|  0|  0|  0|  0|  0|  0|  0"   // Static white
-  #define BTN_MODE_MEDIUM "STA| 5| 48|200|196|255|102|  0|  0|  0|  0|  0|  0|  0|  0|  0|  0"   // Fire flicker
-  #define BTN_MODE_LONG   "STA| 5| 46|200|196|255|102|  0|  0|  0|  0|  0|  0|  0|  0|  0|  0"   // Fireworks random
+//#define BTN_MODE_SHORT  "STA|mo|fxm|  s|  b| r1| g1| b1| w1| r2| g2| b2| w2| r3| g3| b3| w3"   // Example
+  #define BTN_MODE_SHORT  "STA| 5|  0|196|255|  0|  0|  0|255|  0|  0|  0|  0|  0|  0|  0|  0"   // Static white
+  #define BTN_MODE_MEDIUM "STA| 5| 48|196|200|255|102|  0|  0|  0|  0|  0|  0|  0|  0|  0|  0"   // Fire flicker
+  #define BTN_MODE_LONG   "STA| 5| 46|196|200|255|102|  0|  0|  0|  0|  0|  0|  0|  0|  0|  0"   // Fireworks random
   unsigned long keyPrevMillis = 0;
   const unsigned long keySampleIntervalMs = 25;
   byte longKeyPressCountMax = 80;       // 80 * 25 = 2000 ms
diff --git a/Arduino/McLighting/request_handlers.h b/Arduino/McLighting/request_handlers.h
index 1cc3495..e8431fe 100644
--- a/Arduino/McLighting/request_handlers.h
+++ b/Arduino/McLighting/request_handlers.h
@@ -1395,6 +1395,7 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
       DBG_OUTPUT_PORT.println("Re-connecting to Wi-Fi...");
       WiFi.setSleepMode(WIFI_NONE_SLEEP);
       WiFi.mode(WIFI_STA);
+      WiFi.hostname(HOSTNAME); 
       WiFi.begin();
     }
 
diff --git a/Arduino/McLighting/version.h b/Arduino/McLighting/version.h
index c3b43d1..e51a3f8 100644
--- a/Arduino/McLighting/version.h
+++ b/Arduino/McLighting/version.h
@@ -1 +1 @@
-#define SKETCH_VERSION "2.2.7.RU1.rgbw.3c"
+#define SKETCH_VERSION "2.2.8.RU1.rgbw.3c"
diff --git a/Arduino/McLighting/version_info.ino b/Arduino/McLighting/version_info.ino
index fbbb069..226b95f 100644
--- a/Arduino/McLighting/version_info.ino
+++ b/Arduino/McLighting/version_info.ino
@@ -168,4 +168,9 @@
  * 09 Oktober 2019
  * Version Bump to 2.2.7 rgbw 3colors 
  * added output to control external power supply
+ * 
+ * 06 December 2019
+ * Version Bump to 2.2.8 rgbw 3colors 
+ * Bugfixes
+ * adressed issue #59
  */