simongehrig/McLighting
1
0
Fork 0
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Changes is order of enum Modes

Browse Source
This commit is contained in:
BPoH_Voodoo
2018-04-24 15:41:18 +02:00
parent 07bdc48fcd
commit a83078c3cf
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Arduino/McLighting/definitions.h
+2 -2
View File
@@ -89,11 +89,11 @@ uint32_t autoParams[][4] = { // color, speed, mode, duration (seconds)
// List of all color modes // List of all color modes
#ifdef ENABLE_LEGACY_ANIMATIONS #ifdef ENABLE_LEGACY_ANIMATIONS
enum MODE { SET_MODE, HOLD, AUTO, OFF, TV, SETCOLOR, SETSPEED, BRIGHTNESS, WIPE, RAINBOW, RAINBOWCYCLE, THEATERCHASE, TWINKLERANDOM, THEATERCHASERAINBOW, CUSTOM}; enum MODE { SET_MODE, HOLD, AUTO, OFF, TV, CUSTOM, SETCOLOR, SETSPEED, BRIGHTNESS, WIPE, RAINBOW, RAINBOWCYCLE, THEATERCHASE, TWINKLERANDOM, THEATERCHASERAINBOW};
MODE mode = RAINBOW; // Standard mode that is active when software starts MODE mode = RAINBOW; // Standard mode that is active when software starts
bool exit_func = false; // Global helper variable to get out of the color modes when mode changes bool exit_func = false; // Global helper variable to get out of the color modes when mode changes
#else #else
enum MODE { SET_MODE, HOLD, AUTO, OFF, TV, SETCOLOR, SETSPEED, BRIGHTNESS, CUSTOM}; enum MODE { SET_MODE, HOLD, AUTO, OFF, TV, CUSTOM, SETCOLOR, SETSPEED, BRIGHTNESS};
MODE mode = SET_MODE; // Standard mode that is active when software starts MODE mode = SET_MODE; // Standard mode that is active when software starts
#endif #endif
clients/web/build/index.htm
+1 -1
View File
@@ -196,7 +196,7 @@ $(function(){
$.getJSON("http://" + host + "/status", function(data) { $.getJSON("http://" + host + "/status", function(data) {
console.log("status", data); console.log("status", data);
mode = data.mode; mode = data.mode;
ws2812fx_mode = data.ws2812fx_mode_name; ws2812fx_mode = data.ws2812fx_mode;
$("#rng_delay").val(data.speed); $("#rng_delay").val(data.speed);
$("#rng_brightness").val(data.brightness); $("#rng_brightness").val(data.brightness);
$("#rng_white").val(data.color[0]); $("#rng_white").val(data.color[0]);