From a9208deb91825b5c78c82d48ef0a2fea161faf60 Mon Sep 17 00:00:00 2001
From: "bsongis@gmail.com"
 <bsongis@gmail.com@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Tue, 25 Jun 2013 06:02:03 +0000
Subject: [PATCH] Some TODOs removed

---
 src/audio_arm.cpp |  3 ++-
 src/audio_arm.h   |  3 ---
 src/lcd.cpp       | 26 +++++++++++++-------------
 src/myeeprom.h    |  2 +-
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/audio_arm.cpp b/src/audio_arm.cpp
index 39dc31e80..2c4a1c8b0 100644
--- a/src/audio_arm.cpp
+++ b/src/audio_arm.cpp
@@ -37,6 +37,8 @@
 #include "opentx.h"
 #include <math.h>
 
+extern OS_MutexID audioMutex;
+
 const unsigned int toneVolumes[] = {
   4000,
   8000,
@@ -833,7 +835,6 @@ void audioEvent(uint8_t e, uint16_t f)
           audioQueue.play(BEEP_DEFAULT_FREQ+1800, 800, 20, PLAY_REPEAT(1)|PLAY_NOW);
           break;
         case AU_SWR_RED:
-          // TODO
           audioQueue.play(450, 160, 40, PLAY_REPEAT(2), 1);
           break;
 #endif
diff --git a/src/audio_arm.h b/src/audio_arm.h
index 76b77d6d3..92c23d5fd 100644
--- a/src/audio_arm.h
+++ b/src/audio_arm.h
@@ -309,7 +309,4 @@ extern void refreshSystemAudioFiles();
 extern void refreshModelAudioFiles();
 extern bool isAudioFileAvailable(uint32_t i, char * filename);
 
-// TODO not public, everything could be inside a function in audio_arm.cpp
-extern OS_MutexID audioMutex;
-
 #endif
diff --git a/src/lcd.cpp b/src/lcd.cpp
index 636acfad4..b4058fad0 100644
--- a/src/lcd.cpp
+++ b/src/lcd.cpp
@@ -697,19 +697,7 @@ void lcd_invert_line(int8_t y)
   }
 }
 
-#if !defined(PCBTARANIS) // TODO test inversion
-void lcdDrawTelemetryTopBar()
-{
-  putsModelName(0, 0, g_model.header.name, g_eeGeneral.currModel, 0);
-  uint8_t att = (g_vbat100mV < g_eeGeneral.vBatWarn ? BLINK : 0);
-  putsVBat(14*FW,0,att);
-  if (g_model.timers[0].mode) {
-    att = (timersStates[0].state==TMR_BEEPING ? BLINK : 0);
-    putsTime(17*FW+5*FWNUM+1, 0, timersStates[0].val, att, att);
-  }
-  lcd_invert_line(0);
-}
-#else
+#if defined(PCBTARANIS)
 void lcdDrawTelemetryTopBar()
 {
   putsModelName(0, 0, g_model.header.name, g_eeGeneral.currModel, 0);
@@ -727,6 +715,18 @@ void lcdDrawTelemetryTopBar()
   }
   lcd_invert_line(0);
 }
+#else
+void lcdDrawTelemetryTopBar()
+{
+  putsModelName(0, 0, g_model.header.name, g_eeGeneral.currModel, 0);
+  uint8_t att = (g_vbat100mV < g_eeGeneral.vBatWarn ? BLINK : 0);
+  putsVBat(14*FW,0,att);
+  if (g_model.timers[0].mode) {
+    att = (timersStates[0].state==TMR_BEEPING ? BLINK : 0);
+    putsTime(17*FW+5*FWNUM+1, 0, timersStates[0].val, att, att);
+  }
+  lcd_invert_line(0);
+}
 #endif
 
 void putsTime(xcoord_t x, uint8_t y, putstime_t tme, LcdFlags att, LcdFlags att2)
diff --git a/src/myeeprom.h b/src/myeeprom.h
index 1c342e173..059771123 100644
--- a/src/myeeprom.h
+++ b/src/myeeprom.h
@@ -1145,7 +1145,7 @@ enum MixSources {
   MIXSRC_SWA,
   MIXSRC_SWB,
   MIXSRC_SWC,
-  MIXSRC_LAST_CSW = MIXSRC_SW1+NUM_CSW-1, // TODO same naming convention
+  MIXSRC_LAST_CSW = MIXSRC_SW1+NUM_CSW-1,
 
   MIXSRC_PPM1,
   MIXSRC_LAST_PPM = MIXSRC_PPM1 + 7,