ADC battery made standard across devices

bmorcelli · web-flow · commit 9bf39fb6700b · 2025-12-11T08:05:32.000Z
diff --git a/README.md b/README.md
@@ -87,6 +87,8 @@ Things that needs to be done in next updates
 * 2.6.5:
      * [x] Added possibility to order by "Latest update"
      * [x] Port to OpenSourceSRDLabs [WaveSentry and WaveSentry Pro ](https://opensourcesdrlab.com/products/aifw-wavesentry-esp32?VariantsId=10331)
+     * [x] Battery ADC measurement fix for Cardputer, Tdeck, StickCPlus2, T-Display S3, T-HMI
+
 * 2.6.4:
      * [x] Fixed CYD 3243S035R touchscreen rotation
      * [x] Fixed Marauder V7 screen issues
diff --git a/boards/CYD-2432S028/custom_flags.py b/boards/CYD-2432S028/custom_flags.py
@@ -30,7 +30,6 @@ def generate_build_flags(board_config):
     flags.append("-DUP_BTN=-1")
     flags.append("-DDW_BTN=-1")
     flags.append("-DBTN_ACT=LOW")
-    flags.append("-DBAT_PIN=4")
     flags.append("-DBTN_ALIAS='\"Sel\"'")
     flags.append("-DMINBRIGHT=190")
     flags.append("-DBACKLIGHT=21")
diff --git a/boards/ESP-General/interface.cpp b/boards/ESP-General/interface.cpp
@@ -18,13 +18,6 @@ void _post_setup_gpio() {
     pinMode(SEL_BTN, INPUT);
 }
 
-/***************************************************************************************
-** Function name: getBattery()
-** location: display.cpp
-** Description:   Delivers the battery value from 1-100
-***************************************************************************************/
-int getBattery() { return 0; }
-
 /*********************************************************************
 ** Function: setBrightness
 ** location: settings.cpp
diff --git a/boards/_New-Device-Model/platformio.ini b/boards/_New-Device-Model/platformio.ini
@@ -34,7 +34,7 @@ build_flags =
 	-DBTN_ALIAS='"M5"'
 	-DLED=19
 	-DLED_ON=HIGH
-	-DBAT_PIN=38
+	-DANALOG_BAT_PIN=38
 	-DBACKLIGHT=27
 	-DMINBRIGHT=190
 	-DFP=1
diff --git a/boards/elecrow/platformio.ini b/boards/elecrow/platformio.ini
@@ -28,7 +28,6 @@ build_flags =
 	-DUP_BTN=-1
 	-DDW_BTN=-1
 	-DBTN_ACT=LOW
-	-DBAT_PIN=4
 	-DBTN_ALIAS='"Sel"'
 	-DMINBRIGHT=190
 	-DBACKLIGHT=27
@@ -87,7 +86,6 @@ build_flags =
 	-DUP_BTN=-1
 	-DDW_BTN=-1
 	-DBTN_ACT=LOW
-	-DBAT_PIN=4
 	-DBTN_ALIAS='\"Sel\"'
 	-DMINBRIGHT=190
 	-DBACKLIGHT=27
diff --git a/boards/lilygo-t-deck-pro/platformio.ini b/boards/lilygo-t-deck-pro/platformio.ini
@@ -29,7 +29,6 @@ build_flags =
 	-DUP_BTN=-1
 	-DDW_BTN=-1
 	-DBTN_ACT=LOW
-	-DBAT_PIN=4
 	-DBTN_ALIAS='"Sel"'
 	-DMINBRIGHT=190
 	-DBACKLIGHT=40
diff --git a/boards/lilygo-t-deck/interface.cpp b/boards/lilygo-t-deck/interface.cpp
@@ -95,21 +95,6 @@ void _setup_gpio() {
 // uint8_t isPlus = false;
 void _post_setup_gpio() {}
 
-/***************************************************************************************
-** Function name: getBattery()
-** location: display.cpp
-** Description:   Delivers the battery value from 1-100
-***************************************************************************************/
-int getBattery() {
-    uint8_t percent;
-    uint32_t volt = analogReadMilliVolts(GPIO_NUM_4);
-
-    float mv = volt;
-    percent = (mv - 3300) * 100 / (float)(4150 - 3350);
-
-    return (percent < 0) ? 0 : (percent >= 100) ? 100 : percent;
-}
-
 /*********************************************************************
 ** Function: setBrightness
 ** location: settings.cpp
diff --git a/boards/lilygo-t-deck/platformio.ini b/boards/lilygo-t-deck/platformio.ini
@@ -37,7 +37,7 @@ build_flags =
 
 	-DBTN_ACT=LOW
 	;-DLR_ACT=HIGH
-	-DBAT_PIN=4
+	-DANALOG_BAT_PIN=4
 	-DBTN_ALIAS='"Mid"'
 	-DMINBRIGHT=1
 	-DBACKLIGHT=42 ;TFT_BL
diff --git a/boards/lilygo-t-display-s3-amoled/platformio.ini b/boards/lilygo-t-display-s3-amoled/platformio.ini
@@ -33,7 +33,6 @@ build_flags =
 	-DUP_BTN=-1
 	-DDW_BTN=-1
 	-DBTN_ACT=LOW
-	-DBAT_PIN=-1
 	-DBTN_ALIAS='"Sel"'
 	-DLED=-1
 	-DLED_ON=HIGH
diff --git a/boards/lilygo-t-display-s3-pro/platformio.ini b/boards/lilygo-t-display-s3-pro/platformio.ini
@@ -33,7 +33,6 @@ build_flags =
 	-DUP_BTN=12
 	-DDW_BTN=16
 	-DBTN_ACT=LOW
-	-DBAT_PIN=4
 	-DBTN_ALIAS='"Sel"'
 	-DMINBRIGHT=190
 	-DBACKLIGHT=TFT_BL
diff --git a/boards/lilygo-t-display-s3-touch/interface.cpp b/boards/lilygo-t-display-s3-touch/interface.cpp
@@ -128,22 +128,6 @@ void _post_setup_gpio() {
     }
 }
 
-/***************************************************************************************
-** Function name: getBattery()
-** location: display.cpp
-** Description:   Delivers the battery value from 1-100
-***************************************************************************************/
-int getBattery() {
-    uint8_t percent;
-    uint32_t volt = 0;
-    // analogReadMilliVolts(GPIO_NUM_38);
-
-    float mv = volt;
-    percent = (mv - 3300) * 100 / (float)(4150 - 3350);
-
-    return (percent < 0) ? 0 : (percent >= 100) ? 100 : percent;
-}
-
 /*********************************************************************
 ** Function: setBrightness
 ** location: settings.cpp
diff --git a/boards/lilygo-t-display-s3-touch/platformio.ini b/boards/lilygo-t-display-s3-touch/platformio.ini
@@ -33,7 +33,7 @@ build_flags =
 	-DUP_BTN=-1
 	-DDW_BTN=14
 	-DBTN_ACT=LOW
-	-DBAT_PIN=4
+	-DANALOG_BAT_PIN=4
 	-DBTN_ALIAS='"Sel"'
 	-DMINBRIGHT=190
 	-DBACKLIGHT=38
diff --git a/boards/lilygo-t-dongle-s3-tft/platformio.ini b/boards/lilygo-t-dongle-s3-tft/platformio.ini
@@ -30,7 +30,6 @@ build_flags =
 	-DUP_BTN=-1
 	-DDW_BTN=14
 	-DBTN_ACT=HIGH
-	-DBAT_PIN=4
 	-DBTN_ALIAS='"Sel"'
 	-DMINBRIGHT=190
 	-DBACKLIGHT=38
diff --git a/boards/lilygo-t-embed-cc1101/interface.cpp b/boards/lilygo-t-embed-cc1101/interface.cpp
@@ -86,18 +86,13 @@ void _setup_gpio() {
 ** Function name: getBattery()
 ** Description:   Delivers the battery value from 1-100
 ***************************************************************************************/
+#if defined(USE_BQ27220_VIA_I2C)
 int getBattery() {
     int percent = 0;
-#if defined(USE_BQ27220_VIA_I2C)
     percent = bq.getChargePcnt();
-#elif defined(T_EMBED)
-    uint32_t volt = analogReadMilliVolts(GPIO_NUM_4);
-    float mv = volt;
-    percent = (mv - 3300) * 100 / (float)(4150 - 3350);
-#endif
-
     return (percent < 0) ? 0 : (percent >= 100) ? 100 : percent;
 }
+#endif
 /*********************************************************************
 **  Function: setBrightness
 **  set brightness value
diff --git a/boards/lilygo-t-embed-cc1101/platformio.ini b/boards/lilygo-t-embed-cc1101/platformio.ini
@@ -40,7 +40,7 @@ build_flags =
 	-DENCODER_KEY=0
 
 	-DBTN_ACT=LOW
-	-DBAT_PIN=4
+	-DANALOG_BAT_PIN=4
 	-DBTN_ALIAS='"Mid"'
 	-DMINBRIGHT=1
 	-DBACKLIGHT=TFT_BL
@@ -122,7 +122,6 @@ build_flags =
 	-DENCODER_KEY=0
 
 	-DBTN_ACT=LOW
-	-DBAT_PIN=4
 	-DBTN_ALIAS='"Mid"'
 	-DMINBRIGHT=1
 	-DBACKLIGHT=TFT_BL
diff --git a/boards/lilygo-t-hmi/interface.cpp b/boards/lilygo-t-hmi/interface.cpp
@@ -119,17 +119,3 @@ void powerOff() {
 ** Btn logic to tornoff the device (name is odd btw)
 **********************************************************************/
 void checkReboot() {}
-
-/***************************************************************************************
-** Function name: getBattery()
-** location: display.cpp
-** Description:   Delivers the battery value from 1-100
-***************************************************************************************/
-int getBattery() {
-    uint8_t percent;
-    uint32_t volt = analogReadMilliVolts(GPIO_NUM_5);
-    float mv = volt;
-    percent = (mv - 3300) * 100 / (float)(4150 - 3350);
-
-    return (percent < 0) ? 0 : (percent >= 100) ? 100 : percent;
-}
diff --git a/boards/lilygo-t-hmi/platformio.ini b/boards/lilygo-t-hmi/platformio.ini
@@ -15,6 +15,8 @@ build_flags =
 	-D CYD28_TouchR_CLK=1
 	-D CYD28_TouchR_CS=2
 
+	-DANALOG_BAT_PIN=5
+
 	-DDISABLE_ALL_LIBRARY_WARNINGS
 	-DDEVICE_NAME='"Lilygo T-HMI"'
 
diff --git a/boards/lilygo-t-lora-pager/platformio.ini b/boards/lilygo-t-lora-pager/platformio.ini
@@ -39,7 +39,6 @@ build_flags =
 	-DENCODER_KEY=7
 
 	-DBTN_ACT=LOW
-	-DBAT_PIN=4
 	-DBTN_ALIAS='"Encoder"'
 	-DMINBRIGHT=1
 	-DBACKLIGHT=TFT_BL
diff --git a/boards/lilygo-t5-epaper-s3-pro/platformio.ini b/boards/lilygo-t5-epaper-s3-pro/platformio.ini
@@ -29,7 +29,6 @@ build_flags =
 	-DUP_BTN=-1
 	-DDW_BTN=48
 	-DBTN_ACT=LOW
-	-DBAT_PIN=4
 	-DBTN_ALIAS='"Sel"'
 	-DMINBRIGHT=190
 	-DBACKLIGHT=40
diff --git a/boards/m5stack-cardputer/interface.cpp b/boards/m5stack-cardputer/interface.cpp
@@ -126,20 +126,6 @@ void _post_setup_gpio() {
     attachInterruptArg(digitalPinToInterrupt(11), gpio_isr_handler, &kb_interrupt, CHANGE);
     tca.enableInterrupts();
 }
-/***************************************************************************************
-** Function name: getBattery()
-** location: display.cpp
-** Description:   Delivers the battery value from 1-100
-***************************************************************************************/
-int getBattery() {
-    uint8_t percent;
-    uint32_t volt = analogReadMilliVolts(GPIO_NUM_10);
-
-    float mv = volt;
-    percent = (mv - 3300) * 100 / (float)(4150 - 3350);
-
-    return (percent < 0) ? 0 : (percent >= 100) ? 100 : percent;
-}
 
 /*********************************************************************
 ** Function: setBrightness
diff --git a/boards/m5stack-cardputer/platformio.ini b/boards/m5stack-cardputer/platformio.ini
@@ -36,7 +36,7 @@ build_flags =
 	-DFP=1
 	-DFM=2
 	-DFG=3
-	-DBAT_PIN=10
+	-DANALOG_BAT_PIN=10
 	-DLED=21
 	-DLED_ON=HIGH
 	-DBACKLIGHT=38
diff --git a/boards/m5stack-cplus2/interface.cpp b/boards/m5stack-cplus2/interface.cpp
@@ -23,21 +23,6 @@ void _setup_gpio() {
     gpio_pullup_dis(GPIO_NUM_36);
 }
 
-/***************************************************************************************
-** Function name: getBattery()
-** location: display.cpp
-** Description:   Delivers the battery value from 1-100
-***************************************************************************************/
-int getBattery() {
-    uint8_t percent;
-    uint32_t volt = analogReadMilliVolts(GPIO_NUM_38);
-
-    float mv = volt;
-    percent = (mv - 3300) * 100 / (float)(4150 - 3350);
-
-    return (percent < 0) ? 0 : (percent >= 100) ? 100 : percent;
-}
-
 /*********************************************************************
 ** Function: setBrightness
 ** location: settings.cpp
diff --git a/boards/m5stack-cplus2/platformio.ini b/boards/m5stack-cplus2/platformio.ini
@@ -35,7 +35,7 @@ build_flags =
 	-DBTN_ALIAS='"M5"'
 	-DLED=19
 	-DLED_ON=HIGH
-	-DBAT_PIN=38
+	-DANALOG_BAT_PIN=38
 	-DBACKLIGHT=27
 	-DMINBRIGHT=190
 	-DFP=1
diff --git a/boards/m5stack-tab5/platformio.ini b/boards/m5stack-tab5/platformio.ini
@@ -35,7 +35,6 @@ build_flags =
 	-DBTN_ALIAS='"M5"'
 	-DLED=19
 	-DLED_ON=HIGH
-	-DBAT_PIN=38
 	-DBACKLIGHT=27
 	-DMINBRIGHT=190
 	-DFP=3
diff --git a/boards/marauder-mini/interface.cpp b/boards/marauder-mini/interface.cpp
@@ -45,12 +45,7 @@ void _setBrightness(uint8_t brightval) {
         ledcWrite(TFT_BL, dutyCycle);
     }
 }
-/***************************************************************************************
-** Function name: getBattery()
-** location: display.cpp
-** Description:   Delivers the battery value from 1-100
-***************************************************************************************/
-int getBattery() { return 0; }
+
 
 /*********************************************************************
 ** Function: InputHandler
diff --git a/boards/marauder-mini/platformio.ini b/boards/marauder-mini/platformio.ini
@@ -32,7 +32,6 @@ build_flags =
 	-DL_BTN=13
 
 	-DBTN_ACT=LOW
-	-DBAT_PIN=4
 	-DBTN_ALIAS='"Sel"'
 	-DLED=-1
 	-DLED_ON=LOW
@@ -97,7 +96,6 @@ build_flags =
 	-DL_BTN=13
 
 	-DBTN_ACT=LOW
-	-DBAT_PIN=4
 	-DBTN_ALIAS='"Sel"'
 	-DLED=-1
 	-DLED_ON=LOW
diff --git a/src/mykeyboard.cpp b/src/mykeyboard.cpp
@@ -858,4 +858,25 @@ void checkReboot() {}
 ** Function name: getBattery()
 ** Description:   Delivers the battery value from 0-100
 ***************************************************************************************/
-int getBattery() { return 0; }
+int getBattery() {
+#ifdef ANALOG_BAT_PIN
+#ifndef ANALOG_BAT_MULTIPLIER
+#define ANALOG_BAT_MULTIPLIER 2.0f
+#endif
+    static bool adcInitialized = false;
+    if (!adcInitialized) {
+        pinMode(ANALOG_BAT_PIN, INPUT);
+        adcInitialized = true;
+    }
+    uint32_t adcReading = analogReadMilliVolts(ANALOG_BAT_PIN);
+    float actualVoltage = (float)adcReading * ANALOG_BAT_MULTIPLIER;
+    const float MIN_VOLTAGE = 3300.0f;
+    const float MAX_VOLTAGE = 4150.0f;
+    float percent = ((actualVoltage - MIN_VOLTAGE) / (MAX_VOLTAGE - (MIN_VOLTAGE + 50.0f))) * 100.0f;
+
+    if (percent < 0) percent = 1;
+    if (percent > 100) percent = 100;
+    return (int)percent;
+#endif
+    return 0;
+}
