mirror of
https://github.com/OneOfEleven/uv-k5-firmware-custom.git
synced 2025-04-28 14:21:25 +03:00
Updated F+4 and F+* scanning
This commit is contained in:
parent
85bcb854af
commit
5ac08023b3
@ -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();
|
||||
|
||||
@ -368,12 +368,12 @@ void SCANNER_Start(void)
|
||||
#endif
|
||||
|
||||
BackupStep = gRxVfo->STEP_SETTING;
|
||||
BackupFrequency = gRxVfo->StepFrequency;
|
||||
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);
|
||||
|
||||
|
BIN
firmware.bin
BIN
firmware.bin
Binary file not shown.
Binary file not shown.
27
ui/scanner.c
27
ui/scanner.c
@ -34,19 +34,21 @@ 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));
|
||||
@ -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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user