From d64c4710e702f4deb9644cf3d3a747b2aa22b0dd Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Sun, 20 May 2012 08:31:09 +0000
Subject: [PATCH] Some code for NODATA alarm still remaining

---
 src/beeper.h        | 1 -
 src/ersky9x/audio.h | 1 -
 src/frsky.cpp       | 5 +----
 src/open9x.cpp      | 1 +
 src/stock/audio.h   | 1 -
 5 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/beeper.h b/src/beeper.h
index ac682c88c..bfecb93e1 100644
--- a/src/beeper.h
+++ b/src/beeper.h
@@ -77,7 +77,6 @@ extern void beep(uint8_t val);
 #define AUDIO_VARIO_UP()      _beep(1)
 #define AUDIO_VARIO_DOWN()    _beep(1)
 #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)
 
diff --git a/src/ersky9x/audio.h b/src/ersky9x/audio.h
index 16c31f363..614589327 100644
--- a/src/ersky9x/audio.h
+++ b/src/ersky9x/audio.h
@@ -127,7 +127,6 @@ void audioDefevent(uint8_t e);
 #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_TELEMETRY_ALARM() audioDefevent(AU_WARNING1)
 
 #define AUDIO_HEARTBEAT()   audio.heartbeat()
 
diff --git a/src/frsky.cpp b/src/frsky.cpp
index 273d0538d..0b0b8bb04 100644
--- a/src/frsky.cpp
+++ b/src/frsky.cpp
@@ -637,12 +637,9 @@ void check_frsky()
   if (frskyStreaming > 0) {
     frskyStreaming--;
   }
-  else if (g_eeGeneral.enableTelemetryAlarm) {
+  else {
     frskyRSSI[0].set(0);
     frskyRSSI[1].set(0);
-    if (!(g_tmr10ms % 30)) {
-      AUDIO_TELEMETRY_ALARM();
-    }
   }
 #endif
 
diff --git a/src/open9x.cpp b/src/open9x.cpp
index 57e9e96c2..f15d6969f 100644
--- a/src/open9x.cpp
+++ b/src/open9x.cpp
@@ -1469,6 +1469,7 @@ void evalFunctions()
 #if defined(AUDIO)
             audioDefevent(AU_FRSKY_FIRST+sd->param);
 #else
+            // TODO sound with warble = !(g_tmr10ms % 60); AUDIO_WARNING2(); }
             beep(3);
 #endif
           }
diff --git a/src/stock/audio.h b/src/stock/audio.h
index 3ea68f3d9..b2aa2b7b1 100644
--- a/src/stock/audio.h
+++ b/src/stock/audio.h
@@ -132,7 +132,6 @@ void audioDefevent(uint8_t e);
 #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_TELEMETRY_ALARM() audioDefevent(AU_WARNING1)
 
 #define AUDIO_DRIVER()      audio.driver()
 #define AUDIO_HEARTBEAT()   audio.heartbeat()