mirror of
https://github.com/wled/WLED.git
synced 2025-07-10 12:26:31 +00:00
Fix error 12 issues
This commit is contained in:
parent
54f4658dae
commit
88ceba59cf
@ -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);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user