From d0615bf93d7d1046747fe49146bb49ed1658911b Mon Sep 17 00:00:00 2001
From: sieja <sieja>
Date: Sat, 22 Feb 2025 18:39:11 +0100
Subject: [PATCH] Kosmetyka baterii

---
 .../TempHumLoggerHomeKit.ino                  | 25 +++++++------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/ESP32/TempHumLoggerHomeKit/TempHumLoggerHomeKit.ino b/ESP32/TempHumLoggerHomeKit/TempHumLoggerHomeKit.ino
index 0f55852..4c79926 100644
--- a/ESP32/TempHumLoggerHomeKit/TempHumLoggerHomeKit.ino
+++ b/ESP32/TempHumLoggerHomeKit/TempHumLoggerHomeKit.ino
@@ -9,7 +9,7 @@
 #include "SD.h"
 #include "SPI.h"
 
-#define Version "0.24"
+#define Version "0.28"
 #define WIRE Wire
 #define DHTTYPE DHT22
 #define DHTPIN 4
@@ -289,15 +289,12 @@ void loop() {
       }
         
       if   (menuL2 == 6){
-        
         display.setCursor(0,24);
         display.print("Wyjdz");
         if (digitalRead(BTN_ENTER) == HIGH) {
               menuL2 = 10;
           }
-          
       }
-
     }
     if   (menuL1 == 7 ) {
       display.setCursor(0, 8);
@@ -335,30 +332,26 @@ void loop() {
     display.println(dateString);
     display.setCursor(0, 8);
     display.print("Battery");
-
+    display.setCursor(50, 8);
+    display.print(batteryPercent); 
+    display.setCursor(70, 8);
+    display.print("%");
     display.setCursor(80,8); 
     display.print("V:");
     display.setCursor(95, 8);
     display.print(batteryVoltage);
 
-
     display.setCursor(0, 24);
     if (currentBatteryVoltage >= 4.20 ){
-        display.print("FlC");
-    } else if (lastBatteryVoltage < currentBatteryVoltage && currentBatteryVoltage >= 2.0 ){
-        display.print("Chr");
+        display.print("Full");
+    } else if ((lastBatteryVoltage < currentBatteryVoltage && currentBatteryVoltage >= 2.0) || currentBatteryVoltage >= 4.06  ){
+        display.print("Charging");
     } else if (lastBatteryVoltage > currentBatteryVoltage && currentBatteryVoltage >= 2.0 ) {
-        display.print("Dsg");
+        display.print("Discharge");
     } else {
         display.print("---");
     }
     batteryPercent = voltageToPercentage(currentBatteryVoltage);
-    display.setCursor(21, 24);
-    display.print("B:");
-    display.setCursor(33, 24);
-    display.print(batteryPercent); 
-    display.setCursor(52, 24);
-    display.print("%");
     
     display.setCursor(60, 24);
     display.print("Est:");