jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-28 05:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow compound commands in json command

Browse Source 
Allow compound commands in json command (#18358)
This commit is contained in:
Theo Arends 2023-04-07 12:36:02 +02:00
parent 97993934f2
commit 4f983105f3
1 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
tasmota/tasmota_support/support_command.ino
View File

@ -587,6 +587,31 @@ void CmndJson(void) {
// {"template":"{\"NAME\":\"Dummy\",\"GPIO\":[320,0,321],\"FLAG\":0,\"BASE\":18}","power":2,"HSBColor":"51,97,100","Channel":[100,85,3]} // {"template":"{\"NAME\":\"Dummy\",\"GPIO\":[320,0,321],\"FLAG\":0,\"BASE\":18}","power":2,"HSBColor":"51,97,100","Channel":[100,85,3]}
// Output: // Output:
// template {"NAME":"Dummy","GPIO":[320,0,321],"FLAG":0,"BASE":18};power 2;HSBColor 51,97,100;Channel1 100;Channel2 85;Channel3 3 // template {"NAME":"Dummy","GPIO":[320,0,321],"FLAG":0,"BASE":18};power 2;HSBColor 51,97,100;Channel1 100;Channel2 85;Channel3 3
/*
String backlog;
for (auto command_key : root) {
const char *command = command_key.getStr();
JsonParserToken parameters = command_key.getValue();
if (parameters.isArray()) {
JsonParserArray parameter_arr = parameters.getArray();
uint32_t index = 1;
for (auto value : parameter_arr) {
backlog = command;
backlog += index++;
backlog += " ";
backlog += value.getStr(); // Channel1 100;Channel2 85;Channel3 3
ExecuteCommand((char*)backlog.c_str(), SRC_FILE);
}
} else if (parameters.isObject()) { // Should have been escaped
// AddLog(LOG_LEVEL_DEBUG, PSTR("JSN: Object"));
} else {
backlog = command;
backlog += " ";
backlog += parameters.getStr(); // HSBColor 51,97,100
ExecuteCommand((char*)backlog.c_str(), SRC_FILE);
}
}
*/
String backlog; // We might need a larger string than XdrvMailbox.data_len accomodating decoded arrays String backlog; // We might need a larger string than XdrvMailbox.data_len accomodating decoded arrays
for (auto command_key : root) { for (auto command_key : root) {
const char *command = command_key.getStr(); const char *command = command_key.getStr();
@ -604,16 +629,25 @@ void CmndJson(void) {
} else if (parameters.isObject()) { // Should have been escaped } else if (parameters.isObject()) { // Should have been escaped
// AddLog(LOG_LEVEL_DEBUG, PSTR("JSN: Object")); // AddLog(LOG_LEVEL_DEBUG, PSTR("JSN: Object"));
} else { } else {
if (backlog.length()) { backlog += ";"; } if (strchr(parameters.getStr(), ';')) {
backlog += command; String compound = command;
backlog += " "; compound += " ";
backlog += parameters.getStr(); // HSBColor 51,97,100 compound += parameters.getStr(); // Rule1 ON Clock#Timer=1 DO Backlog Color #FF000000D0; Wakeup 100 ENDON
ExecuteCommand((char*)compound.c_str(), SRC_FILE);
} else {
if (backlog.length()) { backlog += ";"; }
backlog += command;
backlog += " ";
backlog += parameters.getStr(); // HSBColor 51,97,100
}
} }
} }
XdrvMailbox.data = (char*)backlog.c_str(); // Backlog commands if (backlog.length()) {
XdrvMailbox.data_len = 1; // Any data XdrvMailbox.data = (char*)backlog.c_str(); // Backlog commands
XdrvMailbox.index = 0; // Backlog0 - no delay XdrvMailbox.data_len = 1; // Any data
CmndBacklog(); XdrvMailbox.index = 0; // Backlog0 - no delay
CmndBacklog();
}
} else { } else {
ResponseCmndChar(PSTR(D_JSON_EMPTY)); ResponseCmndChar(PSTR(D_JSON_EMPTY));
} }