Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-18 22:05:17 +03:00
Code Issues Wiki Activity

BEEPER_USB flag will silence the beeper only when battery is really not present (#4121)

Browse source 
Partial fox for #4107
This commit is contained in:
jirif 2017-09-14 12:16:52 +02:00 • committed by Martin Budden
parent 1dca5adb2b
commit 0e19f7701d
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -224,7 +224,7 @@ void beeper(beeperMode_e mode)
if ( if (
mode == BEEPER_SILENCE || ( mode == BEEPER_SILENCE || (
(getBeeperOffMask() & (1 << (BEEPER_USB - 1))) (getBeeperOffMask() & (1 << (BEEPER_USB - 1)))
&& (batteryConfig()->voltageMeterSource != VOLTAGE_METER_NONE && (getBatteryCellCount() == 0)) && getBatteryState() == BATTERY_NOT_PRESENT
) )
) { ) {
beeperSilence(); beeperSilence();

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

@ -154,6 +154,7 @@ static void updateBatteryBeeperAlert(void)
break; break;
case BATTERY_OK: case BATTERY_OK:
case BATTERY_NOT_PRESENT: case BATTERY_NOT_PRESENT:
case BATTERY_INIT:
break; break;
} }
} }
@ -168,7 +169,7 @@ void batteryUpdatePresence(void)
if ( if (
voltageState == BATTERY_NOT_PRESENT (voltageState == BATTERY_NOT_PRESENT || voltageState == BATTERY_INIT)
&& isVoltageFromBat && isVoltageFromBat
&& isVoltageStable && isVoltageStable
) { ) {
@ -275,7 +276,7 @@ batteryState_e getBatteryState(void)
return batteryState; return batteryState;
} }
const char * const batteryStateStrings[] = {"OK", "WARNING", "CRITICAL", "NOT PRESENT"}; const char * const batteryStateStrings[] = {"OK", "WARNING", "CRITICAL", "NOT PRESENT", "INIT"};
const char * getBatteryStateString(void) const char * getBatteryStateString(void)
{ {
@ -287,13 +288,13 @@ void batteryInit(void)
// //
// presence // presence
// //
batteryState = BATTERY_NOT_PRESENT; batteryState = BATTERY_INIT;
batteryCellCount = 0; batteryCellCount = 0;
// //
// voltage // voltage
// //
voltageState = BATTERY_NOT_PRESENT; voltageState = BATTERY_INIT;
batteryWarningVoltage = 0; batteryWarningVoltage = 0;
batteryCriticalVoltage = 0; batteryCriticalVoltage = 0;
lowVoltageCutoff.enabled = false; lowVoltageCutoff.enabled = false;

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

@ -59,7 +59,8 @@ typedef enum {
BATTERY_OK = 0, BATTERY_OK = 0,
BATTERY_WARNING, BATTERY_WARNING,
BATTERY_CRITICAL, BATTERY_CRITICAL,
BATTERY_NOT_PRESENT BATTERY_NOT_PRESENT,
BATTERY_INIT
} batteryState_e; } batteryState_e;
void batteryInit(void); void batteryInit(void);