diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md index ea1320609..34c404120 100644 --- a/CHANGELOG_LATEST.md +++ b/CHANGELOG_LATEST.md @@ -6,4 +6,7 @@ ## Changed +- removed Rx echo failures counting as incomplete telegrams. BAd telegrams show as Warning and not Errors. [#80](https://github.com/emsesp/EMS-ESP32/issues/80) +- add upload_sec to `api/system/info` and removed # from some names to keep consistent with MQTT heartbeat + ## Removed diff --git a/src/system.cpp b/src/system.cpp index fc06a5a64..d7c37cf22 100644 --- a/src/system.cpp +++ b/src/system.cpp @@ -879,8 +879,10 @@ bool System::command_info(const char * value, const int8_t id, JsonObject & json node = json.createNestedObject("System"); - node["version"] = EMSESP_APP_VERSION; - node["uptime"] = uuid::log::format_timestamp_ms(uuid::get_uptime_ms(), 3); + node["version"] = EMSESP_APP_VERSION; + node["uptime"] = uuid::log::format_timestamp_ms(uuid::get_uptime_ms(), 3); + node["uptime_sec"] = uuid::get_uptime_sec(); + #ifndef EMSESP_STANDALONE node["freemem"] = ESP.getFreeHeap() / 1000L; // kilobytes #endif @@ -901,17 +903,17 @@ bool System::command_info(const char * value, const int8_t id, JsonObject & json } if (EMSESP::bus_status() != EMSESP::BUS_STATUS_OFFLINE) { - node["bus protocol"] = EMSbus::is_ht3() ? F("HT3") : F("Buderus"); - node["#telegrams received"] = EMSESP::rxservice_.telegram_count(); - node["#read requests sent"] = EMSESP::txservice_.telegram_read_count(); - node["#write requests sent"] = EMSESP::txservice_.telegram_write_count(); - node["#incomplete telegrams"] = EMSESP::rxservice_.telegram_error_count(); - node["#tx fails"] = EMSESP::txservice_.telegram_fail_count(); - node["rx line quality"] = EMSESP::rxservice_.quality(); - node["tx line quality"] = EMSESP::txservice_.quality(); + node["bus protocol"] = EMSbus::is_ht3() ? F("HT3") : F("Buderus"); + node["telegrams received"] = EMSESP::rxservice_.telegram_count(); + node["read requests sent"] = EMSESP::txservice_.telegram_read_count(); + node["write requests sent"] = EMSESP::txservice_.telegram_write_count(); + node["incomplete telegrams"] = EMSESP::rxservice_.telegram_error_count(); + node["tx fails"] = EMSESP::txservice_.telegram_fail_count(); + node["rx line quality"] = EMSESP::rxservice_.quality(); + node["tx line quality"] = EMSESP::txservice_.quality(); if (Mqtt::enabled()) { - node["#MQTT publishes"] = Mqtt::publish_count(); - node["#MQTT publish fails"] = Mqtt::publish_fails(); + node["MQTT publishes"] = Mqtt::publish_count(); + node["MQTT publish fails"] = Mqtt::publish_fails(); } if (EMSESP::dallas_enabled()) { node["#dallas sensors"] = EMSESP::sensor_devices().size(); diff --git a/src/version.h b/src/version.h index dcc705421..2c29bab9f 100644 --- a/src/version.h +++ b/src/version.h @@ -1 +1 @@ -#define EMSESP_APP_VERSION "3.1.2b0" +#define EMSESP_APP_VERSION "3.1.2b1"