jeans/WLED
jeans/WLED
1
0
Fork 0
mirror of https://github.com/wled/WLED.git synced 2025-07-13 05:46:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix error 12 issues

Browse Source
This commit is contained in:
Scott Bailey 2021-09-02 22:56:49 -07:00
parent 54f4658dae
commit 88ceba59cf
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wled00/ir.cpp
View File

@ -71,9 +71,11 @@ void decBrightness()
// apply preset or fallback to a effect and palette if it doesn't exist // apply preset or fallback to a effect and palette if it doesn't exist
void presetFallback(uint8_t presetID, uint8_t effectID, uint8_t paletteID) void presetFallback(uint8_t presetID, uint8_t effectID, uint8_t paletteID)
{ {
byte prevError = errorFlag;
if (!applyPreset(presetID, CALL_MODE_BUTTON)) { if (!applyPreset(presetID, CALL_MODE_BUTTON)) {
effectCurrent = effectID; effectCurrent = effectID;
effectPalette = paletteID; effectPalette = paletteID;
errorFlag = prevError; //clear error 12 from non-existent preset
} }
} }
@ -566,16 +568,17 @@ void decodeIRJson(uint32_t code)
char objKey[10]; char objKey[10];
const char* cmd; const char* cmd;
String cmdStr; String cmdStr;
byte irError;
DynamicJsonDocument irDoc(JSON_BUFFER_SIZE); DynamicJsonDocument irDoc(JSON_BUFFER_SIZE);
JsonObject fdo; JsonObject fdo;
JsonObject jsonCmdObj; JsonObject jsonCmdObj;
sprintf(objKey, "\"0x%X\":", code); sprintf(objKey, "\"0x%X\":", code);
errorFlag = readObjectFromFile("/ir.json", objKey, &irDoc) ? ERR_NONE : ERR_FS_PLOAD; irError = readObjectFromFile("/ir.json", objKey, &irDoc) ? ERR_NONE : ERR_FS_PLOAD;
fdo = irDoc.as<JsonObject>(); fdo = irDoc.as<JsonObject>();
lastValidCode = 0; lastValidCode = 0;
if (!errorFlag) if (!irError)
{ {
cmd = fdo["cmd"]; cmd = fdo["cmd"];
cmdStr = String(cmd); cmdStr = String(cmd);