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

Further cleanups to the new beeper code.

Browse source
This commit is contained in:
Dominic Clifton 2015-04-24 23:51:45 +02:00
parent 6360aa0dca
commit 3b557d5f42
1 changed files with 5 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -128,7 +128,7 @@ static uint32_t armingBeepTimeMicros = 0;
static void beeperCalculations(void); static void beeperCalculations(void);
/* /*
* Called to activate/deactive beeper, using the given "BEEPER_..." value. * Called to activate/deactivate beeper, using the given "BEEPER_..." value.
* This function returns immediately (does not block). * This function returns immediately (does not block).
*/ */
void beeper(beeperMode_e mode) void beeper(beeperMode_e mode)
@ -143,15 +143,12 @@ void beeper(beeperMode_e mode)
break; break;
case BEEPER_ARMING: case BEEPER_ARMING:
beeperPtr = beep_armingBeep; beeperPtr = beep_armingBeep;
beeperNextToggleTime = 0;
break; break;
case BEEPER_DISARMING: case BEEPER_DISARMING:
beeperPtr = beep_disarmBeep; beeperPtr = beep_disarmBeep;
beeperNextToggleTime = 0;
break; break;
case BEEPER_DISARM_REPEAT: case BEEPER_DISARM_REPEAT:
beeperPtr = beep_disarmRepeatBeep; beeperPtr = beep_disarmRepeatBeep;
beeperNextToggleTime = 0;
break; break;
case BEEPER_ACC_CALIBRATION: case BEEPER_ACC_CALIBRATION:
beeperPtr = beep_2shortBeeps; beeperPtr = beep_2shortBeeps;
@ -161,34 +158,27 @@ void beeper(beeperMode_e mode)
break; break;
case BEEPER_RX_LOST_LANDING: case BEEPER_RX_LOST_LANDING:
beeperPtr = beep_sos; beeperPtr = beep_sos;
beeperNextToggleTime = 0;
break; break;
case BEEPER_RX_LOST: case BEEPER_RX_LOST:
beeperPtr = beep_txLostBeep; beeperPtr = beep_txLostBeep;
beeperNextToggleTime = 0;
break; break;
case BEEPER_BAT_LOW: case BEEPER_BAT_LOW:
beeperPtr = beep_lowBatteryBeep; beeperPtr = beep_lowBatteryBeep;
beeperNextToggleTime = 0;
break; break;
case BEEPER_BAT_CRIT_LOW: case BEEPER_BAT_CRIT_LOW:
beeperPtr = beep_critBatteryBeep; beeperPtr = beep_critBatteryBeep;
beeperNextToggleTime = 0;
break; break;
case BEEPER_ARMED: case BEEPER_ARMED:
beeperPtr = beep_armedBeep; beeperPtr = beep_armedBeep;
break; break;
case BEEPER_ARMING_GPS_FIX: case BEEPER_ARMING_GPS_FIX:
beeperPtr = beep_armedGpsFix; beeperPtr = beep_armedGpsFix;
beeperNextToggleTime = 0;
break; break;
case BEEPER_CONFIRM_BEEP: case BEEPER_CONFIRM_BEEP:
beeperPtr = beep_confirmBeep; beeperPtr = beep_confirmBeep;
beeperNextToggleTime = 0;
break; break;
case BEEPER_MULTI_BEEPS: case BEEPER_MULTI_BEEPS:
beeperPtr = beep_multiBeeps; beeperPtr = beep_multiBeeps;
beeperNextToggleTime = 0;
break; break;
case BEEPER_RX_SET: case BEEPER_RX_SET:
#ifdef GPS #ifdef GPS
@ -206,7 +196,6 @@ void beeper(beeperMode_e mode)
} }
#endif #endif
beeperPtr = beep_shortBeep; beeperPtr = beep_shortBeep;
beeperNextToggleTime = 0;
break; break;
default: default:
@ -214,14 +203,16 @@ void beeper(beeperMode_e mode)
} }
beeperPos = 0; beeperPos = 0;
beeperMode = mode; beeperMode = mode;
beeperNextToggleTime = 0;
} }
void beeperSilence(void) void beeperSilence(void)
{ {
beeperMode = BEEPER_STOPPED;
beeperNextToggleTime = millis();
BEEP_OFF; BEEP_OFF;
beeperIsOn = 0; beeperIsOn = 0;
beeperMode = BEEPER_STOPPED;
beeperNextToggleTime = 0;
beeperPtr = NULL; beeperPtr = NULL;
beeperPos = 0; beeperPos = 0;
} }