Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 16:25:31 +03:00
Code Issues Wiki Activity

Fixed problems with battery low / critical warnings coming on when connecting battery.

Browse source 
Also fixed problems with beeper settings for 1S setups.

Introduced consistent usage of 'batteryCellCount = 0' to indicate 'no
battery present'.
This commit is contained in:
Michael Keller 2016-11-07 09:49:43 +13:00
parent 6aca7cfb0e
commit ceeef947d5
4 changed files with 38 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/io/beeper.c
View file

@ -186,7 +186,7 @@ static const beeperTableEntry_t *currentBeeperEntry = NULL;
*/ */
void beeper(beeperMode_e mode) void beeper(beeperMode_e mode)
{ {
if (mode == BEEPER_SILENCE || ((getBeeperOffMask() & (1 << (BEEPER_USB-1))) && (feature(FEATURE_VBAT) && (batteryCellCount < 2)))) { if (mode == BEEPER_SILENCE || ((getBeeperOffMask() & (1 << (BEEPER_USB-1))) && (feature(FEATURE_VBAT) && (batteryCellCount == 0)))) {
beeperSilence(); beeperSilence();
return; return;
} }

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

@ -43,7 +43,7 @@
#define VBATT_LPF_FREQ 0.4f #define VBATT_LPF_FREQ 0.4f
// Battery monitoring stuff // Battery monitoring stuff
uint8_t batteryCellCount = 3; // cell count uint8_t batteryCellCount;
uint16_t batteryWarningVoltage; uint16_t batteryWarningVoltage;
uint16_t batteryCriticalVoltage; uint16_t batteryCriticalVoltage;
@ -90,33 +90,37 @@ void updateBattery(void)
updateBatteryVoltage(); updateBatteryVoltage();
/* battery has just been connected*/ /* battery has just been connected*/
if (batteryState == BATTERY_NOT_PRESENT && vbat > batteryConfig->batterynotpresentlevel ) if (batteryState == BATTERY_NOT_PRESENT) {
{ if (!ARMING_FLAG(ARMED)) {
/* Actual battery state is calculated below, this is really BATTERY_PRESENT */ /* wait for VBatt to stabilise then we can calc number of cells
batteryState = BATTERY_OK; (using the filtered value takes a long time to ramp up)
/* wait for VBatt to stabilise then we can calc number of cells We only do this on the ground so don't care if we do block, not
(using the filtered value takes a long time to ramp up) worse than original code anyway*/
We only do this on the ground so don't care if we do block, not delay(VBATTERY_STABLE_DELAY);
worse than original code anyway*/ updateBatteryVoltage();
delay(VBATTERY_STABLE_DELAY); }
updateBatteryVoltage();
if (vbat > batteryConfig->batterynotpresentlevel || ARMING_FLAG(ARMED)) {
unsigned cells = (batteryAdcToVoltage(vbatLatestADC) / batteryConfig->vbatmaxcellvoltage) + 1; /* Actual battery state is calculated below, this is really BATTERY_PRESENT */
if (cells > 8) { batteryState = BATTERY_OK;
// something is wrong, we expect 8 cells maximum (and autodetection will be problematic at 6+ cells)
cells = 8; unsigned cells = (batteryAdcToVoltage(vbatLatestADC) / batteryConfig->vbatmaxcellvoltage) + 1;
if (cells > 8) {
// something is wrong, we expect 8 cells maximum (and autodetection will be problematic at 6+ cells)
cells = 8;
}
batteryCellCount = cells;
batteryWarningVoltage = batteryCellCount * batteryConfig->vbatwarningcellvoltage;
batteryCriticalVoltage = batteryCellCount * batteryConfig->vbatmincellvoltage;
}
/* battery has been disconnected - can take a while for filter cap to disharge so we use a threshold of batteryConfig->batterynotpresentlevel */
} else {
if (vbat <= batteryConfig->batterynotpresentlevel && !ARMING_FLAG(ARMED)) {
batteryState = BATTERY_NOT_PRESENT;
batteryCellCount = 0;
batteryWarningVoltage = 0;
batteryCriticalVoltage = 0;
} }
batteryCellCount = cells;
batteryWarningVoltage = batteryCellCount * batteryConfig->vbatwarningcellvoltage;
batteryCriticalVoltage = batteryCellCount * batteryConfig->vbatmincellvoltage;
}
/* battery has been disconnected - can take a while for filter cap to disharge so we use a threshold of VBATT_PRESENT_THRESHOLD */
else if (batteryState != BATTERY_NOT_PRESENT && vbat <= batteryConfig->batterynotpresentlevel && !ARMING_FLAG(ARMED))
{
batteryState = BATTERY_NOT_PRESENT;
batteryCellCount = 0;
batteryWarningVoltage = 0;
batteryCriticalVoltage = 0;
} }
switch(batteryState) switch(batteryState)
@ -166,7 +170,7 @@ void batteryInit(batteryConfig_t *initialBatteryConfig)
{ {
batteryConfig = initialBatteryConfig; batteryConfig = initialBatteryConfig;
batteryState = BATTERY_NOT_PRESENT; batteryState = BATTERY_NOT_PRESENT;
batteryCellCount = 1; batteryCellCount = 0;
batteryWarningVoltage = 0; batteryWarningVoltage = 0;
batteryCriticalVoltage = 0; batteryCriticalVoltage = 0;
} }
@ -216,7 +220,7 @@ void updateCurrentMeter(int32_t lastUpdateAt, rxConfig_t *rxConfig, uint16_t dea
float calculateVbatPidCompensation(void) { float calculateVbatPidCompensation(void) {
float batteryScaler = 1.0f; float batteryScaler = 1.0f;
if (feature(FEATURE_VBAT) && batteryCellCount > 1) { if (feature(FEATURE_VBAT) && batteryCellCount > 0) {
// Up to 33% PID gain. Should be fine for 4,2to 3,3 difference // Up to 33% PID gain. Should be fine for 4,2to 3,3 difference
batteryScaler = constrainf((( (float)batteryConfig->vbatmaxcellvoltage * batteryCellCount ) / (float) vbat), 1.0f, 1.33f); batteryScaler = constrainf((( (float)batteryConfig->vbatmaxcellvoltage * batteryCellCount ) / (float) vbat), 1.0f, 1.33f);
} }
@ -225,7 +229,7 @@ float calculateVbatPidCompensation(void) {
uint8_t calculateBatteryPercentage(void) uint8_t calculateBatteryPercentage(void)
{ {
return constrain((((uint32_t)vbat - (batteryConfig->vbatmincellvoltage * batteryCellCount)) * 100) / ((batteryConfig->vbatmaxcellvoltage - batteryConfig->vbatmincellvoltage) * batteryCellCount), 0, 100); return batteryCellCount > 0 ? constrain((((uint32_t)vbat - (batteryConfig->vbatmincellvoltage * batteryCellCount)) * 100) / ((batteryConfig->vbatmaxcellvoltage - batteryConfig->vbatmincellvoltage) * batteryCellCount), 0, 100) : 0;
} }
uint8_t calculateBatteryCapacityRemainingPercentage(void) uint8_t calculateBatteryCapacityRemainingPercentage(void)

2
src/main/telemetry/frsky.c
View file

@ -529,7 +529,7 @@ void handleFrSkyTelemetry(rxConfig_t *rxConfig, uint16_t deadband3d_throttle)
sendTemperature1(); sendTemperature1();
sendThrottleOrBatterySizeAsRpm(rxConfig, deadband3d_throttle); sendThrottleOrBatterySizeAsRpm(rxConfig, deadband3d_throttle);
if (feature(FEATURE_VBAT)) { if (feature(FEATURE_VBAT) && batteryCellCount > 0) {
sendVoltage(); sendVoltage();
sendVoltageAmp(); sendVoltageAmp();
sendAmperage(); sendAmperage();

4
src/main/telemetry/smartport.c
View file

@ -634,7 +634,7 @@ void handleSmartPortTelemetry(void)
break; break;
#endif #endif
case FSSP_DATAID_VFAS : case FSSP_DATAID_VFAS :
if (feature(FEATURE_VBAT)) { if (feature(FEATURE_VBAT) && batteryCellCount > 0) {
uint16_t vfasVoltage; uint16_t vfasVoltage;
if (telemetryConfig->frsky_vfas_cell_voltage) { if (telemetryConfig->frsky_vfas_cell_voltage) {
vfasVoltage = vbat / batteryCellCount; vfasVoltage = vbat / batteryCellCount;
@ -810,7 +810,7 @@ void handleSmartPortTelemetry(void)
break; break;
#endif #endif
case FSSP_DATAID_A4 : case FSSP_DATAID_A4 :
if (feature(FEATURE_VBAT)) { if (feature(FEATURE_VBAT) && batteryCellCount > 0) {
smartPortSendPackage(id, vbat * 10 / batteryCellCount ); // given in 0.1V, convert to volts smartPortSendPackage(id, vbat * 10 / batteryCellCount ); // given in 0.1V, convert to volts
smartPortHasRequest = 0; smartPortHasRequest = 0;
} }