Fixes from review.

src/main/flight/mixer.c

@@ -363,6 +363,7 @@ void mixerInitProfile(void)
 #if defined(USE_BATTERY_VOLTAGE_SAG_COMPENSATION)
     vbatSagCompensationFactor = 0.0f;
     if (currentPidProfile->vbat_sag_compensation > 0) {
+        //TODO: Make this voltage user configurable
         vbatFull = CELL_VOLTAGE_FULL_CV;
         vbatRangeToCompensate = vbatFull - batteryConfig()->vbatwarningcellvoltage;
         if (vbatRangeToCompensate >= 0) {

src/main/sensors/battery.c

@@ -358,6 +358,8 @@ void batteryInit(void)
     lowVoltageCutoff.startTime = 0;
 
     voltageMeterReset(&voltageMeter);
+
+    voltageMeterGenericInit();
     switch (batteryConfig()->voltageMeterSource) {
         case VOLTAGE_METER_ESC:
 #ifdef USE_ESC_SENSOR

src/main/sensors/voltage.c

@@ -89,7 +89,9 @@ void voltageMeterReset(voltageMeter_t *meter)
 {
     meter->displayFiltered = 0;
     meter->unfiltered = 0;
+#if defined(USE_BATTERY_VOLTAGE_SAG_COMPENSATION)
     meter->sagFiltered = 0;
+#endif
 }
 //
 // ADC
@@ -117,10 +119,10 @@ typedef struct voltageMeterADCState_s {
 #endif
 } voltageMeterADCState_t;
 
-extern voltageMeterADCState_t voltageMeterADCStates[MAX_VOLTAGE_SENSOR_ADC];
-
 voltageMeterADCState_t voltageMeterADCStates[MAX_VOLTAGE_SENSOR_ADC];
 
+static bool sagCompensationConfigured;
+
 voltageMeterADCState_t *getVoltageMeterADC(uint8_t index)
 {
     return &voltageMeterADCStates[index];
@@ -208,16 +210,7 @@ void voltageMeterADCRead(voltageSensorADC_e adcChannel, voltageMeter_t *voltageM
 
 bool isSagCompensationConfigured(void)
 {
-    bool isConfigured = false;
-#if defined(USE_BATTERY_VOLTAGE_SAG_COMPENSATION)
-    for (unsigned i = 0; i < PID_PROFILE_COUNT; i++) {
-        if (pidProfiles(i)->vbat_sag_compensation > 0) {
-            isConfigured = true;
-        }
-    }
-#endif
-
-    return isConfigured;
+    return sagCompensationConfigured;
 }
 
 void voltageMeterADCInit(void)
@@ -237,6 +230,18 @@ void voltageMeterADCInit(void)
     }
 }
 
+void voltageMeterGenericInit(void)
+{
+    sagCompensationConfigured = false;
+#if defined(USE_BATTERY_VOLTAGE_SAG_COMPENSATION)
+    for (unsigned i = 0; i < PID_PROFILE_COUNT; i++) {
+        if (pidProfiles(i)->vbat_sag_compensation > 0) {
+            sagCompensationConfigured = true;
+        }
+    }
+#endif
+}
+
 //
 // ESC
 //

src/main/sensors/voltage.h

@@ -100,6 +100,8 @@ PG_DECLARE_ARRAY(voltageSensorADCConfig_t, MAX_VOLTAGE_SENSOR_ADC, voltageSensor
 //
 void voltageMeterReset(voltageMeter_t *voltageMeter);
 
+void voltageMeterGenericInit(void);
+
 void voltageMeterADCInit(void);
 void voltageMeterADCRefresh(void);
 void voltageMeterADCRead(voltageSensorADC_e adcChannel, voltageMeter_t *voltageMeter);