From 4825385d2f57527d75e56d775e9011457f705cbc Mon Sep 17 00:00:00 2001 From: richonguzman Date: Thu, 19 Sep 2024 10:48:00 -0300 Subject: [PATCH] battery on Screen fix for axp2101 --- src/LoRa_APRS_Tracker.cpp | 2 +- src/power_utils.cpp | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/LoRa_APRS_Tracker.cpp b/src/LoRa_APRS_Tracker.cpp index e07e932..475d8c6 100644 --- a/src/LoRa_APRS_Tracker.cpp +++ b/src/LoRa_APRS_Tracker.cpp @@ -47,7 +47,7 @@ TinyGPSPlus gps; OneButton userButton = OneButton(BUTTON_PIN, true, true); #endif -String versionDate = "2024.09.18"; +String versionDate = "2024.09.19"; uint8_t myBeaconsIndex = 0; int myBeaconsSize = Config.beacons.size(); diff --git a/src/power_utils.cpp b/src/power_utils.cpp index e1275b3..4770281 100644 --- a/src/power_utils.cpp +++ b/src/power_utils.cpp @@ -160,15 +160,10 @@ namespace POWER_Utils { void obtainBatteryInfo() { static unsigned int rate_limit_check_battery = 0; - if (!(rate_limit_check_battery++ % 60)) - BatteryIsConnected = isBatteryConnected(); + if (!(rate_limit_check_battery++ % 60)) BatteryIsConnected = isBatteryConnected(); if (BatteryIsConnected) { - #ifdef HAS_AXP2101 - batteryVoltage = String(PMU.getBattVoltage()/1000); - #else - batteryVoltage = String(getBatteryVoltage(), 2); - #endif - batteryChargeDischargeCurrent = String(getBatteryChargeDischargeCurrent(), 0); + batteryVoltage = String(getBatteryVoltage(), 2); + batteryChargeDischargeCurrent = String(getBatteryChargeDischargeCurrent(), 0); } }