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

have system/message API parse logic via shuntingyard

Browse Source
This commit is contained in:
proddy
2025-10-05 15:36:11 +02:00
parent c4a2f8bac8
commit 145172b6e9
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/system.cpp
View File

@@ -206,14 +206,22 @@ bool System::command_syslog_level(const char * value, const int8_t id) {
*/ */
// send message - to system log and MQTT // send message - to system log and MQTT
bool System::command_message(const char * value, const int8_t id) { bool System::command_message(const char * value, const int8_t id, JsonObject output) {
if (value == nullptr || value[0] == '\0') { if (value == nullptr || value[0] == '\0') {
LOG_WARNING("Message is empty");
return false; // must have a string value return false; // must have a string value
} }
auto computed_value = compute(value); auto computed_value = compute(value); // process the message via Shunting Yard
LOG_INFO("Message: %s", computed_value.c_str());
Mqtt::queue_publish(F_(message), computed_value); if (computed_value.length() == 0) {
LOG_WARNING("Message result is empty");
return false;
}
LOG_INFO("Message: %s", computed_value.c_str()); // send to log
Mqtt::queue_publish(F_(message), computed_value); // send to MQTT if enabled
output["api_data"] = computed_value; // send to API
return true; return true;
} }
@@ -1521,7 +1529,7 @@ bool System::get_value_info(JsonObject output, const char * cmd) {
return true; return true;
} }
} }
} // else skipt, but we don't have value pairs in system root } // else skip, but we don't have value pairs in system root
} }
} }
return false; return false;
@@ -1572,7 +1580,7 @@ bool System::command_info(const char * value, const int8_t id, JsonObject output
node["freeCaps"] = heap_caps_get_free_size(MALLOC_CAP_8BIT) / 1024; // includes heap and psram node["freeCaps"] = heap_caps_get_free_size(MALLOC_CAP_8BIT) / 1024; // includes heap and psram
node["usedApp"] = EMSESP::system_.appUsed(); // kilobytes node["usedApp"] = EMSESP::system_.appUsed(); // kilobytes
node["freeApp"] = EMSESP::system_.appFree(); // kilobytes node["freeApp"] = EMSESP::system_.appFree(); // kilobytes
node["partition"] = esp_ota_get_running_partition()->label; // active partition node["partition"] = (const char *)esp_ota_get_running_partition()->label; // active partition
node["flash_chip_size"] = ESP.getFlashChipSize() / 1024; // kilobytes node["flash_chip_size"] = ESP.getFlashChipSize() / 1024; // kilobytes
#endif #endif
node["resetReason"] = EMSESP::system_.reset_reason(0) + " / " + EMSESP::system_.reset_reason(1); node["resetReason"] = EMSESP::system_.reset_reason(0) + " / " + EMSESP::system_.reset_reason(1);
@@ -1842,6 +1850,7 @@ bool System::command_info(const char * value, const int8_t id, JsonObject output
} }
} }
} }
// Also show EMSESP devices if we have any // Also show EMSESP devices if we have any
if (EMSESP::temperaturesensor_.count_entities()) { if (EMSESP::temperaturesensor_.count_entities()) {
JsonObject obj = devices.add<JsonObject>(); JsonObject obj = devices.add<JsonObject>();

2
src/core/system.h
View File

@@ -83,7 +83,7 @@ class System {
static bool command_restart(const char * value, const int8_t id); static bool command_restart(const char * value, const int8_t id);
static bool command_format(const char * value, const int8_t id); static bool command_format(const char * value, const int8_t id);
static bool command_watch(const char * value, const int8_t id); static bool command_watch(const char * value, const int8_t id);
static bool command_message(const char * value, const int8_t id); static bool command_message(const char * value, const int8_t id, JsonObject output);
static bool command_info(const char * value, const int8_t id, JsonObject output); static bool command_info(const char * value, const int8_t id, JsonObject output);
static bool command_response(const char * value, const int8_t id, JsonObject output); static bool command_response(const char * value, const int8_t id, JsonObject output);
static bool command_service(const char * cmd, const char * value); static bool command_service(const char * cmd, const char * value);