Refactor
This commit is contained in:
46
app/menu.c
46
app/menu.c
@@ -375,7 +375,6 @@ void MENU_AcceptSetting(void)
|
||||
{
|
||||
int32_t Min;
|
||||
int32_t Max;
|
||||
uint8_t Code;
|
||||
FREQ_Config_t *pConfig = &gTxVfo->freq_config_RX;
|
||||
|
||||
if (!MENU_GetLimits(UI_MENU_GetCurrentMenuId(), &Min, &Max))
|
||||
@@ -414,62 +413,51 @@ void MENU_AcceptSetting(void)
|
||||
|
||||
// Fallthrough
|
||||
|
||||
case MENU_R_DCS:
|
||||
if (gSubMenuSelection == 0)
|
||||
{
|
||||
if (pConfig->CodeType != CODE_TYPE_DIGITAL && pConfig->CodeType != CODE_TYPE_REVERSE_DIGITAL)
|
||||
{
|
||||
case MENU_R_DCS: {
|
||||
if (gSubMenuSelection == 0) {
|
||||
if (pConfig->CodeType != CODE_TYPE_DIGITAL && pConfig->CodeType != CODE_TYPE_REVERSE_DIGITAL) {
|
||||
gRequestSaveChannel = 1;
|
||||
return;
|
||||
}
|
||||
Code = 0;
|
||||
pConfig->Code = 0;
|
||||
pConfig->CodeType = CODE_TYPE_OFF;
|
||||
}
|
||||
else
|
||||
if (gSubMenuSelection < 105)
|
||||
{
|
||||
else if (gSubMenuSelection < 105) {
|
||||
pConfig->CodeType = CODE_TYPE_DIGITAL;
|
||||
Code = gSubMenuSelection - 1;
|
||||
pConfig->Code = gSubMenuSelection - 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
else {
|
||||
pConfig->CodeType = CODE_TYPE_REVERSE_DIGITAL;
|
||||
Code = gSubMenuSelection - 105;
|
||||
pConfig->Code = gSubMenuSelection - 105;
|
||||
}
|
||||
|
||||
pConfig->Code = Code;
|
||||
gRequestSaveChannel = 1;
|
||||
return;
|
||||
|
||||
}
|
||||
case MENU_T_CTCS:
|
||||
pConfig = &gTxVfo->freq_config_TX;
|
||||
[[fallthrough]];
|
||||
case MENU_R_CTCS:
|
||||
if (gSubMenuSelection == 0)
|
||||
{
|
||||
if (pConfig->CodeType != CODE_TYPE_CONTINUOUS_TONE)
|
||||
{
|
||||
case MENU_R_CTCS: {
|
||||
if (gSubMenuSelection == 0) {
|
||||
if (pConfig->CodeType != CODE_TYPE_CONTINUOUS_TONE) {
|
||||
gRequestSaveChannel = 1;
|
||||
return;
|
||||
}
|
||||
Code = 0;
|
||||
pConfig->Code = Code;
|
||||
pConfig->Code = 0;
|
||||
pConfig->CodeType = CODE_TYPE_OFF;
|
||||
|
||||
BK4819_ExitSubAu();
|
||||
}
|
||||
else
|
||||
{
|
||||
else {
|
||||
pConfig->Code = gSubMenuSelection - 1;
|
||||
pConfig->CodeType = CODE_TYPE_CONTINUOUS_TONE;
|
||||
Code = gSubMenuSelection - 1;
|
||||
pConfig->Code = Code;
|
||||
|
||||
BK4819_SetCTCSSFrequency(CTCSS_Options[Code]);
|
||||
BK4819_SetCTCSSFrequency(CTCSS_Options[pConfig->Code]);
|
||||
}
|
||||
|
||||
gRequestSaveChannel = 1;
|
||||
return;
|
||||
|
||||
}
|
||||
case MENU_SFT_D:
|
||||
gTxVfo->TX_OFFSET_FREQUENCY_DIRECTION = gSubMenuSelection;
|
||||
gRequestSaveChannel = 1;
|
||||
|
Reference in New Issue
Block a user