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

Bug fix in audio - playASAP sending 1 to many events. So a request for 3 beeps would play 4 etc..

Browse Source 
Fix in haptic to do correct number of vibrations on time count down.
This commit is contained in:
rob@marotori.com
2012-04-17 10:33:56 +00:00
parent 224bed6872
commit bcfc573312
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/audio.cpp
+1 -1
View File
@@ -145,7 +145,7 @@ void audioQueue::playASAP(uint8_t tFreq, uint8_t tLen, uint8_t tPause,
queueToneFreq[t_queueWidx] = ((s_beeper && tFreq) ? tFreq + g_eeGeneral.speakerPitch + BEEP_OFFSET : 0); // add pitch compensator
queueToneLength[t_queueWidx] = getToneLength(tLen);
queueTonePause[t_queueWidx] = tPause;
queueToneRepeat[t_queueWidx] = tRepeat;
queueToneRepeat[t_queueWidx] = tRepeat -1;
queueToneFreqIncr[t_queueWidx] = tFreqIncr;
t_queueWidx = next_queueWidx;
}
src/haptic.h
+13 -1
View File
@@ -94,8 +94,14 @@ inline void hapticAudioEvent(uint8_t e)
{
if (g_eeGeneral.hapticMode>=-1 && e<=AU_ERROR)
hapticDefevent(1);
else if (e == AU_TIMER_30)
hapticDefevent(3);
else if (e == AU_TIMER_20)
hapticDefevent(2);
else if (e == AU_TIMER_10)
hapticDefevent(1);
else if (g_eeGeneral.hapticMode==0 && e>=AU_WARNING1)
hapticDefevent(1);
hapticDefevent(1);
else if (g_eeGeneral.hapticMode>0)
hapticDefevent(0);
}
@@ -104,6 +110,12 @@ inline void hapticBeepEvent(uint8_t e)
{
if (g_eeGeneral.hapticMode>=-1 && e>=3)
hapticDefevent(1);
else if (e == AU_TIMER_30)
hapticDefevent(3);
else if (e == AU_TIMER_20)
hapticDefevent(2);
else if (e == AU_TIMER_10)
hapticDefevent(1);
else if (g_eeGeneral.hapticMode==0 && e>0)
hapticDefevent(1);
else if (g_eeGeneral.hapticMode>0)