From 6a144e73ae2a1b312dc033b830e484fe7b24b7d8 Mon Sep 17 00:00:00 2001
From: Peter Shipley <peter.shipley@gmail.com>
Date: Sun, 14 Jun 2026 03:04:28 -0700
Subject: [PATCH] finally

---
 esp32_marauder/BatteryInterface.cpp |  5 +++++
 esp32_marauder/BatteryInterface.h   |  3 +++
 esp32_marauder/configs.h            | 29 +++++++++++++++++++++++------
 esp32_marauder/esp32_marauder.ino   | 10 +---------
 4 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/esp32_marauder/BatteryInterface.cpp b/esp32_marauder/BatteryInterface.cpp
index 7b85a80..bbf607f 100644
--- a/esp32_marauder/BatteryInterface.cpp
+++ b/esp32_marauder/BatteryInterface.cpp
@@ -62,6 +62,11 @@ void BatteryInterface::RunSetup() {
           }
         #endif
 
+        #ifdef HAS_AXP192
+            axp192_obj.begin();
+        #endif
+
+
         #ifdef HAS_MAX1704X
           Wire.beginTransmission(MAX17048_ADDR);
           error = Wire.endTransmission();
diff --git a/esp32_marauder/BatteryInterface.h b/esp32_marauder/BatteryInterface.h
index 3024835..4cd7f28 100644
--- a/esp32_marauder/BatteryInterface.h
+++ b/esp32_marauder/BatteryInterface.h
@@ -18,6 +18,9 @@
   #include "XPowersLib.h"
 #endif
 
+#ifdef HAS_AXP192
+  AXP192 axp192_obj;
+#endif
 
 #ifndef BATTERY_ADC_PIN  // not 12c
   #include <Wire.h>
diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h
index 5db8aab..34bd7a6 100644
--- a/esp32_marauder/configs.h
+++ b/esp32_marauder/configs.h
@@ -124,6 +124,11 @@
     //#define FLIPPER_ZERO_HAT
     #define HAS_MINI_KB
     #define HAS_BATTERY
+      #if defined(MARAUDER_M5STICKC)
+        #define HAS_AXP192
+      #else
+        #define HAS_TP4057
+      #endif
     #define HAS_BT
     #define HAS_BUTTONS
     //#define HAS_NEOPIXEL_LED
@@ -237,6 +242,7 @@
     #define HAS_TOUCH
     //#define FLIPPER_ZERO_HAT
     #define HAS_BATTERY
+      #define HAS_IP5306
     #define HAS_BT
     //#define HAS_BUTTONS
     #define HAS_NEOPIXEL_LED
@@ -256,6 +262,7 @@
     #define HAS_TOUCH
     //#define FLIPPER_ZERO_HAT
     #define HAS_BATTERY
+      #define HAS_IP5306
     #define HAS_BT
     #define HAS_BT_REMOTE
     #define HAS_BUTTONS
@@ -554,7 +561,7 @@
 
   //// POWER MANAGEMENT
   #ifdef HAS_PWR_MGMT
-    #if defined(MARAUDER_M5STICKC) || defined(MARAUDER_M5STICKCP2)
+    #if defined(HAS_AXP192)
       #include "AXP192.h"
     #endif
 
@@ -2640,14 +2647,9 @@
   //// BATTERY STUFF
   #ifdef HAS_BATTERY
 
-    #ifdef __AXP192_H__
-      #define HAS_AXP2101
-    #endif
-
     #if defined(MARAUDER_M5STICKC) || defined(MARAUDER_M5STICKCP2) 
       #define I2C_SDA 33
       #define I2C_SCL 22
-      #define HAS_AXP2101
 
     #elif defined(MARAUDER_V4) || defined(MARAUDER_V6) || defined(MARAUDER_V6_1) || defined(MARAUDER_KIT)
       #define I2C_SDA 33
@@ -2700,6 +2702,20 @@
       #undef HAS_AXP2101
       #undef HAS_IP5306
       #undef HAS_MAX1704X
+      #undef HAS_AXP192
+
+p
+    // No driver for this LiPo charger
+    #elif HAS_TP4057
+      #undef HAS_AXP2101
+      #undef HAS_IP5306
+      #undef HAS_MAX1704X
+      #undef HAS_AXP192
+
+    #elif defined(HAS_AXP192)
+      #undef HAS_AXP2101
+      #undef HAS_IP5306
+      #undef HAS_MAX1704X
 
     #elif defined(HAS_AXP2101)
       #undef HAS_IP5306
@@ -2710,6 +2726,7 @@
        // #define HAS_AXP2101
        #define HAS_IP5306
        #define HAS_MAX1704X
+       #define HAS_AXP192
     #endif
 
   #endif  // HAS_BATTERY
diff --git a/esp32_marauder/esp32_marauder.ino b/esp32_marauder/esp32_marauder.ino
index a465117..2fd84d9 100644
--- a/esp32_marauder/esp32_marauder.ino
+++ b/esp32_marauder/esp32_marauder.ino
@@ -1,6 +1,6 @@
 /* FLASH SETTINGS
 Board: LOLIN D32
-Flash Frequency: 80MHz
+ Frequency: 80MHz
 Partition Scheme: Minimal SPIFFS
 https://www.online-utility.org/image/convert/to/XBM
 */
@@ -92,10 +92,6 @@ CommandLine cli_obj;
   SDInterface sd_obj;
 #endif
 
-#ifdef MARAUDER_M5STICKC
-  AXP192 axp192_obj;
-#endif
-
 #ifdef HAS_FLIPPER_LED
   flipperLED flipper_led;
 #elif defined(XIAO_ESP32_S3)
@@ -252,10 +248,6 @@ void setup()
     delay(100);
   #endif
 
-  #ifdef defined(MARAUDER_M5STICKC) && !defined(MARAUDER_M5STICKCP2)
-    axp192_obj.begin();
-  #endif
-
   #if defined(MARAUDER_M5STICKCP2) // Prevent StickCP2 from turning off when disconnect USB cable
     pinMode(POWER_HOLD_PIN, OUTPUT);
     digitalWrite(POWER_HOLD_PIN, HIGH);