From eb453293f543a2ef41c6a74fb634e67648343f9a Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Wed, 20 Feb 2019 12:10:46 +0100 Subject: [PATCH] Fix register in Model Setup --- radio/src/gui/128x64/model_setup.cpp | 3 +- .../src/gui/common/stdlcd/radio_sdmanager.cpp | 2 +- radio/src/gui/navigation/navigation_xlite.cpp | 133 ++---------------- 3 files changed, 17 insertions(+), 121 deletions(-) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 0ad038ad4..62c39c18d 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -1161,8 +1161,9 @@ void menuModelSetup(event_t event) lcdDrawText(lcdLastRightPos, y, "[Reg]", (menuHorizontalPosition == 1 ? attr : 0)); if (attr) { if (moduleSettings[moduleIdx].mode == MODULE_MODE_NORMAL && s_editMode > 0) { - if (menuHorizontalPosition == 1 && reusableBuffer.modelSetup.pxx2.registerStep < REGISTER_RX_NAME_SELECTED) { + if (menuHorizontalPosition == 1 && event == EVT_KEY_FIRST(KEY_ENTER)) { moduleSettings[moduleIdx].mode = MODULE_MODE_REGISTER; + reusableBuffer.modelSetup.pxx2.registerStep = REGISTER_START; reusableBuffer.modelSetup.pxx2.registerPopupVerticalPosition = 0; reusableBuffer.modelSetup.pxx2.registerPopupHorizontalPosition = 0; reusableBuffer.modelSetup.pxx2.registerPopupEditMode = 0; diff --git a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp index 1807b8ab3..85699e77a 100644 --- a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp +++ b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp @@ -171,7 +171,7 @@ void menuRadioSdManager(event_t _event) Card_state = SD_ST_DATA; #endif audioQueue.stopSD(); - if(sdCardFormat()) { + if (sdCardFormat()) { f_chdir("/"); REFRESH_FILES(); } diff --git a/radio/src/gui/navigation/navigation_xlite.cpp b/radio/src/gui/navigation/navigation_xlite.cpp index e365f8e77..327c3d209 100644 --- a/radio/src/gui/navigation/navigation_xlite.cpp +++ b/radio/src/gui/navigation/navigation_xlite.cpp @@ -172,7 +172,7 @@ int checkIncDec(event_t event, int val, int i_min, int i_max, unsigned int i_fla } } - if (!READ_ONLY() && i_min==0 && i_max==1 && (event==EVT_KEY_BREAK(KEY_ENTER) || IS_ROTARY_BREAK(event))) { + if (!READ_ONLY() && i_min==0 && i_max==1 && (event==EVT_KEY_BREAK(KEY_ENTER))) { s_editMode = 0; newval = !val; } @@ -185,7 +185,7 @@ int checkIncDec(event_t event, int val, int i_min, int i_max, unsigned int i_fla #if defined(AUTOSOURCE) if (i_flags & INCDEC_SOURCE) { - if (s_editMode>0) { + if (s_editMode > 0) { int8_t source = GET_MOVED_SOURCE(i_min, i_max); if (source) { newval = source; @@ -203,7 +203,7 @@ int checkIncDec(event_t event, int val, int i_min, int i_max, unsigned int i_fla #endif if (newval != val) { - if (!(i_flags & NO_INCDEC_MARKS) && (newval != i_max) && (newval != i_min) && (newval==0 || newval==-100 || newval==+100) && !IS_ROTARY_EVENT(event)) { + if (!(i_flags & NO_INCDEC_MARKS) && (newval != i_max) && (newval != i_min) && (newval==0 || newval==-100 || newval==+100)) { pauseEvents(event); // delay before auto-repeat continues } AUDIO_KEY_PRESS(); @@ -321,25 +321,6 @@ void check(event_t event, uint8_t curr, const MenuHandlerFunc *menuTab, uint8_t int8_t cc = curr; switch (event) { -#if defined(ROTARY_ENCODER_NAVIGATION) - case EVT_ROTARY_BREAK: - if (s_editMode < 0 && maxrow > 0) { - s_editMode = 0; - // TODO ? l_posVert = (horTab && horTab[1]==0xff) ? 2 : 1; - l_posHorz = 0; - } - else { - s_editMode = -1; - } - event = 0; - break; -#endif - -#if defined(ROTARY_ENCODER_NAVIGATION) - case EVT_ROTARY_LEFT: - if (s_editMode >= 0) - break; -#endif case EVT_KEY_FIRST(KEY_LEFT): if (curr > 0) cc = curr - 1; @@ -347,11 +328,6 @@ void check(event_t event, uint8_t curr, const MenuHandlerFunc *menuTab, uint8_t cc = menuTabSize-1; break; -#if defined(ROTARY_ENCODER_NAVIGATION) - case EVT_ROTARY_RIGHT: - if (s_editMode >= 0) - break; -#endif case EVT_KEY_FIRST(KEY_RIGHT): if (curr < (menuTabSize-1)) cc = curr + 1; @@ -363,11 +339,6 @@ void check(event_t event, uint8_t curr, const MenuHandlerFunc *menuTab, uint8_t if (cc != curr) { chainMenu(menuTab[cc]); } - -#if defined(ROTARY_ENCODER_NAVIGATION) - if (IS_ROTARY_ENCODER_NAVIGATION_ENABLE() && s_editMode < 0) - attr = INVERS|BLINK; -#endif } menuCalibrationState = 0; @@ -380,45 +351,17 @@ void check(event_t event, uint8_t curr, const MenuHandlerFunc *menuTab, uint8_t menuEntryTime = get_tmr10ms(); l_posVert = 0; l_posHorz = POS_HORZ_INIT(l_posVert); -#if defined(ROTARY_ENCODER_NAVIGATION) - if (menuTab) { - s_editMode = EDIT_MODE_INIT; - break; - } - // no break -#else s_editMode = EDIT_MODE_INIT; break; -#endif - -#if defined(ROTARY_ENCODER_NAVIGATION) - case EVT_ENTRY_UP: - s_editMode = 0; - break; - - case EVT_ROTARY_BREAK: - if (s_editMode > 1) break; -#endif case EVT_KEY_FIRST(KEY_ENTER): - if (!menuTab || l_posVert>0) { + if (!menuTab || l_posVert > 0) { if (READ_ONLY_UNLOCKED()) { - s_editMode = (s_editMode<=0); + s_editMode = (s_editMode <= 0); } } break; -#if defined(ROTARY_ENCODER_NAVIGATION) - case EVT_ROTARY_LONG: - if (s_editMode > 1) break; - killEvents(event); - if (l_posVert != 0) { - l_posVert = 0; - s_editMode = EDIT_MODE_INIT; - break; - } - // no break -#endif case EVT_KEY_LONG(KEY_EXIT): s_editMode = 0; // TODO needed? we call ENTRY_UP after which does the same popMenu(); @@ -426,17 +369,12 @@ void check(event_t event, uint8_t curr, const MenuHandlerFunc *menuTab, uint8_t case EVT_KEY_BREAK(KEY_EXIT): AUDIO_KEY_PRESS(); -#if defined(ROTARY_ENCODER_NAVIGATION) - if (s_editMode == 0) - s_editMode = EDIT_MODE_INIT; - else -#endif - if (s_editMode>0) { + if (s_editMode > 0) { s_editMode = 0; break; } - if (l_posVert==0 || !menuTab) { + if (l_posVert == 0 || !menuTab) { popMenu(); // beeps itself } else { @@ -446,43 +384,23 @@ void check(event_t event, uint8_t curr, const MenuHandlerFunc *menuTab, uint8_t break; case EVT_KEY_REPT(KEY_RIGHT): //inc - if (l_posHorz==maxcol) break; + if (l_posHorz == maxcol) break; // no break case EVT_KEY_FIRST(KEY_RIGHT)://inc - if (!horTab || s_editMode>0) break; - -#if defined(ROTARY_ENCODER_NAVIGATION) - CASE_EVT_ROTARY_RIGHT - if (s_editMode != 0) break; - if (l_posHorz < maxcol) { - l_posHorz++; - break; - } - else { - l_posHorz = 0; - if (!IS_ROTARY_RIGHT(event)) - break; - } -#else + if (!horTab || s_editMode > 0) break; INC(l_posHorz, 0, maxcol); break; -#endif case EVT_KEY_REPT(KEY_DOWN): - if (!IS_ROTARY_RIGHT(event) && l_posVert==maxrow) break; + if (l_posVert == maxrow) break; // no break case EVT_KEY_FIRST(KEY_DOWN): - if (s_editMode>0) break; + if (s_editMode > 0) break; do { INC(l_posVert, 0, maxrow); } while (CURSOR_NOT_ALLOWED_IN_ROW(l_posVert)); - -#if defined(ROTARY_ENCODER_NAVIGATION) - s_editMode = 0; // if we go down, we must be in this mode -#endif - l_posHorz = min(l_posHorz, MAXCOL(l_posVert)); break; @@ -491,41 +409,18 @@ void check(event_t event, uint8_t curr, const MenuHandlerFunc *menuTab, uint8_t // no break case EVT_KEY_FIRST(KEY_LEFT)://dec - if (!horTab || s_editMode>0) break; - -#if defined(ROTARY_ENCODER_NAVIGATION) - CASE_EVT_ROTARY_LEFT - if (s_editMode != 0) break; - if (l_posHorz > 0) { - l_posHorz--; - break; - } - else if (IS_ROTARY_LEFT(event) && s_editMode == 0) { - l_posHorz = 0xff; - } - else { - l_posHorz = maxcol; - break; - } -#else + if (!horTab || s_editMode > 0) break; DEC(l_posHorz, 0, maxcol); break; -#endif case EVT_KEY_REPT(KEY_UP): - if (!IS_ROTARY_LEFT(event) && l_posVert==0) break; + if (l_posVert == 0) break; // no break case EVT_KEY_FIRST(KEY_UP): - if (s_editMode>0) break; - + if (s_editMode > 0) break; do { DEC(l_posVert, 0, maxrow); } while (CURSOR_NOT_ALLOWED_IN_ROW(l_posVert)); - -#if defined(ROTARY_ENCODER_NAVIGATION) - s_editMode = 0; // if we go up, we must be in this mode -#endif - l_posHorz = min((uint8_t)l_posHorz, MAXCOL(l_posVert)); break; }