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

rename system/info text, added MQTT status

Browse Source
This commit is contained in:
proddy
2021-11-10 12:27:18 +01:00
parent e347ac5742
commit a8f1892d48
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/system.cpp
View File

@@ -963,17 +963,27 @@ bool System::command_settings(const char * value, const int8_t id, JsonObject &
bool System::command_info(const char * value, const int8_t id, JsonObject & output) { bool System::command_info(const char * value, const int8_t id, JsonObject & output) {
JsonObject node; JsonObject node;
// System
node = output.createNestedObject("System"); node = output.createNestedObject("System");
node["version"] = EMSESP_APP_VERSION; node["version"] = EMSESP_APP_VERSION;
node["uptime"] = uuid::log::format_timestamp_ms(uuid::get_uptime_ms(), 3); node["uptime"] = uuid::log::format_timestamp_ms(uuid::get_uptime_ms(), 3);
node["uptime_sec"] = uuid::get_uptime_sec(); node["uptime (seconds)"] = uuid::get_uptime_sec();
#ifndef EMSESP_STANDALONE #ifndef EMSESP_STANDALONE
node["freemem"] = ESP.getFreeHeap() / 1000L; // kilobytes node["freemem"] = ESP.getFreeHeap() / 1000L; // kilobytes
#endif #endif
node["reset_reason"] = EMSESP::system_.reset_reason(0) + " / " + EMSESP::system_.reset_reason(1); node["reset reason"] = EMSESP::system_.reset_reason(0) + " / " + EMSESP::system_.reset_reason(1);
if (EMSESP::dallas_enabled()) {
node["dallas sensors"] = EMSESP::sensor_devices().size();
}
if (Mqtt::enabled()) {
node["MQTT"] = Mqtt::connected() ? F_(connected) : F_(disconnected);
}
// Status
node = output.createNestedObject("Status"); node = output.createNestedObject("Status");
switch (EMSESP::bus_status()) { switch (EMSESP::bus_status()) {
@@ -1003,7 +1013,6 @@ bool System::command_info(const char * value, const int8_t id, JsonObject & outp
node["MQTT publish fails"] = Mqtt::publish_fails(); node["MQTT publish fails"] = Mqtt::publish_fails();
} }
if (EMSESP::dallas_enabled()) { if (EMSESP::dallas_enabled()) {
node["dallas sensors"] = EMSESP::sensor_devices().size();
node["dallas reads"] = EMSESP::sensor_reads(); node["dallas reads"] = EMSESP::sensor_reads();
node["dallas fails"] = EMSESP::sensor_fails(); node["dallas fails"] = EMSESP::sensor_fails();
} }