mirrors/uv-k5-firmware-custom
0
Fork 0
mirror of https://github.com/OneOfEleven/uv-k5-firmware-custom.git synced 2025-06-19 14:48:03 +03:00
Code Issues Releases Activity

Fixed F+4 and F+* freq/ctcss/cdcss search functions

Browse Source
This commit is contained in:
OneOfEleven
2023-10-13 07:49:59 +01:00
parent 75d4f13d7b
commit bc416c7433
13 changed files with 255 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ui/menu.c
View File

@ -577,7 +577,7 @@ void UI_DisplayMenu(void)
break;
Code = 0;
pConfig->code_type = CODE_TYPE_OFF;
pConfig->code_type = CODE_TYPE_NONE;
pConfig->code = Code;
BK4819_ExitSubAu();

29
ui/scanner.c
View File

@ -59,6 +59,7 @@ void UI_DisplayScanner(void)
case SCAN_CSS_STATE_SCANNING:
case SCAN_CSS_STATE_FOUND:
case SCAN_CSS_STATE_FAILED:
case SCAN_CSS_STATE_REPEAT:
{
const uint32_t freq = g_scan_frequency;
sprintf(String, "FREQ %u.%05u", freq / 100000, freq % 100000);
@ -66,7 +67,7 @@ void UI_DisplayScanner(void)
break;
case SCAN_CSS_STATE_FREQ_FAILED:
strcpy(String, "FREQ not found");
strcpy(String, "FREQ none found");
break;
}
@ -83,7 +84,6 @@ void UI_DisplayScanner(void)
{
default:
case SCAN_CSS_STATE_OFF:
case SCAN_CSS_STATE_FREQ_FAILED:
strcpy(String, "CODE");
break;
@ -92,12 +92,13 @@ void UI_DisplayScanner(void)
break;
case SCAN_CSS_STATE_FOUND:
case SCAN_CSS_STATE_REPEAT:
switch (g_scan_css_result_type)
{
default:
case CODE_TYPE_OFF:
strcpy(String, "CODE none");
case CODE_TYPE_NONE:
strcpy(String, "CODE none found");
break;
case CODE_TYPE_CONTINUOUS_TONE:
sprintf(String, "CTCSS %u.%uHz", CTCSS_OPTIONS[g_scan_css_result_code] / 10, CTCSS_OPTIONS[g_scan_css_result_code] % 10);
@ -110,7 +111,7 @@ void UI_DisplayScanner(void)
break;
case SCAN_CSS_STATE_FAILED:
strcpy(String, "CODE none");
strcpy(String, "CODE none found");
break;
}
@ -121,14 +122,14 @@ void UI_DisplayScanner(void)
memset(String, 0, sizeof(String));
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough="
switch (g_scanner_edit_state)
{
default:
case SCAN_EDIT_STATE_NONE:
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough="
switch (g_scan_css_state)
{
default:
@ -153,16 +154,15 @@ void UI_DisplayScanner(void)
}
case SCAN_CSS_STATE_FREQ_FAILED:
case SCAN_CSS_STATE_REPEAT:
strcpy(String, "* repeat");
text_centered = true;
break;
}
#pragma GCC diagnostic pop
break;
case SCAN_EDIT_STATE_SAVE:
case SCAN_EDIT_STATE_SAVE_CHAN:
strcpy(String, "SAVE ");
{
char s[11];
@ -173,13 +173,14 @@ void UI_DisplayScanner(void)
}
break;
case SCAN_EDIT_STATE_DONE:
// strcpy(String, "* repeat M save");
strcpy(String, "* repeat");
case SCAN_EDIT_STATE_SAVE_CONFIRM:
strcpy(String, "* repeat Save ?");
text_centered = true;
break;
}
#pragma GCC diagnostic pop
UI_PrintString(String, text_centered ? 0 : 2, text_centered ? 127 : 0, 5, 8);
// ***********************************