piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Split Haptic from Audio

Browse Source 
Vario from Max added
Tests needed on all boards!
This commit is contained in:
bsongis
2012-05-03 09:19:20 +00:00
parent b0ee619d0a
commit 6afc680d93
20 changed files with 1123 additions and 506 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/beeper.cpp
+4 -3
View File
@@ -39,9 +39,6 @@ uint8_t beepAgainOrig = 0;
uint8_t beepOn = false;
bool warble = false;
bool warbleC;
#if defined(HAPTIC)
uint8_t hapticTick = 0;
#endif
// The various "beep" tone lengths
static const pm_uint8_t beepTab[] PROGMEM = {
@@ -55,6 +52,10 @@ static const pm_uint8_t beepTab[] PROGMEM = {
void beep(uint8_t val)
{
#if defined(HAPTIC)
haptic.event(val==0 ? 0 : AU_TIMER_10+beepAgain);
#endif
if(g_eeGeneral.flashBeep && val > 1) g_LightOffCounter = FLASH_DURATION;
if (g_eeGeneral.beeperMode>0 || (g_eeGeneral.beeperMode==0 && val!=0) || (g_eeGeneral.beeperMode==-1 && val>=3)) {