From 7bece3c32f67df30f7ca17300ff8b22a95c0743c Mon Sep 17 00:00:00 2001 From: CommanderRedYT Date: Thu, 9 Jun 2022 03:39:21 +0200 Subject: [PATCH] Added cloud destroy and battery percentage --- main/cloud.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/main/cloud.cpp b/main/cloud.cpp index 3d8020b..b789aff 100644 --- a/main/cloud.cpp +++ b/main/cloud.cpp @@ -444,6 +444,14 @@ void send_information() infoObject["uptime"] = espchrono::millis_clock::now().time_since_epoch().count(); + // battery + if (const auto avgVoltage = controllers.getAvgVoltage(); avgVoltage) + { + infoObject["percentage"] = fmt::format("{:.1f}%", getBatteryPercentage(*avgVoltage, BatteryCellType(configs.battery.cellType.value()))); + } + else + infoObject["percentage"] = nullptr; + std::string body; serializeJson(doc, body); doc.clear(); @@ -899,6 +907,7 @@ void cloudEventHandler(void *event_handler_arg, esp_event_base_t event_base, int case WEBSOCKET_EVENT_CLOSED: ESP_LOGE(TAG, "%s event_id=%s %.*s", event_base, "WEBSOCKET_EVENT_CLOSED", data->data_len, data->data_ptr); hasAnnouncedItself = false; + destroyCloud(); break; default: ESP_LOGI(TAG, "%s unknown event_id %i", event_base, event_id);