Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-26 01:35:41 +03:00
Code Issues Wiki Activity

Fixed Travis build warning

Browse source
This commit is contained in:
Bas Delfos 2016-11-24 21:00:46 +01:00
parent 7e26afddf1
commit ff2f2dae87
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/main/sensors/battery.c
View file

@ -292,6 +292,7 @@ void updateCurrentMeter(int32_t lastUpdateAt, rxConfig_t *rxConfig, uint16_t dea
break; break;
case CURRENT_SENSOR_ESC: case CURRENT_SENSOR_ESC:
#ifdef USE_ESC_SENSOR #ifdef USE_ESC_SENSOR
<<<<<<< 2af7ff8434cfe047c841c85aae300154c7b4065e
if (feature(FEATURE_ESC_SENSOR)) if (feature(FEATURE_ESC_SENSOR))
{ {
amperage = getEscSensorCurrent(); amperage = getEscSensorCurrent();
@ -299,6 +300,12 @@ void updateCurrentMeter(int32_t lastUpdateAt, rxConfig_t *rxConfig, uint16_t dea
} }
#endif #endif
=======
if (batteryConfig->currentMeterType == CURRENT_SENSOR_ESC) {
amperage = getEscSensorCurrent();
mAhDrawn = getEscSensorConsumption();
}
>>>>>>> Fixed Travis build warning
break; break;
case CURRENT_SENSOR_NONE: case CURRENT_SENSOR_NONE:
amperage = 0; amperage = 0;