add new battery mappings

SlimeVR · Dec 22, 2023 · 9e9b3da · 9e9b3da
1 parent b744c53
commit 9e9b3da
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 11 deletions.
diff --git a/src/batterymonitor.cpp b/src/batterymonitor.cpp
@@ -98,19 +98,43 @@ void BatteryMonitor::Loop()
             #endif
             if (voltage > 0) //valid measurement
             {
-                // Estimate battery level, 3.2V is 0%, 4.17V is 100% (1.0)
-                if (voltage > 3.975f)
-                    level = (voltage - 2.920f) * 0.8f;
-                else if (voltage > 3.678f)
-                    level = (voltage - 3.300f) * 1.25f;
-                else if (voltage > 3.489f)
-                    level = (voltage - 3.400f) * 1.7f;
-                else if (voltage > 3.360f)
-                    level = (voltage - 3.300f) * 0.8f;
+#if BATTERY_REGULATOR == REG_BUCK
+                // Estimate battery level, 3.2V is 0%, 3.87V is 50%, 4.15V is 100% (1.0)
+                // Mapped from battery discharge with buck regulating to 2.8V
+                if (voltage > 4.075)
+                    level = map(voltage, 4.075, 4.15, 0.95, 1);
+                else if (voltage > 3.775)
+                    level = map(voltage, 3.775, 4.075, 0.3, 0.95);
+                else if (voltage > 3.45)
+                    level = map(voltage, 3.45, 3.775, 0.05, 0.3);
                 else
-                    level = (voltage - 3.200f) * 0.3f;
-
+                    level = map(voltage, 3.2, 3.45, 0, 0.05);
+#elif BATTERY_REGULATOR == REG_LDO
+                // Estimate battery level, 3.2V is 0%, 3.77V is 50%, 4.15V is 100% (1.0)
+                // Mapped from battery discharge with ldo
+                if (voltage > 4.025)
+                    level = map(voltage, 4.025, 4.15, 0.95, 1);
+                else if (voltage > 3.65)
+                    level = map(voltage, 3.65, 4.025, 0.3, 0.95);
+                else if (voltage > 3.4)
+                    level = map(voltage, 3.4, 3.65, 0.05, 0.3);
+                else
+                    level = map(voltage, 3.2, 3.4, 0, 0.05);
+#elif BATTERY_REGULATOR == REG_LEGACY
+                // Estimate battery level, 3.2V is 0%, 3.7V is 50%, 4.17V is 100% (1.0)
+                // Mapped from unknown data?
+                if (voltage > 3.975)
+                    level = map(voltage, 3.975, 4.17, 0.84375, 1);
+                else if (voltage > 3.677)
+                    level = map(voltage, 3.677, 3.975, 0.4709, 0.84375);
+                else if (voltage > 3.489)
+                    level = map(voltage, 3.489, 3.677, 0.1512, 0.4709);
+                else if (voltage > 3.36)
+                    level = map(voltage, 3.36, 3.489, 0.048, 0.1512);
+                else
+                    level = map(voltage, 3.2, 3.36, 0, 0.048);
                 level = (level - 0.05f) / 0.95f; // Cut off the last 5% (3.36V)
+#endif
 
                 if (level > 1)
                     level = 1;

diff --git a/src/batterymonitor.h b/src/batterymonitor.h
@@ -54,6 +54,10 @@
     #define BATTERY_SHIELD_R2 220.0
 #endif
 
+#ifndef BATTERY_REGULATOR
+    #define BATTERY_REGULATOR REG_LDO
+#endif
+
 #if BATTERY_MONITOR == BAT_EXTERNAL
     #ifndef PIN_BATTERY_LEVEL
         #error Internal ADC enabled without pin! Please select a pin.

diff --git a/src/consts.h b/src/consts.h
@@ -61,6 +61,10 @@
 #define BAT_MCP3021 3
 #define BAT_INTERNAL_MCP3021 4
 
+#define REG_BUCK 1
+#define REG_LDO 2
+#define REG_LEGACY 3
+
 #define LED_OFF 255
 
 #define POWER_SAVING_LEGACY 0 // No sleeping, but PS enabled

diff --git a/src/defines.h b/src/defines.h
@@ -58,6 +58,12 @@ IMU_DESC_ENTRY(IMU_BMP160, PRIMARY_IMU_ADDRESS_ONE, IMU_ROTATION, PIN_IMU_SCL, P
 //   BAT_MCP3021 for external ADC connected over I2C
 #define BATTERY_MONITOR BAT_EXTERNAL
 
+// Battery voltage mapping options
+//   REG_BUCK if the board uses step-down or buck regulator (2.8V)
+//   REG_LDO if the board uses ldo linear regulator
+//   REG_LEGACY to use the old conversion behavior
+// #define BATTERY_REGULATOR REG_LDO
+
 // BAT_EXTERNAL definition override
 // D1 Mini boards with ESP8266 have internal resistors. For these boards you only have to adjust BATTERY_SHIELD_RESISTANCE.
 // For other boards you can now adjust the other resistor values.
@@ -97,6 +103,9 @@ IMU_DESC_ENTRY(IMU_BMP160, PRIMARY_IMU_ADDRESS_ONE, IMU_ROTATION, PIN_IMU_SCL, P
   #ifndef BATTERY_SHIELD_R2
     #define BATTERY_SHIELD_R2 40.2
   #endif
+  #ifndef BATTERY_REGULATOR
+    #define BATTERY_REGULATOR REG_BUCK
+  #endif
 #elif BOARD == BOARD_SLIMEVR_LEGACY || BOARD == BOARD_SLIMEVR_DEV
   #define PIN_IMU_SDA 4
   #define PIN_IMU_SCL 5