Kosmetyka baterii

This commit is contained in:
sieja
2025-02-22 18:39:11 +01:00
parent 70a448d828
commit d0615bf93d

View File

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