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

remove RSSI from info payload as its in the heartbeat

Browse Source
This commit is contained in:
Proddy
2024-02-21 23:04:10 +01:00
parent 2eb77b5f97
commit 1a08ab6a2b
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/system.cpp
View File

@@ -587,7 +587,6 @@ void System::send_info_mqtt() {
doc["hostname"] = WiFi.getHostname(); doc["hostname"] = WiFi.getHostname();
doc["SSID"] = WiFi.SSID(); doc["SSID"] = WiFi.SSID();
doc["BSSID"] = WiFi.BSSIDstr(); doc["BSSID"] = WiFi.BSSIDstr();
doc["RSSI"] = WiFi.RSSI();
doc["MAC"] = WiFi.macAddress(); doc["MAC"] = WiFi.macAddress();
doc["IPv4 address"] = uuid::printable_to_string(WiFi.localIP()) + "/" + uuid::printable_to_string(WiFi.subnetMask()); doc["IPv4 address"] = uuid::printable_to_string(WiFi.localIP()) + "/" + uuid::printable_to_string(WiFi.subnetMask());
doc["IPv4 gateway"] = uuid::printable_to_string(WiFi.gatewayIP()); doc["IPv4 gateway"] = uuid::printable_to_string(WiFi.gatewayIP());
@@ -602,13 +601,19 @@ void System::send_info_mqtt() {
// create the json for heartbeat // create the json for heartbeat
void System::heartbeat_json(JsonObject output) { void System::heartbeat_json(JsonObject output) {
uint8_t bus_status = EMSESP::bus_status(); switch (EMSESP::bus_status()) {
if (bus_status == EMSESP::BUS_STATUS_TX_ERRORS) { case EMSESP::BUS_STATUS_OFFLINE:
output["bus_status"] = "connecting"; // EMS-ESP is booting...
break;
case EMSESP::BUS_STATUS_TX_ERRORS:
output["bus_status"] = "txerror"; output["bus_status"] = "txerror";
} else if (bus_status == EMSESP::BUS_STATUS_CONNECTED) { break;
case EMSESP::BUS_STATUS_CONNECTED:
output["bus_status"] = "connected"; output["bus_status"] = "connected";
} else { break;
default:
output["bus_status"] = "disconnected"; output["bus_status"] = "disconnected";
break;
} }
output["uptime"] = uuid::log::format_timestamp_ms(uuid::get_uptime_ms(), 3); output["uptime"] = uuid::log::format_timestamp_ms(uuid::get_uptime_ms(), 3);
@@ -732,6 +737,9 @@ void System::system_check() {
static uint8_t last_healthcheck_ = 0; static uint8_t last_healthcheck_ = 0;
if (healthcheck_ != last_healthcheck_) { if (healthcheck_ != last_healthcheck_) {
last_healthcheck_ = healthcheck_; last_healthcheck_ = healthcheck_;
EMSESP::system_.send_heartbeat(); // send MQTT heartbeat immediately when connected
// see if we're better now // see if we're better now
if (healthcheck_ == 0) { if (healthcheck_ == 0) {
// everything is healthy, show LED permanently on or off depending on setting // everything is healthy, show LED permanently on or off depending on setting