diff --git a/firmware.bin b/firmware.bin index 9f42553..0a2a48a 100644 Binary files a/firmware.bin and b/firmware.bin differ diff --git a/firmware.packed.bin b/firmware.packed.bin index 973c501..d2670c1 100644 Binary files a/firmware.packed.bin and b/firmware.packed.bin differ diff --git a/radio.c b/radio.c index 49baa4b..6ec74e8 100644 --- a/radio.c +++ b/radio.c @@ -944,16 +944,24 @@ void RADIO_PrepareTX(void) gDualWatchCountdown_10ms = dual_watch_count_after_tx_10ms; gScheduleDualWatch = false; +#if 0 if (gRxVfoIsActive) { // use the TX vfo gEeprom.RX_VFO = gEeprom.TX_VFO; gRxVfo = &gEeprom.VfoInfo[gEeprom.TX_VFO]; -// gRxVfoIsActive = true; gRxVfoIsActive = false; } - - gCurrentVfo = &gEeprom.VfoInfo[gEeprom.TX_VFO]; - + gCurrentVfo = gRxVfo; +#else + if (!gRxVfoIsActive) + { // use the current RX vfo + gEeprom.RX_VFO = gEeprom.TX_VFO; + gRxVfo = &gEeprom.VfoInfo[gEeprom.TX_VFO]; + gRxVfoIsActive = true; + } + gCurrentVfo = gRxVfo; +#endif + // let the user see that DW is not active '><' symbol gDualWatchActive = false; gUpdateStatus = true; diff --git a/ui/menu.c b/ui/menu.c index b0e128f..42326f5 100644 --- a/ui/menu.c +++ b/ui/menu.c @@ -199,7 +199,7 @@ const char gSubMenu_CHAN[3][10] = const char gSubMenu_XB[3][10] = { - "MAIN\nVFO", + "RX\nVFO", "UPPER\nVFO", "LOWER\nVFO" };