lba.gitea/WLED
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove persistent argument from savePreset()

Browse Source 
(fixes temp preset not applicable by APIs)
Default to 5Mhz hardware SPI driving (#2558)
This commit is contained in:
cschwinne 2022-03-14 20:53:00 +01:00
parent f068327307
commit 9552784e72
8 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usermods/usermod_v2_auto_save/usermod_v2_auto_save.h
View File

@ -64,7 +64,7 @@ class AutoSaveUsermod : public Usermod {
PSTR("~ %02d-%02d %02d:%02d:%02d ~"), PSTR("~ %02d-%02d %02d:%02d:%02d ~"),
month(localTime), day(localTime), month(localTime), day(localTime),
hour(localTime), minute(localTime), second(localTime)); hour(localTime), minute(localTime), second(localTime));
savePreset(autoSavePreset, true, presetNameBuffer); savePreset(autoSavePreset, presetNameBuffer);
} }
void inline displayOverlay() { void inline displayOverlay() {

4
usermods/word-clock-matrix/word-clock-matrix.cpp
View File

@ -65,7 +65,7 @@ void hourChime()
//strip.resetSegments(); //strip.resetSegments();
selectWordSegments(true); selectWordSegments(true);
colorUpdated(CALL_MODE_FX_CHANGED); colorUpdated(CALL_MODE_FX_CHANGED);
savePreset(13, false); //savePreset(255);
selectWordSegments(false); selectWordSegments(false);
//strip.getSegment(0).setOption(0, true); //strip.getSegment(0).setOption(0, true);
strip.getSegment(0).setOption(2, true); strip.getSegment(0).setOption(2, true);
@ -299,7 +299,7 @@ void userLoop()
if (minute(localTime) == 1){ if (minute(localTime) == 1){
//turn off background segment; //turn off background segment;
strip.getSegment(0).setOption(2, false); strip.getSegment(0).setOption(2, false);
//applyPreset(13); //applyPreset(255);
} }
} }
} }

2
wled00/bus_wrapper.h
View File

@ -133,7 +133,7 @@
#endif #endif
//APA102 //APA102
#define B_HS_DOT_3 NeoPixelBrightnessBus<DotStarBgrFeature, DotStarSpiMethod> //hardware SPI #define B_HS_DOT_3 NeoPixelBrightnessBus<DotStarBgrFeature, DotStarSpi5MhzMethod> //hardware SPI
#define B_SS_DOT_3 NeoPixelBrightnessBus<DotStarBgrFeature, DotStarMethod> //soft SPI #define B_SS_DOT_3 NeoPixelBrightnessBus<DotStarBgrFeature, DotStarMethod> //soft SPI
//LPD8806 //LPD8806

4
wled00/fcn_declare.h
View File

@ -190,8 +190,8 @@ void handlePlaylist();
//presets.cpp //presets.cpp
bool applyPreset(byte index, byte callMode = CALL_MODE_DIRECT_CHANGE); bool applyPreset(byte index, byte callMode = CALL_MODE_DIRECT_CHANGE);
inline bool applyTemporaryPreset() {return applyPreset(255);}; inline bool applyTemporaryPreset() {return applyPreset(255);};
void savePreset(byte index, bool persist = true, const char* pname = nullptr, JsonObject saveobj = JsonObject()); void savePreset(byte index, const char* pname = nullptr, JsonObject saveobj = JsonObject());
inline void saveTemporaryPreset() {savePreset(255, false);}; inline void saveTemporaryPreset() {savePreset(255);};
void deletePreset(byte index); void deletePreset(byte index);
//set.cpp //set.cpp

2
wled00/ir.cpp
View File

@ -699,7 +699,7 @@ void decodeIRJson(uint32_t code)
char pname[33]; char pname[33];
sprintf_P(pname, PSTR("IR Preset %d"), psave); sprintf_P(pname, PSTR("IR Preset %d"), psave);
fdo.clear(); fdo.clear();
if (psave > 0 && psave < 251) savePreset(psave, true, pname, fdo); if (psave > 0 && psave < 251) savePreset(psave, pname, fdo);
} }
} }
releaseJSONBufferLock(); releaseJSONBufferLock();

2
wled00/json.cpp
View File

@ -347,7 +347,7 @@ bool deserializeState(JsonObject root, byte callMode, byte presetId)
byte ps = root[F("psave")]; byte ps = root[F("psave")];
if (ps > 0) { if (ps > 0) {
savePreset(ps, true, nullptr, root); savePreset(ps, nullptr, root);
} else { } else {
ps = root[F("pdel")]; //deletion ps = root[F("pdel")]; //deletion
if (ps > 0) { if (ps > 0) {

5
wled00/presets.cpp
View File

@ -50,12 +50,13 @@ bool applyPreset(byte index, byte callMode)
return false; return false;
} }
void savePreset(byte index, bool persist, const char* pname, JsonObject saveobj) void savePreset(byte index, const char* pname, JsonObject saveobj)
{ {
if (index == 0 || (index > 250 && persist) || (index<255 && !persist)) return; if (index == 0 || (index > 250 && index < 255)) return;
char tmp[12]; char tmp[12];
JsonObject sObj = saveobj; JsonObject sObj = saveobj;
bool persist = (index == 255);
const char *filename = persist ? "/presets.json" : "/tmp.json"; const char *filename = persist ? "/presets.json" : "/tmp.json";
if (!fileDoc) { if (!fileDoc) {

2
wled00/wled.h
View File

@ -8,7 +8,7 @@
*/ */
// version code in format yymmddb (b = daily build) // version code in format yymmddb (b = daily build)
#define VERSION 2203140 #define VERSION 2203141
//uncomment this if you have a "my_config.h" file you'd like to use //uncomment this if you have a "my_config.h" file you'd like to use
//#define WLED_USE_MY_CONFIG //#define WLED_USE_MY_CONFIG