rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6947 from mikeller/fix_visual_beeper 

Changed visual beeper to respect beeper settings.
This commit is contained in:
Michael Keller 2018-10-24 23:38:58 +13:00 committed by GitHub
parent e820c8f37c a4b2f655d4
commit c06d9c8004
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/io/beeper.c
View File

@ -177,8 +177,7 @@ static uint8_t beep_multiBeeps[MAX_MULTI_BEEPS + 1];
#define BEEPER_WARNING_BEEP_2_DURATION 5
#define BEEPER_WARNING_BEEP_GAP_DURATION 10
// Beeper off = 0 Beeper on = 1
static uint8_t beeperIsOn = 0;
static bool beeperIsOn = false;
// Place in current sequence
static uint16_t beeperPos = 0;
@ -283,12 +282,11 @@ void beeper(beeperMode_e mode)
void beeperSilence(void)
{
BEEP_OFF;
beeperIsOn = false;
warningLedDisable();
warningLedRefresh();
beeperIsOn = 0;
beeperNextToggleTime = 0;
beeperPos = 0;
@ -399,8 +397,6 @@ void beeperUpdate(timeUs_t currentTimeUs)
}
if (!beeperIsOn) {
beeperIsOn = 1;
#ifdef USE_DSHOT
if (!areMotorsRunning()
&& ((currentBeeperEntry->mode == BEEPER_RX_SET && !(beeperConfig()->dshotBeaconOffFlags & BEEPER_GET_FLAG(BEEPER_RX_SET)))
@ -414,8 +410,11 @@ void beeperUpdate(timeUs_t currentTimeUs)
#endif
if (currentBeeperEntry->sequence[beeperPos] != 0) {
if (!(beeperConfigMutable()->beeper_off_flags & BEEPER_GET_FLAG(currentBeeperEntry->mode)))
if (!(beeperConfigMutable()->beeper_off_flags & BEEPER_GET_FLAG(currentBeeperEntry->mode))) {
BEEP_ON;
beeperIsOn = true;
}
warningLedEnable();
warningLedRefresh();
// if this was arming beep then mark time (for blackbox)
@ -427,9 +426,10 @@ void beeperUpdate(timeUs_t currentTimeUs)
}
}
} else {
beeperIsOn = 0;
if (currentBeeperEntry->sequence[beeperPos] != 0) {
BEEP_OFF;
beeperIsOn = false;
warningLedDisable();
warningLedRefresh();
}