mirrors/uv-k5-firmware-custom
0
Fork 0
mirror of https://github.com/OneOfEleven/uv-k5-firmware-custom.git synced 2025-06-19 06:39:49 +03:00
Code Issues Releases Activity

Fixed menu step bug - never worked !

Browse Source
This commit is contained in:
OneOfEleven
2023-09-28 13:26:27 +01:00
parent 86525941bc
commit 1f1a10b6b8
5 changed files with 46 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/app.c
View File

@ -611,11 +611,11 @@ static void FREQ_NextChannel(void)
static void MR_NextChannel(void)
{
uint8_t Ch;
uint8_t Ch1 = gEeprom.SCANLIST_PRIORITY_CH1[gEeprom.SCAN_LIST_DEFAULT];
uint8_t Ch2 = gEeprom.SCANLIST_PRIORITY_CH2[gEeprom.SCAN_LIST_DEFAULT];
uint8_t PreviousCh = gNextMrChannel;
bool bEnabled = gEeprom.SCAN_LIST_ENABLED[gEeprom.SCAN_LIST_DEFAULT];
const uint8_t PreviousCh = gNextMrChannel;
const uint8_t Ch1 = gEeprom.SCANLIST_PRIORITY_CH1[gEeprom.SCAN_LIST_DEFAULT];
const uint8_t Ch2 = gEeprom.SCANLIST_PRIORITY_CH2[gEeprom.SCAN_LIST_DEFAULT];
const bool bEnabled = gEeprom.SCAN_LIST_ENABLED[gEeprom.SCAN_LIST_DEFAULT];
uint8_t Ch;
if (bEnabled)
{
@ -623,7 +623,10 @@ static void MR_NextChannel(void)
{
gPreviousMrChannel = gNextMrChannel;
if (RADIO_CheckValidChannel(Ch1, false, 0))
gNextMrChannel = Ch1;
{
gNextMrChannel = Ch1;
// goto Skip;
}
else
gCurrentScanList = 1;
}
@ -631,7 +634,10 @@ static void MR_NextChannel(void)
if (gCurrentScanList == 1)
{
if (RADIO_CheckValidChannel(Ch2, false, 0))
gNextMrChannel = Ch2;
{
gNextMrChannel = Ch2;
// goto Skip;
}
else
gCurrentScanList = 2;
}

2
app/menu.c
View File

@ -323,7 +323,7 @@ void MENU_AcceptSetting(void)
gRequestSaveChannel = 1;
return;
}
gSubMenuSelection = gTxVfo->STEP_SETTING;
gTxVfo->STEP_SETTING = gSubMenuSelection;
return;
case MENU_TXP: