From aee6daf0d044f7c965be3b44ca61e47364ba7953 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sat, 9 Mar 2019 11:23:16 +0100 Subject: [PATCH] Cosmetics --- radio/src/gui/128x64/gui.h | 10 +++++----- radio/src/gui/128x64/menus.h | 10 ++++++++++ radio/src/gui/128x64/model_setup.cpp | 8 ++++++-- radio/src/gui/128x64/widgets.cpp | 2 +- radio/src/gui/212x64/menus.h | 10 ++++++++++ radio/src/gui/212x64/widgets.cpp | 2 +- radio/src/gui/480x272/menu_model.cpp | 2 +- radio/src/gui/480x272/menus.h | 13 ++++++++++--- radio/src/gui/common/colorlcd/widgets.cpp | 2 +- radio/src/gui/common/stdlcd/widgets.cpp | 4 ++-- 10 files changed, 47 insertions(+), 16 deletions(-) diff --git a/radio/src/gui/128x64/gui.h b/radio/src/gui/128x64/gui.h index 62fb97887..3fd8bb060 100644 --- a/radio/src/gui/128x64/gui.h +++ b/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]; - void menuTextView(event_t event); - void pushMenuTextView(const char *filename); - void pushModelNotes(); - void readModelNotes(); +extern char s_text_file[TEXT_FILENAME_MAXLEN]; +void menuTextView(event_t event); +void pushMenuTextView(const char *filename); +void pushModelNotes(); +void readModelNotes(); #define LABEL(...) (uint8_t)-1 diff --git a/radio/src/gui/128x64/menus.h b/radio/src/gui/128x64/menus.h index 0e79d72a0..adc4bb67d 100644 --- a/radio/src/gui/128x64/menus.h +++ b/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]; diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index e4689cd0d..6d69c690d 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/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, ""); + else + lcdDrawSizedText(MODEL_SETUP_2ND_COLUMN, y, g_model.modelRegistrationID, sizeof(g_model.modelRegistrationID), ZCHAR); break; case ITEM_MODEL_INTERNAL_MODULE_PXX2_MODEL_NUM: diff --git a/radio/src/gui/128x64/widgets.cpp b/radio/src/gui/128x64/widgets.cpp index cec799981..f9ba1f651 100644 --- a/radio/src/gui/128x64/widgets.cpp +++ b/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; } diff --git a/radio/src/gui/212x64/menus.h b/radio/src/gui/212x64/menus.h index 91fb3be07..a45483eb6 100644 --- a/radio/src/gui/212x64/menus.h +++ b/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); diff --git a/radio/src/gui/212x64/widgets.cpp b/radio/src/gui/212x64/widgets.cpp index 8eb631d09..2e4166f94 100644 --- a/radio/src/gui/212x64/widgets.cpp +++ b/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; } diff --git a/radio/src/gui/480x272/menu_model.cpp b/radio/src/gui/480x272/menu_model.cpp index f751b2bf2..e03cf34a3 100644 --- a/radio/src/gui/480x272/menu_model.cpp +++ b/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); diff --git a/radio/src/gui/480x272/menus.h b/radio/src/gui/480x272/menus.h index 0c13c92fd..aa5d9e045 100644 --- a/radio/src/gui/480x272/menus.h +++ b/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, diff --git a/radio/src/gui/common/colorlcd/widgets.cpp b/radio/src/gui/common/colorlcd/widgets.cpp index 84f49e67d..0dd0a4a39 100644 --- a/radio/src/gui/common/colorlcd/widgets.cpp +++ b/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; } diff --git a/radio/src/gui/common/stdlcd/widgets.cpp b/radio/src/gui/common/stdlcd/widgets.cpp index fde626ecd..266ec6446 100644 --- a/radio/src/gui/common/stdlcd/widgets.cpp +++ b/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) {