Update to work around issue 80 - better solution to be proposed shortly.

This commit is contained in:
rob@marotori.com
2012-08-29 12:39:31 +00:00
parent 4407071146
commit 6b660b4af7
3 changed files with 5 additions and 4 deletions
+3 -2
View File
@@ -437,6 +437,7 @@ void AudioQueue::play(uint8_t tFreq, uint8_t tLen, uint8_t tPause, uint8_t tFlag
{
CoEnterMutexSection(audioMutex);
if (tFlags & PLAY_SOUND_VARIO) {
background.freq = tFreq * 2;
background.duration = tLen;
@@ -531,6 +532,7 @@ void audioEvent(uint8_t e, uint8_t f)
// inactivity timer alert
case AU_INACTIVITY:
audioQueue.play(70, 20, 4, 2|PLAY_NOW);
audioQueue.pause(200);
break;
// low battery in tx
case AU_TX_BATTERY_LOW:
@@ -583,8 +585,7 @@ void audioEvent(uint8_t e, uint8_t f)
break;
// pot/stick center
case AU_POT_STICK_MIDDLE:
audioQueue.play(BEEP_DEFAULT_FREQ + 50, 20, 2, PLAY_NOW);
break;
audioQueue.play(BEEP_DEFAULT_FREQ + 50, 20, 2, PLAY_NOW); break;
// mix warning 1
case AU_MIX_WARNING_1:
audioQueue.play(BEEP_DEFAULT_FREQ + 50, 12, 0, PLAY_NOW);
+1 -1
View File
@@ -36,7 +36,7 @@
#define AUDIO_QUEUE_LENGTH (20)
#define BEEP_DEFAULT_FREQ (70)
#define BEEP_OFFSET (10)
#define BEEP_OFFSET (18)
#define BEEP_KEY_UP_FREQ (BEEP_DEFAULT_FREQ+5)
#define BEEP_KEY_DOWN_FREQ (BEEP_DEFAULT_FREQ-5)
+1 -1
View File
@@ -234,7 +234,7 @@ void menuProcSetup(uint8_t event)
lcd_putsLeft( y, STR_SPKRPITCH);
lcd_outdezAtt(GENERAL_PARAM_OFS, y, g_eeGeneral.speakerPitch, attr|LEFT);
if (attr) {
CHECK_INCDEC_GENVAR(event, g_eeGeneral.speakerPitch, 0, 100);
CHECK_INCDEC_GENVAR(event, g_eeGeneral.speakerPitch, 0, 20);
}
break;
#endif