From 33c020fcc395a7ffa0902ac42910d585fcd125f8 Mon Sep 17 00:00:00 2001
From: Michael Keller <github@ike.ch>
Date: Mon, 23 Jan 2017 12:41:45 +1300
Subject: [PATCH] Disabled battery current sensing if no battery is connected.

---
 src/main/sensors/battery.c | 87 ++++++++++++++++++++------------------
 1 file changed, 46 insertions(+), 41 deletions(-)

diff --git a/src/main/sensors/battery.c b/src/main/sensors/battery.c
index 0a9e00e94..d5fa9ed91 100644
--- a/src/main/sensors/battery.c
+++ b/src/main/sensors/battery.c
@@ -266,56 +266,61 @@ void updateConsumptionWarning(void)
 
 void updateCurrentMeter(int32_t lastUpdateAt, rxConfig_t *rxConfig, uint16_t deadband3d_throttle)
 {
-    switch(batteryConfig->currentMeterType) {
-        case CURRENT_SENSOR_ADC:
-            updateBatteryCurrent();
+    if (getBatteryState() != BATTERY_NOT_PRESENT) {
+        switch(batteryConfig->currentMeterType) {
+            case CURRENT_SENSOR_ADC:
+                updateBatteryCurrent();
 
-            updateCurrentDrawn(lastUpdateAt);
+                updateCurrentDrawn(lastUpdateAt);
 
-            updateConsumptionWarning();
+                updateConsumptionWarning();
 
-            break;
-        case CURRENT_SENSOR_VIRTUAL:
-            amperageLatest = (int32_t)batteryConfig->currentMeterOffset;
-            if (ARMING_FLAG(ARMED)) {
-                throttleStatus_e throttleStatus = calculateThrottleStatus(rxConfig, deadband3d_throttle);
-                int throttleOffset = (int32_t)rcCommand[THROTTLE] - 1000;
-                if (throttleStatus == THROTTLE_LOW && feature(FEATURE_MOTOR_STOP)) {
-                    throttleOffset = 0;
-                }
-                int throttleFactor = throttleOffset + (throttleOffset * throttleOffset / 50);
-                amperageLatest += throttleFactor * (int32_t)batteryConfig->currentMeterScale  / 1000;
-            }
-            amperage = amperageLatest;
-
-            updateCurrentDrawn(lastUpdateAt);
-
-            updateConsumptionWarning();
-
-            break;
-        case CURRENT_SENSOR_ESC:
-            #ifdef USE_ESC_SENSOR
-            if (feature(FEATURE_ESC_SENSOR)) {
-                escSensorData_t *escData = getEscSensorData(ESC_SENSOR_COMBINED);
-                if (escData->dataAge <= MAX_ESC_BATTERY_AGE) {
-                    amperageLatest = escData->current;
-                    mAhDrawn = escData->consumption;
-                } else {
-                    amperageLatest = 0;
-                    mAhDrawn = 0;
+                break;
+            case CURRENT_SENSOR_VIRTUAL:
+                amperageLatest = (int32_t)batteryConfig->currentMeterOffset;
+                if (ARMING_FLAG(ARMED)) {
+                    throttleStatus_e throttleStatus = calculateThrottleStatus(rxConfig, deadband3d_throttle);
+                    int throttleOffset = (int32_t)rcCommand[THROTTLE] - 1000;
+                    if (throttleStatus == THROTTLE_LOW && feature(FEATURE_MOTOR_STOP)) {
+                        throttleOffset = 0;
+                    }
+                    int throttleFactor = throttleOffset + (throttleOffset * throttleOffset / 50);
+                    amperageLatest += throttleFactor * (int32_t)batteryConfig->currentMeterScale  / 1000;
                 }
                 amperage = amperageLatest;
 
+                updateCurrentDrawn(lastUpdateAt);
+
                 updateConsumptionWarning();
-            }
 
-            break;
-            #endif
-        case CURRENT_SENSOR_NONE:
-            amperage = 0;
-            amperageLatest = 0;
+                break;
+            case CURRENT_SENSOR_ESC:
+#ifdef USE_ESC_SENSOR
+                if (feature(FEATURE_ESC_SENSOR)) {
+                    escSensorData_t *escData = getEscSensorData(ESC_SENSOR_COMBINED);
+                    if (escData->dataAge <= MAX_ESC_BATTERY_AGE) {
+                        amperageLatest = escData->current;
+                        mAhDrawn = escData->consumption;
+                    } else {
+                        amperageLatest = 0;
+                        mAhDrawn = 0;
+                    }
+                    amperage = amperageLatest;
 
-            break;
+                    updateConsumptionWarning();
+                }
+
+                break;
+#endif
+            case CURRENT_SENSOR_NONE:
+                amperage = 0;
+                amperageLatest = 0;
+
+                break;
+        }
+    } else {
+        amperage = 0;
+        amperageLatest = 0;
     }
 }