mirror of
https://github.com/betaflight/betaflight.git
synced 2025-07-24 16:55:36 +03:00
Fixed Travis build warning
This commit is contained in:
parent
7e26afddf1
commit
ff2f2dae87
1 changed files with 7 additions and 0 deletions
|
@ -292,6 +292,7 @@ void updateCurrentMeter(int32_t lastUpdateAt, rxConfig_t *rxConfig, uint16_t dea
|
|||
break;
|
||||
case CURRENT_SENSOR_ESC:
|
||||
#ifdef USE_ESC_SENSOR
|
||||
<<<<<<< 2af7ff8434cfe047c841c85aae300154c7b4065e
|
||||
if (feature(FEATURE_ESC_SENSOR))
|
||||
{
|
||||
amperage = getEscSensorCurrent();
|
||||
|
@ -299,6 +300,12 @@ void updateCurrentMeter(int32_t lastUpdateAt, rxConfig_t *rxConfig, uint16_t dea
|
|||
}
|
||||
#endif
|
||||
|
||||
=======
|
||||
if (batteryConfig->currentMeterType == CURRENT_SENSOR_ESC) {
|
||||
amperage = getEscSensorCurrent();
|
||||
mAhDrawn = getEscSensorConsumption();
|
||||
}
|
||||
>>>>>>> Fixed Travis build warning
|
||||
break;
|
||||
case CURRENT_SENSOR_NONE:
|
||||
amperage = 0;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue