diff --git a/app/menu.c b/app/menu.c index 8f2465b..a1bbc67 100644 --- a/app/menu.c +++ b/app/menu.c @@ -285,12 +285,6 @@ int MENU_GetLimits(uint8_t menu_id, int32_t *pMin, int32_t *pMax) *pMax = MR_CHANNEL_LAST; break; - case MENU_SLIST1: - case MENU_SLIST2: - *pMin = -1; - *pMax = MR_CHANNEL_LAST; - break; - case MENU_SAVE: *pMin = 0; *pMax = ARRAY_SIZE(gSubMenu_SAVE) - 1; @@ -301,10 +295,6 @@ int MENU_GetLimits(uint8_t menu_id, int32_t *pMin, int32_t *pMax) *pMax = 4; break; - case MENU_S_LIST: - *pMin = 0; - *pMax = 2; - break; #ifdef ENABLE_DTMF_CALLING case MENU_D_RSP: @@ -655,10 +645,6 @@ void MENU_AcceptSetting(void) gEeprom.CHAN_1_CALL = gSubMenuSelection; break; - case MENU_S_LIST: - gEeprom.SCAN_LIST_DEFAULT = gSubMenuSelection; - break; - #ifdef ENABLE_ALARM case MENU_AL_MOD: gEeprom.ALARM_MODE = gSubMenuSelection; @@ -1053,18 +1039,6 @@ void MENU_ShowCurrentSetting(void) gSubMenuSelection = gEeprom.CHAN_1_CALL; break; - case MENU_S_LIST: - gSubMenuSelection = gEeprom.SCAN_LIST_DEFAULT; - break; - - case MENU_SLIST1: - gSubMenuSelection = RADIO_FindNextChannel(0, 1, true, 0); - break; - - case MENU_SLIST2: - gSubMenuSelection = RADIO_FindNextChannel(0, 1, true, 1); - break; - #ifdef ENABLE_ALARM case MENU_AL_MOD: gSubMenuSelection = gEeprom.ALARM_MODE; @@ -1717,13 +1691,6 @@ static void MENU_Key_UP_DOWN(bool bKeyPressed, bool bKeyHeld, int8_t Direction) bCheckScanList = false; break; - case MENU_SLIST2: - VFO = 1; - [[fallthrough]]; - case MENU_SLIST1: - bCheckScanList = true; - break; - default: MENU_ClampSelection(Direction); gRequestDisplayScreen = DISPLAY_MENU; diff --git a/ui/menu.c b/ui/menu.c index 582c6d8..72062e5 100644 --- a/ui/menu.c +++ b/ui/menu.c @@ -58,21 +58,15 @@ const t_menu_item MenuList[] = {"ChSave", VOICE_ID_MEMORY_CHANNEL, MENU_MEM_CH }, // was "MEM-CH" {"ChDele", VOICE_ID_DELETE_CHANNEL, MENU_DEL_CH }, // was "DEL-CH" {"ChName", VOICE_ID_INVALID, MENU_MEM_NAME }, - - {"SList", VOICE_ID_INVALID, MENU_S_LIST }, - {"SList1", VOICE_ID_INVALID, MENU_SLIST1 }, - {"SList2", VOICE_ID_INVALID, MENU_SLIST2 }, {"ScnRev", VOICE_ID_INVALID, MENU_SC_REV }, #ifdef ENABLE_NOAA {"NOAA-S", VOICE_ID_INVALID, MENU_NOAA_S }, #endif - {"F1Shrt", VOICE_ID_INVALID, MENU_F1SHRT }, {"F1Long", VOICE_ID_INVALID, MENU_F1LONG }, {"F2Shrt", VOICE_ID_INVALID, MENU_F2SHRT }, {"F2Long", VOICE_ID_INVALID, MENU_F2LONG }, {"M Long", VOICE_ID_INVALID, MENU_MLONG }, - {"KeyLck", VOICE_ID_INVALID, MENU_AUTOLK }, // was "AUTOLk" {"TxTOut", VOICE_ID_TRANSMIT_OVER_TIME, MENU_TOT }, // was "TOT" {"BatSav", VOICE_ID_SAVE_MODE, MENU_SAVE }, // was "SAVE" @@ -121,7 +115,6 @@ const t_menu_item MenuList[] = {"BatVol", VOICE_ID_INVALID, MENU_VOL }, // was "VOL" {"RxMode", VOICE_ID_DUAL_STANDBY, MENU_TDR }, {"Sql", VOICE_ID_SQUELCH, MENU_SQL }, - // hidden menu items from here on // enabled if pressing both the PTT and upper side button at power-on {"F Lock", VOICE_ID_INVALID, MENU_F_LOCK }, @@ -740,13 +733,6 @@ void UI_DisplayMenu(void) sprintf(String, "%d*100ms", gSubMenuSelection); break; - case MENU_S_LIST: - if (gSubMenuSelection < 2) - sprintf(String, "LIST%u", 1 + gSubMenuSelection); - else - strcpy(String, "ALL"); - break; - #ifdef ENABLE_ALARM case MENU_AL_MOD: sprintf(String, gSubMenu_AL_MOD[gSubMenuSelection]); @@ -913,53 +899,6 @@ void UI_DisplayMenu(void) } } - if (UI_MENU_GetCurrentMenuId() == MENU_SLIST1 || UI_MENU_GetCurrentMenuId() == MENU_SLIST2) - { - i = (UI_MENU_GetCurrentMenuId() == MENU_SLIST1) ? 0 : 1; - -// if (gSubMenuSelection == 0xFF) - if (gSubMenuSelection < 0) - strcpy(String, "NULL"); - else - UI_GenerateChannelStringEx(String, true, gSubMenuSelection); - -// if (gSubMenuSelection == 0xFF || !gEeprom.SCAN_LIST_ENABLED[i]) - if (gSubMenuSelection < 0 || !gEeprom.SCAN_LIST_ENABLED[i]) - { - // channel number - UI_PrintString(String, menu_item_x1, menu_item_x2, 0, 8); - - // channel name - SETTINGS_FetchChannelName(String, gSubMenuSelection); - if (String[0] == 0) - strcpy(String, "--"); - UI_PrintString(String, menu_item_x1, menu_item_x2, 2, 8); - } - else - { - // channel number - UI_PrintString(String, menu_item_x1, menu_item_x2, 0, 8); - - // channel name - SETTINGS_FetchChannelName(String, gSubMenuSelection); - if (String[0] == 0) - strcpy(String, "--"); - UI_PrintStringSmall(String, menu_item_x1, menu_item_x2, 2); - - if (IS_MR_CHANNEL(gEeprom.SCANLIST_PRIORITY_CH1[i])) - { - sprintf(String, "PRI1:%u", gEeprom.SCANLIST_PRIORITY_CH1[i] + 1); - UI_PrintString(String, menu_item_x1, menu_item_x2, 3, 8); - } - - if (IS_MR_CHANNEL(gEeprom.SCANLIST_PRIORITY_CH2[i])) - { - sprintf(String, "PRI2:%u", gEeprom.SCANLIST_PRIORITY_CH2[i] + 1); - UI_PrintString(String, menu_item_x1, menu_item_x2, 5, 8); - } - } - } - if ((UI_MENU_GetCurrentMenuId() == MENU_R_CTCS || UI_MENU_GetCurrentMenuId() == MENU_R_DCS) && gCssBackgroundScan) UI_PrintString("SCAN", menu_item_x1, menu_item_x2, 4, 8); diff --git a/ui/menu.h b/ui/menu.h index be3dccd..531e44e 100644 --- a/ui/menu.h +++ b/ui/menu.h @@ -75,9 +75,6 @@ enum #endif MENU_COMPAND, MENU_1_CALL, - MENU_S_LIST, - MENU_SLIST1, - MENU_SLIST2, #ifdef ENABLE_ALARM MENU_AL_MOD, #endif