diff --git a/wled00/FX.cpp b/wled00/FX.cpp index e6eaa3566..419897df6 100644 --- a/wled00/FX.cpp +++ b/wled00/FX.cpp @@ -1328,7 +1328,7 @@ uint16_t gradient_base(bool loading) { uint16_t mode_gradient(void) { return gradient_base(false); } -static const char _data_FX_MODE_GRADIENT[] PROGMEM = "Gradient@!,Spread=16;!,!,;!;1d"; +static const char _data_FX_MODE_GRADIENT[] PROGMEM = "Gradient@!,Spread;!,!,;!;ix=16,1d"; /* @@ -1337,7 +1337,7 @@ static const char _data_FX_MODE_GRADIENT[] PROGMEM = "Gradient@!,Spread=16;!,!,; uint16_t mode_loading(void) { return gradient_base(true); } -static const char _data_FX_MODE_LOADING[] PROGMEM = "Loading@!,Fade=16;!,!,;!;1d"; +static const char _data_FX_MODE_LOADING[] PROGMEM = "Loading@!,Fade;!,!,;!;ix=16,1d"; //American Police Light with all LEDs Red and Blue @@ -6250,7 +6250,7 @@ uint16_t mode_gravcentric(void) { // Gravcentric. By Andrew return FRAMETIME; } // mode_gravcentric() -static const char _data_FX_MODE_GRAVCENTRIC[] PROGMEM = "Gravcentric@Rate of fall,Sensitivity=128;!;!;ix=128,mp12=2,ssim=0,1d,vo"; // Circle, Beatsin +static const char _data_FX_MODE_GRAVCENTRIC[] PROGMEM = "Gravcentric@Rate of fall,Sensitivity;!;!;ix=128,mp12=2,ssim=0,1d,vo"; // Circle, Beatsin /////////////////////// @@ -6396,7 +6396,7 @@ uint16_t mode_midnoise(void) { // Midnoise. By Andrew Tuline. return FRAMETIME; } // mode_midnoise() -static const char _data_FX_MODE_MIDNOISE[] PROGMEM = "Midnoise@Fade rate,Maximum length=128;,!;!;ix=128,mp12=2,ssim=0,1d,vo"; // Circle, Beatsin +static const char _data_FX_MODE_MIDNOISE[] PROGMEM = "Midnoise@Fade rate,Maximum length;,!;!;ix=128,mp12=2,ssim=0,1d,vo"; // Circle, Beatsin ////////////////////// @@ -7013,7 +7013,7 @@ uint16_t mode_gravfreq(void) { // Gravfreq. By Andrew Tuline. return FRAMETIME; } // mode_gravfreq() -static const char _data_FX_MODE_GRAVFREQ[] PROGMEM = "Gravfreq@Rate of fall,Sensivity=128;,!;!;mp12=2,ssim=0,1d,fr"; // Circle, Beatsin +static const char _data_FX_MODE_GRAVFREQ[] PROGMEM = "Gravfreq@Rate of fall,Sensivity;,!;!;ix=128,mp12=2,ssim=0,1d,fr"; // Circle, Beatsin ////////////////////// diff --git a/wled00/ir.cpp b/wled00/ir.cpp index 3efb75452..35464cac6 100644 --- a/wled00/ir.cpp +++ b/wled00/ir.cpp @@ -1,5 +1,7 @@ #include "wled.h" +#include "ir_codes.h" + /* * Infrared sensor support for generic 24/40/44 key RGB remotes */ diff --git a/wled00/json.cpp b/wled00/json.cpp index 9aacdd60f..a53f6924a 100644 --- a/wled00/json.cpp +++ b/wled00/json.cpp @@ -189,6 +189,7 @@ void deserializeSegment(JsonObject elem, byte it, byte presetId) { int16_t sOpt; uint8_t tmp = 255; +/* // compatibility mode begin char buf[5]; // dummy buffer for (int i=0; i<5; i++) { @@ -210,6 +211,7 @@ void deserializeSegment(JsonObject elem, byte it, byte presetId) } } //end compatibility mode +*/ sOpt = extractModeDefaults(fx, SET_F("sx")); if (sOpt >= 0) seg.speed = sOpt; sOpt = extractModeDefaults(fx, SET_F("ix")); if (sOpt >= 0) seg.intensity = sOpt; sOpt = extractModeDefaults(fx, SET_F("c1")); if (sOpt >= 0) seg.custom1 = sOpt; diff --git a/wled00/wled.h b/wled00/wled.h index 0a3f93ad0..8dd2a8473 100644 --- a/wled00/wled.h +++ b/wled00/wled.h @@ -8,7 +8,7 @@ */ // version code in format yymmddb (b = daily build) -#define VERSION 2208033 +#define VERSION 2208041 //uncomment this if you have a "my_config.h" file you'd like to use //#define WLED_USE_MY_CONFIG @@ -156,13 +156,6 @@ using PSRAMDynamicJsonDocument = BasicJsonDocument; #include "const.h" #include "fcn_declare.h" -#include "html_ui.h" -#ifdef WLED_ENABLE_SIMPLE_UI - #include "html_simple.h" -#endif -#include "html_settings.h" -#include "html_other.h" -#include "ir_codes.h" #include "NodeStruct.h" #include "pin_manager.h" #include "bus_manager.h" diff --git a/wled00/wled_server.cpp b/wled00/wled_server.cpp index 3b2eb0591..da2aadb33 100644 --- a/wled00/wled_server.cpp +++ b/wled00/wled_server.cpp @@ -1,5 +1,12 @@ #include "wled.h" +#include "html_ui.h" +#ifdef WLED_ENABLE_SIMPLE_UI + #include "html_simple.h" +#endif +#include "html_settings.h" +#include "html_other.h" + /* * Integrated HTTP web server page declarations */