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

Removed unnecessary enums for CURRENT_SENSOR_ESC and BATTERY_SENSOR_ESC

Browse source
This commit is contained in:
Bas Delfos 2016-11-27 11:16:38 +01:00
parent ff2f2dae87
commit 2ffe57761e
2 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -84,17 +84,12 @@ static void updateBatteryVoltage(void)
} }
#ifdef USE_ESC_SENSOR #ifdef USE_ESC_SENSOR
<<<<<<< 0a89e28c8e6e538d5b283fe9a389c481f24523fb
if (feature(FEATURE_ESC_SENSOR) && batteryConfig->batteryMeterType == BATTERY_SENSOR_ESC) { if (feature(FEATURE_ESC_SENSOR) && batteryConfig->batteryMeterType == BATTERY_SENSOR_ESC) {
vbatLatest = getEscSensorVbat(); vbatLatest = getEscSensorVbat();
if (debugMode == DEBUG_BATTERY) { if (debugMode == DEBUG_BATTERY) {
debug[0] = -1; debug[0] = -1;
} }
vbat = biquadFilterApply(&vBatFilter, vbatLatest); vbat = biquadFilterApply(&vBatFilter, vbatLatest);
=======
if (batteryConfig->batteryMeterType == BATTERY_SENSOR_ESC) {
vbatSample = vbatLatest = getEscSensorVbat();
>>>>>>> Remove fallback on ADC sensor when ESC sensor fails
} }
else else
#endif #endif
@ -292,7 +287,6 @@ 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();
@ -300,12 +294,6 @@ 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;

3
src/main/sensors/battery.h
View file

@ -31,7 +31,8 @@ typedef enum {
CURRENT_SENSOR_NONE = 0, CURRENT_SENSOR_NONE = 0,
CURRENT_SENSOR_ADC, CURRENT_SENSOR_ADC,
CURRENT_SENSOR_VIRTUAL, CURRENT_SENSOR_VIRTUAL,
CURRENT_SENSOR_ESC CURRENT_SENSOR_ESC,
CURRENT_SENSOR_MAX = CURRENT_SENSOR_ESC
} currentSensor_e; } currentSensor_e;
typedef enum { typedef enum {