Merge fixes

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

@@ -409,7 +409,7 @@ void menuModelSetup(event_t event)
   MENU_TAB({
     HEADER_LINE_COLUMNS
     0,
-    TIMERS_ROWS,
+    TIMER_ROWS,
     0, // Extended limits
     1, // Extended trims
     0, // Show trims
@@ -1767,18 +1767,19 @@ void menuModelSetup(event_t event)
         getModuleStatusString(EXTERNAL_MODULE, reusableBuffer.moduleSetup.msg);
         lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, reusableBuffer.moduleSetup.msg);
         break;
-
+      }
 #if defined(HARDWARE_INTERNAL_MODULE)
       case ITEM_MODEL_SETUP_INTERNAL_MODULE_SYNCSTATUS:
 #endif
 #if defined(HARDWARE_EXTERNAL_MODULE)
       case ITEM_MODEL_SETUP_EXTERNAL_MODULE_SYNCSTATUS:
 #endif
-      {
-        lcdDrawTextAlignedLeft(y, STR_MODULE_SYNC);
-        getModuleSyncStatusString(moduleIdx, reusableBuffer.moduleSetup.msg);
-        lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, reusableBuffer.moduleSetup.msg);
-        break;
+        {
+          lcdDrawTextAlignedLeft(y, STR_MODULE_SYNC);
+          getModuleSyncStatusString(moduleIdx, reusableBuffer.moduleSetup.msg);
+          lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, reusableBuffer.moduleSetup.msg);
+          break;
+        }
 #endif
 
 #if defined(AFHDS3)

radio/src/gui/gui_common.cpp

@@ -1096,15 +1096,6 @@ const mm_protocol_definition *getMultiProtocolDefinition (uint8_t protocol)
 }
 #endif
 
-void editStickHardwareSettings(coord_t x, coord_t y, int idx, event_t event, LcdFlags flags)
-{
-  lcdDrawTextAtIndex(INDENT_WIDTH, y, STR_VSRCRAW, idx+1, 0);
-  if (ZEXIST(g_eeGeneral.anaNames[idx]) || (flags && s_editMode > 0))
-    editName(x, y, g_eeGeneral.anaNames[idx], LEN_ANA_NAME, event, flags);
-  else
-    lcdDrawMMM(x, y, flags);
-}
-
 #if defined(MULTIMODULE)
 const char * getMultiOptionTitle(uint8_t moduleIdx)
 {