From 1a32118d0b7c04e3cd9fa858ce2e37e1b1e340c7 Mon Sep 17 00:00:00 2001
From: 3djc <lesitewebdejc@hotmail.com>
Date: Wed, 24 Apr 2019 14:15:40 +0200
Subject: [PATCH] R9M continued

---
 radio/src/gui/128x64/model_setup.cpp | 18 ------------------
 radio/src/pulses/pulses.h            |  2 +-
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp
index a1a88ec2b..1454407df 100644
--- a/radio/src/gui/128x64/model_setup.cpp
+++ b/radio/src/gui/128x64/model_setup.cpp
@@ -185,10 +185,7 @@ enum MenuModelSetupItems {
 
 #define PORT_CHANNELS_ROWS(x)          (x==EXTERNAL_MODULE ? EXTERNAL_MODULE_CHANNELS_ROWS : 0)
 
-
 #define EXTERNAL_MODULE_MODE_ROWS      (isModuleXJT(EXTERNAL_MODULE) || isModuleR9M(EXTERNAL_MODULE) || isModuleDSM2(EXTERNAL_MODULE) || isModuleMultimodule(EXTERNAL_MODULE)) ? (uint8_t)1 : (uint8_t)0
-#define EXTERNAL_MODULE_FREQ_ROW       (isModuleR9M_EUPLUS(EXTERNAL_MODULE) || isModuleR9M_AU_PLUS(EXTERNAL_MODULE)) ? (uint8_t)1: (uint8_t)HIDDEN_ROW,
-
 
 #define CURSOR_ON_CELL                 (true)
 #define MODEL_SETUP_MAX_LINES          (HEADER_LINE+ITEM_MODEL_SETUP_MAX)
@@ -589,7 +586,6 @@ void menuModelSetup(event_t event)
       IF_NOT_PXX2_MODULE(EXTERNAL_MODULE, EXTERNAL_MODULE_OPTION_ROW),
       MULTIMODULE_MODULE_ROWS
       EXTERNAL_MODULE_POWER_ROW,
-      EXTERNAL_MODULE_FREQ_ROW
       FAILSAFE_ROWS(EXTERNAL_MODULE),
       IF_PXX2_MODULE(EXTERNAL_MODULE, 1),                          // Range check and Register buttons
       IF_PXX2_MODULE(EXTERNAL_MODULE, 0),                          // Module options
@@ -1766,20 +1762,6 @@ void menuModelSetup(event_t event)
       }
       break;
 
-#if !defined(PCBXLITE)
-      case ITEM_MODEL_EXTERNAL_MODULE_FREQ:
-      {
-        uint8_t moduleIdx = CURRENT_MODULE_EDITED(k);
-        lcdDrawTextAlignedLeft(y, STR_FREQUENCY);
-        lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_R9MFLEX_FREQ, g_model.moduleData[moduleIdx].r9m.freq, LEFT | attr);
-        if (attr)
-        {
-          CHECK_INCDEC_MODELVAR_ZERO(event, g_model.moduleData[moduleIdx].r9m.freq, 1);
-        }
-      }
-      break;
-#endif
-
 #if defined(MULTIMODULE)
       case ITEM_MODEL_EXTERNAL_MODULE_AUTOBIND:
         if (g_model.moduleData[EXTERNAL_MODULE].getMultiProtocol(true) == MM_RF_PROTO_DSM2)
diff --git a/radio/src/pulses/pulses.h b/radio/src/pulses/pulses.h
index db4049947..2c47220d5 100644
--- a/radio/src/pulses/pulses.h
+++ b/radio/src/pulses/pulses.h
@@ -353,7 +353,7 @@ enum R9MLBTPowerValues {
 #else
 
 #define LEN_R9M_REGION                 "\006"
-#define TR_R9M_REGION                  "FCC\0""EU\0 ""868MHz""915MHz"
+#define TR_R9M_REGION                  "FCC\0  ""EU\0   ""868MHz""915MHz"
 #define LEN_R9MFLEX_FREQ               "\006"
 #define TR_R9MFLEX_FREQ                "868Mhz""915Mhz"
 #define LEN_R9M_FCC_POWER_VALUES       "\006"