Battery usermod/general update 2026

usermods/Battery/UMBattery.h

@@ -11,26 +11,61 @@ class UMBattery
 {
     private:
 
+    public:
+        /**
+         * Lookup table entry for voltage-to-percentage mapping.
+         * Table must be sorted descending by voltage.
+         */
+        struct LutEntry { float voltage; float percent; };
+
     protected:
         float minVoltage;
         float maxVoltage;
         float voltage;
         int8_t level = 100;
         float calibration; // offset or calibration value to fine tune the calculated voltage
         float voltageMultiplier; // ratio for the voltage divider
-        
+
         float linearMapping(float v, float min, float max, float oMin = 0.0f, float oMax = 100.0f)
         {
             return (v-min) * (oMax-oMin) / (max-min) + oMin;
         }
 
+        float lutInterpolate(float v, const LutEntry* lut, uint8_t size)
+        {
+            if (size == 0) return 0.0f;
+
+            LutEntry first, last;
+            memcpy_P(&first, &lut[0], sizeof(LutEntry));
+            memcpy_P(&last, &lut[size-1], sizeof(LutEntry));
+
+            if (v >= first.voltage) return first.percent;
+            if (v <= last.voltage) return last.percent;
+
+            for (uint8_t i = 0; i < size - 1; i++) {
+                LutEntry hi, lo;
+                memcpy_P(&hi, &lut[i], sizeof(LutEntry));
+                memcpy_P(&lo, &lut[i+1], sizeof(LutEntry));
+
+                if (v >= lo.voltage) {
+                    float span = hi.voltage - lo.voltage;
+                    if (fabsf(span) < 1e-6f) return hi.percent;
+                    float ratio = (v - lo.voltage) / span;
+                    return lo.percent + ratio * (hi.percent - lo.percent);
+                }
+            }
+            return last.percent;
+        }
+
     public:
         UMBattery()
         {
             this->setVoltageMultiplier(USERMOD_BATTERY_VOLTAGE_MULTIPLIER);
             this->setCalibration(USERMOD_BATTERY_CALIBRATION);
         }
 
+        virtual ~UMBattery() = default;
+
         virtual void update(batteryConfig cfg)
         {
             if(cfg.minVoltage) this->setMinVoltage(cfg.minVoltage);
@@ -42,15 +77,14 @@ class UMBattery
 
         /**
          * Corresponding battery curves
-         * calculates the level in % (0-100) with given voltage and possible voltage range
+         * calculates the level in % (0-100) with given voltage
          */
-        virtual float mapVoltage(float v, float min, float max) = 0;
-        // { 
-        //     example implementation, linear mapping
-        //     return (v-min) * 100 / (max-min);
-        // };
+        virtual float mapVoltage(float v) = 0;
 
-        virtual void calculateAndSetLevel(float voltage) = 0;
+        void calculateAndSetLevel(float voltage)
+        {
+            this->setLevel(this->mapVoltage(voltage));
+        }
 
 
 
@@ -104,20 +138,19 @@ class UMBattery
          */
         void setVoltage(float voltage)
         {
-            // this->voltage = ( (voltage < this->getMinVoltage() * 0.85f) || (voltage > this->getMaxVoltage() * 1.1f) ) 
-            //     ? -1.0f 
-            //     : voltage;
-            this->voltage = voltage;
+            this->voltage = ( (voltage < this->getMinVoltage() * 0.85f) || (voltage > this->getMaxVoltage() * 1.1f) )
+                ? -1.0f
+                : voltage;
         }
 
-        float getLevel()
+        int8_t getLevel()
         {
             return this->level;
         }
 
         void setLevel(float level)
         {
-            this->level = constrain(level, 0.0f, 110.0f);
+            this->level = (int8_t)constrain(level, 0.0f, 110.0f);
         }
 
         /*

usermods/Battery/battery_defaults.h

@@ -27,24 +27,12 @@
 
 
 /* Default Battery Type
- * 0 = unkown
  * 1 = Lipo
  * 2 = Lion
+ * 3 = LiFePO4
  */
 #ifndef USERMOD_BATTERY_DEFAULT_TYPE
-  #define USERMOD_BATTERY_DEFAULT_TYPE 0
-#endif
-/*
- *
- *  Unkown 'Battery' defaults
- *
- */
-#ifndef USERMOD_BATTERY_UNKOWN_MIN_VOLTAGE
-  // Extra save defaults
-  #define USERMOD_BATTERY_UNKOWN_MIN_VOLTAGE 3.3f
-#endif
-#ifndef USERMOD_BATTERY_UNKOWN_MAX_VOLTAGE
-  #define USERMOD_BATTERY_UNKOWN_MAX_VOLTAGE 4.2f
+  #define USERMOD_BATTERY_DEFAULT_TYPE 1
 #endif
 
 /*
@@ -73,6 +61,18 @@
   #define USERMOD_BATTERY_LION_MAX_VOLTAGE 4.2f
 #endif
 
+/*
+ *
+ *  Lithium Iron Phosphate (LiFePO4) defaults
+ *
+ */
+#ifndef USERMOD_BATTERY_LIFEPO4_MIN_VOLTAGE
+  #define USERMOD_BATTERY_LIFEPO4_MIN_VOLTAGE 2.8f
+#endif
+#ifndef USERMOD_BATTERY_LIFEPO4_MAX_VOLTAGE
+  #define USERMOD_BATTERY_LIFEPO4_MAX_VOLTAGE 3.6f
+#endif
+
 // the default ratio for the voltage divider
 #ifndef USERMOD_BATTERY_VOLTAGE_MULTIPLIER
   #ifdef ARDUINO_ARCH_ESP32
@@ -117,12 +117,22 @@
   #define USERMOD_BATTERY_LOW_POWER_INDICATOR_DURATION 5
 #endif
 
+// battery capacity in mAh (used for runtime estimation with INA226 current sensor)
+#ifndef USERMOD_BATTERY_CAPACITY
+  #define USERMOD_BATTERY_CAPACITY 3000
+#endif
+
+// Enable remote battery config updates via JSON API and MQTT
+// Uncomment below or define in my_config.h / build flags to allow runtime config changes
+// #define USERMOD_BATTERY_ALLOW_REMOTE_UPDATE
+
 // battery types
-typedef enum
+// fixed uint8_t base so the enum is exactly one byte (exposed via getUMData() as UMT_BYTE)
+typedef enum : uint8_t
 {
-  unknown=0,
   lipo=1,
-  lion=2
+  lion=2,
+  lifepo4=3
 } batteryType;
 
 // used for initial configuration after boot