Slight IR JSON simplefication

Check for missing file
No duplicate cmd object
This commit is contained in:
cschwinne 2021-09-09 12:05:02 +02:00
parent a839809eb8
commit f1e2439e66
2 changed files with 48 additions and 45 deletions

View File

@ -215,6 +215,7 @@
#define ERR_FS_BEGIN 10 // Could not init filesystem (no partition?)
#define ERR_FS_QUOTA 11 // The FS is full or the maximum file size is reached
#define ERR_FS_PLOAD 12 // It was attempted to load a preset that does not exist
#define ERR_FS_IRLOAD 13 // It was attempted to load an IR JSON cmd, but the "ir.json" file does not exist
#define ERR_FS_GENERAL 19 // A general unspecified filesystem error occured
#define ERR_OVERTEMP 30 // An attached temperature sensor has measured above threshold temperature (not implemented)
#define ERR_OVERCURRENT 31 // An attached current sensor has measured a current above the threshold (not implemented)

View File

@ -568,21 +568,24 @@ void decodeIRJson(uint32_t code)
char objKey[10];
const char* cmd;
String cmdStr;
byte irError;
DynamicJsonDocument irDoc(JSON_BUFFER_SIZE);
JsonObject fdo;
JsonObject jsonCmdObj;
sprintf(objKey, "\"0x%X\":", code);
irError = readObjectFromFile("/ir.json", objKey, &irDoc) ? ERR_NONE : ERR_FS_PLOAD;
readObjectFromFile("/ir.json", objKey, &irDoc);
fdo = irDoc.as<JsonObject>();
lastValidCode = 0;
if (!irError)
{
cmd = fdo["cmd"];
cmdStr = String(cmd);
if (fdo.isNull()) {
//the received code does not exist
if (!WLED_FS.exists("/ir.json")) errorFlag = ERR_FS_IRLOAD; //warn if IR file itself doesn't exist
return;
}
jsonCmdObj = fdo["cmd"];
cmdStr = String(jsonCmdObj);
if (!cmdStr.isEmpty())
{
if (cmdStr.startsWith("!")) {
@ -623,7 +626,6 @@ void decodeIRJson(uint32_t code)
fileDoc = nullptr;
}
}
}
void initIR()
{