From b619b84b3aeb5df5e2f17086292e01fafefb0dda Mon Sep 17 00:00:00 2001
From: richonguzman <richon2001@hotmail.com>
Date: Sun, 31 Dec 2023 12:39:55 -0300
Subject: [PATCH] final update for other boards

---
 src/power_utils.cpp |  3 ++-
 src/power_utils.h   | 66 ---------------------------------------------
 2 files changed, 2 insertions(+), 67 deletions(-)

diff --git a/src/power_utils.cpp b/src/power_utils.cpp
index e551a75..0962dcf 100644
--- a/src/power_utils.cpp
+++ b/src/power_utils.cpp
@@ -236,6 +236,7 @@ namespace POWER_Utils {
     PMU.setChargerTerminationCurr(XPOWERS_AXP192_CHG_ITERM_LESS_10_PERCENT);
     PMU.setChargeTargetVoltage(XPOWERS_AXP192_CHG_VOL_4V2);
     PMU.setChargerConstantCurr(XPOWERS_AXP192_CHG_CUR_780MA);
+    PMU.setSysPowerDownVoltage(2600);
     #endif
     #if defined(TTGO_T_Beam_V1_2) || defined(TTGO_T_Beam_V1_2_SX1262)
     Wire.begin(SDA, SCL);
@@ -255,8 +256,8 @@ namespace POWER_Utils {
     PMU.setChargerTerminationCurr(XPOWERS_AXP2101_CHG_ITERM_25MA);
     PMU.setChargeTargetVoltage(XPOWERS_AXP2101_CHG_VOL_4V2);
     PMU.setChargerConstantCurr(XPOWERS_AXP2101_CHG_CUR_800MA);
-    #endif
     PMU.setSysPowerDownVoltage(2600);
+    #endif
   }
 
   void lowerCpuFrequency() {
diff --git a/src/power_utils.h b/src/power_utils.h
index 9af3cac..7285f5d 100644
--- a/src/power_utils.h
+++ b/src/power_utils.h
@@ -4,72 +4,6 @@
 #include <Arduino.h>
 #include "XPowersLib.h"
 
-
-/*#if defined(TTGO_T_Beam_V0_7) || defined(ESP32_DIY_LoRa_GPS) || defined(TTGO_T_LORA_V2_1_GPS) || defined(TTGO_T_LORA_V2_1_TNC) || defined(ESP32_DIY_1W_LoRa_GPS)
-// The V0.7 boards have no power managment components connected to TwoWire. 
-// Battery charging is controlled by a TP5400 IC indepemdetly from the ESP32.
-// Wire.h must be included to maitain software compatibility with V1.0 and 1.2 boards.
-#include <Wire.h>
-#endif
-#if defined(TTGO_T_Beam_V1_0) || defined(TTGO_T_Beam_V1_0_SX1268)
-#include <axp20x.h>
-#endif
-#if defined(TTGO_T_Beam_V1_2) || defined(TTGO_T_Beam_V1_2_SX1262)
-#define XPOWERS_CHIP_AXP2101
-#include "XPowersLib.h"
-#endif
-
-class PowerManagement {
-public:
-  PowerManagement() : BatteryIsConnected(false), batteryVoltage(""), batteryChargeDischargeCurrent("") {};
-  bool begin(TwoWire &port);
-
-  void setup();
-  void lowerCpuFrequency();
-  void handleChargingLed(); 
-
-  void obtainBatteryInfo();
-  String getBatteryInfoVoltage();
-  String getBatteryInfoCurrent();
-  bool getBatteryInfoIsConnected();
-  void batteryManager();
-  void shutdown();
-  bool isChargeing();
-
-private:
-  void activateLoRa();
-  void deactivateLoRa();
-
-  void activateGPS();
-  void deactivateGPS();
-
-  void activateOLED();
-  void decativateOLED();
-
-  void enableChgLed();
-  void disableChgLed();
-
-  void activateMeasurement();
-  void deactivateMeasurement();
-
-  double getBatteryVoltage();
-  double getBatteryChargeDischargeCurrent();
-
-  bool isBatteryConnected();
-
-  #if defined(TTGO_T_Beam_V1_0) || defined(TTGO_T_Beam_V1_0_SX1268)
-  AXP20X_Class axp;
-  #endif
-  #if defined(TTGO_T_Beam_V1_2) || defined(TTGO_T_Beam_V1_2_SX1262)
-  XPowersPMU PMU;
-  #endif
-
-  bool   BatteryIsConnected;
-  String batteryVoltage;
-  String batteryChargeDischargeCurrent;
-};*/
-
-///////////////////////////////
 namespace POWER_Utils {
 
   double getBatteryVoltage();