Some code for NODATA alarm still remaining

This commit is contained in:
bsongis
2012-05-20 08:31:09 +00:00
parent bb871ce6cf
commit d64c4710e7
5 changed files with 2 additions and 7 deletions
-1
View File
@@ -77,7 +77,6 @@ extern void beep(uint8_t val);
#define AUDIO_VARIO_UP() _beep(1) #define AUDIO_VARIO_UP() _beep(1)
#define AUDIO_VARIO_DOWN() _beep(1) #define AUDIO_VARIO_DOWN() _beep(1)
#define AUDIO_TRIM_MIDDLE(f) beep(2) #define AUDIO_TRIM_MIDDLE(f) beep(2)
#define AUDIO_TELEMETRY_ALARM() { warble = !(g_tmr10ms % 60); AUDIO_WARNING2(); }
#define IS_AUDIO_BUSY() (g_beepCnt || beepAgain || beepOn) #define IS_AUDIO_BUSY() (g_beepCnt || beepAgain || beepOn)
-1
View File
@@ -127,7 +127,6 @@ void audioDefevent(uint8_t e);
#define AUDIO_VARIO_UP() audioDefevent(AU_KEYPAD_UP) #define AUDIO_VARIO_UP() audioDefevent(AU_KEYPAD_UP)
#define AUDIO_VARIO_DOWN() audioDefevent(AU_KEYPAD_DOWN) #define AUDIO_VARIO_DOWN() audioDefevent(AU_KEYPAD_DOWN)
#define AUDIO_TRIM_MIDDLE(f) audio.event(AU_TRIM_MIDDLE, f) #define AUDIO_TRIM_MIDDLE(f) audio.event(AU_TRIM_MIDDLE, f)
#define AUDIO_TELEMETRY_ALARM() audioDefevent(AU_WARNING1)
#define AUDIO_HEARTBEAT() audio.heartbeat() #define AUDIO_HEARTBEAT() audio.heartbeat()
+1 -4
View File
@@ -637,12 +637,9 @@ void check_frsky()
if (frskyStreaming > 0) { if (frskyStreaming > 0) {
frskyStreaming--; frskyStreaming--;
} }
else if (g_eeGeneral.enableTelemetryAlarm) { else {
frskyRSSI[0].set(0); frskyRSSI[0].set(0);
frskyRSSI[1].set(0); frskyRSSI[1].set(0);
if (!(g_tmr10ms % 30)) {
AUDIO_TELEMETRY_ALARM();
}
} }
#endif #endif
+1
View File
@@ -1469,6 +1469,7 @@ void evalFunctions()
#if defined(AUDIO) #if defined(AUDIO)
audioDefevent(AU_FRSKY_FIRST+sd->param); audioDefevent(AU_FRSKY_FIRST+sd->param);
#else #else
// TODO sound with warble = !(g_tmr10ms % 60); AUDIO_WARNING2(); }
beep(3); beep(3);
#endif #endif
} }
-1
View File
@@ -132,7 +132,6 @@ void audioDefevent(uint8_t e);
#define AUDIO_VARIO_UP() audioDefevent(AU_KEYPAD_UP) #define AUDIO_VARIO_UP() audioDefevent(AU_KEYPAD_UP)
#define AUDIO_VARIO_DOWN() audioDefevent(AU_KEYPAD_DOWN) #define AUDIO_VARIO_DOWN() audioDefevent(AU_KEYPAD_DOWN)
#define AUDIO_TRIM_MIDDLE(f) audio.event(AU_TRIM_MIDDLE, f) #define AUDIO_TRIM_MIDDLE(f) audio.event(AU_TRIM_MIDDLE, f)
#define AUDIO_TELEMETRY_ALARM() audioDefevent(AU_WARNING1)
#define AUDIO_DRIVER() audio.driver() #define AUDIO_DRIVER() audio.driver()
#define AUDIO_HEARTBEAT() audio.heartbeat() #define AUDIO_HEARTBEAT() audio.heartbeat()