Bug fix in audio - playASAP sending 1 to many events. So a request for 3 beeps would play 4 etc..
Fix in haptic to do correct number of vibrations on time count down.
This commit is contained in:
+1
-1
@@ -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
|
queueToneFreq[t_queueWidx] = ((s_beeper && tFreq) ? tFreq + g_eeGeneral.speakerPitch + BEEP_OFFSET : 0); // add pitch compensator
|
||||||
queueToneLength[t_queueWidx] = getToneLength(tLen);
|
queueToneLength[t_queueWidx] = getToneLength(tLen);
|
||||||
queueTonePause[t_queueWidx] = tPause;
|
queueTonePause[t_queueWidx] = tPause;
|
||||||
queueToneRepeat[t_queueWidx] = tRepeat;
|
queueToneRepeat[t_queueWidx] = tRepeat -1;
|
||||||
queueToneFreqIncr[t_queueWidx] = tFreqIncr;
|
queueToneFreqIncr[t_queueWidx] = tFreqIncr;
|
||||||
t_queueWidx = next_queueWidx;
|
t_queueWidx = next_queueWidx;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -94,6 +94,12 @@ inline void hapticAudioEvent(uint8_t e)
|
|||||||
{
|
{
|
||||||
if (g_eeGeneral.hapticMode>=-1 && e<=AU_ERROR)
|
if (g_eeGeneral.hapticMode>=-1 && e<=AU_ERROR)
|
||||||
hapticDefevent(1);
|
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)
|
else if (g_eeGeneral.hapticMode==0 && e>=AU_WARNING1)
|
||||||
hapticDefevent(1);
|
hapticDefevent(1);
|
||||||
else if (g_eeGeneral.hapticMode>0)
|
else if (g_eeGeneral.hapticMode>0)
|
||||||
@@ -104,6 +110,12 @@ inline void hapticBeepEvent(uint8_t e)
|
|||||||
{
|
{
|
||||||
if (g_eeGeneral.hapticMode>=-1 && e>=3)
|
if (g_eeGeneral.hapticMode>=-1 && e>=3)
|
||||||
hapticDefevent(1);
|
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)
|
else if (g_eeGeneral.hapticMode==0 && e>0)
|
||||||
hapticDefevent(1);
|
hapticDefevent(1);
|
||||||
else if (g_eeGeneral.hapticMode>0)
|
else if (g_eeGeneral.hapticMode>0)
|
||||||
|
|||||||
Reference in New Issue
Block a user