From 9a08af81efa19aa76b175425362b382e2383485d Mon Sep 17 00:00:00 2001
From: Torsten Stauder <stauder@ts-cs.de>
Date: Tue, 13 Jul 2021 18:19:30 +0200
Subject: [PATCH] Added battery-voltage to info-window (webgui)

---
 src/Web.cpp  | 12 ++++++++----
 src/main.cpp |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/Web.cpp b/src/Web.cpp
index 67b9bf7..cf42bf2 100644
--- a/src/Web.cpp
+++ b/src/Web.cpp
@@ -154,22 +154,26 @@ void webserverStart(void) {
         wServer.on(
             "/info", HTTP_GET, [](AsyncWebServerRequest *request) {
                 #if (LANGUAGE == DE)
-                    String info = "Freier heap: " + String(ESP.getFreeHeap());
-                    info += "\nGroesster freier heap-block: " + String((uint32_t)heap_caps_get_largest_free_block(MALLOC_CAP_8BIT));
+                    String info = "Freier Heap: " + String(ESP.getFreeHeap()) + " Bytes";
+                    info += "\nGroesster freier Heap-Block: " + String((uint32_t)heap_caps_get_largest_free_block(MALLOC_CAP_8BIT)) + " Bytes";
                     info += "\nFreier PSRAM: ";
                     info += (!psramInit()) ? "nicht verfuegbar" : String(ESP.getFreePsram());
                     if (Wlan_IsConnected()) {
                         info += "\nWLAN-Signalstaerke: " + String((int8_t)Wlan_GetRssi()) + " dBm";
                     }
                 #else
-                    String info = "Free heap: " + String(ESP.getFreeHeap());
-                    info += "\nLargest free heap-block: " + String((uint32_t)heap_caps_get_largest_free_block(MALLOC_CAP_8BIT));
+                    String info = "Free heap: " + String(ESP.getFreeHeap()) + " bytes";
+                    info += "\nLargest free heap-block: " + String((uint32_t)heap_caps_get_largest_free_block(MALLOC_CAP_8BIT)) + " bytes";
                     info += "\nFree PSRAM: ";
                     info += (!psramInit()) ? "not available" : String(ESP.getFreePsram());
                     if (Wlan_IsConnected) {
                         info += "\nWiFi signal-strength: " + String((int8_t)Wlan_GetRssi()) + " dBm";
                     }
                 #endif
+                #ifdef MEASURE_BATTERY_VOLTAGE
+                    snprintf(Log_Buffer, Log_BufferLength, "\n%s: %.2f V", (char *) FPSTR(currentVoltageMsg), Battery_GetVoltage());
+                    info += (String) Log_Buffer;
+                #endif
                 request->send_P(200, "text/plain", info.c_str());
             });
 
diff --git a/src/main.cpp b/src/main.cpp
index a41c22d..c03ebbc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -184,7 +184,7 @@ void setup() {
     Serial.println(F(" | |___   ___) | |  __/  | |_| | | | | | | | | (_) |"));
     Serial.println(F(" |_____| |____/  |_|      \\__,_| |_| |_| |_|  \\___/ "));
     Serial.println(F(" Rfid-controlled musicplayer\n"));
-    Serial.println(F(" Rev 20210713-1\n"));
+    Serial.println(F(" Rev 20210713-2\n"));
 
     // print wake-up reason
     printWakeUpReason();