Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-21 15:25:17 +03:00
Code Issues Wiki Activity

A1/A2/RSSI/SWR alarms available on all ARM boards

Browse source
This commit is contained in:
bsongis 2014-05-13 21:14:49 +02:00
parent 4932ed8099
commit 0e84a27521
3 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
radio/src/audio_arm.cpp
View file

@ -190,7 +190,6 @@ const char * audioFilenames[] = {
"timer10", "timer10",
"timer20", "timer20",
"timer30", "timer30",
#if defined(PCBTARANIS)
"a1_org", "a1_org",
"a1_red", "a1_red",
"a2_org", "a2_org",
@ -198,7 +197,6 @@ const char * audioFilenames[] = {
"rssi_org", "rssi_org",
"rssi_red", "rssi_red",
"swr_red", "swr_red",
#endif
"telemko", "telemko",
"telemok" "telemok"
}; };
@ -1058,7 +1056,6 @@ void audioEvent(uint8_t e, uint16_t f)
case AU_TIMER_30: case AU_TIMER_30:
audioQueue.playTone(BEEP_DEFAULT_FREQ+150, 120, 20, PLAY_REPEAT(2)|PLAY_NOW); audioQueue.playTone(BEEP_DEFAULT_FREQ+150, 120, 20, PLAY_REPEAT(2)|PLAY_NOW);
break; break;
#if defined(PCBTARANIS)
case AU_A1_ORANGE: case AU_A1_ORANGE:
audioQueue.playTone(BEEP_DEFAULT_FREQ+600, 200, 20, PLAY_NOW); audioQueue.playTone(BEEP_DEFAULT_FREQ+600, 200, 20, PLAY_NOW);
break; break;
@ -1080,7 +1077,6 @@ void audioEvent(uint8_t e, uint16_t f)
case AU_SWR_RED: case AU_SWR_RED:
audioQueue.playTone(450, 160, 40, PLAY_REPEAT(2), 1); audioQueue.playTone(450, 160, 40, PLAY_REPEAT(2), 1);
break; break;
#endif
case AU_FRSKY_BEEP1: case AU_FRSKY_BEEP1:
audioQueue.playTone(BEEP_DEFAULT_FREQ, 60, 20); audioQueue.playTone(BEEP_DEFAULT_FREQ, 60, 20);
break; break;

4
radio/src/audio_arm.h
View file

@ -281,8 +281,6 @@ void audioStart();
#define AUDIO_TRIM(event, f) AUDIO_BUZZER(audioEvent(AU_TRIM_MOVE, f), { if (!IS_KEY_FIRST(event)) warble = true; beep(1); }) #define AUDIO_TRIM(event, f) AUDIO_BUZZER(audioEvent(AU_TRIM_MOVE, f), { if (!IS_KEY_FIRST(event)) warble = true; beep(1); })
#define AUDIO_PLAY(p) audioEvent(p) #define AUDIO_PLAY(p) audioEvent(p)
#define AUDIO_VARIO(fq, t, p, f) audioQueue.playTone(fq, t, p, f) #define AUDIO_VARIO(fq, t, p, f) audioQueue.playTone(fq, t, p, f)
#if defined(PCBTARANIS)
#define AUDIO_A1_ORANGE() audioEvent(AU_A1_ORANGE) #define AUDIO_A1_ORANGE() audioEvent(AU_A1_ORANGE)
#define AUDIO_A1_RED() audioEvent(AU_A1_RED) #define AUDIO_A1_RED() audioEvent(AU_A1_RED)
#define AUDIO_A2_ORANGE() audioEvent(AU_A2_ORANGE) #define AUDIO_A2_ORANGE() audioEvent(AU_A2_ORANGE)
@ -290,8 +288,6 @@ void audioStart();
#define AUDIO_RSSI_ORANGE() audioEvent(AU_RSSI_ORANGE) #define AUDIO_RSSI_ORANGE() audioEvent(AU_RSSI_ORANGE)
#define AUDIO_RSSI_RED() audioEvent(AU_RSSI_RED) #define AUDIO_RSSI_RED() audioEvent(AU_RSSI_RED)
#define AUDIO_SWR_RED() audioEvent(AU_SWR_RED) #define AUDIO_SWR_RED() audioEvent(AU_SWR_RED)
#endif
#define AUDIO_TELEMETRY_LOST() audioEvent(AU_TELEMETRY_LOST) #define AUDIO_TELEMETRY_LOST() audioEvent(AU_TELEMETRY_LOST)
#define AUDIO_TELEMETRY_BACK() audioEvent(AU_TELEMETRY_BACK) #define AUDIO_TELEMETRY_BACK() audioEvent(AU_TELEMETRY_BACK)

4
radio/src/opentx.h
View file

@ -1277,7 +1277,7 @@ enum AUDIO_SOUNDS {
AU_TIMER_LT10, AU_TIMER_LT10,
AU_TIMER_20, AU_TIMER_20,
AU_TIMER_30, AU_TIMER_30,
#if defined(PCBTARANIS) #if defined(CPUARM)
AU_A1_ORANGE, AU_A1_ORANGE,
AU_A1_RED, AU_A1_RED,
AU_A2_ORANGE, AU_A2_ORANGE,
@ -1285,8 +1285,6 @@ enum AUDIO_SOUNDS {
AU_RSSI_ORANGE, AU_RSSI_ORANGE,
AU_RSSI_RED, AU_RSSI_RED,
AU_SWR_RED, AU_SWR_RED,
#endif
#if defined(CPUARM)
AU_TELEMETRY_LOST, AU_TELEMETRY_LOST,
AU_TELEMETRY_BACK, AU_TELEMETRY_BACK,
#endif #endif