Radio tools related fixes (#7444)

Radio tools related fixes

radio/src/gui/128x64/menus.h

@@ -50,7 +50,7 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
 
 enum MenuRadioIndexes
 {
-#if defined(LUA) || defined(PXX2) || defined(MULTIMODULE)
+#if defined(RADIO_TOOLS)
   MENU_RADIO_TOOLS,
 #endif
   CASE_SDCARD(MENU_RADIO_SD_MANAGER)
@@ -76,7 +76,7 @@ void menuRadioPowerMeter(event_t event);
 void menuRadioCalibration(event_t event);
 
 static const MenuHandlerFunc menuTabGeneral[MENU_RADIO_PAGES_COUNT]  = {
-#if defined(LUA) || defined(PXX2) || defined(MULTIMODULE)
+#if defined(RADIO_TOOLS)
   menuRadioTools,
 #endif
   CASE_SDCARD(menuRadioSdManager)

radio/src/gui/128x64/view_main.cpp

@@ -364,7 +364,7 @@ void menuMainView(event_t event)
       break;
 
     case EVT_KEY_GENERAL_MENU:
-      pushMenu(menuRadioTools);
+      pushMenu(menuTabGeneral[0]);
       killEvents(event);
       break;
 #endif

radio/src/gui/212x64/menu_radio.cpp

@@ -21,7 +21,7 @@
 #include "opentx.h"
 
 const MenuHandlerFunc menuTabGeneral[MENU_RADIO_PAGES_COUNT] = {
-#if defined(LUA) || defined(PXX2)
+#if defined(RADIO_TOOLS)
   menuRadioTools,
 #endif
   menuRadioSdManager,

radio/src/gui/212x64/view_main.cpp

@@ -455,7 +455,7 @@ void menuMainView(event_t event)
       break;
 
     case EVT_KEY_LONG(KEY_MENU):
-      pushMenu(menuRadioTools);
+      pushMenu(menuTabGeneral[0]);
       killEvents(event);
       break;
 #endif

radio/src/gui/480x272/menu_radio.cpp

@@ -21,7 +21,7 @@
 #include "opentx.h"
 
 const MenuHandlerFunc menuTabGeneral[MENU_RADIO_PAGES_COUNT] = {
-#if defined(LUA) || defined(PXX2) || defined(MULTIMODULE)
+#if defined(RADIO_TOOLS)
   menuRadioTools,
 #endif
   menuRadioSdManager,

radio/src/gui/480x272/menus.cpp

@@ -55,8 +55,10 @@ void pushMenu(MenuHandlerFunc newMenu)
   killEvents(KEY_ENTER);
 
   if (menuLevel == 0) {
+#if defined(RADIO_TOOLS)
     if (newMenu == menuRadioTools)
       menuVerticalPositions[0] = 1;
+#endif
     if (newMenu == menuModelSetup)
       menuVerticalPositions[0] = 0;
   }

radio/src/gui/480x272/menus.h

@@ -189,7 +189,7 @@ bool menuRadioDiagAnalogs(event_t event);
 extern const MenuHandlerFunc menuTabModel[MENU_MODEL_PAGES_COUNT];
 
 enum EnumTabRadio {
-#if defined(LUA) || defined(PXX2) || defined(MULTIMODULE)
+#if defined(RADIO_TOOLS)
   MENU_RADIO_TOOLS,
 #endif
   MENU_RADIO_SD_MANAGER,
@@ -203,7 +203,7 @@ enum EnumTabRadio {
 
 const uint8_t RADIO_ICONS[MENU_RADIO_PAGES_COUNT + 1] = {
   ICON_RADIO,
-#if defined(LUA) || defined(PXX2) || defined(MULTIMODULE)
+#if defined(RADIO_TOOLS)
   ICON_RADIO_TOOLS,
 #endif
   ICON_RADIO_SD_MANAGER,

radio/src/opentx.h

@@ -219,6 +219,10 @@
   #define IS_SLAVE_TRAINER()           (g_model.trainerData.mode == TRAINER_MODE_SLAVE)
 #endif
 
+#if defined(LUA) || defined(PXX2) || defined(MULTIMODULE)
+  #define RADIO_TOOLS
+#endif
+
 // RESX range is used for internal calculation; The menu says -100.0 to 100.0; internally it is -1024 to 1024 to allow some optimizations
 #define RESX_SHIFT 10
 #define RESX       1024