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

Revert fix bug on SWITCH MAIN ONLY

Browse Source
This commit is contained in:
Armel FAUVEAU
2024-02-08 01:48:18 +01:00
parent 1b6528fe05
commit 186ea416bf
6 changed files with 29 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/action.c
View File

@@ -458,7 +458,7 @@ void ACTION_Main(void)
static uint8_t b;
if(gSetting_set_dual_watch_session == 0 && gSetting_set_cross_band_RX_TX_session == 0 && cycle != 1)
if(gEeprom.DUAL_WATCH == 0 && gEeprom.CROSS_BAND_RX_TX == 0 && cycle != 1)
{
return;
}
@@ -466,11 +466,11 @@ void ACTION_Main(void)
{
if(cycle == 0)
{
a = gSetting_set_dual_watch_session;
b = gSetting_set_cross_band_RX_TX_session;
a = gEeprom.DUAL_WATCH;
b = gEeprom.CROSS_BAND_RX_TX;
gSetting_set_dual_watch_session = 0;
gSetting_set_cross_band_RX_TX_session = 0;
gEeprom.DUAL_WATCH = 0;
gEeprom.CROSS_BAND_RX_TX = 0;
gFlagReconfigureVfos = true;
gUpdateStatus = true;
@@ -479,8 +479,8 @@ void ACTION_Main(void)
}
else
{
gSetting_set_dual_watch_session = a;
gSetting_set_cross_band_RX_TX_session = b;
gEeprom.DUAL_WATCH = a;
gEeprom.CROSS_BAND_RX_TX = b;
gFlagReconfigureVfos = true;
gUpdateStatus = true;

10
app/menu.c
View File

@@ -568,12 +568,6 @@ void MENU_AcceptSetting(void)
case MENU_TDR:
gEeprom.DUAL_WATCH = (gEeprom.TX_VFO + 1) * (gSubMenuSelection & 1);
gEeprom.CROSS_BAND_RX_TX = (gEeprom.TX_VFO + 1) * ((gSubMenuSelection & 2) > 0);
#ifdef ENABLE_FEAT_F4HWN
// Special for actions
gSetting_set_dual_watch_session = gEeprom.DUAL_WATCH;
gSetting_set_cross_band_RX_TX_session = gEeprom.CROSS_BAND_RX_TX;
#endif
gFlagReconfigureVfos = true;
gUpdateStatus = true;
break;
@@ -1007,11 +1001,7 @@ void MENU_ShowCurrentSetting(void)
break;
case MENU_TDR:
#ifdef ENABLE_FEAT_F4HWN
gSubMenuSelection = (gSetting_set_dual_watch_session != DUAL_WATCH_OFF) + (gSetting_set_cross_band_RX_TX_session != CROSS_BAND_OFF) * 2;
#else
gSubMenuSelection = (gEeprom.DUAL_WATCH != DUAL_WATCH_OFF) + (gEeprom.CROSS_BAND_RX_TX != CROSS_BAND_OFF) * 2;
#endif
break;
case MENU_BEEP: