BRNSystems/brnQuanFW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Reduce nesting

Browse Source
This commit is contained in:
Juan Antonio
2023-12-25 14:21:43 +01:00
committed by Krzysiek Egzmont
parent ea733115de
commit 289418f1c7
2 changed files with 52 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
app/menu.c
View File

@@ -103,7 +103,7 @@ void MENU_CssScanFound(void)
void MENU_StopCssScan(void)
{
gCssBackgroundScan = false;
#ifdef ENABLE_VOICE
gAnotherVoiceID = VOICE_ID_SCANNING_STOP;
#endif
@@ -133,12 +133,12 @@ int MENU_GetLimits(uint8_t menu_id, int32_t *pMin, int32_t *pMax)
case MENU_ABR_MIN:
*pMin = 0;
*pMax = 9;
break;
break;
case MENU_ABR_MAX:
*pMin = 1;
*pMax = 10;
break;
break;
case MENU_F_LOCK:
*pMin = 0;
@@ -303,7 +303,7 @@ int MENU_GetLimits(uint8_t menu_id, int32_t *pMin, int32_t *pMax)
*pMin = 0;
*pMax = 2;
break;
#ifdef ENABLE_DTMF_CALLING
case MENU_D_RSP:
*pMin = 0;
@@ -500,7 +500,7 @@ void MENU_AcceptSetting(void)
break;
edit[i] = ' ';
}
SETTINGS_SaveChannelName(gSubMenuSelection, edit);
return;
@@ -531,7 +531,7 @@ void MENU_AcceptSetting(void)
case MENU_ABR_MAX:
gEeprom.BACKLIGHT_MAX = gSubMenuSelection;
gEeprom.BACKLIGHT_MIN = MIN(gSubMenuSelection - 1, gEeprom.BACKLIGHT_MIN);
break;
break;
case MENU_ABR_ON_TX_RX:
gSetting_backlight_on_tx_rx = gSubMenuSelection;
@@ -835,9 +835,9 @@ void MENU_ShowCurrentSetting(void)
case MENU_RESET:
gSubMenuSelection = 0;
break;
break;
case MENU_R_DCS:
case MENU_R_DCS:
case MENU_R_CTCS:
{
DCS_CodeType_t type = gTxVfo->freq_config_RX.CodeType;
@@ -940,7 +940,7 @@ void MENU_ShowCurrentSetting(void)
case MENU_ABR_MAX:
gSubMenuSelection = gEeprom.BACKLIGHT_MAX;
break;
break;
case MENU_ABR_ON_TX_RX:
gSubMenuSelection = gSetting_backlight_on_tx_rx;
@@ -1133,7 +1133,7 @@ void MENU_ShowCurrentSetting(void)
case MENU_BATTYP:
gSubMenuSelection = gEeprom.BATTERY_TYPE;
break;
break;
case MENU_F1SHRT:
case MENU_F1LONG:
@@ -1154,7 +1154,7 @@ void MENU_ShowCurrentSetting(void)
gSubMenuSelection = i;
break;
}
}
break;
}
@@ -1256,17 +1256,17 @@ static void MENU_Key_0_to_9(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
#ifdef ENABLE_VOICE
gAnotherVoiceID = (VOICE_ID_t)Key;
#endif
Frequency = StrToUL(INPUTBOX_GetAscii())*100;
gSubMenuSelection = FREQUENCY_RoundToStep(Frequency, gTxVfo->StepFrequency);
gInputBoxIndex = 0;
return;
}
if (UI_MENU_GetCurrentMenuId() == MENU_MEM_CH ||
UI_MENU_GetCurrentMenuId() == MENU_DEL_CH ||
UI_MENU_GetCurrentMenuId() == MENU_1_CALL ||
if (UI_MENU_GetCurrentMenuId() == MENU_MEM_CH ||
UI_MENU_GetCurrentMenuId() == MENU_DEL_CH ||
UI_MENU_GetCurrentMenuId() == MENU_1_CALL ||
UI_MENU_GetCurrentMenuId() == MENU_MEM_NAME)
{ // enter 3-digit channel number
@@ -1452,16 +1452,11 @@ static void MENU_Key_MENU(const bool bKeyPressed, const bool bKeyHeld)
return; // next char
// exit
if (memcmp(edit_original, edit, sizeof(edit_original)) == 0)
{ // no change - drop it
gFlagAcceptSetting = false;
gIsInSubMenu = false;
gAskForConfirmation = 0;
}
else
{
gFlagAcceptSetting = false;
gAskForConfirmation = 0;
gFlagAcceptSetting = false;
gAskForConfirmation = 0;
if (memcmp(edit_original, edit, sizeof(edit_original)) == 0) {
// no change - drop it
gIsInSubMenu = false;
}
}
}