From de34cb7ef2ed57a00c22451d5bd815994dcacd1a Mon Sep 17 00:00:00 2001
From: "bsongis@gmail.com"
 <bsongis@gmail.com@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Fri, 12 Apr 2013 20:43:22 +0000
Subject: [PATCH] [Taranis] Cosmetics

---
 src/menu_model.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/menu_model.cpp b/src/menu_model.cpp
index c9d8a5145..f02bda413 100644
--- a/src/menu_model.cpp
+++ b/src/menu_model.cpp
@@ -1234,8 +1234,6 @@ void menuModelSetup(uint8_t event)
                   newFlag = PXX_SEND_RXNUM;
                 else if (m_posHorz == 2) {
                   newFlag = PXX_SEND_RANGECHECK;
-                  displayPopup("RSSI: ");
-                  lcd_outdezAtt(16+4*FW, 5*FH, frskyData.rssi[0].value, BOLD);
                 }
               }
               pxxFlag[moduleIdx] = newFlag;
@@ -1279,7 +1277,7 @@ void menuModelSetup(uint8_t event)
       }
 
       case ITEM_MODEL_TRAINER:
-        g_model.trainerMode = onoffMenuItem(g_model.trainerMode, MODEL_SETUP_2ND_COLUMN, y, STR_TRAINER, attr, event);
+        g_model.trainerMode = selectMenuItem(MODEL_SETUP_2ND_COLUMN, y, PSTR("Trainer Mode"), PSTR("\006MasterSlave"), g_model.trainerMode, 0, 1, attr, event);
         break;
 #else
       case ITEM_MODEL_PROTOCOL:
@@ -1429,6 +1427,13 @@ void menuModelSetup(uint8_t event)
 #endif // defined(PCBTARANIS)
     }
   }
+
+#if defined(PCBTARANIS)
+  if (pxxFlag[0] == PXX_SEND_RANGECHECK || pxxFlag[1] == PXX_SEND_RANGECHECK) {
+    displayPopup("RSSI: ");
+    lcd_outdezAtt(16+4*FW, 5*FH, frskyData.rssi[0].value, BOLD);
+  }
+#endif
 }
 
 static uint8_t s_currIdx;