Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Random Cycle -> Random Smooth + netdebug/serial bugfix

Browse Source
This commit is contained in:
Ewoud
2023-03-24 15:36:00 +01:00
parent 274cdb4d32
commit a66274d532
5 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
usermods/usermod_v2_games/usermod_v2_games.h
View File

@@ -319,7 +319,7 @@ uint16_t mode_3DIMUCube(void) {
return FRAMETIME; return FRAMETIME;
} }
static const char _data_FX_MODE_3DIMUCube[] PROGMEM = "🎮 3DIMUCube ☾@,Perspective;!;!;2;pal=1"; //random cycle static const char _data_FX_MODE_3DIMUCube[] PROGMEM = "🎮 3DIMUCube ☾@,Perspective;!;!;2;pal=1"; //WLEDMM random smooth
class GamesUsermod : public Usermod { class GamesUsermod : public Usermod {
private: private:

4
wled00/FX_fcn.cpp
View File

@@ -2125,12 +2125,12 @@ WS2812FX* WS2812FX::instance = nullptr;
const char JSON_mode_names[] PROGMEM = R"=====(["FX names moved"])====="; const char JSON_mode_names[] PROGMEM = R"=====(["FX names moved"])=====";
//WLEDMM netmindz ar palette add Audio responsive //WLEDMM netmindz ar palette add Audio responsive
const char JSON_palette_names[] PROGMEM = R"=====([ const char JSON_palette_names[] PROGMEM = R"=====([
"Default","* Random Cycle ☾","* Color 1","* Colors 1&2","* Color Gradient","* Colors Only","Party","Cloud","Lava","Ocean", "Default","* Random Smooth ☾","* Color 1","* Colors 1&2","* Color Gradient","* Colors Only","Party","Cloud","Lava","Ocean",
"Forest","Rainbow","Rainbow Bands","Sunset","Rivendell","Breeze","Red & Blue","Yellowout","Analogous","Splash", "Forest","Rainbow","Rainbow Bands","Sunset","Rivendell","Breeze","Red & Blue","Yellowout","Analogous","Splash",
"Pastel","Sunset 2","Beach","Vintage","Departure","Landscape","Beech","Sherbet","Hult","Hult 64", "Pastel","Sunset 2","Beach","Vintage","Departure","Landscape","Beech","Sherbet","Hult","Hult 64",
"Drywet","Jul","Grintage","Rewhi","Tertiary","Fire","Icefire","Cyane","Light Pink","Autumn", "Drywet","Jul","Grintage","Rewhi","Tertiary","Fire","Icefire","Cyane","Light Pink","Autumn",
"Magenta","Magred","Yelmag","Yelblu","Orange & Teal","Tiamat","April Night","Orangery","C9","Sakura", "Magenta","Magred","Yelmag","Yelblu","Orange & Teal","Tiamat","April Night","Orangery","C9","Sakura",
"Aurora","Atlantica","C9 2","C9 New","Temperature","Aurora 2","Retro Clown","Candy","Toxy Reaf","Fairy Reaf", "Aurora","Atlantica","C9 2","C9 New","Temperature","Aurora 2","Retro Clown","Candy","Toxy Reaf","Fairy Reaf",
"Semi Blue","Pink Candy","Red Reaf","Aqua Flash","Yelblu Hot","Lite Light","Red Flash","Blink Red","Red Shift","Red Tide", "Semi Blue","Pink Candy","Red Reaf","Aqua Flash","Yelblu Hot","Lite Light","Red Flash","Blink Red","Red Shift","Red Tide",
"Candy2","Audio Responsive Ratio ☾","Audio Responsive Hue ☾","* Random Cycle 💡" "Candy2","Audio Responsive Ratio ☾","Audio Responsive Hue ☾","* Random Cycle"
])====="; ])=====";

3
wled00/cfg.cpp
View File

@@ -484,6 +484,8 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
CJSON(netDebugPrintIP[i], if_ndb_ip[i]); CJSON(netDebugPrintIP[i], if_ndb_ip[i]);
CJSON(netDebugPrintPort, if_ndb["port"]); CJSON(netDebugPrintPort, if_ndb["port"]);
CJSON(netDebugEnabled, if_ndb["enabled"]); CJSON(netDebugEnabled, if_ndb["enabled"]);
// USER_PRINTF("deserializeConfig %d\n", netDebugEnabled);
pinManager.manageDebugTXPin();
#endif #endif
JsonObject if_ntp = interfaces[F("ntp")]; JsonObject if_ntp = interfaces[F("ntp")];
@@ -953,6 +955,7 @@ void serializeConfig() {
} }
if_ndb["port"] = netDebugPrintPort; if_ndb["port"] = netDebugPrintPort;
if_ndb["enabled"] = netDebugEnabled; if_ndb["enabled"] = netDebugEnabled;
// USER_PRINTF("serializeConfig %d\n", netDebugEnabled);
#endif #endif
JsonObject if_ntp = interfaces.createNestedObject("ntp"); JsonObject if_ntp = interfaces.createNestedObject("ntp");

2
wled00/const.h
View File

@@ -5,7 +5,7 @@
* Readability defines and their associated numerical values + compile-time constants * Readability defines and their associated numerical values + compile-time constants
*/ */
#define GRADIENT_PALETTE_COUNT 61 //WLEDMM netmindz ar palette +2, ewowi second Random Cycle palette +1 #define GRADIENT_PALETTE_COUNT 61 //WLEDMM netmindz ar palette +2, ewowi Random Smooth palette +1
//Defaults //Defaults
#define DEFAULT_CLIENT_SSID "Your_Network" #define DEFAULT_CLIENT_SSID "Your_Network"

7
wled00/json.cpp
View File

@@ -352,7 +352,11 @@ bool deserializeState(JsonObject root, byte callMode, byte presetId)
#if defined(WLED_DEBUG_HOST) #if defined(WLED_DEBUG_HOST)
bool oldValue = netDebugEnabled; bool oldValue = netDebugEnabled;
netDebugEnabled = root[F("netDebug")] | netDebugEnabled; netDebugEnabled = root[F("netDebug")] | netDebugEnabled;
if (oldValue != netDebugEnabled) doSerializeConfig = true; //WLEDMM to make it will be stored in cfg.json! (tbd: check if this is the right approach) // USER_PRINTF("deserializeState %d (%d)\n", netDebugEnabled, oldValue);
if (oldValue != netDebugEnabled) {
pinManager.manageDebugTXPin();
doSerializeConfig = true; //WLEDMM to make it will be stored in cfg.json! (tbd: check if this is the right approach)
}
#endif #endif
bool onBefore = bri; bool onBefore = bri;
@@ -605,6 +609,7 @@ void serializeState(JsonObject root, bool forPreset, bool includeBri, bool segme
//WLEDMM: store netDebug //WLEDMM: store netDebug
#if defined(WLED_DEBUG_HOST) #if defined(WLED_DEBUG_HOST)
root[F("netDebug")] = netDebugEnabled; root[F("netDebug")] = netDebugEnabled;
// USER_PRINTF("serializeState %d\n", netDebugEnabled);
#endif #endif
if (errorFlag) {root[F("error")] = errorFlag; errorFlag = ERR_NONE;} //prevent error message to persist on screen if (errorFlag) {root[F("error")] = errorFlag; errorFlag = ERR_NONE;} //prevent error message to persist on screen