putVoiceQueueUpper cleanup for TTS_CZ

This commit is contained in:
mhotar@gmail.com
2012-08-14 19:40:18 +00:00
parent 8c8b40f5a8
commit eda268518b
+156 -167
View File
@@ -1,167 +1,156 @@
/* /*
* Authors (alphabetical order) * Authors (alphabetical order)
* - Bertrand Songis <bsongis@gmail.com> * - Bertrand Songis <bsongis@gmail.com>
* - Bryan J. Rentoul (Gruvin) <gruvin@gmail.com> * - Bryan J. Rentoul (Gruvin) <gruvin@gmail.com>
* - Cameron Weeks <th9xer@gmail.com> * - Cameron Weeks <th9xer@gmail.com>
* - Erez Raviv * - Erez Raviv
* - Jean-Pierre Parisy * - Jean-Pierre Parisy
* - Karl Szmutny <shadow@privy.de> * - Karl Szmutny <shadow@privy.de>
* - Michael Blandford * - Michael Blandford
* - Michal Hlavinka * - Michal Hlavinka
* - Pat Mackenzie * - Pat Mackenzie
* - Philip Moss * - Philip Moss
* - Rob Thomson * - Rob Thomson
* - Romolo Manfredini <romolo.manfredini@gmail.com> * - Romolo Manfredini <romolo.manfredini@gmail.com>
* - Thomas Husterer * - Thomas Husterer
* *
* open9x is based on code named * open9x is based on code named
* gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/,
* er9x by Erez Raviv: http://code.google.com/p/er9x/, * er9x by Erez Raviv: http://code.google.com/p/er9x/,
* and the original (and ongoing) project by * and the original (and ongoing) project by
* Thomas Husterer, th9x: http://code.google.com/p/th9x/ * Thomas Husterer, th9x: http://code.google.com/p/th9x/
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * published by the Free Software Foundation.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
*/ */
#if defined(PCBARM) #if defined(PCBARM)
#include "ersky9x/sound.h" #include "ersky9x/sound.h"
#endif #endif
#if defined(PCBSTD) #if defined(PCBSTD)
#define SPEAKER_ON BUZZER_ON #define SPEAKER_ON BUZZER_ON
#define SPEAKER_OFF toneFreq=0; BUZZER_OFF #define SPEAKER_OFF toneFreq=0; BUZZER_OFF
#endif #endif
//audio //audio
#define AUDIO_QUEUE_LENGTH (8) //8 seems to suit most alerts #define AUDIO_QUEUE_LENGTH (8) //8 seems to suit most alerts
#define BEEP_DEFAULT_FREQ (70) #define BEEP_DEFAULT_FREQ (70)
#define BEEP_OFFSET (10) #define BEEP_OFFSET (10)
#define BEEP_KEY_UP_FREQ (BEEP_DEFAULT_FREQ+5) #define BEEP_KEY_UP_FREQ (BEEP_DEFAULT_FREQ+5)
#define BEEP_KEY_DOWN_FREQ (BEEP_DEFAULT_FREQ-5) #define BEEP_KEY_DOWN_FREQ (BEEP_DEFAULT_FREQ-5)
class audioQueue class audioQueue
{ {
public: public:
audioQueue(); audioQueue();
void play(uint8_t tFreq, uint8_t tLen, uint8_t tPause, uint8_t tFlags=0, int8_t tFreqIncr=0); void play(uint8_t tFreq, uint8_t tLen, uint8_t tPause, uint8_t tFlags=0, int8_t tFreqIncr=0);
void pause(uint8_t tLen); void pause(uint8_t tLen);
inline bool busy() { return (toneTimeLeft > 0); } inline bool busy() { return (toneTimeLeft > 0); }
void event(uint8_t e, uint8_t f=BEEP_DEFAULT_FREQ); void event(uint8_t e, uint8_t f=BEEP_DEFAULT_FREQ);
inline void driver() { inline void driver() {
if (toneFreq) { if (toneFreq) {
toneCounter += toneFreq; toneCounter += toneFreq;
if ((toneCounter & 0x80) == 0x80) if ((toneCounter & 0x80) == 0x80)
BUZZER_ON; BUZZER_ON;
else else
BUZZER_OFF; BUZZER_OFF;
} }
} }
// heartbeat is responsibile for issueing the audio tones and general square waves // heartbeat is responsibile for issueing the audio tones and general square waves
// it is essentially the life of the class. // it is essentially the life of the class.
void heartbeat(); void heartbeat();
inline bool empty() { inline bool empty() {
return (t_queueRidx == t_queueWidx); return (t_queueRidx == t_queueWidx);
} }
protected: protected:
inline uint8_t getToneLength(uint8_t tLen); inline uint8_t getToneLength(uint8_t tLen);
private: private:
uint8_t t_queueRidx; uint8_t t_queueRidx;
uint8_t t_queueWidx; uint8_t t_queueWidx;
uint8_t toneFreq; uint8_t toneFreq;
int8_t toneFreqIncr; int8_t toneFreqIncr;
uint8_t toneTimeLeft; uint8_t toneTimeLeft;
uint8_t tonePause; uint8_t tonePause;
// vario has less priority // vario has less priority
uint8_t tone2Freq; uint8_t tone2Freq;
uint8_t tone2TimeLeft; uint8_t tone2TimeLeft;
uint8_t tone2Pause; uint8_t tone2Pause;
// queue arrays // queue arrays
uint8_t queueToneFreq[AUDIO_QUEUE_LENGTH]; uint8_t queueToneFreq[AUDIO_QUEUE_LENGTH];
int8_t queueToneFreqIncr[AUDIO_QUEUE_LENGTH]; int8_t queueToneFreqIncr[AUDIO_QUEUE_LENGTH];
uint8_t queueToneLength[AUDIO_QUEUE_LENGTH]; uint8_t queueToneLength[AUDIO_QUEUE_LENGTH];
uint8_t queueTonePause[AUDIO_QUEUE_LENGTH]; uint8_t queueTonePause[AUDIO_QUEUE_LENGTH];
uint8_t queueToneRepeat[AUDIO_QUEUE_LENGTH]; uint8_t queueToneRepeat[AUDIO_QUEUE_LENGTH];
uint8_t toneCounter; uint8_t toneCounter;
}; };
extern audioQueue audio; extern audioQueue audio;
void audioDefevent(uint8_t e); void audioDefevent(uint8_t e);
#define AUDIO_KEYPAD_UP() audioDefevent(AU_KEYPAD_UP) #define AUDIO_KEYPAD_UP() audioDefevent(AU_KEYPAD_UP)
#define AUDIO_KEYPAD_DOWN() audioDefevent(AU_KEYPAD_DOWN) #define AUDIO_KEYPAD_DOWN() audioDefevent(AU_KEYPAD_DOWN)
#define AUDIO_MENUS() audioDefevent(AU_MENUS) #define AUDIO_MENUS() audioDefevent(AU_MENUS)
#define AUDIO_WARNING1() audioDefevent(AU_WARNING1) #define AUDIO_WARNING1() audioDefevent(AU_WARNING1)
#define AUDIO_WARNING2() audioDefevent(AU_WARNING2) #define AUDIO_WARNING2() audioDefevent(AU_WARNING2)
#define AUDIO_ERROR() audioDefevent(AU_ERROR) #define AUDIO_ERROR() audioDefevent(AU_ERROR)
#if defined(VOICE) #if defined(VOICE)
#if defined(TTS_CZ) && defined(PCBSTD) #define AUDIO_TADA() pushPrompt(PROMPT_SYSTEM_BASE+AU_TADA)
#define AUDIO_TADA() putVoiceQueueUpper(PROMPT_SYSTEM_BASE+AU_TADA) #define AUDIO_TX_BATTERY_LOW() pushPrompt(PROMPT_SYSTEM_BASE+AU_TX_BATTERY_LOW)
#define AUDIO_TX_BATTERY_LOW() putVoiceQueueUpper(PROMPT_SYSTEM_BASE+AU_TX_BATTERY_LOW) #define AUDIO_INACTIVITY() pushPrompt(PROMPT_SYSTEM_BASE+AU_INACTIVITY)
#define AUDIO_INACTIVITY() putVoiceQueueUpper(PROMPT_SYSTEM_BASE+AU_INACTIVITY) #define AUDIO_ERROR_MESSAGE(e) pushPrompt(PROMPT_SYSTEM_BASE+e)
#define AUDIO_ERROR_MESSAGE(e) putVoiceQueueUpper(PROMPT_SYSTEM_BASE+e) #define AUDIO_TIMER_30() pushPrompt(PROMPT_SYSTEM_BASE+AU_TIMER_30)
#define AUDIO_TIMER_30() putVoiceQueueUpper(PROMPT_SYSTEM_BASE+AU_TIMER_30) #define AUDIO_TIMER_20() pushPrompt(PROMPT_SYSTEM_BASE+AU_TIMER_20)
#define AUDIO_TIMER_20() putVoiceQueueUpper(PROMPT_SYSTEM_BASE+AU_TIMER_20) #define AUDIO_TIMER_10() pushPrompt(PROMPT_SYSTEM_BASE+AU_TIMER_10)
#define AUDIO_TIMER_10() putVoiceQueueUpper(PROMPT_SYSTEM_BASE+AU_TIMER_10) #define AUDIO_TIMER_LT3(x) pushPrompt(PROMPT_SYSTEM_BASE+AU_TIMER_LT3)
#define AUDIO_TIMER_LT3(x) putVoiceQueueUpper(PROMPT_SYSTEM_BASE+AU_TIMER_LT3) #else
#else #define AUDIO_TADA()
#define AUDIO_TADA() pushPrompt(PROMPT_SYSTEM_BASE+AU_TADA) #define AUDIO_TX_BATTERY_LOW() audioDefevent(AU_TX_BATTERY_LOW)
#define AUDIO_TX_BATTERY_LOW() pushPrompt(PROMPT_SYSTEM_BASE+AU_TX_BATTERY_LOW) #define AUDIO_INACTIVITY() audioDefevent(AU_INACTIVITY)
#define AUDIO_INACTIVITY() pushPrompt(PROMPT_SYSTEM_BASE+AU_INACTIVITY) #define AUDIO_ERROR_MESSAGE(e) audioDefevent(AU_ERROR)
#define AUDIO_ERROR_MESSAGE(e) pushPrompt(PROMPT_SYSTEM_BASE+e) #define AUDIO_TIMER_30() audioDefevent(AU_TIMER_30)
#define AUDIO_TIMER_30() pushPrompt(PROMPT_SYSTEM_BASE+AU_TIMER_30) #define AUDIO_TIMER_20() audioDefevent(AU_TIMER_20)
#define AUDIO_TIMER_20() pushPrompt(PROMPT_SYSTEM_BASE+AU_TIMER_20) #define AUDIO_TIMER_10() audioDefevent(AU_TIMER_10)
#define AUDIO_TIMER_10() pushPrompt(PROMPT_SYSTEM_BASE+AU_TIMER_10) #define AUDIO_TIMER_LT3(x) audioDefevent(AU_TIMER_LT3)
#define AUDIO_TIMER_LT3(x) pushPrompt(PROMPT_SYSTEM_BASE+AU_TIMER_LT3) #endif
#endif
#else #define AUDIO_MINUTE_BEEP() audioDefevent(AU_WARNING1)
#define AUDIO_TADA() #define AUDIO_MIX_WARNING_1() audioDefevent(AU_MIX_WARNING_1)
#define AUDIO_TX_BATTERY_LOW() audioDefevent(AU_TX_BATTERY_LOW) #define AUDIO_MIX_WARNING_2() audioDefevent(AU_MIX_WARNING_2)
#define AUDIO_INACTIVITY() audioDefevent(AU_INACTIVITY) #define AUDIO_MIX_WARNING_3() audioDefevent(AU_MIX_WARNING_3)
#define AUDIO_ERROR_MESSAGE(e) audioDefevent(AU_ERROR) #define AUDIO_POT_STICK_MIDDLE() audioDefevent(AU_POT_STICK_MIDDLE)
#define AUDIO_TIMER_30() audioDefevent(AU_TIMER_30) #define AUDIO_VARIO_UP() audioDefevent(AU_KEYPAD_UP)
#define AUDIO_TIMER_20() audioDefevent(AU_TIMER_20) #define AUDIO_VARIO_DOWN() audioDefevent(AU_KEYPAD_DOWN)
#define AUDIO_TIMER_10() audioDefevent(AU_TIMER_10) #define AUDIO_TRIM_MIDDLE(f) audio.event(AU_TRIM_MIDDLE, f)
#define AUDIO_TIMER_LT3(x) audioDefevent(AU_TIMER_LT3) #define AUDIO_TRIM_END(f) AUDIO_TRIM_MIDDLE(f)
#endif #define AUDIO_TRIM(event, f) audio.event(AU_TRIM_MOVE, f)
#define AUDIO_PLAY(p) audio.event(p)
#define AUDIO_MINUTE_BEEP() audioDefevent(AU_WARNING1) #define AUDIO_VARIO(f, t) audio.play(f, t, 0, PLAY_SOUND_VARIO)
#define AUDIO_MIX_WARNING_1() audioDefevent(AU_MIX_WARNING_1)
#define AUDIO_MIX_WARNING_2() audioDefevent(AU_MIX_WARNING_2) #define AUDIO_DRIVER() audio.driver()
#define AUDIO_MIX_WARNING_3() audioDefevent(AU_MIX_WARNING_3) #define AUDIO_HEARTBEAT() audio.heartbeat()
#define AUDIO_POT_STICK_MIDDLE() audioDefevent(AU_POT_STICK_MIDDLE) #define IS_AUDIO_BUSY() audio.busy()
#define AUDIO_VARIO_UP() audioDefevent(AU_KEYPAD_UP)
#define AUDIO_VARIO_DOWN() audioDefevent(AU_KEYPAD_DOWN)
#define AUDIO_TRIM_MIDDLE(f) audio.event(AU_TRIM_MIDDLE, f)
#define AUDIO_TRIM_END(f) AUDIO_TRIM_MIDDLE(f)
#define AUDIO_TRIM(event, f) audio.event(AU_TRIM_MOVE, f)
#define AUDIO_PLAY(p) audio.event(p)
#define AUDIO_VARIO(f, t) audio.play(f, t, 0, PLAY_SOUND_VARIO)
#define AUDIO_DRIVER() audio.driver()
#define AUDIO_HEARTBEAT() audio.heartbeat()
#define IS_AUDIO_BUSY() audio.busy()