Cosmetics

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

@@ -281,11 +281,11 @@ void drawStatusLine();
 #endif
 
 #define TEXT_FILENAME_MAXLEN         40
-  extern char s_text_file[TEXT_FILENAME_MAXLEN];
+extern char s_text_file[TEXT_FILENAME_MAXLEN];
-  void menuTextView(event_t event);
+void menuTextView(event_t event);
-  void pushMenuTextView(const char *filename);
+void pushMenuTextView(const char *filename);
-  void pushModelNotes();
+void pushModelNotes();
-  void readModelNotes();
+void readModelNotes();
 
 #define LABEL(...)                     (uint8_t)-1
 

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

@@ -57,6 +57,16 @@ void chainMenu(MenuHandlerFunc newMenu);
 void pushMenu(MenuHandlerFunc newMenu);
 void popMenu();
 
+inline bool isRadioMenuDisplayed()
+{
+  return menuVerticalPositions[0] == 1;
+}
+
+inline bool isModelMenuDisplayed()
+{
+  return menuVerticalPositions[0] == 0;
+}
+
 inline MenuHandlerFunc lastPopMenu()
 {
   return menuHandlers[menuLevel+1];

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

@@ -428,7 +428,7 @@ void menuModelSetup(event_t event)
     NUM_STICKS + NUM_POTS + NUM_SLIDERS + NUM_ROTARY_ENCODERS - 1, // Center beeps
     0, // Global functions
 
-    isDefaultModelRegistrationID() ? HIDDEN_ROW : READONLY_ROW,    // Registration ID
+    READONLY_ROW, // Registration ID
 
     LABEL(InternalModule),
       INTERNAL_MODULE_MODE_ROWS,                                   // module mode (PXX(2) / None)
@@ -1185,7 +1185,11 @@ void menuModelSetup(event_t event)
 
 #if defined(PCBTARANIS)
       case ITEM_MODEL_REGISTRATION_ID:
-        editSingleName(MODEL_SETUP_2ND_COLUMN, y, STR_REG_ID, g_model.modelRegistrationID, sizeof(g_model.modelRegistrationID), event, attr);
+        lcdDrawTextAlignedLeft(y, STR_REG_ID);
+        if (isDefaultModelRegistrationID())
+          lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, "<default>");
+        else
+          lcdDrawSizedText(MODEL_SETUP_2ND_COLUMN, y, g_model.modelRegistrationID, sizeof(g_model.modelRegistrationID), ZCHAR);
         break;
 
       case ITEM_MODEL_INTERNAL_MODULE_PXX2_MODEL_NUM:

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

@@ -74,7 +74,7 @@ choice_t editChoice(coord_t x, coord_t y, const char * label, const char *values
 {
   drawFieldLabel(x, y, label);
   if (values) lcdDrawTextAtIndex(x, y, values, value-min, attr);
-  if (attr & (~RIGHT)) value = checkIncDec(event, value, min, max, (menuVerticalPositions[0] == 0) ? EE_MODEL : EE_GENERAL);
+  if (attr & (~RIGHT)) value = checkIncDec(event, value, min, max, (isModelMenuDisplayed()) ? EE_MODEL : EE_GENERAL);
   return value;
 }
 

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

@@ -43,6 +43,16 @@ void chainMenu(MenuHandlerFunc newMenu);
 void pushMenu(MenuHandlerFunc newMenu);
 void popMenu();
 
+inline bool isRadioMenuDisplayed()
+{
+  return menuVerticalPositions[0] == 1;
+}
+
+inline bool isModelMenuDisplayed()
+{
+  return menuVerticalPositions[0] == 0;
+}
+
 void onMainViewMenu(const char * result);
 
 void menuFirstCalib(event_t event);

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

@@ -134,7 +134,7 @@ choice_t editChoice(coord_t x, coord_t y, const char * label, const char *values
 {
   drawFieldLabel(x, y, label);
   if (values) lcdDrawTextAtIndex(x, y, values, value-min, attr);
-  if (attr & (~RIGHT)) value = checkIncDec(event, value, min, max, (menuVerticalPositions[0] == 0) ? EE_MODEL : EE_GENERAL);
+  if (attr & (~RIGHT)) value = checkIncDec(event, value, min, max, (isModelMenuDisplayed()) ? EE_MODEL : EE_GENERAL);
   return value;
 }
 

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

@@ -135,7 +135,7 @@ void editName(coord_t x, coord_t y, char * name, uint8_t size, event_t event, ui
             v = zchar2char(v);
         }
         name[editNameCursorPos] = v;
-        storageDirty(menuVerticalPositions[0] == 0 ? EE_MODEL : EE_GENERAL);
+        storageDirty(isModelMenuDisplayed() ? EE_MODEL : EE_GENERAL);
       }
 
       lcdDrawSizedText(x, y, name, size, flags);

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

@@ -48,13 +48,20 @@ extern uint8_t menuVerticalPositions[4];
 extern uint8_t menuLevel;
 extern event_t menuEvent;
 
-/// goto given Menu, but substitute current menu in menuStack
 void chainMenu(MenuHandlerFunc newMenu);
-/// goto given Menu, store current menu in menuStack
 void pushMenu(MenuHandlerFunc newMenu);
-/// return to last menu in menuStack
 void popMenu();
 
+inline bool isRadioMenuDisplayed()
+{
+  return menuVerticalPositions[0] == 1;
+}
+
+inline bool isModelMenuDisplayed()
+{
+  return menuVerticalPositions[0] == 0;
+}
+
 enum MenuIcons {
   ICON_OPENTX,
   ICON_RADIO,

radio/src/gui/common/colorlcd/widgets.cpp

@@ -46,7 +46,7 @@ void drawValueWithUnit(coord_t x, coord_t y, int32_t val, uint8_t unit, LcdFlags
 
 int editChoice(coord_t x, coord_t y, const char * values, int value, int min, int max, LcdFlags attr, event_t event)
 {
-  if (attr & INVERS) value = checkIncDec(event, value, min, max, (menuVerticalPositions[0] == 0) ? EE_MODEL : EE_GENERAL);
+  if (attr & INVERS) value = checkIncDec(event, value, min, max, (isModelMenuDisplayed()) ? EE_MODEL : EE_GENERAL);
   if (values) lcdDrawTextAtIndex(x, y, values, value-min, attr);
   return value;
 }

radio/src/gui/common/stdlcd/widgets.cpp

@@ -69,7 +69,7 @@ void editName(coord_t x, coord_t y, char * name, uint8_t size, event_t event, ui
     else
       mode = FIXEDWIDTH;
   }
-  
+
   lcdDrawSizedText(x, y, name, size, attr | mode);
   coord_t backupNextPos = lcdNextPos;
   
@@ -156,7 +156,7 @@ void editName(coord_t x, coord_t y, char * name, uint8_t size, event_t event, ui
       
       if (c != v) {
         name[cur] = v;
-        storageDirty(menuVerticalPositions[0] == 0 ? EE_MODEL : EE_GENERAL);
+        storageDirty(isModelMenuDisplayed() ? EE_MODEL : EE_GENERAL);
       }
       
       if (attr == ZCHAR) {