diff --git a/app/scanner.c b/app/scanner.c index 91367a7..e79d378 100644 --- a/app/scanner.c +++ b/app/scanner.c @@ -356,7 +356,7 @@ void SCANNER_ProcessKeys(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld) void SCANNER_Start(void) { uint8_t BackupStep; - uint16_t BackupFrequency; + uint16_t BackupStepFreq; BK4819_StopScan(); @@ -367,13 +367,13 @@ void SCANNER_Start(void) gRxVfo->CHANNEL_SAVE = FREQ_CHANNEL_FIRST + BAND6_400MHz; #endif - BackupStep = gRxVfo->STEP_SETTING; - BackupFrequency = gRxVfo->StepFrequency; + BackupStep = gRxVfo->STEP_SETTING; + BackupStepFreq = gRxVfo->StepFrequency; RADIO_InitInfo(gRxVfo, gRxVfo->CHANNEL_SAVE, gRxVfo->pRX->Frequency); gRxVfo->STEP_SETTING = BackupStep; - gRxVfo->StepFrequency = BackupFrequency; + gRxVfo->StepFrequency = BackupStepFreq; RADIO_SetupRegisters(true); diff --git a/firmware.bin b/firmware.bin index 83662b3..f692137 100644 Binary files a/firmware.bin and b/firmware.bin differ diff --git a/firmware.packed.bin b/firmware.packed.bin index 0f3b5aa..bbb472c 100644 Binary files a/firmware.packed.bin and b/firmware.packed.bin differ diff --git a/ui/scanner.c b/ui/scanner.c index 259945a..a4f7984 100644 --- a/ui/scanner.c +++ b/ui/scanner.c @@ -34,25 +34,27 @@ void UI_DisplayScanner(void) memset(String, 0, sizeof(String)); if (gScanSingleFrequency || (gScanCssState != SCAN_CSS_STATE_OFF && gScanCssState != SCAN_CSS_STATE_FAILED)) - sprintf(String, "FREQ:%u.%05u", gScanFrequency / 100000, gScanFrequency % 100000); + sprintf(String, "FREQ %u.%05u", gScanFrequency / 100000, gScanFrequency % 100000); else - strcpy(String, "FREQ:**.*****"); +// strcpy(String, "FREQ ***.*****"); + strcpy(String, "FREQ scanning"); UI_PrintString(String, 2, 0, 1, 8); memset(String, 0, sizeof(String)); if (gScanCssState < SCAN_CSS_STATE_FOUND || !gScanUseCssResult) - strcpy(String, "CTC:******"); +// strcpy(String, " CTC ******"); + strcpy(String, " CTC scanning"); else if (gScanCssResultType == CODE_TYPE_CONTINUOUS_TONE) - sprintf(String, "CTC:%u.%uHz", CTCSS_Options[gScanCssResultCode] / 10, CTCSS_Options[gScanCssResultCode] % 10); + sprintf(String, " CTC %u.%uHz", CTCSS_Options[gScanCssResultCode] / 10, CTCSS_Options[gScanCssResultCode] % 10); else - sprintf(String, "DCS:D%03oN", DCS_Options[gScanCssResultCode]); + sprintf(String, " DCS D%03oN", DCS_Options[gScanCssResultCode]); UI_PrintString(String, 2, 0, 3, 8); memset(String, 0, sizeof(String)); if (gScannerEditState == 2) { - strcpy(String, "SAVE?"); + strcpy(String, "SAVE ?"); Start = 0; bCentered = 1; @@ -61,20 +63,25 @@ void UI_DisplayScanner(void) { if (gScannerEditState == 1) { - strcpy(String, "SAVE:"); + strcpy(String, "SAVE "); UI_GenerateChannelStringEx(String + 5, gShowChPrefix, gScanChannel); } else if (gScanCssState < SCAN_CSS_STATE_FOUND) { - strcpy(String, "SCAN"); - memset(String + 4, '.', (gScanProgressIndicator & 7) + 1); +// strcpy(String, "SCAN "); +// memset(String + 4, '.', 1 + (gScanProgressIndicator & 7u)); + + memset(String, 0, sizeof(String)); + memset(String, '.', 15); + String[gScanProgressIndicator % 15] = '#'; } else if (gScanCssState == SCAN_CSS_STATE_FOUND) - strcpy(String, "SCAN CMP."); +// strcpy(String, "SCAN CMP"); + strcpy(String, " '*' to save"); else - strcpy(String, "SCAN FAIL."); + strcpy(String, "SCAN FAIL"); Start = 2; bCentered = 0;