Fix scanning on opposite VFO, ignore scan result on EXIT button, changed status bar while scanning

This commit is contained in:
Krzysiek Egzmont
2023-10-17 02:57:55 +02:00
parent 0c0cbb232c
commit 6172d942be
3 changed files with 26 additions and 12 deletions

View File

@@ -45,6 +45,7 @@ bool gScanUseCssResult;
int8_t gScanStateDir;
bool bScanKeepFrequency;
uint8_t gRestoreMrChannel;
uint8_t gRestoreCROSS_BAND_RX_TX;
static void SCANNER_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
{
@@ -426,6 +427,11 @@ void SCANNER_Start(void)
void SCANNER_Stop(void)
{
if(gRestoreCROSS_BAND_RX_TX != CROSS_BAND_OFF) {
gEeprom.CROSS_BAND_RX_TX = gRestoreCROSS_BAND_RX_TX;
gRestoreCROSS_BAND_RX_TX = CROSS_BAND_OFF;
}
gScanStateDir = SCAN_OFF;
if (!bScanKeepFrequency)
@@ -580,6 +586,11 @@ static void SCANNER_NextMemChannel(void)
void SCANNER_NextChannel(const bool storeBackupSettings, const int8_t scan_direction)
{
if (storeBackupSettings) {
gRestoreCROSS_BAND_RX_TX = gEeprom.CROSS_BAND_RX_TX;
gEeprom.CROSS_BAND_RX_TX = CROSS_BAND_OFF;
}
RADIO_SelectVfos();
gNextMrChannel = gRxVfo->CHANNEL_SAVE;