battery & power code sanitization

include/battery.h

@@ -1,14 +0,0 @@
-#ifndef _BATTERY_H
-#define _BATTERY_H
-
-#include <driver/adc.h>
-#include <esp_adc_cal.h>
-
-#define DEFAULT_VREF 1100 // tbd: use adc2_vref_to_gpio() for better estimate
-#define NO_OF_SAMPLES 64  // we do some multisampling to get better values
-
-uint16_t read_voltage(void);
-void calibrate_voltage(void);
-bool batt_sufficient(void);
-
-#endif

include/globals.h

@@ -121,6 +121,7 @@ extern time_t userUTCTime;
 #include "led.h"
 #include "payload.h"
 #include "blescan.h"
+#include "power.h"
 
 #if (HAS_GPS)
 #include "gpsread.h"
@@ -142,10 +143,6 @@ extern time_t userUTCTime;
 #include "button.h"
 #endif
 
-#ifdef BAT_MEASURE_ADC
-#include "battery.h"
-#endif
-
 #ifdef HAS_ANTENNA_SWITCH
 #include "antenna.h"
 #endif

include/ota.h

@@ -4,7 +4,6 @@
 #ifdef USE_OTA
 
 #include "globals.h"
-#include "battery.h"
 #include <Update.h>
 #include <WiFi.h>
 #include <WiFiClientSecure.h>

include/power.h

@@ -2,12 +2,20 @@
 #define _POWER_H
 
 #include <Arduino.h>
+#include <driver/adc.h>
+#include <esp_adc_cal.h>
 #include "i2cscan.h"
 
+#define DEFAULT_VREF 1100 // tbd: use adc2_vref_to_gpio() for better estimate
+#define NO_OF_SAMPLES 64  // we do some multisampling to get better values
+
 #ifdef HAS_PMU
 #include <axp20x.h>
 #endif
 
 void AXP192_init(void);
+uint16_t read_voltage(void);
+void calibrate_voltage(void);
+uint8_t getBattLevel (void);
 
 #endif