refactor bat

Author: qqqlab

src/madflight/bat/BatteryADC/BatteryADC.h src/madflight/bat/BatteryADC.hsrc/madflight/bat/BatteryADC/BatteryADC.h renamed to src/madflight/bat/BatteryADC.h

@@ -11,19 +11,17 @@ cfg.BAT_CAL_I //BatteryADC current conversion factor, set this to 1 and enable p
 
 #pragma once
 
-#include "../bat_interface.h"
+#include "bat_interface.h"
+#include "../cfg/cfg_interface.h"
 
 class BatteryADC: public Battery {
     public:
-        //float i;// = 0; //Battery current (A)
-        //float v;// = 0; //battery voltage (V)
-        //float mah;// = 0; //battery usage (Ah)
-        //float wh;// = 0; //battery usage (Wh)
         float factor_v;// = 8.04/13951; //voltage conversion factor, set this to 1 and enable print_bat(), then enter here: Actual Volt / bat_v ADC reading
         float factor_i;// = 1.0/847; //current conversion factor, set this to 1 and enable print_bat(), then enter here: Actual Amperes / bat_i ADC reading
         uint32_t interval_us = 10000; //update interval in us
 
-    void setup() {
+    void begin(MF_I2C *i2c, int8_t i2c_adr) override {
+       (void)i2c; (void)i2c_adr; //does not use i2c
         i = 0;
         v = 0;
         mah = 0;
@@ -38,7 +36,7 @@ class BatteryADC: public Battery {
     }
 
     //returns true if battery was updated
-    bool update() {
+    bool update() override {
         static uint32_t ts = micros();
         uint32_t now = micros();
         if(now - ts >= interval_us) {

src/madflight/bat/BatteryINA226.h

@@ -0,0 +1,37 @@
+#pragma once
+
+#include "bat_interface.h"
+#include "../common/MF_I2C.h"
+#include "INA226/INA226.h"
+
+class BatteryINA226: public Battery {
+protected:
+  INA226 bat_ina226;
+
+public:
+  void begin(MF_I2C *i2c, int8_t i2c_adr) override {
+    if(i2c_adr == 0) i2c_adr = 0x40; //default address
+    bat_ina226.begin(i2c, i2c_adr);
+
+    // Configure INA226 -> sample time = 2 * 128 * 140us = 36ms => 28Hz
+    bat_ina226.configure(INA226_AVERAGES_128, INA226_BUS_CONV_TIME_140US, INA226_SHUNT_CONV_TIME_140US, INA226_MODE_SHUNT_BUS_CONT);
+
+    float Rshunt = cfg.BAT_CAL_I; //ohm
+    bat_ina226.calibrate(Rshunt);
+  }
+
+  bool update() override {
+    static uint32_t ts = micros();
+    if(!bat_ina226.isConversionReady()) return false;
+    uint32_t now = micros();
+    float dt_h = (now - ts) / 3600e6;
+    ts = now;
+    i = bat_ina226.readShuntCurrent();
+    v = bat_ina226.readBusVoltage();
+    //w = bat_ina226.readBusPower(); //note w is not always equal to v * i, because w, v, and i are averaged values
+    w = v * i; //This appears to be more accurate, specially for low values.
+    mah += i * dt_h * 1000;
+    wh += w * dt_h;
+    return true;
+  }
+};

src/madflight/bat/BatteryINA228.h

@@ -0,0 +1,37 @@
+#pragma once
+
+#include "bat_interface.h"
+#include "../common/MF_I2C.h"
+#include "INA228/INA228.h"
+
+class BatteryINA228: public Battery {
+protected:
+  INA228 bat_ina228;
+
+public:
+  void begin(MF_I2C *i2c, int8_t i2c_adr) override {
+    if(i2c_adr == 0) i2c_adr = 0x40; //default address
+
+    float Rshunt = cfg.BAT_CAL_I; //ohm
+
+    // Configure INA226 -> sample time = 512 * 2 * 50us = 51.2ms => 20Hz
+    bat_ina228.begin(i2c, i2c_adr);
+    bat_ina228.setADCRange(false); //  false => 164 mV, true => 41 mV
+    bat_ina228.setBusVoltageConversionTime(INA228_50_us);
+    bat_ina228.setShuntVoltageConversionTime(INA228_50_us);
+    bat_ina228.setTemperatureConversionTime(INA228_50_us);
+    bat_ina228.setAverage(INA228_512_SAMPLES);
+    bat_ina228.calibrate(Rshunt);
+    bat_ina228.setMode(INA228_MODE_CONT_BUS_SHUNT);
+  }
+
+  bool update() override {
+    if(!bat_ina228.isConversionReady()) return false;
+    i   = bat_ina228.getAmpere();
+    v   = bat_ina228.getBusVolt();
+    w   = bat_ina228.getWatt();
+    mah = bat_ina228.getCoulomb() * (1000.0 / 3600);
+    wh  = bat_ina228.getWattHour();
+    return true;
+  }
+};

src/madflight/bat/BatteryNone.h

@@ -0,0 +1,9 @@
+#pragma once
+
+#include "bat_interface.h"
+
+class BatteryNone: public Battery {
+  public:
+  void begin(MF_I2C *i2c, int8_t i2c_adr) override { (void)i2c; (void)i2c_adr; }
+  bool update() override { return false; }
+};