From 341c469b49f7856c3567d4c9576c9e48ab7bd4aa Mon Sep 17 00:00:00 2001
From: bpohvoodoo <voodoo@bpoh.de>
Date: Sun, 29 Sep 2019 13:27:37 +0200
Subject: [PATCH] V3.0.0.BETA1

 * Version Bump to 3.0.0.BETA1
 * further code changes
 * bugfixes
---
 .gitmodules                                   |   6 -
 Arduino/McLighting/McLighting.ino             |  82 +--
 Arduino/McLighting/definitions.h              |  15 +-
 .../mode_custom_ws2812fx_animations.h         |   1 -
 Arduino/McLighting/request_handlers.h         | 432 ++++++++-------
 Arduino/McLighting/version_info.ino           |   5 +-
 clients/HomeAssistant/light.yaml              |   7 +-
 clients/homebridge/config.json                |   4 +-
 clients/newWebClient/favicon.ico              | Bin 1150 -> 0 bytes
 clients/newWebClient/index.htm.gz             | Bin 19973 -> 0 bytes
 clients/web(RGBW)/README.md                   |   4 -
 clients/web(RGBW)/build/index.htm             | 491 ------------------
 clients/web(RGBW)/gulpfile.js                 |  55 --
 clients/web(RGBW)/package.json                |  18 -
 clients/web(RGBW)/src/index.htm               | 159 ------
 clients/web(RGBW)/src/js/script.js            | 331 ------------
 clients/web/README.md                         |   4 -
 clients/web/apple-touch-icon.png              | Bin 0 -> 4500 bytes
 clients/web/build/index.htm                   | 466 -----------------
 clients/{newWebClient => web}/edit.htm        |   0
 clients/{newWebClient => web}/edit.htm.gz     | Bin
 clients/web/favicon.ico                       | Bin 0 -> 34494 bytes
 clients/web/graphs.js.gz                      | Bin 0 -> 1971 bytes
 clients/web/gulpfile.js                       |  55 --
 clients/{newWebClient => web}/index.htm       | 187 +++----
 clients/web/index.htm.gz                      | Bin 0 -> 19755 bytes
 clients/web/package.json                      |  18 -
 clients/web/src/index.htm                     | 162 ------
 clients/web/src/js/script.js                  | 305 -----------
 29 files changed, 339 insertions(+), 2468 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 100644 clients/newWebClient/favicon.ico
 delete mode 100644 clients/newWebClient/index.htm.gz
 delete mode 100644 clients/web(RGBW)/README.md
 delete mode 100644 clients/web(RGBW)/build/index.htm
 delete mode 100644 clients/web(RGBW)/gulpfile.js
 delete mode 100644 clients/web(RGBW)/package.json
 delete mode 100644 clients/web(RGBW)/src/index.htm
 delete mode 100644 clients/web(RGBW)/src/js/script.js
 delete mode 100644 clients/web/README.md
 create mode 100644 clients/web/apple-touch-icon.png
 delete mode 100644 clients/web/build/index.htm
 rename clients/{newWebClient => web}/edit.htm (100%)
 rename clients/{newWebClient => web}/edit.htm.gz (100%)
 create mode 100644 clients/web/favicon.ico
 create mode 100644 clients/web/graphs.js.gz
 delete mode 100644 clients/web/gulpfile.js
 rename clients/{newWebClient => web}/index.htm (93%)
 create mode 100644 clients/web/index.htm.gz
 delete mode 100644 clients/web/package.json
 delete mode 100644 clients/web/src/index.htm
 delete mode 100644 clients/web/src/js/script.js

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e764857..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,6 +0,0 @@
-[submodule "Arduino/McLighting/data/McLightingUI"]
-	path = Arduino/McLighting/data/McLightingUI
-	url = https://github.com/toblum/McLightingUI
-[submodule "clients/web/McLightingUI"]
-	path = clients/web/McLightingUI
-	url = https://github.com/toblum/McLightingUI
diff --git a/Arduino/McLighting/McLighting.ino b/Arduino/McLighting/McLighting.ino
index 8a962cb..13e245e 100644
--- a/Arduino/McLighting/McLighting.ino
+++ b/Arduino/McLighting/McLighting.ino
@@ -671,8 +671,6 @@ void setup() {
   #if defined(ENABLE_REMOTE)
     irrecv.enableIRIn();  // Start the receiver
   #endif
-  snprintf(last_state, sizeof(last_state), "STA|%2d|%3d|%3d|%3d|%3d|%3d|%3d|%3d|%3d|%3d|%3d|%3d|%3d|%3d|%3d|%3d", mode, ws2812fx_mode, ws2812fx_speed, brightness, main_color.red, main_color.green, main_color.blue, main_color.white, back_color.red, back_color.green, back_color.blue, back_color.white, xtra_color.red, xtra_color.green, xtra_color.blue,xtra_color.white);
-  last_state[sizeof(last_state)]= 0x00;
   ws2812fx_speed_actual = ws2812fx_speed;
   brightness_trans = brightness;
   memcpy(hex_colors, hex_colors_trans, sizeof(hex_colors_trans));
@@ -777,48 +775,43 @@ void loop() {
   
   if (mode == SET) {
     mode = HOLD;
+    // Mode
     if (ws2812fx_mode !=  strip->getMode(selected_segment)) {  // SET_MODE
-    #if defined(ENABLE_MQTT)
-      snprintf(mqtt_buf, sizeof(mqtt_buf), "OK /%i", ws2812fx_mode);
-    #endif
+      #if defined(ENABLE_MQTT)
+        snprintf(mqtt_buf, sizeof(mqtt_buf), "OK /%i", ws2812fx_mode);
+      #endif
       strip->strip_off();
       autoCount = 0;
       autoDelay = 0;
       strip->setMode(selected_segment, ws2812fx_mode);
     }
+    //Color
+    /*if (memcmp(hex_colors_trans, strip->getColors(selected_segment), sizeof(hex_colors_trans)) != 0) {
+     
+    }*/
+    // Brightness
     if (strip->getBrightness() != brightness) {
       #if defined(ENABLE_MQTT)
         snprintf(mqtt_buf, sizeof(mqtt_buf), "OK %%%i", brightness);
       #endif
       brightness_trans = brightness;
     }
+    // Speed
+    if (ws2812fx_speed_actual != ws2812fx_speed) {
+      #if defined(ENABLE_MQTT)
+        snprintf(mqtt_buf, sizeof(mqtt_buf), "OK ?%i", ws2812fx_speed);
+      #endif
+    }
     prevmode = SET;
     strip->trigger();
   }  
-     
-  /*if (mode == SET) {
-    mode = HOLD;
-    if (trans_cnt==0) { trans_cnt=1;   }
-    if (!transEffect) { trans_cnt=255; }
-    convertColorsFade();
-    prevmode = SET;
-  }*/
-  
-  if (mode == SET_SPEED) {
-    #if defined(ENABLE_MQTT)
-      snprintf(mqtt_buf, sizeof(mqtt_buf), "OK ?%i", ws2812fx_speed);
-    #endif
-    mode = prevmode;
-    prevmode = SET_SPEED;
-  }
  
   if (prevmode != mode) {
     convertColors();
     if (memcmp(hex_colors_trans, strip->getColors(selected_segment), sizeof(hex_colors_trans)) != 0) {
       DBG_OUTPUT_PORT.println("Colors not equal!");
-      if (trans_cnt==0) { trans_cnt=1;   }
-      if (!transEffect) { trans_cnt=255; }
       convertColorsFade();
+      trans_cnt = 1;
     }
     strip->setSpeed(selected_segment, convertSpeed(ws2812fx_speed_actual));
     //strip->setBrightness(brightness_actual);       
@@ -873,7 +866,7 @@ void loop() {
     }
   #endif
 
-  if ((mode == HOLD) || ((mode == OFF) && ((strip->getBrightness() == 0) || !transEffect))) { 
+  if ((mode == HOLD) || ((mode == OFF) && (strip->getBrightness() > 0) && transEffect)) { 
     if (ws2812fx_mode == FX_MODE_CUSTOM_0) {
       handleAutoPlay();
     }
@@ -882,26 +875,33 @@ void loop() {
   }
   
   // Async color transition
-  if ((trans_cnt > 0) && (trans_cnt < 255)) {
-    uint32_t hex_colors_actual[3] = {};
-    if ((transEffect) && (colorFadeDelay <= millis())) {
-      hex_colors_actual[0] = trans(hex_colors_trans[0], hex_colors[0], trans_cnt);
-      hex_colors_actual[1] = trans(hex_colors_trans[1], hex_colors[1], trans_cnt);
-      hex_colors_actual[2] = trans(hex_colors_trans[2], hex_colors[2], trans_cnt);
-      strip->setColors(selected_segment, hex_colors_actual);
-      trans_cnt++;
-      colorFadeDelay = millis() + TRANS_COLOR_DELAY;
+  if (memcmp(hex_colors_trans, strip->getColors(selected_segment), sizeof(hex_colors_trans)) != 0) {
+    if (transEffect) {
+      if ((trans_cnt > 0) && (trans_cnt < trans_cnt_max)) {
+        if (colorFadeDelay <= millis()) {
+          uint32_t hex_colors_actual[3] = {};
+          hex_colors_actual[0] = trans(hex_colors_trans[0], hex_colors[0], trans_cnt);
+          hex_colors_actual[1] = trans(hex_colors_trans[1], hex_colors[1], trans_cnt);
+          hex_colors_actual[2] = trans(hex_colors_trans[2], hex_colors[2], trans_cnt);
+          strip->setColors(selected_segment, hex_colors_actual);
+          trans_cnt++;
+          colorFadeDelay = millis() + TRANS_COLOR_DELAY;
+          if (mode == HOLD) strip->trigger();
+        }
+      } else if (trans_cnt >= trans_cnt_max) {
+        memcpy(hex_colors, hex_colors_trans, sizeof(hex_colors_trans));
+        strip->setColors(selected_segment, hex_colors);
+        if (mode == HOLD) strip->trigger();
+        trans_cnt = 0;
+        DBG_OUTPUT_PORT.println("Color transition finished!");
+      }
+    } else {
+      memcpy(hex_colors, hex_colors_trans, sizeof(hex_colors_trans));
+      strip->setColors(selected_segment, hex_colors);
       if (mode == HOLD) strip->trigger();
+      trans_cnt = 0;
     }
   }
-  if (trans_cnt > 254) {
-    memcpy(hex_colors, hex_colors_trans, sizeof(hex_colors_trans));
-    strip->setColors(selected_segment, hex_colors);
-    if (mode == HOLD) strip->trigger();
-    trans_cnt = 0;
-    DBG_OUTPUT_PORT.println("Color transition finished!");
-  }
-  
   // Async speed transition
   if (ws2812fx_speed_actual != ws2812fx_speed) {
     if (transEffect) {
diff --git a/Arduino/McLighting/definitions.h b/Arduino/McLighting/definitions.h
index 6ef1856..9ad718a 100644
--- a/Arduino/McLighting/definitions.h
+++ b/Arduino/McLighting/definitions.h
@@ -21,11 +21,11 @@ char HOSTNAME[65] = "McLightingRGBW"; // Friedly hostname  is configurable just
 #define ENABLE_HOMEASSISTANT          // If defined, enable Homeassistant integration, ENABLE_MQTT must be active
 #define MQTT_HOME_ASSISTANT_SUPPORT   // If defined, use AMQTT and select Tools -> IwIP Variant -> Higher Bandwidth
 #define ENABLE_BUTTON 14              // If defined, enable button handling code, see: https://github.com/toblum/McLighting/wiki/Button-control, the value defines the input pin (14 / D5) for switching the LED strip on / off, connect this PIN to ground to trigger button.
-#define ENABLE_BUTTON_GY33 12         // If defined, enable button handling code for GY-33 color sensor to scan color. The value defines the input pin (12 / D6) for read color data with RGB sensor, connect this PIN to ground to trigger button.
+//#define ENABLE_BUTTON_GY33 12         // If defined, enable button handling code for GY-33 color sensor to scan color. The value defines the input pin (12 / D6) for read color data with RGB sensor, connect this PIN to ground to trigger button.
 #if defined(ENABLE_BUTTON_GY33)
   #define GAMMA 2.5                   // Gamma correction for GY-33 sensor
 #endif
-//#define ENABLE_REMOTE 13              // If defined, enable Remote Control via TSOP31238. The value defines the input pin (13 / D7) for TSOP31238 Out 
+#define ENABLE_REMOTE 13              // If defined, enable Remote Control via TSOP31238. The value defines the input pin (13 / D7) for TSOP31238 Out 
 
 #define ENABLE_STATE_SAVE 1           // If defined, load saved state on reboot and save state. If set to 0 from EEPROM, if set to 1 from SPIFFS
 
@@ -35,12 +35,13 @@ char HOSTNAME[65] = "McLightingRGBW"; // Friedly hostname  is configurable just
 #define TRANS_COLOR_DELAY 5            // Delay for color transition
 #define TRANS_DELAY 10                 // Delay for brightness and speed transition
 
-bool          transEffect  = false;    // Experimental: Enable transitions of color, brightness and speed. It does not work properly for all effects.
+bool          transEffect         = false;    // Experimental: Enable transitions of color, brightness and speed. It does not work properly for all effects.
 bool          transEffectOverride = false;
-uint8_t       trans_cnt = 0;
-unsigned long colorFadeDelay = 0;
+uint8_t       trans_cnt           = 0;
+int           trans_cnt_max       = 0;
+unsigned long colorFadeDelay      = 0;
 unsigned long brightnessFadeDelay = 0;
-unsigned long speedFadeDelay = 0;
+unsigned long speedFadeDelay      = 0;
 
 #if defined(CUSTOM_WS2812FX_ANIMATIONS)
   #define MULTICAST false
@@ -140,7 +141,7 @@ uint32_t autoParams[][6] = {   // main_color, back_color, xtra_color, speed, mod
 #define DBG_OUTPUT_PORT Serial  // Set debug output port
 
 // List of all color modes
-enum MODE {OFF, HOLD, SET, SET_SPEED, INIT_STRIP};
+enum MODE {OFF, HOLD, SET, INIT_STRIP};
 MODE mode = SET;           // Standard mode that is active when software starts
 MODE prevmode = HOLD;          // Do not change
 
diff --git a/Arduino/McLighting/mode_custom_ws2812fx_animations.h b/Arduino/McLighting/mode_custom_ws2812fx_animations.h
index 8b345aa..a851d82 100644
--- a/Arduino/McLighting/mode_custom_ws2812fx_animations.h
+++ b/Arduino/McLighting/mode_custom_ws2812fx_animations.h
@@ -150,7 +150,6 @@ void handleE131(){
   }
 }
 
-
 #include <FastLED.h>  //https://github.com/FastLED/FastLED
 /*
  * paste in the Fire2012 code with a small edit at the end which uses the
diff --git a/Arduino/McLighting/request_handlers.h b/Arduino/McLighting/request_handlers.h
index 95bcc98..9e73264 100644
--- a/Arduino/McLighting/request_handlers.h
+++ b/Arduino/McLighting/request_handlers.h
@@ -17,38 +17,33 @@ void convertColors() {
   hex_colors_trans[2] = (uint32_t)(xtra_color.white << 24) | (xtra_color.red << 16) | (xtra_color.green << 8) | xtra_color.blue;
 }
 
-void convertColorsFade() {
-  if ((transEffect) && (trans_cnt > 1) && (trans_cnt < 254)) {
-    memcpy(hex_colors, strip->getColors(selected_segment), sizeof(strip->getColors(selected_segment)));
-    DBG_OUTPUT_PORT.println("Color transistion aborted. Restarting...!");
-    trans_cnt = 1;
-  } else {
-    //memcpy(hex_colors, hex_colors_trans, sizeof(hex_colors_trans));
-  }
-}
-
-uint8_t calculateColorTransitionSteps () {
+void calculateColorTransitionSteps() {
   //compare all colors and calculate steps
-  int     trans_cnt_max = 0;
+  trans_cnt_max = 0;
   int     calculate_max[4] = {};
   for (uint8_t i=0; i<3; i++){
-    DBG_OUTPUT_PORT.printf("i: %i\r\n", i);
     for (uint8_t j=0; j<4; j++) {
-      DBG_OUTPUT_PORT.printf("j: %i\r\n", j);
       calculate_max[j] = ((hex_colors[i] >> ((3-j)*8)) & 0xFF) - ((hex_colors_trans[i] >> ((3-j)*8)) & 0xFF);
       calculate_max[j] = abs(calculate_max[j]);
       trans_cnt_max = max(trans_cnt_max, calculate_max[j]);
-     DBG_OUTPUT_PORT.printf("calcmax: %i %i\r\n", j, calculate_max[j]);
     }
   }
-  DBG_OUTPUT_PORT.printf("max: %i\r\n", trans_cnt_max);
-  return trans_cnt_max;
 }
 
-
+void convertColorsFade() {
+  if (transEffect) {
+      if (trans_cnt > 1) {
+        memcpy(hex_colors, strip->getColors(selected_segment), sizeof(hex_colors));
+        DBG_OUTPUT_PORT.println("Color transistion aborted. Restarting...!");
+        trans_cnt = 1;
+      }
+    calculateColorTransitionSteps();
+  }
+}
 
 void getArgs() {
   if (mode == SET) {
+    //color wrgb
     if (server.arg("rgb") != "") {
       uint32_t rgb = (uint32_t) strtoul(server.arg("rgb").c_str(), NULL, 16);
       main_color.white = ((rgb >> 24) & 0xFF);
@@ -121,17 +116,16 @@ void getArgs() {
     xtra_color.green = constrain(xtra_color.green, 0, 255);
     xtra_color.blue = constrain(xtra_color.blue, 0, 255);
     xtra_color.white = constrain(xtra_color.white, 0, 255);
-  }
-  if (mode == SET || mode == SET_SPEED) {
+    // Speed
     if ((server.arg("s") != "") && (server.arg("s").toInt() >= 0) && (server.arg("s").toInt() <= 255)) {
-    ws2812fx_speed = constrain(server.arg("s").toInt(), 0, 255);
+      ws2812fx_speed = constrain(server.arg("s").toInt(), 0, 255);
     }
-  }
-  if (mode == SET) {
+    //Mode
     if ((server.arg("m") != "") && (server.arg("m").toInt() >= 0) && (server.arg("m").toInt() <= strip->getModeCount())) {
       ws2812fx_mode = constrain(server.arg("m").toInt(), 0, strip->getModeCount() - 1);
     }
-    if ((server.arg("c") != "") && (server.arg("c").toInt() >= 0) && (server.arg("c").toInt() <= 100)) {
+    // Brightness
+    if ((server.arg("c") != "") && (server.arg("c").toInt() >= 0) && (server.arg("c").toInt() <= 100)) { 
       brightness = constrain((int) server.arg("c").toInt() * 2.55, 0, 255);
     } else if ((server.arg("p") != "") && (server.arg("p").toInt() >= 0) && (server.arg("p").toInt() <= 255)) {
       brightness = constrain(server.arg("p").toInt(), 0, 255);
@@ -204,9 +198,9 @@ void handleSetAllMode(uint8_t * mypayload) {
 
 void handleSetSingleLED(uint8_t * mypayload, uint8_t firstChar = 0) {
   // decode led index
-  char templed[3];
-  strncpy (templed, (const char *) &mypayload[firstChar], 2 );
-  templed[2] = 0x00;
+  char templed[5];
+  strncpy (templed, (const char *) &mypayload[firstChar], 4 );
+  templed[4] = 0x00;
   uint8_t led = atoi(templed);
 
   DBG_OUTPUT_PORT.printf("led value: [%i]. Entry threshold: <= [%i] (=> %s)\r\n", led, WS2812FXStripSettings.stripSize, mypayload );
@@ -215,10 +209,10 @@ void handleSetSingleLED(uint8_t * mypayload, uint8_t firstChar = 0) {
     char greenhex[3];
     char bluehex[3];
     char whitehex[3];
-    strncpy (whitehex, (const char *) &mypayload[2 + firstChar], 2 );
-    strncpy (redhex, (const char *) &mypayload[4 + firstChar], 2 );
-    strncpy (greenhex, (const char *) &mypayload[6 + firstChar], 2 );
-    strncpy (bluehex, (const char *) &mypayload[8 + firstChar], 2 );
+    strncpy (whitehex, (const char *) &mypayload[4 + firstChar], 2 );
+    strncpy (redhex, (const char *) &mypayload[6 + firstChar], 2 );
+    strncpy (greenhex, (const char *) &mypayload[8 + firstChar], 2 );
+    strncpy (bluehex, (const char *) &mypayload[10 + firstChar], 2 );
     whitehex[2] = 0x00;
     redhex[2] = 0x00;
     greenhex[2] = 0x00;
@@ -260,26 +254,26 @@ void handleSetDifferentColors(uint8_t * mypayload) {
 void handleRangeDifferentColors(uint8_t * mypayload) {
   uint8_t* nextCommand = 0;
   nextCommand = (uint8_t*) strtok((char*) mypayload, "R");
-  // While there is a range to process R0110<00ff00>
+  // While there is a range to process R00010010<0000ff00> 
 
   while (nextCommand) {
     // Loop for each LED.
-    char startled[4];
-    char endled[4];
+    char startled[5];
+    char endled[5];
     char colorval[9];
-    strncpy ( startled, (const char *) &nextCommand[0], 2 );
-    startled[3] = 0x00;
-    strncpy ( endled, (const char *) &nextCommand[2], 2 );
-    endled[3] = 0x00;
-    strncpy ( colorval, (const char *) &nextCommand[4], 8 );
+    strncpy ( startled, (const char *) &nextCommand[0], 4 );
+    startled[4] = 0x00;
+    strncpy ( endled, (const char *) &nextCommand[4], 4 );
+    endled[4] = 0x00;
+    strncpy ( colorval, (const char *) &nextCommand[8], 8 );
     colorval[8] = 0x00;
     uint8_t rangebegin = atoi(startled);
     uint8_t rangeend = atoi(endled);
     DBG_OUTPUT_PORT.printf("Setting RANGE from [%i] to [%i] as color [%s]\r\n", rangebegin, rangeend, colorval);
 
     while ( rangebegin <= rangeend ) {
-      char rangeData[11];
-      snprintf(rangeData, sizeof(rangeData), "%02d%s", rangebegin, colorval);
+      char rangeData[18];
+      snprintf(rangeData, sizeof(rangeData), "%04d%s", rangebegin, colorval);
       rangeData[sizeof(rangeData) - 1] = 0x00;
       // Set one LED
       handleSetSingleLED((uint8_t*) rangeData, 0);
@@ -472,6 +466,9 @@ void handleSetWS2812FXMode(uint8_t * mypayload) {
     if (strcmp((char *) &mypayload[1], "off") == 0) {
       mode = OFF;
     }
+    if (strcmp((char *) &mypayload[1], "on") == 0) {
+      mode = HOLD;
+    }
   }    
 }
 
@@ -646,7 +643,7 @@ void checkpayload(uint8_t * payload, bool mqtt = false, uint8_t num = 0) {
   if (payload[0] == '?') {
     uint8_t d = (uint8_t) strtol((const char *) &payload[1], NULL, 10);
     ws2812fx_speed = constrain(d, 0, 255);
-    mode = SET_SPEED;
+    mode = SET;
     Dbg_Prefix(mqtt, num);
     DBG_OUTPUT_PORT.printf("Set speed to: [%u]\r\n", ws2812fx_speed);
   }
@@ -1059,7 +1056,7 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
         uint8_t json_speed = constrain((uint8_t) root["speed"], 0, 255);
         if (json_speed != ws2812fx_speed) {
           ws2812fx_speed = json_speed;
-          mode = SET_SPEED;
+          mode = SET;
         }
       }
 
@@ -1663,7 +1660,7 @@ void handleRemote() {
           mode = OFF;
         }
       }
-      if ((mode != AUTO) && (mode != OFF)) {
+      if (mode == HOLD) {
         if (results.value == rmt_commands[BRIGHTNESS_UP]) { //Brightness Up
           last_remote_cmd = results.value;
           if (brightness + chng <= 255) {
@@ -1678,204 +1675,204 @@ void handleRemote() {
             mode = SET;
           }
         }
-      }
-      if ((mode !=AUTO) && (mode != OFF)) {
-        if (results.value == rmt_commands[SPEED_UP]) { //Speed Up
-          last_remote_cmd = results.value;
-          if (ws2812fx_speed + chng <= 255) {
-            ws2812fx_speed = ws2812fx_speed + chng;
-            mode = SET_SPEED;
-          }
-        }
-        if (results.value == rmt_commands[SPEED_DOWN]) { //Speed down
-          last_remote_cmd = results.value;
-          if (ws2812fx_speed - chng >= 0) {
-            ws2812fx_speed = ws2812fx_speed - chng;
-            mode = SET_SPEED;
-          }
-        }
-      }
-      if (mode == HOLD) {
-        if (results.value == rmt_commands[RED_UP]) { //Red Up
-          last_remote_cmd = results.value;
-          if (selected_color == 1) {
-            if (main_color.red + chng <= 255) {
-              main_color.red = main_color.red + chng;
+        if ((ws2812fx_mode < 56) || (ws2812fx_mode > 57)) {
+          if (results.value == rmt_commands[SPEED_UP]) { //Speed Up
+            last_remote_cmd = results.value;
+            if (ws2812fx_speed + chng <= 255) {
+              ws2812fx_speed = ws2812fx_speed + chng;
               mode = SET;
             }
           }
-          if (selected_color == 2) {
-            if (back_color.red + chng <= 255) {
-              back_color.red = back_color.red + chng;
-              mode = SET;
-            }
-          }
-          if (selected_color == 3) {
-            if (xtra_color.red + chng <= 255) {
-              xtra_color.red = xtra_color.red + chng;
+          if (results.value == rmt_commands[SPEED_DOWN]) { //Speed down
+            last_remote_cmd = results.value;
+            if (ws2812fx_speed - chng >= 0) {
+              ws2812fx_speed = ws2812fx_speed - chng;
               mode = SET;
             }
           }
         }
-        if (results.value == rmt_commands[RED_DOWN]) { //Red down
-          last_remote_cmd = results.value;
-          if (selected_color == 1) {
-            if (main_color.red - chng >= 0) {
-              main_color.red = main_color.red - chng;
-              mode = SET; 
+        if ((ws2812fx_mode < 56) || (ws2812fx_mode > 60)) {        
+          if (results.value == rmt_commands[RED_UP]) { //Red Up
+            last_remote_cmd = results.value;
+            if (selected_color == 1) {
+              if (main_color.red + chng <= 255) {
+                main_color.red = main_color.red + chng;
+                mode = SET;
+              }
+            }
+            if (selected_color == 2) {
+              if (back_color.red + chng <= 255) {
+                back_color.red = back_color.red + chng;
+                mode = SET;
+              }
+            }
+            if (selected_color == 3) {
+              if (xtra_color.red + chng <= 255) {
+                xtra_color.red = xtra_color.red + chng;
+                mode = SET;
+              }
             }
           }
-          if (selected_color == 2) {
-            if (back_color.red - chng >= 0) {
-              back_color.red = back_color.red - chng;
-              mode = SET;
+          if (results.value == rmt_commands[RED_DOWN]) { //Red down
+            last_remote_cmd = results.value;
+            if (selected_color == 1) {
+              if (main_color.red - chng >= 0) {
+                main_color.red = main_color.red - chng;
+                mode = SET; 
+              }
+            }
+            if (selected_color == 2) {
+              if (back_color.red - chng >= 0) {
+                back_color.red = back_color.red - chng;
+                mode = SET;
+              }
+            }
+            if (selected_color == 3) {
+              if (xtra_color.red - chng >= 0) {
+                xtra_color.red = xtra_color.red - chng;
+                mode = SET;
+              }
             }
           }
-          if (selected_color == 3) {
-            if (xtra_color.red - chng >= 0) {
-              xtra_color.red = xtra_color.red - chng;
-              mode = SET;
+          if (results.value == rmt_commands[GREEN_UP]) { //Green Up
+            last_remote_cmd = results.value;
+            if (selected_color == 1) {
+              if (main_color.green + chng <= 255) {
+                main_color.green = main_color.green + chng;
+                mode = SET;
+              }
+            }
+            if (selected_color == 2) {
+              if (back_color.green + chng <= 255) {
+                back_color.green = back_color.green + chng;
+                mode = SET;
+              }
+            }
+            if (selected_color == 3) {
+              if (xtra_color.green + chng <= 255) {
+                xtra_color.green = xtra_color.green + chng;
+                mode = SET;
+              }
             }
           }
-        }
-        if (results.value == rmt_commands[GREEN_UP]) { //Green Up
-          last_remote_cmd = results.value;
-          if (selected_color == 1) {
-            if (main_color.green + chng <= 255) {
-              main_color.green = main_color.green + chng;
-              mode = SET;
+          if (results.value == rmt_commands[GREEN_DOWN]) { //Green down
+            last_remote_cmd = results.value;
+            if (selected_color == 1) {
+              if (main_color.green - chng >= 0) {
+                main_color.green = main_color.green - chng;;
+                mode = SET; 
+              }
+            }
+            if (selected_color == 2) {
+              if (back_color.green - chng >= 0) {
+                back_color.green = back_color.green - chng;
+                mode = SET;
+              }
+            }
+            if (selected_color == 3) {
+              if (xtra_color.green - chng >= 0) {
+                xtra_color.green = xtra_color.green - chng;
+                mode = SET;
+              }
             }
           }
-          if (selected_color == 2) {
-            if (back_color.green + chng <= 255) {
-              back_color.green = back_color.green + chng;
-              mode = SET;
+          if (results.value == rmt_commands[BLUE_UP]) { //Blue Up
+            last_remote_cmd = results.value;
+            if (selected_color == 1) {
+              if (main_color.blue + chng <= 255) {
+                main_color.blue = main_color.blue + chng;
+                mode = SET;
+              }
+            }
+            if (selected_color == 2) {
+              if (back_color.blue + chng <= 255) {
+                back_color.blue = back_color.blue + chng;
+                mode = SET;
+              }
+            }
+            if (selected_color == 3) {
+              if (xtra_color.blue + chng <= 255) {
+                xtra_color.blue = xtra_color.blue + chng;
+                mode = SET;
+              }
             }
           }
-          if (selected_color == 3) {
-            if (xtra_color.green + chng <= 255) {
-              xtra_color.green = xtra_color.green + chng;
-              mode = SET;
+          if (results.value == rmt_commands[BLUE_DOWN]) { //Blue down
+            last_remote_cmd = results.value;
+            if (selected_color == 1) {
+              if (main_color.blue - chng >= 0) {
+                main_color.blue = main_color.blue - chng;
+                mode = SET; 
+              }
+            }
+            if (selected_color == 2) {
+              if (back_color.blue - chng >= 0) {
+                back_color.blue = back_color.blue - chng;
+                mode = SET;
+              }
+            }
+            if (selected_color == 3) {
+              if (xtra_color.blue - chng >= 0) {
+                xtra_color.blue = xtra_color.blue - chng;
+                mode = SET;
+              }
             }
           }
-        }
-        if (results.value == rmt_commands[GREEN_DOWN]) { //green down
-          last_remote_cmd = results.value;
-          if (selected_color == 1) {
-            if (main_color.green - chng >= 0) {
-              main_color.green = main_color.green - chng;;
-              mode = SET; 
+          if (results.value == rmt_commands[WHITE_UP]) { //White Up
+            last_remote_cmd = results.value;
+            if (selected_color == 1) {
+              if (main_color.white + chng <= 255) {
+                main_color.white = main_color.white + chng;
+                mode = SET;
+              }
+            }
+            if (selected_color == 2) {
+              if (back_color.white + chng <= 255) {
+                back_color.white = back_color.white + chng;
+                mode = SET;
+              }
+            }
+            if (selected_color == 3) {
+              if (xtra_color.white + chng <= 255) {
+                xtra_color.white = xtra_color.white + chng;
+                mode = SET;
+              }
             }
           }
-          if (selected_color == 2) {
-            if (back_color.green - chng >= 0) {
-              back_color.green = back_color.green - chng;
-              mode = SET;
+          if (results.value == rmt_commands[WHITE_DOWN]) { //White down
+            last_remote_cmd = results.value;
+            if (selected_color == 1) {
+              if (main_color.white - chng >= 0) {
+                main_color.white = main_color.white - chng;
+                mode = SET; 
+              }
+            }
+            if (selected_color == 2) {
+              if (back_color.white - chng >= 0) {
+                back_color.white = back_color.white - chng;
+                mode = SET;
+              }
+            }
+            if (selected_color == 3) {
+              if (xtra_color.white - chng >= 0) {
+                xtra_color.white = xtra_color.white - chng;
+                mode = SET;
+              }
             }
           }
-          if (selected_color == 3) {
-            if (xtra_color.green - chng >= 0) {
-              xtra_color.green = xtra_color.green - chng;
-              mode = SET;
-            }
+          if (results.value == rmt_commands[COL_M]) { // Select Main Color
+            last_remote_cmd = 0;
+            selected_color = 1;
+          } 
+          if (results.value == rmt_commands[COL_B]) { // Select Back Color
+            last_remote_cmd = 0;
+            selected_color = 2;
+          } 
+          if (results.value == rmt_commands[COL_X]) { // Select Extra Color
+            last_remote_cmd = 0;
+            selected_color = 3;
           }
         }
-        if (results.value == rmt_commands[BLUE_UP]) { //Blue Up
-          last_remote_cmd = results.value;
-          if (selected_color == 1) {
-            if (main_color.blue + chng <= 255) {
-              main_color.blue = main_color.blue + chng;
-              mode = SET;
-            }
-          }
-          if (selected_color == 2) {
-            if (back_color.blue + chng <= 255) {
-              back_color.blue = back_color.blue + chng;
-              mode = SET;
-            }
-          }
-          if (selected_color == 3) {
-            if (xtra_color.blue + chng <= 255) {
-              xtra_color.blue = xtra_color.blue + chng;
-              mode = SET;
-            }
-          }
-        }
-        if (results.value == rmt_commands[BLUE_DOWN]) { //BLUE down
-          last_remote_cmd = results.value;
-          if (selected_color == 1) {
-            if (main_color.blue - chng >= 0) {
-              main_color.blue = main_color.blue - chng;
-              mode = SET; 
-            }
-          }
-          if (selected_color == 2) {
-            if (back_color.blue - chng >= 0) {
-              back_color.blue = back_color.blue - chng;
-              mode = SET;
-            }
-          }
-          if (selected_color == 3) {
-            if (xtra_color.blue - chng >= 0) {
-              xtra_color.blue = xtra_color.blue - chng;
-              mode = SET;
-            }
-          }
-        }
-        if (results.value == rmt_commands[WHITE_UP]) { //White Up
-          last_remote_cmd = results.value;
-          if (selected_color == 1) {
-            if (main_color.white + chng <= 255) {
-              main_color.white = main_color.white + chng;
-              mode = SET;
-            }
-          }
-          if (selected_color == 2) {
-            if (back_color.white + chng <= 255) {
-              back_color.white = back_color.white + chng;
-              mode = SET;
-            }
-          }
-          if (selected_color == 3) {
-            if (xtra_color.white + chng <= 255) {
-              xtra_color.white = xtra_color.white + chng;
-              mode = SET;
-            }
-          }
-        }
-        if (results.value == rmt_commands[WHITE_DOWN]) { //White down
-          last_remote_cmd = results.value;
-          if (selected_color == 1) {
-            if (main_color.white - chng >= 0) {
-              main_color.white = main_color.white - chng;
-              mode = SET; 
-            }
-          }
-          if (selected_color == 2) {
-            if (back_color.white - chng >= 0) {
-              back_color.white = back_color.white - chng;
-              mode = SET;
-            }
-          }
-          if (selected_color == 3) {
-            if (xtra_color.white - chng >= 0) {
-              xtra_color.white = xtra_color.white - chng;
-              mode = SET;
-            }
-          }
-        }
-        if (results.value == rmt_commands[COL_M]) { // Select Main Color
-          last_remote_cmd = 0;
-          selected_color = 1;
-        } 
-        if (results.value == rmt_commands[COL_B]) { // Select Back Color
-          last_remote_cmd = 0;
-          selected_color = 2;
-        } 
-        if (results.value == rmt_commands[COL_X]) { // Select Extra Color
-          last_remote_cmd = 0;
-          selected_color = 3;
-        }
       } // end of if HOLD
       if (results.value == rmt_commands[MODE_UP]) { //Mode Up
         last_remote_cmd = results.value;
@@ -1937,6 +1934,7 @@ uint32_t scale_wrgb(uint32_t wrgb, uint8_t level) {
 }
 
 uint32_t trans(uint32_t newcolor, uint32_t oldcolor, uint8_t level) {
+  level = (level * (255/trans_cnt_max));
   newcolor = scale_wrgb(newcolor, level);
   oldcolor = scale_wrgb(oldcolor, 255-level);
   return newcolor + oldcolor;
diff --git a/Arduino/McLighting/version_info.ino b/Arduino/McLighting/version_info.ino
index 1bee4b4..cd572df 100644
--- a/Arduino/McLighting/version_info.ino
+++ b/Arduino/McLighting/version_info.ino
@@ -172,7 +172,7 @@
  * adressed issue: https://github.com/toblum/McLighting/issues/403 (Experimental Support of transitions: set transEffect = true in definitions.h)
  * corrected use of DMA for Neopixelbus by Makuna (Tests for other strips than SK6812 GRBW were not made)
  * 
-  * 27 September 2019
+ * 27 September 2019
  * Version Bump to 3.0.0.ALPHA1
  * removed LEGACY_ANIMATIONS
  * removed old Custom Animations from beginning of list.
@@ -184,4 +184,7 @@
  * moved Custom Animation 'Gradients' to number 61
  * REST-API changes (will be documented soon)
  *
+ * 29 September 2019
+ * Version Bump to 3.0.0.BETA1
+ * further code changes 
  */
diff --git a/clients/HomeAssistant/light.yaml b/clients/HomeAssistant/light.yaml
index 72543f1..061f4a7 100644
--- a/clients/HomeAssistant/light.yaml
+++ b/clients/HomeAssistant/light.yaml
@@ -64,7 +64,12 @@ light:
       - "Bicolor Chase"
       - "Tricolor Chase"
       - "ICU"
-      - "E131"
+      - "AutoPlay"
+      - "Custom WS"
+      - "TV"
+      - "E1.31"
+      - "Fire(2012)"
+      - "Gradient"
     brightness: true
     color_temp: true
     rgb: true
diff --git a/clients/homebridge/config.json b/clients/homebridge/config.json
index 239959b..7adf230 100644
--- a/clients/homebridge/config.json
+++ b/clients/homebridge/config.json
@@ -22,12 +22,12 @@
 
                         "brightness": {
                                 "status": "http://<ESP_HOST>/get_brightness",
-                                "url": "http://<ESP_HOST>/set_brightness?c=%s"
+                                "url": "http://<ESP_HOST>/set?c=%s"
                         },
 
                         "color": {
                                 "status": "http://<ESP_HOST>/get_color",
-                                "url": "http://<ESP_HOST>/all?rgb=%s",
+                                "url": "http://<ESP_HOST>/set?m=0?rgb=%s",
                                 "brightness": true
                         }
                 }
diff --git a/clients/newWebClient/favicon.ico b/clients/newWebClient/favicon.ico
deleted file mode 100644
index 12e9deac79f3905e145ebb882854ba06f85357d0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1150
zcmah|ZAep57=Cu|w(I6tx>><$HVY}7N?+ur&KZ{|tthOBW%OYzg$hZ?=ts?xK9&?2
z&Y+Bj)sL>!k3Jxx59j^_5w#x~^mU^|s2QY!LV0~VcS|zu<6NF|InQ~Y_q^wQ-vema
zmzD-LJ5ZwqrU978z$nHfdG-U?o;5Xz#CqbS*Q<;Pxj7<yn*yk*3!{>uxH5q0d17LZ
zPuNUUs%s7BoaxdY+Ae7yUF*}lf2%<5Cp=_0)uUiTqz~B*5`;XLYCF+^uE17dY}+gw
zKV2m~y&&!z(|sHyJYZ-ZA#5YUq5;B`4jJ%PjOh&}7U;54-04kAWb3QlWd7Vt!jlU_
zTuU&D+WHWD469nBD2xrk&in}9iRU|Ho_D&n+BK>hQ^wXb$#E~AW;`t;^TpM@yqM=_
zeEQfKEZTIWF86EncX|aup^S_HvRDpFs@9kZaqdYWo`2s;v)b&#DTNkQJL!HZ$MfZW
zyFE5sR7B+QMB-MfQ?xBbprjp2>1_?o-o;0mnS~Q3%Q?=dhGX%1TceGQqZADGC>~E`
zz_}jbO*cWlTcDhc2&qQ@8dX*Gp;&B?y1V<Sy1Fjx@*#ZS0q9@^<lXXreI3)spAXXK
z7yVSbvo2h)5`nXwP_DlQ)gA?l9~OgQas(+q<3HkQjea;hO3#k>DC=2YWoAP>e*<y(
z3#h9T!(}4=n!h4lx&N9YHvF=f=t^-Up3U;dPBQJUhZKJY8j(TQPoTGGPQu5p`mtIr
z#A1IF*U|gftWcM2fNHGC`mI?3IOoAFwLl(t2zt{Dy0jKUI~<5EOF>A4A>>0&G>E-J
zckzU}xPCe&Nb+p0)9uwK`X_POk_D(ZR}DF`8+30i=yERTv>6oCq)`hBsU3UhD%$8E
z&d3YK_3yY$X|kunwS7LMqYKe@ItxmZ33NhZqDJH>`ylqMgD5%R_~ZLg{b-YIW3n3{
zx>6BXszbOGy6|F{12&ivxzd6gcO>w23ed>|4NR*-9egJsy#F04r;af@RikQu0B{>1
A)c^nh

diff --git a/clients/newWebClient/index.htm.gz b/clients/newWebClient/index.htm.gz
deleted file mode 100644
index 951285306aff190abefe75b74be775b34cbc417c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 19973
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

diff --git a/clients/web(RGBW)/README.md b/clients/web(RGBW)/README.md
deleted file mode 100644
index b7e7616..0000000
--- a/clients/web(RGBW)/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-## Retired, use:
-McLightingHTML from https://github.com/FabLab-Luenen/McLightingHTML
-
-or set #define USE_HTML_MIN_GZ in definitions.h to use the integrated!
diff --git a/clients/web(RGBW)/build/index.htm b/clients/web(RGBW)/build/index.htm
deleted file mode 100644
index e30b5d7..0000000
--- a/clients/web(RGBW)/build/index.htm
+++ /dev/null
@@ -1,491 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<!--Import Google Icon Font-->
-		<link href="http://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-		<!--Import materialize.css-->
-		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.min.css" media="screen,projection" />
-
-		<!--Let browser know website is optimized for mobile-->
-		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
-		<meta name="mobile-web-app-capable" content="yes">
-		<meta charset="utf-8"/>
-		<meta name="mobile-web-app-capable" content="yes">
-		<title>McLighting (RGBW) v2</title>
-	</head>
-
-	<body>
-		<nav class="blue light-blueXXX lighten-1XXX" role="navigation" id="mc-nav">
-			<div class="nav-wrapper container">
-				<a id="logo-container" href="#" class="brand-logo">McLighting (RGBW) v2</a>
-
-				<ul class="right hide-on-med-and-down">
-					<li><a href="#" class="mc-navlink" data-pane="pane1">Wheel</a></li>
-					<li><a href="#" class="mc-navlink" data-pane="pane2">Modes</a></li>
-				</ul>
-
-				<ul id="nav-mobile" class="side-nav">
-					<li><a href="#" class="mc-navlink" data-pane="pane1">Wheel</a></li>
-					<li><a href="#" class="mc-navlink" data-pane="pane2">Modes</a></li>
-				</ul>
-				<a href="#" data-activates="nav-mobile" class="button-collapse"><i class="material-icons">menu</i></a>
-			</div>
-		</nav>
-		
-		<div class="container mc_pane" id="pane0">
-			<div class="section">
-				<div class="row" id="mc-wsloader">
-					<div class="col">
-						<div class="preloader-wrapper active">
-							<div class="spinner-layer spinner-blue-only">
-								<div class="circle-clipper left">
-									<div class="circle"></div>
-								</div>
-								<div class="gap-patch">
-									<div class="circle"></div>
-								</div>
-								<div class="circle-clipper right">
-									<div class="circle"></div>
-								</div>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row hide" id="mc-wserror">
-					<div class="col">
-						<div>Error on websocket connect.</div>
-					</div>
-				</div>
-			</div>
-		</div>
-		
-		<div class="container mc_pane hide" id="pane1">
-			<div class="section">
-				<div class="row">
-					<div class="col s12 m6">
-						<div style="height: 330px; width: 330px;">
-							<canvas id="myCanvas" width="330" height="330" style="-webkit-user-select: none;-webkit-tap-highlight-color: rgba(0,0,0,0);-moz-user-select:none;"></canvas>
-						</div>
-					</div>
-					<div class="col s12 m6">
-						<div class="card-panel" id="status">
-							<div id="status_pos">pick a color</div>
-							<div id="status_color"></div>
-						</div>
-					</div>
-					<div class="col s12 m6">
-						<div class="right switch">Auto:<br>
-							<label>Off 
-								<input id="autoSwitch" type="checkbox"><span class="lever"></span>On 
-							</label>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-		
-		<div class="container mc_pane hide" id="pane2">
-			<div class="section">
-				<div class="row">
-					<form class="col s12">
-						<div class="row">
-							<div class="input-field col s12 l4">
-								<label for="txt_red">Red</label><br/>
-								<p class="range-field"><input type="range" id="rng_red" min="0" max="255" class="update_colors" /></p>
-							</div>
-							<div class="input-field col s12 l4">
-								<label for="txt_green">Green</label><br/>
-								<p class="range-field"><input type="range" id="rng_green" min="0" max="255" class="update_colors" /></p>
-							</div>
-							<div class="input-field col s12 l4">
-								<label for="txt_blue">Blue</label><br/>
-								<p class="range-field"><input type="range" id="rng_blue" min="0" max="255" class="update_colors" /></p>
-							</div>
-						</div>
-						
-						<div class="row">
-							<div class="input-field col s12">						
-								<label for="txt_white">White</label><br/>
-								<p class="range-field"><input type="range" id="rng_white" min="0" max="255" class="update_colors" /></p>
-							</div>
-						</div>
-						
-						<div class="row">
-							<div class="input-field col s12">
-								<label for="txt_delay">Speed</label><br/>
-								<p class="range-field"><input type="range" id="rng_delay" min="0" max="255" value="196" class="update_delay" /></p>
-							</div>
-						</div>
-						
-						<div class="row">
-							<div class="input-field col s12">
-								<label for="txt_delay">Brightness</label><br/>
-								<p class="range-field"><input type="range" id="rng_brightness" min="0" max="255" value="196" class="update_brightness" /></p>
-							</div>
-						</div>
-					</form>
-				</div>
-				
-				<div class="row">
-					<div id="modes">
-						<div class="input-field col s12">
-							Loading animations...
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-		
-		<footer class="page-footer blue">
-			<div class="footer-copyright">
-				<div class="container">© 2017
-				<a class="grey-text text-lighten-4 right" href="https://github.com/toblum/McLighting">Project home</a>
-				</div>
-			</div>
-		</footer>
-		
-		<style type="text/css">
-			.btn_grid {
-				margin: 7px 0;
-			}
-		</style>
-	
-		<!--Import jQuery before materialize.js-->
-		<script type="text/javascript" src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
-		<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script>
-		<script type="text/javascript">(function($){
-$(function(){
-	  
-	// Settings
-	var host = window.location.hostname;
-	//host = "esp8266_02.local";
-
-	var ws_url = 'ws://' + host + ':81';
-	var connection;
-	var ws_waiting = 0;
-
-	// ******************************************************************
-	// Side navigation
-	// ******************************************************************
-    $('.button-collapse').sideNav();
-	
-	// Navlinks
-	$('#mc-nav').on('click', '.mc-navlink', function(){
-		console.log("Navigate to pane: ", $(this).data("pane"));
-		showPane($(this).data("pane"));
-	});
-	
-	function showPane(pane) {
-		$('.mc_pane').addClass('hide');
-		$('#' + pane).removeClass('hide');
-		$('.button-collapse').sideNav('hide');
-		
-		//if (pane == "pane2") {
-		//	setMainColor();
-		//}
-	}
-	
-	
-	// ******************************************************************
-	// init()
-	// ******************************************************************
-	function init() {
-		console.log("Connection websockets to:", ws_url);
-		connection = new WebSocket(ws_url, ['arduino']);
-		var mode = 0;
-		var ws2812fx_mode = 0;
-		$.getJSON("http://" + host + "/status", function(data) {
-		    console.log("status", data);
-			mode  = data.mode;
-			if (mode == "1") {
-			  // set autoswitch $("#autoSwitch").val('checked');
-			}
-			ws2812fx_mode = data.ws2812fx_mode;
-		    $("#rng_delay").val(data.speed);
-			$("#rng_brightness").val(data.brightness);
-			$("#rng_white").val(data.color[0]);	
-			$("#rng_red").val(data.color[1]);
-			$("#rng_green").val(data.color[2]);
-			$("#rng_blue").val(data.color[3]);
-			var statusColor = "#" + componentToHex(data.color[1]) + componentToHex(data.color[2]) + componentToHex(data.color[3]);
-			$('#status').css("backgroundColor", statusColor);
-			$('#status_color').text(statusColor + "- R=" + data.color[1] + ", G=" + data.color[2] + ", B=" + data.color[3]);
-		});
-
-		// Load modes async
-		// List of all color modes
-		//   enum MODE {OFF, AUTO, TV, E131, SET_MODE, HOLD, CUSTOM, SETCOLOR, SETSPEED, BRIGHTNESS, WIPE, RAINBOW, RAINBOWCYCLE, THEATERCHASE, TWINKLERANDOM, THEATERCHASERAINBOW};
-		$.getJSON("http://" + host + "/get_modes", function(data) {
-		    console.log("modes", data);
-			var modes_html = "";
-			data.forEach(function(current_mode){
-				if (current_mode.mode !== undefined) {
-					modes_html += '<div class="col s12 m6 l6 btn_grid">'; 
-					if ((mode == "5" && current_mode.mode == ws2812fx_mode) || (mode == "0" && current_mode.mode == "off") || (mode == "2" && current_mode.mode == "tv") || (mode == "3" && current_mode.mode == "e131")){
-						modes_html += '<a class="btn waves-effect waves-light btn_mode red" name="action" data-mode="' + current_mode.mode + '">(' + current_mode.mode +') '+ current_mode.name; 					
-					} else {
-						modes_html += '<a class="btn waves-effect waves-light btn_mode blue" name="action" data-mode="' + current_mode.mode + '">(' + current_mode.mode +') '+ current_mode.name; 
-					}
-					modes_html += '<i class="material-icons right">send</i>';
-					modes_html += '</a>';
-					modes_html += '</div>';
-				}
-			});
-			
-			$('#modes').html(modes_html);
-		});
-		// When the connection is open, send some data to the server
-		connection.onopen = function () {
-			//connection.send('Ping'); // Send the message 'Ping' to the server
-			console.log('WebSocket Open');
-			showPane('pane1');
-		};
-
-		// Log errors
-		connection.onerror = function (error) {
-			console.log('WebSocket Error ' + error);
-			$('#mc-wsloader').addClass('hide');
-			$('#mc-wserror').removeClass('hide');
-		};
-
-		// Log messages from the server
-		connection.onmessage = function (e) {
-			console.log('WebSocket from server: ' + e.data);
-			ws_waiting = 0;
-		};
-	}
-
-	
-	// ******************************************************************
-	// Modes
-	// ******************************************************************	
-	$("#pane2").on("click", ".btn_mode", function() {
-		var mode = $(this).attr("data-mode");
-		last_mode = mode;
-		var btn = $(this);
-		setMode(mode, function() {
-			$(".btn_mode, .btn_mode_static").removeClass("red").addClass("blue");
-			btn.removeClass("blue").addClass("red");
-		});
-	});	
-	
-	$("#pane2").on("click", ".btn_mode_static", function() {
-		var mode = $(this).attr("data-mode");
-		var btn = $(this);
-		
-		wsSendCommand("=" + mode);
-		$(".btn_mode, .btn_mode_static").removeClass("red").addClass("blue");
-		btn.removeClass("blue").addClass("red");
-	});
-	
-	$("#pane2").on("change", ".update_colors", setMainColor);	
-	
-	$("#pane2").on("change", ".update_delay", function() {
-		var delay = $("#rng_delay").val();		
-		
-		wsSendCommand("?" + delay);
-	});
-	
-	$("#pane2").on("change", ".update_brightness", function() {
-		var brightness = $("#rng_brightness").val();		
-		
-		wsSendCommand("%" + brightness);
-	});
-
-	$("#autoSwitch").on("change", function () {
-		if ($(this).prop('checked')) {
-			wsSendCommand("start");
-		} else {
-			wsSendCommand("stop");
-		}
-	}); 
-	
-	function setMode(mode, finish_funtion) {
-		console.log("Mode: ", mode);
-
-		wsSendCommand("/" + mode);
-		finish_funtion();
-	}
-	
-	function setMainColor() {
-		var white = $("#rng_white").val();	
-		var red = $("#rng_red").val();
-		var green = $("#rng_green").val();
-		var blue = $("#rng_blue").val();
-		
-		var hexColor = componentToHex(white) + componentToHex(red) + componentToHex(green) + componentToHex(blue);
-		var statusColor = "#" + componentToHex(red) + componentToHex(green) + componentToHex(blue);
-		wsSetMainColor(hexColor);
-		$('#status').css("backgroundColor", statusColor);
-		$('#status_color').text(statusColor + "- R=" + red + ", G=" + green + ", B=" + blue);
-	}
-	
-	
-	// ******************************************************************
-	// WebSocket commands
-	// ******************************************************************
-	function wsSendCommand(cmd) {
-		console.log("Send WebSocket command:", cmd);
-		if (ws_waiting == 0)  {
-			connection.send(cmd);
-			ws_waiting++;
-		} else {
-			console.log("++++++++ WS call waiting, skip")
-		}
-	}	
-	
-	
-	function wsSetAll(hexColor) {
-		console.log("wsSetAll() Set all colors to:", hexColor);
-		wsSendCommand("*" + hexColor);
-	}
-	
-	function wsSetMainColor(hexColor) {
-		console.log("wsSetMainColor() Set main colors to:", hexColor);
-		wsSendCommand("#" + hexColor);
-	}
-	
-	
-	
-	// ******************************************************************
-	// Colorwheel
-	// ******************************************************************
-	// this is supposed to work on mobiles (touch) as well as on a desktop (click)
-	// since we couldn't find a decent one .. this try of writing one by myself
-	// + google. swiping would be really nice - I will possibly implement it with
-	// jquery later - or never.
-
-	var canvas = document.getElementById("myCanvas");
-	// FIX: Cancel touch end event and handle click via touchstart
-	// canvas.addEventListener("touchend", function(e) { e.preventDefault(); }, false);
-	canvas.addEventListener("touchmove", doTouch, false);
-	canvas.addEventListener("click", doClick, false);
-	//canvas.addEventListener("mousemove", doClick, false);
-
-	
-	var context = canvas.getContext('2d');
-	var centerX = canvas.width / 2;
-	var centerY = canvas.height / 2;
-	var innerRadius = canvas.width / 4.5;
-	var outerRadius = (canvas.width - 10) / 2
-
-	//outer border
-	context.beginPath();
-	//outer circle
-	context.arc(centerX, centerY, outerRadius, 0, 2 * Math.PI, false);
-	//draw the outer border: (gets drawn around the circle!)
-	context.lineWidth = 4;
-	context.strokeStyle = '#000000';
-	context.stroke();
-	context.closePath();
-
-	//fill with beautiful colors 
-	//taken from here: http://stackoverflow.com/questions/18265804/building-a-color-wheel-in-html5
-	for(var angle=0; angle<=360; angle+=1) {
-		var startAngle = (angle-2)*Math.PI/180;
-		var endAngle = angle * Math.PI/180;
-		context.beginPath();
-		context.moveTo(centerX, centerY);
-		context.arc(centerX, centerY, outerRadius, startAngle, endAngle, false);
-		context.closePath();
-		context.fillStyle = 'hsl('+angle+', 100%, 50%)';
-		context.fill();
-		context.closePath();
-	}
-
-	//inner border
-	context.beginPath();
-	//context.arc(centerX, centerY, radius, startAngle, endAngle, counterClockwise);
-	context.arc(centerX, centerY, innerRadius, 0, 2 * Math.PI, false);
-	//fill the center
-	var my_gradient=context.createLinearGradient(0,0,170,0);
-	my_gradient.addColorStop(0,"black");
-	my_gradient.addColorStop(1,"white");
-	
-	context.fillStyle = my_gradient;
-	context.fillStyle = "white";
-	context.fill();
-
-	//draw the inner line
-	context.lineWidth = 2;
-	context.strokeStyle = '#000000';
-	context.stroke();
-	context.closePath();
-
-	//get Mouse x/y canvas position
-	function getMousePos(canvas, evt) {
-		var rect = canvas.getBoundingClientRect();
-		return {
-			x: evt.clientX - rect.left,
-			y: evt.clientY - rect.top
-		};
-	}
-
-	//comp to Hex
-	function componentToHex(c) {
-		//var hex = c.toString(16);
-		//return hex.length == 1 ? "0" + hex : hex;
-		return  ("0"+(Number(c).toString(16))).slice(-2).toUpperCase();
-	}
-
-	//rgb/rgba to Hex
-	function rgbToHex(rgb) {
-		return componentToHex(rgb[0]) + componentToHex(rgb[1]) + componentToHex(rgb[2]);
-	}
-
-	//display the touch/click position and color info
-	function updateStatus(pos, color) {
-		//var hexColor = rgbToHex(color);
-		//wsSetAll(hexColor);
-		var hexColor = componentToHex(color[0]) + componentToHex(color[1]) + componentToHex(color[2]);
-		wsSetMainColor(hexColor);
-		hexColor = "#" + hexColor;
-		
-		$('#status').css("backgroundColor", hexColor);
-		$('#status_color').text(hexColor + " - R=" + color[0] + ", G=" + color[1] + ", B=" + color[2]);
-		$('#status_pos').text("x: " + pos.x + " - y: " + pos.y);
-		
-		$("#rng_white").val(0);
-		$("#rng_red").val(color[0]);
-		$("#rng_green").val(color[1]);
-		$("#rng_blue").val(color[2]);
-	}
-
-	//handle the touch event
-	function doTouch(event) {
-		//to not also fire on click
-		event.preventDefault();
-		var el = event.target;
-		
-		//touch position
-		var pos = {x: Math.round(event.targetTouches[0].pageX - el.offsetLeft),
-				   y: Math.round(event.targetTouches[0].pageY - el.offsetTop)};
-		//color
-		var color = context.getImageData(pos.x, pos.y, 1, 1).data;
-
-		updateStatus(pos, color);
-	}
-
-	function doClick(event) {   
-		//click position   
-		var pos = getMousePos(canvas, event);
-		//color
-		var color = context.getImageData(pos.x, pos.y, 1, 1).data;
-		
-		//console.log("click", pos.x, pos.y, color);
-		updateStatus(pos, color);
-		
-		//now do sth with the color rgbToHex(color);
-		//don't do stuff when #000000 (outside circle and lines
-	}
-
-
-	// ******************************************************************
-	// main
-	// ******************************************************************
-	init();
-	
-}); // end of document ready
-})(jQuery); // end of jQuery name space</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/clients/web(RGBW)/gulpfile.js b/clients/web(RGBW)/gulpfile.js
deleted file mode 100644
index cb2773a..0000000
--- a/clients/web(RGBW)/gulpfile.js
+++ /dev/null
@@ -1,55 +0,0 @@
-var gulp = require('gulp'),
-    request = require('request'),
-    fs = require('fs'),
-    connect = require('gulp-connect'),
-	fileinclude = require('gulp-file-include');
-	
-var src_dir = "src/";
-var build_dir = "build/";
-
-	
-gulp.task('html', function() {
-  gulp.src(src_dir + '*.htm')
-	.pipe(fileinclude({
-		prefix: '@@',
-		basepath: '@file'
-	}))
-    .pipe(gulp.dest('build'))
-    .pipe(connect.reload());
-});
- 
- 
-gulp.task('connect', function() {
-    connect.server({
-		root: 'build',
-        livereload: true
-    });
-});
-
-gulp.task('watch', function() {
-    gulp.watch(src_dir + '*.htm', ['html']);
-    gulp.watch(src_dir + 'js/*.js', ['html']);
-});
-
-
-gulp.task('upload', ['html'], function() {
-	var url = 'http://192.168.0.49/edit';
-	var options = {
-		url: url,
-		headers: {
-			'Content-Type': 'multipart/form-data'
-		}
-	};
-	
-	var r = request.post(options, function optionalCallback(err, httpResponse, body) {
-			if (err) {
-				return console.error('upload failed:', err);
-			}
-			console.log('Upload successful!  Server responded with:', body);
-		});
-	var form = r.form();
-	form.append('data', fs.createReadStream(__dirname + "/" + build_dir + '/index.htm'), {filename: '/index.htm', contentType: "application/octet-stream"});
-});
-
-gulp.task('default', ['html']);
-gulp.task('serve', ['watch', 'connect']);
\ No newline at end of file
diff --git a/clients/web(RGBW)/package.json b/clients/web(RGBW)/package.json
deleted file mode 100644
index 98632aa..0000000
--- a/clients/web(RGBW)/package.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "name": "mc_lighting",
-  "version": "2.0.0",
-  "description": "Web client for Mc Lighting",
-  "main": "index.html",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "Tobias Blum",
-  "license": "MIT",
-  "dependencies": {
-    "fs": "0.0.2",
-    "gulp": "^3.9.1",
-    "gulp-connect": "^5.0.0",
-    "gulp-file-include": "^1.0.0",
-    "request": "^2.72.0"
-  }
-}
diff --git a/clients/web(RGBW)/src/index.htm b/clients/web(RGBW)/src/index.htm
deleted file mode 100644
index b5e1645..0000000
--- a/clients/web(RGBW)/src/index.htm
+++ /dev/null
@@ -1,159 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<!--Import Google Icon Font-->
-		<link href="http://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-		<!--Import materialize.css-->
-		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.min.css" media="screen,projection" />
-
-		<!--Let browser know website is optimized for mobile-->
-		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
-		<meta name="mobile-web-app-capable" content="yes">
-		<meta charset="utf-8"/>
-		<meta name="mobile-web-app-capable" content="yes">
-		<title>McLighting (RGBW) v2</title>
-	</head>
-
-	<body>
-		<nav class="blue light-blueXXX lighten-1XXX" role="navigation" id="mc-nav">
-			<div class="nav-wrapper container">
-				<a id="logo-container" href="#" class="brand-logo">McLighting (RGBW) v2</a>
-
-				<ul class="right hide-on-med-and-down">
-					<li><a href="#" class="mc-navlink" data-pane="pane1">Wheel</a></li>
-					<li><a href="#" class="mc-navlink" data-pane="pane2">Modes</a></li>
-				</ul>
-
-				<ul id="nav-mobile" class="side-nav">
-					<li><a href="#" class="mc-navlink" data-pane="pane1">Wheel</a></li>
-					<li><a href="#" class="mc-navlink" data-pane="pane2">Modes</a></li>
-				</ul>
-				<a href="#" data-activates="nav-mobile" class="button-collapse"><i class="material-icons">menu</i></a>
-			</div>
-		</nav>
-		
-		<div class="container mc_pane" id="pane0">
-			<div class="section">
-				<div class="row" id="mc-wsloader">
-					<div class="col">
-						<div class="preloader-wrapper active">
-							<div class="spinner-layer spinner-blue-only">
-								<div class="circle-clipper left">
-									<div class="circle"></div>
-								</div>
-								<div class="gap-patch">
-									<div class="circle"></div>
-								</div>
-								<div class="circle-clipper right">
-									<div class="circle"></div>
-								</div>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row hide" id="mc-wserror">
-					<div class="col">
-						<div>Error on websocket connect.</div>
-					</div>
-				</div>
-			</div>
-		</div>
-		
-		<div class="container mc_pane hide" id="pane1">
-			<div class="section">
-				<div class="row">
-					<div class="col s12 m6">
-						<div style="height: 330px; width: 330px;">
-							<canvas id="myCanvas" width="330" height="330" style="-webkit-user-select: none;-webkit-tap-highlight-color: rgba(0,0,0,0);-moz-user-select:none;"></canvas>
-						</div>
-					</div>
-					<div class="col s12 m6">
-						<div class="card-panel" id="status">
-							<div id="status_pos">pick a color</div>
-							<div id="status_color"></div>
-						</div>
-					</div>
-					<div class="col s12 m6">
-						<div class="right switch">Auto:<br>
-							<label>Off 
-								<input id="autoSwitch" type="checkbox"><span class="lever"></span>On 
-							</label>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-		
-		<div class="container mc_pane hide" id="pane2">
-			<div class="section">
-				<div class="row">
-					<form class="col s12">
-						<div class="row">
-							<div class="input-field col s12 l4">
-								<label for="txt_red">Red</label><br/>
-								<p class="range-field"><input type="range" id="rng_red" min="0" max="255" class="update_colors" /></p>
-							</div>
-							<div class="input-field col s12 l4">
-								<label for="txt_green">Green</label><br/>
-								<p class="range-field"><input type="range" id="rng_green" min="0" max="255" class="update_colors" /></p>
-							</div>
-							<div class="input-field col s12 l4">
-								<label for="txt_blue">Blue</label><br/>
-								<p class="range-field"><input type="range" id="rng_blue" min="0" max="255" class="update_colors" /></p>
-							</div>
-						</div>
-						
-						<div class="row">
-							<div class="input-field col s12">						
-								<label for="txt_white">White</label><br/>
-								<p class="range-field"><input type="range" id="rng_white" min="0" max="255" class="update_colors" /></p>
-							</div>
-						</div>
-						
-						<div class="row">
-							<div class="input-field col s12">
-								<label for="txt_delay">Speed</label><br/>
-								<p class="range-field"><input type="range" id="rng_delay" min="0" max="255" value="196" class="update_delay" /></p>
-							</div>
-						</div>
-						
-						<div class="row">
-							<div class="input-field col s12">
-								<label for="txt_delay">Brightness</label><br/>
-								<p class="range-field"><input type="range" id="rng_brightness" min="0" max="255" value="196" class="update_brightness" /></p>
-							</div>
-						</div>
-					</form>
-				</div>
-				
-				<div class="row">
-					<div id="modes">
-						<div class="input-field col s12">
-							Loading animations...
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-		
-		<footer class="page-footer blue">
-			<div class="footer-copyright">
-				<div class="container">© 2017
-				<a class="grey-text text-lighten-4 right" href="https://github.com/toblum/McLighting">Project home</a>
-				</div>
-			</div>
-		</footer>
-		
-		<style type="text/css">
-			.btn_grid {
-				margin: 7px 0;
-			}
-		</style>
-	
-		<!--Import jQuery before materialize.js-->
-		<script type="text/javascript" src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
-		<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script>
-		<script type="text/javascript">@@include('js/script.js')</script>
-	</body>
- \ No newline at end of file	
-</html>
\ No newline at end of file
diff --git a/clients/web(RGBW)/src/js/script.js b/clients/web(RGBW)/src/js/script.js
deleted file mode 100644
index 4f62d27..0000000
--- a/clients/web(RGBW)/src/js/script.js
+++ /dev/null
@@ -1,331 +0,0 @@
-(function($){
-$(function(){
-	  
-	// Settings
-	var host = window.location.hostname;
-	//host = "esp8266_02.local";
-
-	var ws_url = 'ws://' + host + ':81';
-	var connection;
-	var ws_waiting = 0;
-
-	// ******************************************************************
-	// Side navigation
-	// ******************************************************************
-    $('.button-collapse').sideNav();
-	
-	// Navlinks
-	$('#mc-nav').on('click', '.mc-navlink', function(){
-		console.log("Navigate to pane: ", $(this).data("pane"));
-		showPane($(this).data("pane"));
-	});
-	
-	function showPane(pane) {
-		$('.mc_pane').addClass('hide');
-		$('#' + pane).removeClass('hide');
-		$('.button-collapse').sideNav('hide');
-		
-		//if (pane == "pane2") {
-		//	setMainColor();
-		//}
-	}
-	
-	
-	// ******************************************************************
-	// init()
-	// ******************************************************************
-	function init() {
-		console.log("Connection websockets to:", ws_url);
-		connection = new WebSocket(ws_url, ['arduino']);
-		var mode = 0;
-		var ws2812fx_mode = 0;
-		$.getJSON("http://" + host + "/status", function(data) {
-		    console.log("status", data);
-			mode  = data.mode;
-			ws2812fx_mode = data.ws2812fx_mode;
-		    $("#rng_delay").val(data.speed);
-			$("#rng_brightness").val(data.brightness);
-			$("#rng_white").val(data.color[0]);	
-			$("#rng_red").val(data.color[1]);
-			$("#rng_green").val(data.color[2]);
-			$("#rng_blue").val(data.color[3]);
-			var statusColor = "#" + componentToHex(data.color[1]) + componentToHex(data.color[2]) + componentToHex(data.color[3]);
-			$('#status').css("backgroundColor", statusColor);
-			$('#status_color').text(statusColor + "- R=" + data.color[1] + ", G=" + data.color[2] + ", B=" + data.color[3]);
-		});
-
-		// Load modes async
-		// List of all color modes
-		//   enum MODE {OFF, AUTO, TV, E131, SET_MODE, HOLD, CUSTOM, SETCOLOR, SETSPEED, BRIGHTNESS, WIPE, RAINBOW, RAINBOWCYCLE, THEATERCHASE, TWINKLERANDOM, THEATERCHASERAINBOW};
-		$.getJSON("http://" + host + "/get_modes", function(data) {
-		    console.log("modes", data);
-			var modes_html = "";
-			data.forEach(function(current_mode){
-				if (current_mode.mode !== undefined) {
-					modes_html += '<div class="col s12 m6 l6 btn_grid">'; 
-					if ((mode == "5" && current_mode.mode == ws2812fx_mode) || (mode == "0" && current_mode.mode == "off") || (mode == "2" && current_mode.mode == "tv") || (mode == "3" && current_mode.mode == "e131")){
-						modes_html += '<a class="btn waves-effect waves-light btn_mode red" name="action" data-mode="' + current_mode.mode + '">(' + current_mode.mode +') '+ current_mode.name; 					
-					} else {
-						modes_html += '<a class="btn waves-effect waves-light btn_mode blue" name="action" data-mode="' + current_mode.mode + '">(' + current_mode.mode +') '+ current_mode.name; 
-					}
-					modes_html += '<i class="material-icons right">send</i>';
-					modes_html += '</a>';
-					modes_html += '</div>';
-				}
-			});
-			
-			$('#modes').html(modes_html);
-		});
-		// When the connection is open, send some data to the server
-		connection.onopen = function () {
-			//connection.send('Ping'); // Send the message 'Ping' to the server
-			console.log('WebSocket Open');
-			showPane('pane1');
-		};
-
-		// Log errors
-		connection.onerror = function (error) {
-			console.log('WebSocket Error ' + error);
-			$('#mc-wsloader').addClass('hide');
-			$('#mc-wserror').removeClass('hide');
-		};
-
-		// Log messages from the server
-		connection.onmessage = function (e) {
-			console.log('WebSocket from server: ' + e.data);
-			ws_waiting = 0;
-		};
-	}
-
-	
-	// ******************************************************************
-	// Modes
-	// ******************************************************************	
-	$("#pane2").on("click", ".btn_mode", function() {
-		var mode = $(this).attr("data-mode");
-		last_mode = mode;
-		var btn = $(this);
-		setMode(mode, function() {
-			$(".btn_mode, .btn_mode_static").removeClass("red").addClass("blue");
-			btn.removeClass("blue").addClass("red");
-		});
-	});	
-	
-	$("#pane2").on("click", ".btn_mode_static", function() {
-		var mode = $(this).attr("data-mode");
-		var btn = $(this);
-		
-		wsSendCommand("=" + mode);
-		$(".btn_mode, .btn_mode_static").removeClass("red").addClass("blue");
-		btn.removeClass("blue").addClass("red");
-	});
-	
-	$("#pane2").on("change", ".update_colors", setMainColor);	
-	
-	$("#pane2").on("change", ".update_delay", function() {
-		var delay = $("#rng_delay").val();		
-		
-		wsSendCommand("?" + delay);
-	});
-	
-	$("#pane2").on("change", ".update_brightness", function() {
-		var brightness = $("#rng_brightness").val();		
-		
-		wsSendCommand("%" + brightness);
-	});
-
-	$("#autoSwitch").on("change", function () {
-		if ($(this).prop('checked')) {
-			wsSendCommand("start");
-		} else {
-			wsSendCommand("stop");
-		}
-	}); 
-	
-	function setMode(mode, finish_funtion) {
-		console.log("Mode: ", mode);
-
-		wsSendCommand("/" + mode);
-		finish_funtion();
-	}
-	
-	function setMainColor() {
-		var white = $("#rng_white").val();	
-		var red = $("#rng_red").val();
-		var green = $("#rng_green").val();
-		var blue = $("#rng_blue").val();
-		
-		var hexColor = componentToHex(white) + componentToHex(red) + componentToHex(green) + componentToHex(blue);
-		var statusColor = "#" + componentToHex(red) + componentToHex(green) + componentToHex(blue);
-		wsSetMainColor(hexColor);
-		$('#status').css("backgroundColor", statusColor);
-		$('#status_color').text(statusColor + "- R=" + red + ", G=" + green + ", B=" + blue);
-	}
-	
-	
-	// ******************************************************************
-	// WebSocket commands
-	// ******************************************************************
-	function wsSendCommand(cmd) {
-		console.log("Send WebSocket command:", cmd);
-		if (ws_waiting == 0)  {
-			connection.send(cmd);
-			ws_waiting++;
-		} else {
-			console.log("++++++++ WS call waiting, skip")
-		}
-	}	
-	
-	
-	function wsSetAll(hexColor) {
-		console.log("wsSetAll() Set all colors to:", hexColor);
-		wsSendCommand("*" + hexColor);
-	}
-	
-	function wsSetMainColor(hexColor) {
-		console.log("wsSetMainColor() Set main colors to:", hexColor);
-		wsSendCommand("#" + hexColor);
-	}
-	
-	
-	
-	// ******************************************************************
-	// Colorwheel
-	// ******************************************************************
-	// this is supposed to work on mobiles (touch) as well as on a desktop (click)
-	// since we couldn't find a decent one .. this try of writing one by myself
-	// + google. swiping would be really nice - I will possibly implement it with
-	// jquery later - or never.
-
-	var canvas = document.getElementById("myCanvas");
-	// FIX: Cancel touch end event and handle click via touchstart
-	// canvas.addEventListener("touchend", function(e) { e.preventDefault(); }, false);
-	canvas.addEventListener("touchmove", doTouch, false);
-	canvas.addEventListener("click", doClick, false);
-	//canvas.addEventListener("mousemove", doClick, false);
-
-	
-	var context = canvas.getContext('2d');
-	var centerX = canvas.width / 2;
-	var centerY = canvas.height / 2;
-	var innerRadius = canvas.width / 4.5;
-	var outerRadius = (canvas.width - 10) / 2
-
-	//outer border
-	context.beginPath();
-	//outer circle
-	context.arc(centerX, centerY, outerRadius, 0, 2 * Math.PI, false);
-	//draw the outer border: (gets drawn around the circle!)
-	context.lineWidth = 4;
-	context.strokeStyle = '#000000';
-	context.stroke();
-	context.closePath();
-
-	//fill with beautiful colors 
-	//taken from here: http://stackoverflow.com/questions/18265804/building-a-color-wheel-in-html5
-	for(var angle=0; angle<=360; angle+=1) {
-		var startAngle = (angle-2)*Math.PI/180;
-		var endAngle = angle * Math.PI/180;
-		context.beginPath();
-		context.moveTo(centerX, centerY);
-		context.arc(centerX, centerY, outerRadius, startAngle, endAngle, false);
-		context.closePath();
-		context.fillStyle = 'hsl('+angle+', 100%, 50%)';
-		context.fill();
-		context.closePath();
-	}
-
-	//inner border
-	context.beginPath();
-	//context.arc(centerX, centerY, radius, startAngle, endAngle, counterClockwise);
-	context.arc(centerX, centerY, innerRadius, 0, 2 * Math.PI, false);
-	//fill the center
-	var my_gradient=context.createLinearGradient(0,0,170,0);
-	my_gradient.addColorStop(0,"black");
-	my_gradient.addColorStop(1,"white");
-	
-	context.fillStyle = my_gradient;
-	context.fillStyle = "white";
-	context.fill();
-
-	//draw the inner line
-	context.lineWidth = 2;
-	context.strokeStyle = '#000000';
-	context.stroke();
-	context.closePath();
-
-	//get Mouse x/y canvas position
-	function getMousePos(canvas, evt) {
-		var rect = canvas.getBoundingClientRect();
-		return {
-			x: evt.clientX - rect.left,
-			y: evt.clientY - rect.top
-		};
-	}
-
-	//comp to Hex
-	function componentToHex(c) {
-		//var hex = c.toString(16);
-		//return hex.length == 1 ? "0" + hex : hex;
-		return  ("0"+(Number(c).toString(16))).slice(-2).toUpperCase();
-	}
-
-	//rgb/rgba to Hex
-	function rgbToHex(rgb) {
-		return componentToHex(rgb[0]) + componentToHex(rgb[1]) + componentToHex(rgb[2]);
-	}
-
-	//display the touch/click position and color info
-	function updateStatus(pos, color) {
-		//var hexColor = rgbToHex(color);
-		//wsSetAll(hexColor);
-		var hexColor = componentToHex(color[0]) + componentToHex(color[1]) + componentToHex(color[2]);
-		wsSetMainColor(hexColor);
-		hexColor = "#" + hexColor;
-		
-		$('#status').css("backgroundColor", hexColor);
-		$('#status_color').text(hexColor + " - R=" + color[0] + ", G=" + color[1] + ", B=" + color[2]);
-		$('#status_pos').text("x: " + pos.x + " - y: " + pos.y);
-		
-		$("#rng_white").val(0);
-		$("#rng_red").val(color[0]);
-		$("#rng_green").val(color[1]);
-		$("#rng_blue").val(color[2]);
-	}
-
-	//handle the touch event
-	function doTouch(event) {
-		//to not also fire on click
-		event.preventDefault();
-		var el = event.target;
-		
-		//touch position
-		var pos = {x: Math.round(event.targetTouches[0].pageX - el.offsetLeft),
-				   y: Math.round(event.targetTouches[0].pageY - el.offsetTop)};
-		//color
-		var color = context.getImageData(pos.x, pos.y, 1, 1).data;
-
-		updateStatus(pos, color);
-	}
-
-	function doClick(event) {   
-		//click position   
-		var pos = getMousePos(canvas, event);
-		//color
-		var color = context.getImageData(pos.x, pos.y, 1, 1).data;
-		
-		//console.log("click", pos.x, pos.y, color);
-		updateStatus(pos, color);
-		
-		//now do sth with the color rgbToHex(color);
-		//don't do stuff when #000000 (outside circle and lines
-	}
-
-
-	// ******************************************************************
-	// main
-	// ******************************************************************
-	init();
-	
-}); // end of document ready
-})(jQuery); // end of jQuery name space
\ No newline at end of file
diff --git a/clients/web/README.md b/clients/web/README.md
deleted file mode 100644
index b7e7616..0000000
--- a/clients/web/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-## Retired, use:
-McLightingHTML from https://github.com/FabLab-Luenen/McLightingHTML
-
-or set #define USE_HTML_MIN_GZ in definitions.h to use the integrated!
diff --git a/clients/web/apple-touch-icon.png b/clients/web/apple-touch-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..c00fb89de57046547094f4785167e3409afdc8ac
GIT binary patch
literal 4500
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

literal 0
HcmV?d00001

diff --git a/clients/web/build/index.htm b/clients/web/build/index.htm
deleted file mode 100644
index 365cbbd..0000000
--- a/clients/web/build/index.htm
+++ /dev/null
@@ -1,466 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<!--Import Google Icon Font-->
-		<link href="http://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-		<!--Import materialize.css-->
-		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.min.css" media="screen,projection" />
-
-		<!--Let browser know website is optimized for mobile-->
-		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
-		<meta name="mobile-web-app-capable" content="yes">
-		<meta charset="utf-8"/>
-		<title>McLighting v2</title>
-	</head>
-
-	<body>
-		<nav class="blue light-blueXXX lighten-1XXX" role="navigation" id="mc-nav">
-			<div class="nav-wrapper container">
-				<a id="logo-container" href="#" class="brand-logo">Mc Lighting v2</a>
-
-				<ul class="right hide-on-med-and-down">
-					<li><a href="#" class="mc-navlink" data-pane="pane1">Wheel</a></li>
-					<li><a href="#" class="mc-navlink" data-pane="pane2">Modes</a></li>
-				</ul>
-
-				<ul id="nav-mobile" class="side-nav">
-					<li><a href="#" class="mc-navlink" data-pane="pane1">Wheel</a></li>
-					<li><a href="#" class="mc-navlink" data-pane="pane2">Modes</a></li>
-				</ul>
-				<a href="#" data-activates="nav-mobile" class="button-collapse"><i class="material-icons">menu</i></a>
-			</div>
-		</nav>
-		
-		<div class="container mc_pane" id="pane0">
-			<div class="section">
-				<div class="row" id="mc-wsloader">
-					<div class="col">
-						<div class="preloader-wrapper active">
-							<div class="spinner-layer spinner-blue-only">
-								<div class="circle-clipper left">
-									<div class="circle"></div>
-								</div>
-								<div class="gap-patch">
-									<div class="circle"></div>
-								</div>
-								<div class="circle-clipper right">
-									<div class="circle"></div>
-								</div>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row hide" id="mc-wserror">
-					<div class="col">
-						<div>Error on websocket connect.</div>
-					</div>
-				</div>
-			</div>
-		</div>
-		
-		<div class="container mc_pane hide" id="pane1">
-			<div class="section">
-				<div class="row">
-					<div class="col s12 m6">
-						<div style="height: 330px; width: 330px;">
-							<canvas id="myCanvas" width="330" height="330" style="-webkit-user-select: none;-webkit-tap-highlight-color: rgba(0,0,0,0);-moz-user-select:none;"></canvas>
-						</div>
-					</div>
-					<div class="col s12 m6">
-						<div class="card-panel" id="status">
-							<div id="status_pos">pick a color</div>
-							<div id="status_color"></div>
-						</div>
-					</div>
-					<div class="col s12 m6">
-						<div class="right switch">Auto:<br>
-							<label>Off 
-								<input id="autoSwitch" type="checkbox"><span class="lever"></span>On 
-							</label>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-		
-		<div class="container mc_pane hide" id="pane2">
-			<div class="section">
-				<div class="row">
-					<form class="col s12">
-						<div class="row">
-							<div class="input-field col s12 l4">
-								<label for="txt_red">Red</label><br/>
-								<p class="range-field"><input type="range" id="rng_red" min="0" max="255" class="update_colors" /></p>
-							</div>
-							<div class="input-field col s12 l4">
-								<label for="txt_green">Green</label><br/>
-								<p class="range-field"><input type="range" id="rng_green" min="0" max="255" class="update_colors" /></p>
-							</div>
-							<div class="input-field col s12 l4">
-								<label for="txt_blue">Blue</label><br/>
-								<p class="range-field"><input type="range" id="rng_blue" min="0" max="255" class="update_colors" /></p>
-							</div>
-						</div>
-						
-						<div class="row">
-							<div class="input-field col s12">
-								<label for="txt_delay">Speed</label><br/>
-								<p class="range-field"><input type="range" id="rng_delay" min="0" max="255" value="196" class="update_delay" /></p>
-							</div>
-						</div>
-						
-						<div class="row">
-							<div class="input-field col s12">
-								<label for="txt_delay">Brightness</label><br/>
-								<p class="range-field"><input type="range" id="rng_brightness" min="0" max="255" value="196" class="update_brightness" /></p>
-							</div>
-						</div>
-					</form>
-				</div>
-				
-				<div class="row">
-					<div class="col s12 m6 l6 btn_grid">
-						<a class="btn waves-effect waves-light btn_mode_static blue" name="action" data-mode="off">OFF
-							<i class="material-icons right">send</i>
-						</a>
-					</div>
-					
-					<div class="col s12 m6 l6 btn_grid">
-						<a class="btn waves-effect waves-light btn_mode_static blue" name="action" data-mode="tv">TV
-							<i class="material-icons right">send</i>
-						</a>
-					</div>
-
-					<div id="modes">
-						<div class="input-field col s12">
-							Loading animations...
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-		
-		<footer class="page-footer blue">
-			<div class="footer-copyright">
-				<div class="container">© 2017
-				<a class="grey-text text-lighten-4 right" href="https://github.com/toblum/McLighting">Project home</a>
-				</div>
-			</div>
-		</footer>
-		
-		<style type="text/css">
-			.btn_grid {
-				margin: 7px 0;
-			}
-		</style>
-	
-		<!--Import jQuery before materialize.js-->
-		<script type="text/javascript" src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
-		<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script>
-		<script type="text/javascript">(function($){
-$(function(){
-	  
-	// Settings
-	var host = window.location.hostname;
-	//host = "esp8266_02.local";
-
-	var ws_url = 'ws://' + host + ':81';
-	var connection;
-	var ws_waiting = 0;
-
-	// ******************************************************************
-	// Side navigation
-	// ******************************************************************
-    $('.button-collapse').sideNav();
-	
-	// Navlinks
-	$('#mc-nav').on('click', '.mc-navlink', function(){
-		console.log("Navigate to pane: ", $(this).data("pane"));
-		showPane($(this).data("pane"));
-	});
-	
-	function showPane(pane) {
-		$('.mc_pane').addClass('hide');
-		$('#' + pane).removeClass('hide');
-		$('.button-collapse').sideNav('hide');
-		
-		if (pane == "pane2") {
-			setMainColor();
-		}
-	}
-	
-	
-	// ******************************************************************
-	// init()
-	// ******************************************************************
-	function init() {
-		console.log("Connection websockets to:", ws_url);
-		connection = new WebSocket(ws_url, ['arduino']);
-		
-		// Load modes async
-		$.getJSON("http://" + host + "/get_modes", function(data) {
-			//console.log("modes", data);
-			
-			var modes_html = "";
-			data.forEach(function(current_mode){
-				if (current_mode.mode !== undefined) {
-					modes_html += '<div class="col s12 m6 l6 btn_grid">'; 
-					modes_html += '<a class="btn waves-effect waves-light btn_mode blue" name="action" data-mode="' + current_mode.mode + '">(' + current_mode.mode +') '+ current_mode.name; 
-					modes_html += '<i class="material-icons right">send</i>';
-					modes_html += '</a>';
-					modes_html += '</div>';
-				}
-			});
-			
-			$('#modes').html(modes_html);
-		});
-				
-		// When the connection is open, send some data to the server
-		connection.onopen = function () {
-			//connection.send('Ping'); // Send the message 'Ping' to the server
-			console.log('WebSocket Open');
-			showPane('pane1');
-		};
-
-		// Log errors
-		connection.onerror = function (error) {
-			console.log('WebSocket Error ' + error);
-			$('#mc-wsloader').addClass('hide');
-			$('#mc-wserror').removeClass('hide');
-		};
-
-		// Log messages from the server
-		connection.onmessage = function (e) {
-			console.log('WebSocket from server: ' + e.data);
-			ws_waiting = 0;
-		};
-	}
-
-	
-	// ******************************************************************
-	// Modes
-	// ******************************************************************	
-	$("#pane2").on("click", ".btn_mode", function() {
-		var mode = $(this).attr("data-mode");
-		last_mode = mode;
-		var btn = $(this);
-		setMode(mode, function() {
-			$(".btn_mode, .btn_mode_static").removeClass("red").addClass("blue");
-			btn.removeClass("blue").addClass("red");
-		});
-	});	
-	
-	$("#pane2").on("click", ".btn_mode_static", function() {
-		var mode = $(this).attr("data-mode");
-		var btn = $(this);
-		
-		wsSendCommand("=" + mode);
-		$(".btn_mode, .btn_mode_static").removeClass("red").addClass("blue");
-		btn.removeClass("blue").addClass("red");
-	});
-	
-	$("#pane2").on("change", ".update_colors", setMainColor);	
-	
-	$("#pane2").on("change", ".update_delay", function() {
-		var delay = $("#rng_delay").val();		
-		
-		wsSendCommand("?" + delay);
-	});
-	
-	$("#pane2").on("change", ".update_brightness", function() {
-		var brightness = $("#rng_brightness").val();		
-		
-		wsSendCommand("%" + brightness);
-	});
-
-	$("#autoSwitch").on("change", function () {
-		if ($(this).prop('checked')) {
-			wsSendCommand("start");
-		} else {
-			wsSendCommand("stop");
-		}
-	}); 
-	
-	function setMode(mode, finish_funtion) {
-		console.log("Mode: ", mode);
-
-		wsSendCommand("/" + mode);
-		finish_funtion();
-	}
-	
-	function setMainColor() {
-		var red = $("#rng_red").val();
-		var green = $("#rng_green").val();
-		var blue = $("#rng_blue").val();		
-		
-		var mainColorHex = componentToHex(red) + componentToHex(green) + componentToHex(blue);
-		wsSetMainColor(mainColorHex);
-	}
-	
-	
-	// ******************************************************************
-	// WebSocket commands
-	// ******************************************************************
-	function wsSendCommand(cmd) {
-		console.log("Send WebSocket command:", cmd);
-		if (ws_waiting == 0)  {
-			connection.send(cmd);
-			ws_waiting++;
-		} else {
-			console.log("++++++++ WS call waiting, skip")
-		}
-	}	
-	
-	
-	function wsSetAll(hexColor) {
-		console.log("wsSetAll() Set all colors to:", hexColor);
-		wsSendCommand("*" + hexColor);
-	}
-	
-	function wsSetMainColor(hexColor) {
-		console.log("wsSetMainColor() Set main colors to:", hexColor);
-		wsSendCommand("#" + hexColor);
-	}
-	
-	
-	
-	// ******************************************************************
-	// Colorwheel
-	// ******************************************************************
-	// this is supposed to work on mobiles (touch) as well as on a desktop (click)
-	// since we couldn't find a decent one .. this try of writing one by myself
-	// + google. swiping would be really nice - I will possibly implement it with
-	// jquery later - or never.
-
-	var canvas = document.getElementById("myCanvas");
-	// FIX: Cancel touch end event and handle click via touchstart
-	// canvas.addEventListener("touchend", function(e) { e.preventDefault(); }, false);
-	canvas.addEventListener("touchmove", doTouch, false);
-	canvas.addEventListener("click", doClick, false);
-	//canvas.addEventListener("mousemove", doClick, false);
-
-	
-	var context = canvas.getContext('2d');
-	var centerX = canvas.width / 2;
-	var centerY = canvas.height / 2;
-	var innerRadius = canvas.width / 4.5;
-	var outerRadius = (canvas.width - 10) / 2
-
-	//outer border
-	context.beginPath();
-	//outer circle
-	context.arc(centerX, centerY, outerRadius, 0, 2 * Math.PI, false);
-	//draw the outer border: (gets drawn around the circle!)
-	context.lineWidth = 4;
-	context.strokeStyle = '#000000';
-	context.stroke();
-	context.closePath();
-
-	//fill with beautiful colors 
-	//taken from here: http://stackoverflow.com/questions/18265804/building-a-color-wheel-in-html5
-	for(var angle=0; angle<=360; angle+=1) {
-		var startAngle = (angle-2)*Math.PI/180;
-		var endAngle = angle * Math.PI/180;
-		context.beginPath();
-		context.moveTo(centerX, centerY);
-		context.arc(centerX, centerY, outerRadius, startAngle, endAngle, false);
-		context.closePath();
-		context.fillStyle = 'hsl('+angle+', 100%, 50%)';
-		context.fill();
-		context.closePath();
-	}
-
-	//inner border
-	context.beginPath();
-	//context.arc(centerX, centerY, radius, startAngle, endAngle, counterClockwise);
-	context.arc(centerX, centerY, innerRadius, 0, 2 * Math.PI, false);
-	//fill the center
-	var my_gradient=context.createLinearGradient(0,0,170,0);
-	my_gradient.addColorStop(0,"black");
-	my_gradient.addColorStop(1,"white");
-	
-	context.fillStyle = my_gradient;
-	context.fillStyle = "white";
-	context.fill();
-
-	//draw the inner line
-	context.lineWidth = 2;
-	context.strokeStyle = '#000000';
-	context.stroke();
-	context.closePath();
-
-	//get Mouse x/y canvas position
-	function getMousePos(canvas, evt) {
-		var rect = canvas.getBoundingClientRect();
-		return {
-			x: evt.clientX - rect.left,
-			y: evt.clientY - rect.top
-		};
-	}
-
-	//comp to Hex
-	function componentToHex(c) {
-		//var hex = c.toString(16);
-		//return hex.length == 1 ? "0" + hex : hex;
-		return  ("0"+(Number(c).toString(16))).slice(-2).toUpperCase();
-	}
-
-	//rgb/rgba to Hex
-	function rgbToHex(rgb) {
-		return componentToHex(rgb[0]) + componentToHex(rgb[1]) + componentToHex(rgb[2]);
-	}
-
-	//display the touch/click position and color info
-	function updateStatus(pos, color) {
-		var hexColor = rgbToHex(color);
-		wsSetAll(hexColor);
-		
-		hexColor = "#" + hexColor;
-		
-		$('#status').css("backgroundColor", hexColor);
-		$('#status_color').text(hexColor + " - R=" + color[0] + ", G=" + color[1] + ", B=" + color[2]);
-		$('#status_pos').text("x: " + pos.x + " - y: " + pos.y);
-		
-		$("#rng_red").val(color[0]);
-		$("#rng_green").val(color[1]);
-		$("#rng_blue").val(color[2]);
-	}
-
-	//handle the touch event
-	function doTouch(event) {
-		//to not also fire on click
-		event.preventDefault();
-		var el = event.target;
-		
-		//touch position
-		var pos = {x: Math.round(event.targetTouches[0].pageX - el.offsetLeft),
-				   y: Math.round(event.targetTouches[0].pageY - el.offsetTop)};
-		//color
-		var color = context.getImageData(pos.x, pos.y, 1, 1).data;
-
-		updateStatus(pos, color);
-	}
-
-	function doClick(event) {   
-		//click position   
-		var pos = getMousePos(canvas, event);
-		//color
-		var color = context.getImageData(pos.x, pos.y, 1, 1).data;
-		
-		//console.log("click", pos.x, pos.y, color);
-		updateStatus(pos, color);
-		
-		//now do sth with the color rgbToHex(color);
-		//don't do stuff when #000000 (outside circle and lines
-	}
-
-
-	// ******************************************************************
-	// main
-	// ******************************************************************
-	init();
-	
-}); // end of document ready
-})(jQuery); // end of jQuery name space</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/clients/newWebClient/edit.htm b/clients/web/edit.htm
similarity index 100%
rename from clients/newWebClient/edit.htm
rename to clients/web/edit.htm
diff --git a/clients/newWebClient/edit.htm.gz b/clients/web/edit.htm.gz
similarity index 100%
rename from clients/newWebClient/edit.htm.gz
rename to clients/web/edit.htm.gz
diff --git a/clients/web/favicon.ico b/clients/web/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..1c55beaf3d048b31b786937190d4bdc8a40610ea
GIT binary patch
literal 34494
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

literal 0
HcmV?d00001

diff --git a/clients/web/graphs.js.gz b/clients/web/graphs.js.gz
new file mode 100644
index 0000000000000000000000000000000000000000..72435445a7ef86e00fe6c66b3b71c47fdbd53a93
GIT binary patch
literal 1971
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
F000|7$0Ps%

literal 0
HcmV?d00001

diff --git a/clients/web/gulpfile.js b/clients/web/gulpfile.js
deleted file mode 100644
index cb2773a..0000000
--- a/clients/web/gulpfile.js
+++ /dev/null
@@ -1,55 +0,0 @@
-var gulp = require('gulp'),
-    request = require('request'),
-    fs = require('fs'),
-    connect = require('gulp-connect'),
-	fileinclude = require('gulp-file-include');
-	
-var src_dir = "src/";
-var build_dir = "build/";
-
-	
-gulp.task('html', function() {
-  gulp.src(src_dir + '*.htm')
-	.pipe(fileinclude({
-		prefix: '@@',
-		basepath: '@file'
-	}))
-    .pipe(gulp.dest('build'))
-    .pipe(connect.reload());
-});
- 
- 
-gulp.task('connect', function() {
-    connect.server({
-		root: 'build',
-        livereload: true
-    });
-});
-
-gulp.task('watch', function() {
-    gulp.watch(src_dir + '*.htm', ['html']);
-    gulp.watch(src_dir + 'js/*.js', ['html']);
-});
-
-
-gulp.task('upload', ['html'], function() {
-	var url = 'http://192.168.0.49/edit';
-	var options = {
-		url: url,
-		headers: {
-			'Content-Type': 'multipart/form-data'
-		}
-	};
-	
-	var r = request.post(options, function optionalCallback(err, httpResponse, body) {
-			if (err) {
-				return console.error('upload failed:', err);
-			}
-			console.log('Upload successful!  Server responded with:', body);
-		});
-	var form = r.form();
-	form.append('data', fs.createReadStream(__dirname + "/" + build_dir + '/index.htm'), {filename: '/index.htm', contentType: "application/octet-stream"});
-});
-
-gulp.task('default', ['html']);
-gulp.task('serve', ['watch', 'connect']);
\ No newline at end of file
diff --git a/clients/newWebClient/index.htm b/clients/web/index.htm
similarity index 93%
rename from clients/newWebClient/index.htm
rename to clients/web/index.htm
index 7d8a7bf..647bb87 100644
--- a/clients/newWebClient/index.htm
+++ b/clients/web/index.htm
@@ -5,8 +5,8 @@
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <meta name="mobile-web-app-capable" content="yes">
-        <link rel="shortcut icon" href="https://cdn.rawgit.com/toblum/McLightingUI/1346e334/material/McLightingLogo/favicon.ico" type="image/x-icon" />
-        <link rel="apple-touch-icon" href="https://cdn.rawgit.com/toblum/McLightingUI/1346e334/material/McLightingLogo/apple-touch-icon.png">
+        <link rel="shortcut icon" href="https://raw.githubusercontent.com/FabLab-Luenen/McLighting/master/Arduino/McLighting/data/favicon.ico" type="image/x-icon" />
+        <link rel="apple-touch-icon" href="https://raw.githubusercontent.com/FabLab-Luenen/McLighting/master/Arduino/McLighting/apple-touch-icon.png">
         <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Material+Icons">
         <style>
 * {
@@ -912,34 +912,25 @@ input[type=number], label{
                             <input type="number" id="speedNum">
                             <input value="255" type="range" min="0" max="255" id="speed">
                         </div>
-                        <div style="display:inline-flex; margin-top:12px;">
-                            <label class="switch">
-                                <input type="checkbox" id="autoplay" onclick="toggleAutoplay(this.checked);">
-                                <span id="autoplaybgcolor" class="slider round"></span>
-                            </label><div id="autoplayLbl" style="margin:auto 8px;font-size:18px;">autoplay</div>
+                        <div id="message" class="container hidden" style="text-align: left;">
+                            <div id="wsmessageLbl" style="text-align: left;"><p>wsMessage</p>
+                                <input type="text" id="wsmessage" style="border: 2px solid #aaaaaa; border-radius: 6px; width:100%;" />
+                            </div>
                         </div>
                     </div>
                 </div>
             </div>
-            <div id="message" class="container hidden" style="text-align: left;">
-                <div class="layout row wrap">
-                    <div class="flex xs12" id="wsmessageLbl" style="text-align: left;"><p>wsMessage</p>
-                        <input type="text" id="wsmessage" style="border: 2px solid #aaaaaa; border-radius: 6px; width:100%;" />
-                    </div>
-                </div>
-            </div>
             <div class="container" style="text-align: center;"><div id="modes" class="layout row wrap"></div></div>
-            
             <div id="settings" class="container hidden" style="text-align: center;">
                 <div class="layout row wrap">
                     <div class="flex xs12 sm4"><p>selectLanguage</p>
                         <select id="language" class="custom-select"></select>
                     </div>
-                    <div class="flex xs12 sm4"><p>showAutoplay</p>
+                    <div class="flex xs12 sm4"><p>transitionEffects</p>
                         <div style="display:inline-flex;">
                             <label class="switch">
-                                <input type="checkbox" id="set-autoplay">
-                                <span id="setautoplaybgcolor" class="slider round"></span>
+                                <input type="checkbox" id="set-transitionEffects">
+                                <span id="settransitionEffectsbgcolor" class="slider round"></span>
                             </label>
                         </div>
                     </div>
@@ -1010,7 +1001,7 @@ input[type=number], label{
             </div>
             
             <footer id="footer" style="height: 32px;">
-                <div><a href="https://github.com/toblum/McLighting/" id="footer-link" target="_blank">Project home</a> - © 2018</div> <div class="spacer"></div>
+                <div><a href="https://github.com/FabLab-Luenen/McLighting" id="footer-link" target="_blank">Project home</a> - © 2019</div> <div class="spacer"></div>
                 <button id="settings-open" type="button" class="btn btn--bottom btn__content"><i aria-hidden="true" class="icon material-icons">settings</i></button>
             </footer>
         </div>
@@ -1031,7 +1022,7 @@ var language = {
     en: {
         lang_name: "English",
         title: "McLighting",
-        name: "Mc Lighting UI (RGBW)",
+        name: "McLightingUI V3(RGBW)",
         connected: "connected",
         disconnected: "disconnected",
         reconnect: "Reconnect",
@@ -1052,7 +1043,6 @@ var language = {
         white: "White",
         not_greater: "cannot enter numbers greater than 255",
         not_less: "cannot enter numbers less than 0",
-        autoplay: "Autoplay",
         wsMessage: "Websocket Message:",
         selectLanguage: "Select Language:",
         selectHostname: "Hostname:",
@@ -1077,7 +1067,7 @@ var language = {
         selectPicker: "Select color picker:",
         circle: "Circle",
         wheel: "Wheel",
-        showAutoplay: "Show Autoplay:",
+        transitionEffects: "Transition Effects:",
         disableRGBW: "activate RGBW",
         slaveNodes: "Additional McLighting Slave Nodes (\";\" seperated)",
         saveSettings: " Save Settings",
@@ -1088,7 +1078,7 @@ var language = {
     nl: {
         lang_name: "Nederlands",
         title: "McLighting",
-        name: "Mc Lighting UI (RGBW)",
+        name: "McLightingUI V3(RGBW)",
         connected: "verbonden",
         disconnected: "niet verbonden",
         reconnect: "Verbind opnieuw",
@@ -1109,7 +1099,6 @@ var language = {
         white: "Wit",
         not_greater: "Geen nummers hoger dan 255",
         not_less: "Geen nummers lager dan 0",
-        autoplay: "Autoplay",
         wsMessage: "Websocket message:",
         selectLanguage: "Selecteer Taal:",
         selectHostname: "Hostname:",
@@ -1134,7 +1123,7 @@ var language = {
         selectPicker: "Selecteer Kleur kiezer:",
         circle: "Cirkel",
         wheel: "Wiel",
-        showAutoplay: "Autoplay tonen:",
+        transitionEffects: "Overgangseffecten:",
         disableRGBW: "RGBW activeren",
         slaveNodes: "Additionele McLighting modules (\";\" gescheiden)",
         saveSettings: " Instellingen opslaan",
@@ -1145,7 +1134,7 @@ var language = {
     de: {
         lang_name: "Deutsch",
         title: "McLighting",
-        name: "Mc Lighting UI (RGBW)",
+        name: "McLightingUI V3(RGBW)",
         connected: "verbunden",
         disconnected: "getrennt",
         reconnect: "Wieder verbinden",
@@ -1166,7 +1155,6 @@ var language = {
         white: "Weiß",
         not_greater: "Akzeptiere keine Nummern größer 255",
         not_less: "Akzeptiere keine Nummern kleiner 0",
-        autoplay: "Autoplay",
         wsMessage: "Websocket Message:",
         selectLanguage: "Sprache auswählen:",
         selectHostname: "Hostname:",
@@ -1191,7 +1179,7 @@ var language = {
         selectPicker: "Farbwahltyp auswählen:",
         circle: "Kreis",
         wheel: "Rad",
-        showAutoplay: "Autoplay anzeigen:",
+        transitionEffects: "Übergangseffekte:",
         disableRGBW: "RGBW aktivieren",
         slaveNodes: "weitere McLighting Slave Nodes (\";\" getrennt)",
         saveSettings: " Einstellungen speichern",
@@ -1285,7 +1273,6 @@ var settings = {
     theme_btnsel: "#FF0000",
     visibility: [],
     picker_type: "wheel",
-    autoplay: true,
     slave_nodes: ""
 };
 var config = {
@@ -1299,6 +1286,7 @@ var config = {
     ws_pin: 0,
     ws_fxopt: 0,
     enable_rgbw: false,
+    transitionEffects: true
 };
 var data = {
     mode: 0,
@@ -1567,6 +1555,7 @@ function getConfig() {
                 }
                 if (typeof res.ws_pin    !== "undefined") config.ws_pin = res.ws_pin;
                 if (typeof res.ws_fxopt  !== "undefined") config.ws_fxopt = res.ws_fxopt;
+                if (typeof res.transEffect  !== "undefined") config.transitionEffects = res.transEffect;
             }
         } else {
             console.error(e);
@@ -1678,21 +1667,6 @@ function toggle(mode, el) {
     //console.log("Hidden items: " + settings.visibility);
 }
 
-function toggleAutoplay(status) {
-    var message = (status) ? "start" : "stop";
-    ws_send(message);
-    if (!status) {
-        document.getElementById("autoplay").checked = false;
-        document.getElementById("autoplaybgcolor").style.backgroundColor = "";
-        ws_send("$");
-    } else {
-        document.getElementById("autoplay").checked = true;
-        data.mode = 1;
-        document.getElementById("autoplaybgcolor").style.backgroundColor = settings.theme_btn;
-        select_active_button();
-    }
-};
-
 function onSelectColNum(colnum) {
     data.color_num = colnum;
     console.log("selected color:" + colnum);
@@ -1737,49 +1711,42 @@ function initSettings() {
     hostname.addEventListener('change', ()=>{
         config.hostname = hostname.value;
         ws_send("Ch" + config.hostname);
-        ws_send("C");
     });
     var mqtt_host = document.getElementById("mqtt_host");
     mqtt_host.value = config.mqtt_host;
     mqtt_host.addEventListener('change', ()=>{
         config.mqtt_host = mqtt_host.value;
         ws_send("Cmh" + config.mqtt_host);
-        ws_send("C");
     });
     var mqtt_port = document.getElementById("mqtt_port");
     mqtt_port.value = config.mqtt_port;
     mqtt_port.addEventListener('change', ()=>{
         config.mqtt_port = mqtt_port.value;
         ws_send("Cmp" + config.mqtt_port);
-        ws_send("C");
     });
     var mqtt_user = document.getElementById("mqtt_user");
     mqtt_user.value = config.mqtt_user;
     mqtt_user.addEventListener('change', ()=>{
         config.mqtt_user = mqtt_user.value;
         ws_send("Cmu" + config.mqtt_user);
-        ws_send("C");
     });
     var mqtt_pass = document.getElementById("mqtt_pass");
     mqtt_pass.value = config.mqtt_pass;
     mqtt_pass.addEventListener('change', ()=>{
         config.mqtt_pass = mqtt_pass.value;
         ws_send("Cmw" + config.mqtt_pass);
-        ws_send("C");
     });
     var count = document.getElementById("selectcount");
     count.value = config.ws_cnt;
     count.addEventListener('change', ()=>{
         config.ws_cnt = count.value;
         ws_send("Csc" + config.ws_cnt);
-        ws_send("C");
     });
     var pin = document.getElementById("selectpin");
     pin.value = config.ws_pin;
     pin.addEventListener('change', ()=>{
         config.ws_pin = pin.value;
         ws_send("Csp" + config.ws_pin);
-        ws_send("C");
     });
     var rgbo = document.getElementById("selectrgbo");
     for (var code in selectrgbo) {
@@ -1792,8 +1759,6 @@ function initSettings() {
     rgbo.addEventListener('change', ()=>{
         config.ws_rgbo = rgbo.value;
         ws_send("Csr" + config.ws_rgbo);
-        ws_send("C");
-		
     });
     var optrev = document.getElementById("selectoptrev");
     for (var code in selectoptrev) {
@@ -1806,7 +1771,6 @@ function initSettings() {
     optrev.addEventListener('change', ()=>{
         config.ws_fxopt = optrev.value | optfade.value | optgamma.value | optsize.value;
         ws_send("Cso" + config.ws_fxopt);
-        ws_send("C");
     });
     var optfade = document.getElementById("selectoptfade");
     for (var code in selectoptfade) {
@@ -1819,7 +1783,6 @@ function initSettings() {
     optfade.addEventListener('change', ()=>{
         config.ws_fxopt = optrev.value | optfade.value | optgamma.value | optsize.value;
         ws_send("Cso" + config.ws_fxopt);
-        ws_send("C");
     });
     var optgamma = document.getElementById("selectoptgamma");
     for (var code in selectoptgamma) {
@@ -1832,7 +1795,6 @@ function initSettings() {
     optgamma.addEventListener('change', ()=>{
         config.ws_fxopt = optrev.value | optfade.value | optgamma.value | optsize.value;
         ws_send("Cso" + config.ws_fxopt);
-        ws_send("C");
     });
     var optsize = document.getElementById("selectoptsize");
     for (var code in selectoptsize) {
@@ -1845,7 +1807,6 @@ function initSettings() {
     optsize.addEventListener('change', ()=>{
         config.ws_fxopt = optrev.value | optfade.value | optgamma.value | optsize.value;
         ws_send("Cso" + config.ws_fxopt);
-        ws_send("C");
     });
     slavenodes.value = settings.slave_nodes;
     lang.addEventListener('change', ()=>{
@@ -1858,18 +1819,16 @@ function initSettings() {
         settings.picker_type = (picker.checked) ? "circle" : "wheel";
         redrawColorPicker();
     });
-    var setautoplay = document.getElementById("set-autoplay");
-    setautoplay.checked = settings.autoplay;
-    if (!setautoplay.checked) autoplay.parentNode.parentNode.style.visibility = "hidden";
-    setautoplay.addEventListener('change', ()=>{
-        settings.autoplay = setautoplay.checked;
-        var play = document.getElementById("autoplay").parentNode.parentNode;
-        if (setautoplay.checked) {
-            play.style.visibility = "visible";
-            document.getElementById("setautoplaybgcolor").style.backgroundColor = settings.theme_btn;
+    var settransitionEffects = document.getElementById("set-transitionEffects");
+    settransitionEffects.checked = config.transitionEffects;
+    settransitionEffects.addEventListener('change', ()=>{
+        config.transitionEffects = settransitionEffects.checked;
+        if (settransitionEffects.checked) {
+            document.getElementById("settransitionEffectsbgcolor").style.backgroundColor = settings.theme_btn;
+            ws_send("Ce1");                                                                                         
         } else {
-            play.style.visibility = "hidden";
-            document.getElementById("setautoplaybgcolor").style.backgroundColor = "";
+            document.getElementById("settransitionEffectsbgcolor").style.backgroundColor = "";
+            ws_send("Ce0");                                                                         
         }
     });
     var colmain = document.getElementById("color-main");
@@ -1908,7 +1867,6 @@ function initSettings() {
         for (var i = 0; i < icons.length; i++) {
             icons[i].style.color = (yiq >= 125) ? '#222' : '#EEE';
         }
-        document.getElementById("autoplayLbl").style.color = (yiq >= 125) ? '#111' : '#EEE';
         document.getElementById("wsmessageLbl").style.color = (yiq >= 125) ? '#111' : '#EEE';
         document.getElementById("redNum").style.color = (yiq >= 125) ? '#111' : '#EEE';
         document.getElementById("greenNum").style.color = (yiq >= 125) ? '#111' : '#EEE';
@@ -1924,8 +1882,7 @@ function initSettings() {
         settings.theme_btn = colbtn.value;
         document.getElementById("settings-save").style.backgroundColor = settings.theme_btn;
         document.getElementById("pickerbgcolor").style.backgroundColor = settings.theme_btn;
-        if (setautoplay.checked) document.getElementById("setautoplaybgcolor").style.backgroundColor = settings.theme_btn;
-        if (document.getElementById("autoplay").checked) document.getElementById("autoplaybgcolor").style.backgroundColor = settings.theme_btn;
+        if (settransitionEffects.checked) document.getElementById("settransitionEffectsbgcolor").style.backgroundColor = settings.theme_btn;
         select_active_button();
     });
     var colbtns = document.getElementById("color-btnsel");
@@ -2255,62 +2212,54 @@ function select_active_button() {
     for (i = 0; i < btns.length; i++) {
         btns[i].style.backgroundColor = settings.theme_btn;
     }
-    if (data.mode != 1) document.getElementById("autoplay").checked = false;
-    if (data.mode != 4) {
+    if (data.mode != 1 || (data.mode === 1 && data.ws2812fx_mode !== 57)) {  // CUSTOM WS MODE
         wsmess = document.getElementById("message");
         var arr = wsmess.className.split(" ");
         if (arr.indexOf("hidden") === -1) {
             wsmess.className += " hidden";
         }
     }
-    if (data.mode >= 5) {
+    if (data.mode >= 1) {
         document.getElementById(data.ws2812fx_mode).style.backgroundColor = settings.theme_btnsel;
-        disable_modebuttons(false);
-        disable_color_selection(false);
-        disable_bright_selection(false);
-        disable_speed_selection(false);
-    } else {
-        if (data.mode == 0) {
-            document.getElementById("off").style.backgroundColor = settings.theme_btnsel;
+        if (data.ws2812fx_mode === 56) { // AUTOPLAY
             disable_modebuttons(false);
             disable_color_selection(true);
-            disable_bright_selection(true);
+            disable_bright_selection(false);
             disable_speed_selection(true);
+        } else if (data.ws2812fx_mode === 57) { //CUSTOM_WS
+            wsmess = document.getElementById("message");
+            wsmess.className = wsmess.className.replace(/\b hidden\b/g, "");
+            disable_modebuttons(false);
+            disable_color_selection(true);
+            disable_bright_selection(false);
+            disable_speed_selection(true);
+        } else if (data.ws2812fx_mode === 58) { //TV
+            disable_modebuttons(false);
+            disable_color_selection(true);
+            disable_bright_selection(false);
+            disable_speed_selection(false);
+        } else if (data.ws2812fx_mode === 59) {  //E1.31
+            disable_modebuttons(false);
+            disable_color_selection(true);
+            disable_bright_selection(false);
+            disable_speed_selection(true);
+        } else if (data.ws2812fx_mode === 60) {  //Fire2012
+            disable_modebuttons(false);
+            disable_color_selection(true);
+            disable_bright_selection(false);
+            disable_speed_selection(false);
         } else {
-            if (data.mode == 1) { // AUTO
-                document.getElementById("autoplay").checked = true;
-                disable_modebuttons(true);
+            disable_modebuttons(false);
+            disable_color_selection(false);
+            disable_bright_selection(false);
+            disable_speed_selection(false);
+        }
+    } else if (data.mode === 0) {
+                document.getElementById("off").style.backgroundColor = settings.theme_btnsel;
+                disable_modebuttons(false);
                 disable_color_selection(true);
                 disable_bright_selection(true);
                 disable_speed_selection(true);
-            } else {
-                if (data.mode == 2) {
-                    document.getElementById("tv").style.backgroundColor = settings.theme_btnsel;
-                    disable_modebuttons(false);
-                    disable_color_selection(true);
-                    disable_bright_selection(false);
-                    disable_speed_selection(false);
-                } else {
-                    if (data.mode == 3) {
-                        document.getElementById("e131").style.backgroundColor = settings.theme_btnsel;
-                        disable_modebuttons(false);
-                        disable_color_selection(true);
-                        disable_bright_selection(false);
-                        disable_speed_selection(true);
-                    } else {
-                        if (data.mode == 4) {
-                            document.getElementById("custom").style.backgroundColor = settings.theme_btnsel;
-                            wsmess = document.getElementById("message");
-                            wsmess.className = wsmess.className.replace(/\b hidden\b/g, "");
-                            disable_modebuttons(false);
-                            disable_color_selection(true);
-                            disable_bright_selection(false);
-                            disable_speed_selection(true);
-                        }
-                    }
-                }
-            }
-        }
     }
 }
 
@@ -2332,24 +2281,14 @@ function disable_modebuttons(status) {
 }
 
 function set_mode(mode_id) {
-    if (document.getElementById("autoplay").checked == true) toggleAutoplay(false);
     if (Number.isInteger(mode_id)) {
-        data.mode = 5;
+        data.mode = 1;
         data.ws2812fx_mode = mode_id;
     } else {
         // For named modes
         if (mode_id == "off") {
           data.mode = 0;
         }
-        if (mode_id == "tv") {
-          data.mode = 2;
-        }
-        if (mode_id == "e131") {
-          data.mode = 3;
-        }
-        if (mode_id == "custom") {
-          data.mode = 4;
-        }
     }
     select_active_button();
     ws_send("/" + mode_id);
diff --git a/clients/web/index.htm.gz b/clients/web/index.htm.gz
new file mode 100644
index 0000000000000000000000000000000000000000..50d463761194d6ce10e47eed6ed6cdc7ed9971be
GIT binary patch
literal 19755
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

literal 0
HcmV?d00001

diff --git a/clients/web/package.json b/clients/web/package.json
deleted file mode 100644
index 98632aa..0000000
--- a/clients/web/package.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "name": "mc_lighting",
-  "version": "2.0.0",
-  "description": "Web client for Mc Lighting",
-  "main": "index.html",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "Tobias Blum",
-  "license": "MIT",
-  "dependencies": {
-    "fs": "0.0.2",
-    "gulp": "^3.9.1",
-    "gulp-connect": "^5.0.0",
-    "gulp-file-include": "^1.0.0",
-    "request": "^2.72.0"
-  }
-}
diff --git a/clients/web/src/index.htm b/clients/web/src/index.htm
deleted file mode 100644
index 7adb7f0..0000000
--- a/clients/web/src/index.htm
+++ /dev/null
@@ -1,162 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<!--Import Google Icon Font-->
-		<link href="http://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-		<!--Import materialize.css-->
-		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.min.css" media="screen,projection" />
-
-		<!--Let browser know website is optimized for mobile-->
-		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
-		<meta name="mobile-web-app-capable" content="yes">
-		<meta charset="utf-8"/>
-		<title>McLighting v2</title>
-	</head>
-
-	<body>
-		<nav class="blue light-blueXXX lighten-1XXX" role="navigation" id="mc-nav">
-			<div class="nav-wrapper container">
-				<a id="logo-container" href="#" class="brand-logo">Mc Lighting v2</a>
-
-				<ul class="right hide-on-med-and-down">
-					<li><a href="#" class="mc-navlink" data-pane="pane1">Wheel</a></li>
-					<li><a href="#" class="mc-navlink" data-pane="pane2">Modes</a></li>
-				</ul>
-
-				<ul id="nav-mobile" class="side-nav">
-					<li><a href="#" class="mc-navlink" data-pane="pane1">Wheel</a></li>
-					<li><a href="#" class="mc-navlink" data-pane="pane2">Modes</a></li>
-				</ul>
-				<a href="#" data-activates="nav-mobile" class="button-collapse"><i class="material-icons">menu</i></a>
-			</div>
-		</nav>
-		
-		<div class="container mc_pane" id="pane0">
-			<div class="section">
-				<div class="row" id="mc-wsloader">
-					<div class="col">
-						<div class="preloader-wrapper active">
-							<div class="spinner-layer spinner-blue-only">
-								<div class="circle-clipper left">
-									<div class="circle"></div>
-								</div>
-								<div class="gap-patch">
-									<div class="circle"></div>
-								</div>
-								<div class="circle-clipper right">
-									<div class="circle"></div>
-								</div>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row hide" id="mc-wserror">
-					<div class="col">
-						<div>Error on websocket connect.</div>
-					</div>
-				</div>
-			</div>
-		</div>
-		
-		<div class="container mc_pane hide" id="pane1">
-			<div class="section">
-				<div class="row">
-					<div class="col s12 m6">
-						<div style="height: 330px; width: 330px;">
-							<canvas id="myCanvas" width="330" height="330" style="-webkit-user-select: none;-webkit-tap-highlight-color: rgba(0,0,0,0);-moz-user-select:none;"></canvas>
-						</div>
-					</div>
-					<div class="col s12 m6">
-						<div class="card-panel" id="status">
-							<div id="status_pos">pick a color</div>
-							<div id="status_color"></div>
-						</div>
-					</div>
-					<div class="col s12 m6">
-						<div class="right switch">Auto:<br>
-							<label>Off 
-								<input id="autoSwitch" type="checkbox"><span class="lever"></span>On 
-							</label>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-		
-		<div class="container mc_pane hide" id="pane2">
-			<div class="section">
-				<div class="row">
-					<form class="col s12">
-						<div class="row">
-							<div class="input-field col s12 l4">
-								<label for="txt_red">Red</label><br/>
-								<p class="range-field"><input type="range" id="rng_red" min="0" max="255" class="update_colors" /></p>
-							</div>
-							<div class="input-field col s12 l4">
-								<label for="txt_green">Green</label><br/>
-								<p class="range-field"><input type="range" id="rng_green" min="0" max="255" class="update_colors" /></p>
-							</div>
-							<div class="input-field col s12 l4">
-								<label for="txt_blue">Blue</label><br/>
-								<p class="range-field"><input type="range" id="rng_blue" min="0" max="255" class="update_colors" /></p>
-							</div>
-						</div>
-						
-						<div class="row">
-							<div class="input-field col s12">
-								<label for="txt_delay">Speed</label><br/>
-								<p class="range-field"><input type="range" id="rng_delay" min="0" max="255" value="196" class="update_delay" /></p>
-							</div>
-						</div>
-						
-						<div class="row">
-							<div class="input-field col s12">
-								<label for="txt_delay">Brightness</label><br/>
-								<p class="range-field"><input type="range" id="rng_brightness" min="0" max="255" value="196" class="update_brightness" /></p>
-							</div>
-						</div>
-					</form>
-				</div>
-				
-				<div class="row">
-					<div class="col s12 m6 l6 btn_grid">
-						<a class="btn waves-effect waves-light btn_mode_static blue" name="action" data-mode="off">OFF
-							<i class="material-icons right">send</i>
-						</a>
-					</div>
-					
-					<div class="col s12 m6 l6 btn_grid">
-						<a class="btn waves-effect waves-light btn_mode_static blue" name="action" data-mode="tv">TV
-							<i class="material-icons right">send</i>
-						</a>
-					</div>
-
-					<div id="modes">
-						<div class="input-field col s12">
-							Loading animations...
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-		
-		<footer class="page-footer blue">
-			<div class="footer-copyright">
-				<div class="container">© 2017
-				<a class="grey-text text-lighten-4 right" href="https://github.com/toblum/McLighting">Project home</a>
-				</div>
-			</div>
-		</footer>
-		
-		<style type="text/css">
-			.btn_grid {
-				margin: 7px 0;
-			}
-		</style>
-	
-		<!--Import jQuery before materialize.js-->
-		<script type="text/javascript" src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
-		<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script>
-		<script type="text/javascript">@@include('js/script.js')</script>
-	</body>
-</html>
diff --git a/clients/web/src/js/script.js b/clients/web/src/js/script.js
deleted file mode 100644
index 60ef6d8..0000000
--- a/clients/web/src/js/script.js
+++ /dev/null
@@ -1,305 +0,0 @@
-(function($){
-$(function(){
-	  
-	// Settings
-	var host = window.location.hostname;
-	//host = "esp8266_02.local";
-
-	var ws_url = 'ws://' + host + ':81';
-	var connection;
-	var ws_waiting = 0;
-
-	// ******************************************************************
-	// Side navigation
-	// ******************************************************************
-    $('.button-collapse').sideNav();
-	
-	// Navlinks
-	$('#mc-nav').on('click', '.mc-navlink', function(){
-		console.log("Navigate to pane: ", $(this).data("pane"));
-		showPane($(this).data("pane"));
-	});
-	
-	function showPane(pane) {
-		$('.mc_pane').addClass('hide');
-		$('#' + pane).removeClass('hide');
-		$('.button-collapse').sideNav('hide');
-		
-		if (pane == "pane2") {
-			setMainColor();
-		}
-	}
-	
-	
-	// ******************************************************************
-	// init()
-	// ******************************************************************
-	function init() {
-		console.log("Connection websockets to:", ws_url);
-		connection = new WebSocket(ws_url, ['arduino']);
-		
-		// Load modes async
-		$.getJSON("http://" + host + "/get_modes", function(data) {
-			//console.log("modes", data);
-			
-			var modes_html = "";
-			data.forEach(function(current_mode){
-				if (current_mode.mode !== undefined) {
-					modes_html += '<div class="col s12 m6 l6 btn_grid">'; 
-					modes_html += '<a class="btn waves-effect waves-light btn_mode blue" name="action" data-mode="' + current_mode.mode + '">(' + current_mode.mode +') '+ current_mode.name; 
-					modes_html += '<i class="material-icons right">send</i>';
-					modes_html += '</a>';
-					modes_html += '</div>';
-				}
-			});
-			
-			$('#modes').html(modes_html);
-		});
-				
-		// When the connection is open, send some data to the server
-		connection.onopen = function () {
-			//connection.send('Ping'); // Send the message 'Ping' to the server
-			console.log('WebSocket Open');
-			showPane('pane1');
-		};
-
-		// Log errors
-		connection.onerror = function (error) {
-			console.log('WebSocket Error ' + error);
-			$('#mc-wsloader').addClass('hide');
-			$('#mc-wserror').removeClass('hide');
-		};
-
-		// Log messages from the server
-		connection.onmessage = function (e) {
-			console.log('WebSocket from server: ' + e.data);
-			ws_waiting = 0;
-		};
-	}
-
-	
-	// ******************************************************************
-	// Modes
-	// ******************************************************************	
-	$("#pane2").on("click", ".btn_mode", function() {
-		var mode = $(this).attr("data-mode");
-		last_mode = mode;
-		var btn = $(this);
-		setMode(mode, function() {
-			$(".btn_mode, .btn_mode_static").removeClass("red").addClass("blue");
-			btn.removeClass("blue").addClass("red");
-		});
-	});	
-	
-	$("#pane2").on("click", ".btn_mode_static", function() {
-		var mode = $(this).attr("data-mode");
-		var btn = $(this);
-		
-		wsSendCommand("=" + mode);
-		$(".btn_mode, .btn_mode_static").removeClass("red").addClass("blue");
-		btn.removeClass("blue").addClass("red");
-	});
-	
-	$("#pane2").on("change", ".update_colors", setMainColor);	
-	
-	$("#pane2").on("change", ".update_delay", function() {
-		var delay = $("#rng_delay").val();		
-		
-		wsSendCommand("?" + delay);
-	});
-	
-	$("#pane2").on("change", ".update_brightness", function() {
-		var brightness = $("#rng_brightness").val();		
-		
-		wsSendCommand("%" + brightness);
-	});
-
-	$("#autoSwitch").on("change", function () {
-		if ($(this).prop('checked')) {
-			wsSendCommand("start");
-		} else {
-			wsSendCommand("stop");
-		}
-	}); 
-	
-	function setMode(mode, finish_funtion) {
-		console.log("Mode: ", mode);
-
-		wsSendCommand("/" + mode);
-		finish_funtion();
-	}
-	
-	function setMainColor() {
-		var red = $("#rng_red").val();
-		var green = $("#rng_green").val();
-		var blue = $("#rng_blue").val();		
-		
-		var mainColorHex = componentToHex(red) + componentToHex(green) + componentToHex(blue);
-		wsSetMainColor(mainColorHex);
-	}
-	
-	
-	// ******************************************************************
-	// WebSocket commands
-	// ******************************************************************
-	function wsSendCommand(cmd) {
-		console.log("Send WebSocket command:", cmd);
-		if (ws_waiting == 0)  {
-			connection.send(cmd);
-			ws_waiting++;
-		} else {
-			console.log("++++++++ WS call waiting, skip")
-		}
-	}	
-	
-	
-	function wsSetAll(hexColor) {
-		console.log("wsSetAll() Set all colors to:", hexColor);
-		wsSendCommand("*" + hexColor);
-	}
-	
-	function wsSetMainColor(hexColor) {
-		console.log("wsSetMainColor() Set main colors to:", hexColor);
-		wsSendCommand("#" + hexColor);
-	}
-	
-	
-	
-	// ******************************************************************
-	// Colorwheel
-	// ******************************************************************
-	// this is supposed to work on mobiles (touch) as well as on a desktop (click)
-	// since we couldn't find a decent one .. this try of writing one by myself
-	// + google. swiping would be really nice - I will possibly implement it with
-	// jquery later - or never.
-
-	var canvas = document.getElementById("myCanvas");
-	// FIX: Cancel touch end event and handle click via touchstart
-	// canvas.addEventListener("touchend", function(e) { e.preventDefault(); }, false);
-	canvas.addEventListener("touchmove", doTouch, false);
-	canvas.addEventListener("click", doClick, false);
-	//canvas.addEventListener("mousemove", doClick, false);
-
-	
-	var context = canvas.getContext('2d');
-	var centerX = canvas.width / 2;
-	var centerY = canvas.height / 2;
-	var innerRadius = canvas.width / 4.5;
-	var outerRadius = (canvas.width - 10) / 2
-
-	//outer border
-	context.beginPath();
-	//outer circle
-	context.arc(centerX, centerY, outerRadius, 0, 2 * Math.PI, false);
-	//draw the outer border: (gets drawn around the circle!)
-	context.lineWidth = 4;
-	context.strokeStyle = '#000000';
-	context.stroke();
-	context.closePath();
-
-	//fill with beautiful colors 
-	//taken from here: http://stackoverflow.com/questions/18265804/building-a-color-wheel-in-html5
-	for(var angle=0; angle<=360; angle+=1) {
-		var startAngle = (angle-2)*Math.PI/180;
-		var endAngle = angle * Math.PI/180;
-		context.beginPath();
-		context.moveTo(centerX, centerY);
-		context.arc(centerX, centerY, outerRadius, startAngle, endAngle, false);
-		context.closePath();
-		context.fillStyle = 'hsl('+angle+', 100%, 50%)';
-		context.fill();
-		context.closePath();
-	}
-
-	//inner border
-	context.beginPath();
-	//context.arc(centerX, centerY, radius, startAngle, endAngle, counterClockwise);
-	context.arc(centerX, centerY, innerRadius, 0, 2 * Math.PI, false);
-	//fill the center
-	var my_gradient=context.createLinearGradient(0,0,170,0);
-	my_gradient.addColorStop(0,"black");
-	my_gradient.addColorStop(1,"white");
-	
-	context.fillStyle = my_gradient;
-	context.fillStyle = "white";
-	context.fill();
-
-	//draw the inner line
-	context.lineWidth = 2;
-	context.strokeStyle = '#000000';
-	context.stroke();
-	context.closePath();
-
-	//get Mouse x/y canvas position
-	function getMousePos(canvas, evt) {
-		var rect = canvas.getBoundingClientRect();
-		return {
-			x: evt.clientX - rect.left,
-			y: evt.clientY - rect.top
-		};
-	}
-
-	//comp to Hex
-	function componentToHex(c) {
-		//var hex = c.toString(16);
-		//return hex.length == 1 ? "0" + hex : hex;
-		return  ("0"+(Number(c).toString(16))).slice(-2).toUpperCase();
-	}
-
-	//rgb/rgba to Hex
-	function rgbToHex(rgb) {
-		return componentToHex(rgb[0]) + componentToHex(rgb[1]) + componentToHex(rgb[2]);
-	}
-
-	//display the touch/click position and color info
-	function updateStatus(pos, color) {
-		var hexColor = rgbToHex(color);
-		wsSetAll(hexColor);
-		
-		hexColor = "#" + hexColor;
-		
-		$('#status').css("backgroundColor", hexColor);
-		$('#status_color').text(hexColor + " - R=" + color[0] + ", G=" + color[1] + ", B=" + color[2]);
-		$('#status_pos').text("x: " + pos.x + " - y: " + pos.y);
-		
-		$("#rng_red").val(color[0]);
-		$("#rng_green").val(color[1]);
-		$("#rng_blue").val(color[2]);
-	}
-
-	//handle the touch event
-	function doTouch(event) {
-		//to not also fire on click
-		event.preventDefault();
-		var el = event.target;
-		
-		//touch position
-		var pos = {x: Math.round(event.targetTouches[0].pageX - el.offsetLeft),
-				   y: Math.round(event.targetTouches[0].pageY - el.offsetTop)};
-		//color
-		var color = context.getImageData(pos.x, pos.y, 1, 1).data;
-
-		updateStatus(pos, color);
-	}
-
-	function doClick(event) {   
-		//click position   
-		var pos = getMousePos(canvas, event);
-		//color
-		var color = context.getImageData(pos.x, pos.y, 1, 1).data;
-		
-		//console.log("click", pos.x, pos.y, color);
-		updateStatus(pos, color);
-		
-		//now do sth with the color rgbToHex(color);
-		//don't do stuff when #000000 (outside circle and lines
-	}
-
-
-	// ******************************************************************
-	// main
-	// ******************************************************************
-	init();
-	
-}); // end of document ready
-})(jQuery); // end of jQuery name space
\ No newline at end of file