From a83078c3cfe32eb5493824a4d75033260ff09fab Mon Sep 17 00:00:00 2001 From: BPoH_Voodoo Date: Tue, 24 Apr 2018 15:41:18 +0200 Subject: [PATCH] Changes is order of enum Modes --- Arduino/McLighting/definitions.h | 4 ++-- clients/web/build/index.htm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Arduino/McLighting/definitions.h b/Arduino/McLighting/definitions.h index b843ecc..c98e53f 100644 --- a/Arduino/McLighting/definitions.h +++ b/Arduino/McLighting/definitions.h @@ -89,11 +89,11 @@ uint32_t autoParams[][4] = { // color, speed, mode, duration (seconds) // List of all color modes #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 bool exit_func = false; // Global helper variable to get out of the color modes when mode changes #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 #endif diff --git a/clients/web/build/index.htm b/clients/web/build/index.htm index 16988ba..0f3de05 100644 --- a/clients/web/build/index.htm +++ b/clients/web/build/index.htm @@ -196,7 +196,7 @@ $(function(){ $.getJSON("http://" + host + "/status", function(data) { console.log("status", data); mode = data.mode; - ws2812fx_mode = data.ws2812fx_mode_name; + ws2812fx_mode = data.ws2812fx_mode; $("#rng_delay").val(data.speed); $("#rng_brightness").val(data.brightness); $("#rng_white").val(data.color[0]);