From a84a50f8a614527df35f7e9b7eff992ea79bbdf4 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Sun, 28 Apr 2019 21:19:17 +0200
Subject: [PATCH] Bugfixes on X3 and X7

---
 radio/src/gui/128x64/model_setup.cpp | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp
index 03d3e5895..6dd01bce1 100644
--- a/radio/src/gui/128x64/model_setup.cpp
+++ b/radio/src/gui/128x64/model_setup.cpp
@@ -111,9 +111,6 @@ enum MenuModelSetupItems {
   ITEM_MODEL_EXTERNAL_MODULE_AUTOBIND,
 #endif
   ITEM_MODEL_EXTERNAL_MODULE_POWER,
-#if !defined(PCBXLITE)
-  ITEM_MODEL_EXTERNAL_MODULE_FREQ,
-#endif
   ITEM_MODEL_EXTERNAL_MODULE_FAILSAFE,
   ITEM_MODEL_EXTERNAL_MODULE_PXX2_REGISTER_RANGE,
   ITEM_MODEL_EXTERNAL_MODULE_PXX2_OPTIONS,
@@ -125,17 +122,17 @@ enum MenuModelSetupItems {
   ITEM_MODEL_EXTRA_MODULE_CHANNELS,
   ITEM_MODEL_EXTRA_MODULE_BIND,
 #endif
-#if defined(PCBX7) || defined(PCBX3)
+#if defined(PCBTARANIS)
   ITEM_MODEL_TRAINER_LABEL,
   ITEM_MODEL_TRAINER_MODE,
+#endif
+#if defined(PCBX7) || defined(PCBX3)
   #if defined(BLUETOOTH)
     ITEM_MODEL_TRAINER_BLUETOOTH,
   #endif
   ITEM_MODEL_TRAINER_CHANNELS,
   ITEM_MODEL_TRAINER_PARAMS,
 #elif defined(PCBXLITE)
-  ITEM_MODEL_TRAINER_LABEL,
-  ITEM_MODEL_TRAINER_MODE,
   ITEM_MODEL_TRAINER_BLUETOOTH,
   ITEM_MODEL_TRAINER_CHANNELS,
   ITEM_MODEL_TRAINER_PARAMS,
@@ -179,7 +176,7 @@ enum MenuModelSetupItems {
 
 #if defined(PCBSKY9X) && defined(REVX)
   #define OUTPUT_TYPE_ROWS()             (isModulePPM(EXTERNAL_MODULE) ? (uint8_t)0 : HIDDEN_ROW) ,
-#else
+#elif defined(PCBSKY9X)
   #define OUTPUT_TYPE_ROWS()
 #endif
 
@@ -578,8 +575,7 @@ void menuModelSetup(event_t event)
       MULTIMODULE_STATUS_ROWS
       EXTERNAL_MODULE_CHANNELS_ROWS,
       IF_NOT_PXX2_MODULE(EXTERNAL_MODULE, EXTERNAL_MODULE_BIND_ROWS()),      // line reused for PPM: PPM settings
-      IF_PXX2_MODULE(EXTERNAL_MODULE, 0),                                    // RxNum
-      OUTPUT_TYPE_ROWS()
+      IF_PXX2_MODULE(EXTERNAL_MODULE, 0),                          // RxNum
       IF_NOT_PXX2_MODULE(EXTERNAL_MODULE, EXTERNAL_MODULE_OPTION_ROW),
       MULTIMODULE_MODULE_ROWS
       EXTERNAL_MODULE_POWER_ROW,