Update Classes

Aircoookie · Sep 9, 2023 · a9d6a15 · a9d6a15
1 parent b8c61b5
commit a9d6a15
Show file tree

Hide file tree

Showing 6 changed files with 110 additions and 154 deletions.
diff --git a/usermods/Battery/battery.h b/usermods/Battery/battery.h
@@ -17,6 +17,7 @@ class Battery
         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)
         {
@@ -26,7 +27,9 @@ class Battery
     public:
         Battery()
         {
-
+            this->setVoltage(this->getVoltage());
+            this->setVoltageMultiplier(USERMOD_BATTERY_VOLTAGE_MULTIPLIER);
+            this->setCalibration(USERMOD_BATTERY_CALIBRATION);
         }
 
         virtual void update(batteryConfig cfg) = 0;
@@ -127,6 +130,24 @@ class Battery
         {
             calibration = offset;
         }
+
+        /*
+        * Get the configured calibration value
+        * a value to set the voltage divider ratio
+        */
+        virtual float getVoltageMultiplier()
+        {
+            return voltageMultiplier;
+        }
+
+        /*
+        * Set the voltage multiplier value
+        * a value to set the voltage divider ratio.
+        */
+        virtual void setVoltageMultiplier(float multiplier)
+        {
+            voltageMultiplier = voltageMultiplier;
+        }
 };
 
 #endif
diff --git a/usermods/Battery/battery_defaults.h b/usermods/Battery/battery_defaults.h
@@ -40,10 +40,7 @@
 #ifndef USERMOD_BATTERY_UNKOWN_MAX_VOLTAGE
   #define USERMOD_BATTERY_UNKOWN_MAX_VOLTAGE 4.2f
 #endif
-#ifndef USERMOD_BATTERY_UNKOWN_CALIBRATION
-  // offset or calibration value to fine tune the calculated voltage
-  #define USERMOD_BATTERY_UNKOWN_CALIBRATION 0
-#endif
+
 /*
  *
  *  Lithium polymer (Li-Po) defaults
@@ -56,9 +53,7 @@
 #ifndef USERMOD_BATTERY_LIPO_MAX_VOLTAGE
   #define USERMOD_BATTERY_LIPO_MAX_VOLTAGE 4.2f
 #endif
-#ifndef USERMOD_BATTERY_LIPO_CALIBRATION
-  #define USERMOD_BATTERY_LIPO_CALIBRATION 0
-#endif
+
 /*
  *
  *  Lithium-ion (Li-Ion) defaults
@@ -71,12 +66,8 @@
 #ifndef USERMOD_BATTERY_LION_MAX_VOLTAGE
   #define USERMOD_BATTERY_LION_MAX_VOLTAGE 4.2f
 #endif
-#ifndef USERMOD_BATTERY_LION_CALIBRATION
-  // offset or calibration value to fine tune the calculated voltage
-  #define USERMOD_BATTERY_LION_CALIBRATION 0
-#endif
 
-//the default ratio for the voltage divider
+// the default ratio for the voltage divider
 #ifndef USERMOD_BATTERY_VOLTAGE_MULTIPLIER
   #ifdef ARDUINO_ARCH_ESP32
     #define USERMOD_BATTERY_VOLTAGE_MULTIPLIER 2.0f
@@ -85,13 +76,8 @@
   #endif
 #endif
 
-#ifndef USERMOD_BATTERY_MAX_VOLTAGE
-  #define USERMOD_BATTERY_MAX_VOLTAGE 4.2f
-#endif
-
-// a common capacity for single 18650 battery cells is between 2500 and 3600 mAh
-#ifndef USERMOD_BATTERY_TOTAL_CAPACITY
-  #define USERMOD_BATTERY_TOTAL_CAPACITY 3100
+#ifndef USERMOD_BATTERY_AVERAGING_ALPHA
+  #define USERMOD_BATTERY_AVERAGING_ALPHA 0.1f
 #endif
 
 // offset or calibration value to fine tune the calculated voltage
@@ -138,7 +124,6 @@ typedef struct bconfig_t
   batteryType type;
   float minVoltage;
   float maxVoltage;
-  unsigned int capacity;  // current capacity
   float voltage;          // current voltage
   int8_t level;           // current level
   float calibration;      // offset or calibration value to fine tune the calculated voltage

diff --git a/usermods/Battery/types/lion.h b/usermods/Battery/types/lion.h
@@ -14,11 +14,10 @@ class Lion : public Battery
 
     public:
         Lion()
+        : Battery()
         {
             this->setMinVoltage(USERMOD_BATTERY_LION_MIN_VOLTAGE);
             this->setMaxVoltage(USERMOD_BATTERY_LION_MAX_VOLTAGE);
-            this->setVoltage(this->getVoltage());
-            this->setCalibration(USERMOD_BATTERY_LION_CALIBRATION);
         }
 
         void update(batteryConfig cfg)

diff --git a/usermods/Battery/types/lipo.h b/usermods/Battery/types/lipo.h
@@ -14,11 +14,10 @@ class Lipo : public Battery
 
     public:
         Lipo()
+        : Battery()
         {
             this->setMinVoltage(USERMOD_BATTERY_LIPO_MIN_VOLTAGE);
             this->setMaxVoltage(USERMOD_BATTERY_LIPO_MAX_VOLTAGE);
-            this->setVoltage(this->getVoltage());
-            this->setCalibration(USERMOD_BATTERY_LIPO_CALIBRATION);
         }
 
         void update(batteryConfig cfg)

diff --git a/usermods/Battery/types/unkown.h b/usermods/Battery/types/unkown.h
@@ -14,18 +14,16 @@ class Unkown : public Battery
 
     public:
         Unkown()
+        : Battery()
         {
             this->setMinVoltage(USERMOD_BATTERY_UNKOWN_MIN_VOLTAGE);
             this->setMaxVoltage(USERMOD_BATTERY_UNKOWN_MAX_VOLTAGE);
-            this->setVoltage(this->getVoltage());
-            this->setCalibration(USERMOD_BATTERY_UNKOWN_CALIBRATION);
         }
 
         void update(batteryConfig cfg)
         {
             if(cfg.minVoltage) this->setMinVoltage(cfg.minVoltage); else this->setMinVoltage(USERMOD_BATTERY_UNKOWN_MIN_VOLTAGE);
             if(cfg.maxVoltage) this->setMaxVoltage(cfg.maxVoltage); else this->setMaxVoltage(USERMOD_BATTERY_UNKOWN_MAX_VOLTAGE);
-            if(cfg.calibration) this->setCalibration(cfg.calibration); else this->setCalibration(USERMOD_BATTERY_UNKOWN_CALIBRATION);
         }
 
         float mapVoltage(float v, float min, float max) override