kuba/TEF6686_ESP32
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Battery update

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2025-02-10 12:31:22 +01:00
parent e58f7c2dc6
commit c6f3814d1f
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TEF6686_ESP32.ino
+4 -8
View File
@@ -1441,7 +1441,7 @@ void GetData() {
ShowOffset(); ShowOffset();
ShowBW(); ShowBW();
updateCodetect(); updateCodetect();
if (millis() >= tuningtimer + 200) ShowBattery(); if (millis() >= tuningtimer + 200 && !wifi) ShowBattery();
} }
} }
@@ -4155,12 +4155,12 @@ void ShowBattery() {
} }
uint16_t v = 0; uint16_t v = 0;
if (!wifi) v = analogRead(BATTERY_PIN); v = analogRead(BATTERY_PIN);
battery = map(constrain(v, BAT_LEVEL_EMPTY, BAT_LEVEL_FULL), BAT_LEVEL_EMPTY, BAT_LEVEL_FULL, 0, BAT_LEVEL_STAGE); battery = map(constrain(v, BAT_LEVEL_EMPTY, BAT_LEVEL_FULL), BAT_LEVEL_EMPTY, BAT_LEVEL_FULL, 0, BAT_LEVEL_STAGE);
byte batteryprobe = map(constrain(v, BAT_LEVEL_EMPTY, BAT_LEVEL_FULL), BAT_LEVEL_EMPTY, BAT_LEVEL_FULL, 0, 20); byte batteryprobe = map(constrain(v, BAT_LEVEL_EMPTY, BAT_LEVEL_FULL), BAT_LEVEL_EMPTY, BAT_LEVEL_FULL, 0, 20);
if (batteryold != batteryprobe) { if (batteryold != batteryprobe) {
if (!wifi && batterydetect) { if (batterydetect) {
if (battery == 0) { if (battery == 0) {
tft.drawRoundRect(277, 6, 37, 20, 2, BarSignificantColor); tft.drawRoundRect(277, 6, 37, 20, 2, BarSignificantColor);
tft.fillRoundRect(313, 13, 4, 6, 2, BarSignificantColor); tft.fillRoundRect(313, 13, 4, 6, 2, BarSignificantColor);
@@ -4173,17 +4173,13 @@ void ShowBattery() {
} else { } else {
tft.fillRoundRect(279, 8, 33, 16, 2, BackgroundColor); tft.fillRoundRect(279, 8, 33, 16, 2, BackgroundColor);
} }
// } else {
// tft.drawRoundRect(277, 6, 37, 20, 2, GreyoutColor);
// tft.fillRoundRect(313, 13, 4, 6, 2, GreyoutColor);
// tft.fillRoundRect(279, 8, 33, 16, 2, BackgroundColor);
} }
batteryold = batteryprobe; batteryold = batteryprobe;
batteryVold = 0; batteryVold = 0;
vPerold = 0; vPerold = 0;
if (!wifi && batterydetect) { if (batterydetect) {
float batteryV = constrain((((float)v / 4095.0) * 3.3 * (1100 / 1000.0) * 2.0), 0.0, 5.0); float batteryV = constrain((((float)v / 4095.0) * 3.3 * (1100 / 1000.0) * 2.0), 0.0, 5.0);
float vPer = constrain((batteryV - BATTERY_LOW_VALUE) / (BATTERY_FULL_VALUE - BATTERY_LOW_VALUE), 0.0, 0.99) * 100; float vPer = constrain((batteryV - BATTERY_LOW_VALUE) / (BATTERY_FULL_VALUE - BATTERY_LOW_VALUE), 0.0, 0.99) * 100;