andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 16:29:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

add hc to console calls

Browse Source
This commit is contained in:
MichaelDvP
2021-11-10 14:06:00 +01:00
parent 3c13c144d5
commit 4f2da0347c
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/console.cpp
View File

@@ -379,7 +379,6 @@ void EMSESPShell::add_console_commands() {
return; return;
} }
DynamicJsonDocument doc(EMSESP_JSON_SIZE_XXLARGE_DYN);
// validate that a command is present // validate that a command is present
if (arguments.size() < 2) { if (arguments.size() < 2) {
@@ -388,27 +387,33 @@ void EMSESPShell::add_console_commands() {
return; return;
} }
const char * cmd = arguments[1].c_str(); DynamicJsonDocument doc(EMSESP_JSON_SIZE_XXLARGE_DYN);
int8_t id = -1;
const char * cmd = Command::parse_command_string(arguments[1].c_str(), id);
uint8_t return_code = CommandRet::OK; uint8_t return_code = CommandRet::OK;
JsonObject json = doc.to<JsonObject>(); JsonObject json = doc.to<JsonObject>();
if (arguments.size() == 2) { if (arguments.size() == 2) {
// no value specified, just the cmd // no value specified, just the cmd
return_code = Command::call(device_type, cmd, nullptr, true, -1, json); return_code = Command::call(device_type, cmd, nullptr, true, id, json);
} else if (arguments.size() == 3) { } else if (arguments.size() == 3) {
if (strncmp(cmd, "info", 4) == 0) { if (strncmp(cmd, "info", 4) == 0) {
// info has a id but no value // info has a id but no value
return_code = Command::call(device_type, cmd, nullptr, true, atoi(arguments.back().c_str()), json); return_code = Command::call(device_type, cmd, nullptr, true, atoi(arguments.back().c_str()), json);
} else if (arguments[2] == "?") {
return_code = Command::call(device_type, cmd, nullptr, true, id, json);
} else { } else {
// has a value but no id so use -1 // has a value but no id so use -1
return_code = Command::call(device_type, cmd, arguments.back().c_str(), true, -1, json); return_code = Command::call(device_type, cmd, arguments.back().c_str(), true, id, json);
} }
} else { } else {
// use value, which could be an id or hc // use value, which could be an id or hc
if (arguments[2] == "?") {
return_code = Command::call(device_type, cmd, nullptr, true, atoi(arguments[3].c_str()), json);
} else {
return_code = Command::call(device_type, cmd, arguments[2].c_str(), true, atoi(arguments[3].c_str()), json); return_code = Command::call(device_type, cmd, arguments[2].c_str(), true, atoi(arguments[3].c_str()), json);
} }
}
if (return_code == CommandRet::OK && json.size()) { if (return_code == CommandRet::OK && json.size()) {
serializeJsonPretty(doc, shell); serializeJsonPretty(doc, shell);