jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-25 20:26:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow string, object and array json commands

Browse Source
This commit is contained in:
fvanroie 2020-11-25 17:02:42 +01:00
parent 5b988b5405
commit f71ffd510a
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/hasp_dispatch.cpp
View File

@ -501,7 +501,7 @@ void dispatchParseJson(const char * payload)
// json.shrinkToFit(); // json.shrinkToFit();
if(jsonError) { // Couldn't parse incoming JSON command if(jsonError) { // Couldn't parse incoming JSON command
Log.warning(TAG_MSGR, F("JSON: Failed to parse incoming JSON command with error: %s"), jsonError.c_str()); Log.warning(TAG_MSGR, F("Failed to parse incoming JSON command with error: %s"), jsonError.c_str());
} else { } else {
if(json.is<JsonArray>()) { if(json.is<JsonArray>()) {
@ -514,9 +514,17 @@ void dispatchParseJson(const char * payload)
// handle json as a jsonl // handle json as a jsonl
uint8_t savedPage = haspGetPage(); uint8_t savedPage = haspGetPage();
hasp_new_object(json.as<JsonObject>(), savedPage); hasp_new_object(json.as<JsonObject>(), savedPage);
} else { } else if(json.is<const char *>()) {
// handle json as a single command // handle json as a single command
dispatchTextLine(json.as<const char *>()); dispatchTextLine(json.as<const char *>());
} else if(json.is<char *>()) {
// handle json as a single command
dispatchTextLine(json.as<char *>());
} else if(json.is<String>()) {
// handle json as a single command
dispatchTextLine(json.as<String>().c_str());
} else {
Log.warning(TAG_MSGR, F("Failed to parse incoming JSON command"));
} }
} }
} }