Move TOOLS menu as first radio screen (#7312)

Move TOOLS menu as first radio screen

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

@@ -50,11 +50,11 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
 
 enum MenuRadioIndexes
 {
-  MENU_RADIO_SETUP,
-  CASE_SDCARD(MENU_RADIO_SD_MANAGER)
 #if defined(LUA) || defined(PXX2) || defined(MULTIMODULE)
   MENU_RADIO_TOOLS,
 #endif
+  CASE_SDCARD(MENU_RADIO_SD_MANAGER)
+  MENU_RADIO_SETUP,
   MENU_RADIO_SPECIAL_FUNCTIONS,
   MENU_RADIO_TRAINER,
   MENU_RADIO_HARDWARE,
@@ -76,11 +76,11 @@ void menuRadioPowerMeter(event_t event);
 void menuRadioCalibration(event_t event);
 
 static const MenuHandlerFunc menuTabGeneral[MENU_RADIO_PAGES_COUNT]  = {
-  menuRadioSetup,
-  CASE_SDCARD(menuRadioSdManager)
 #if defined(LUA) || defined(PXX2) || defined(MULTIMODULE)
   menuRadioTools,
 #endif
+  CASE_SDCARD(menuRadioSdManager)
+  menuRadioSetup,
   menuRadioSpecialFunctions,
   menuRadioTrainer,
   menuRadioHardware,

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

@@ -369,7 +369,7 @@ void menuMainView(event_t event)
       break;
 
     case EVT_KEY_GENERAL_MENU:
-      pushMenu(menuRadioSetup);
+      pushMenu(menuRadioTools);
       killEvents(event);
       break;
 #endif

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

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

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

@@ -52,11 +52,11 @@ void menuTraceBuffer(event_t event);
 #endif
 
 enum MenuRadioIndexes {
-  MENU_RADIO_SETUP,
-  MENU_RADIO_SD_MANAGER,
 #if defined(LUA) || defined(PXX2) || defined(MULTIMODULE)
   MENU_RADIO_TOOLS,
 #endif
+  MENU_RADIO_SD_MANAGER,
+  MENU_RADIO_SETUP,
   MENU_RADIO_SPECIAL_FUNCTIONS,
   MENU_RADIO_TRAINER,
   MENU_RADIO_HARDWARE,

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

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

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

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

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

@@ -55,7 +55,7 @@ void pushMenu(MenuHandlerFunc newMenu)
   killEvents(KEY_ENTER);
 
   if (menuLevel == 0) {
-    if (newMenu == menuRadioSetup)
+    if (newMenu == menuRadioTools)
       menuVerticalPositions[0] = 1;
     if (newMenu == menuModelSetup)
       menuVerticalPositions[0] = 0;

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

@@ -190,11 +190,11 @@ bool menuRadioDiagAnalogs(event_t event);
 extern const MenuHandlerFunc menuTabModel[MENU_MODEL_PAGES_COUNT];
 
 enum EnumTabRadio {
-  MENU_RADIO_SETUP,
-  MENU_RADIO_SD_MANAGER,
 #if defined(LUA) || defined(PXX2) || defined(MULTIMODULE)
   MENU_RADIO_TOOLS,
 #endif
+  MENU_RADIO_SD_MANAGER,
+  MENU_RADIO_SETUP,
   MENU_RADIO_SPECIAL_FUNCTIONS,
   MENU_RADIO_TRAINER,
   MENU_RADIO_HARDWARE,
@@ -204,11 +204,11 @@ enum EnumTabRadio {
 
 const uint8_t RADIO_ICONS[MENU_RADIO_PAGES_COUNT + 1] = {
   ICON_RADIO,
-  ICON_RADIO_SETUP,
-  ICON_RADIO_SD_MANAGER,
 #if defined(LUA) || defined(PXX2)
   ICON_RADIO_TOOLS,
 #endif
+  ICON_RADIO_SD_MANAGER,
+  ICON_RADIO_SETUP,
   ICON_RADIO_GLOBAL_FUNCTIONS,
   ICON_RADIO_TRAINER,
   ICON_RADIO_HARDWARE,