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

Fix F+4 and F+* scanning

Browse Source
This commit is contained in:
OneOfEleven
2023-10-07 15:12:53 +01:00
parent f93f3659f9
commit 06c7d79b4b
12 changed files with 209 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ui/menu.c
View File

@ -341,6 +341,7 @@ const char gSubMenu_SCRAMBLER[11][7] =
};
const char gSubMenu_SIDE_BUTT[9][16] =
//const char gSubMenu_SIDE_BUTT[10][16] =
{
"NONE",
"FLASH\nLIGHT",
@ -350,7 +351,8 @@ const char gSubMenu_SIDE_BUTT[9][16] =
"VOX\non\\off",
"ALARM\non\\off",
"FM RADIO\non\\off",
"TX\n1750Hz"
"TX\n1750Hz",
// "2nd PTT",
};
// ***************************************************************************************

65
ui/scanner.c
View File

@ -30,8 +30,7 @@
void UI_DisplayScanner(void)
{
char String[16];
bool bCentered;
uint8_t Start;
bool text_centered = false;
memset(gFrameBuffer, 0, sizeof(gFrameBuffer));
@ -49,7 +48,7 @@ void UI_DisplayScanner(void)
memset(String, 0, sizeof(String));
if (gScanCssState < SCAN_CSS_STATE_FOUND || !gScanUseCssResult)
strcpy(String, " CTC scanning");
strcpy(String, "CODE scanning");
else
if (gScanCssResultType == CODE_TYPE_CONTINUOUS_TONE)
sprintf(String, " CTC %u.%uHz", CTCSS_Options[gScanCssResultCode] / 10, CTCSS_Options[gScanCssResultCode] % 10);
@ -58,42 +57,40 @@ void UI_DisplayScanner(void)
UI_PrintString(String, 2, 0, 3, 8);
memset(String, 0, sizeof(String));
if (gScannerEditState == 2)
switch (gScannerEditState)
{
strcpy(String, "SAVE ?");
default:
case SCAN_EDIT_STATE_NONE:
if (gScanCssState < SCAN_CSS_STATE_FOUND)
{ // rolling indicator
memset(String, 0, sizeof(String));
memset(String, '.', 15);
String[gScanProgressIndicator % 15] = '#';
}
else
if (gScanCssState == SCAN_CSS_STATE_FOUND)
{
// strcpy(String, "SCAN COMPLETE");
strcpy(String, "* repeat M save");
text_centered = true;
}
else
{
strcpy(String, "SCAN FAIL");
}
break;
Start = 0;
bCentered = 1;
}
else
{
if (gScannerEditState == 1)
{
case SCAN_EDIT_STATE_BUSY:
strcpy(String, "SAVE ");
UI_GenerateChannelStringEx(String + 5, gShowChPrefix, gScanChannel);
}
else
if (gScanCssState < SCAN_CSS_STATE_FOUND)
{
memset(String, 0, sizeof(String));
memset(String, '.', 15);
String[gScanProgressIndicator % 15] = '#';
}
else
if (gScanCssState == SCAN_CSS_STATE_FOUND)
{
// strcpy(String, "SCAN CMP");
strcpy(String, " '*' to save");
}
else
{
strcpy(String, "SCAN FAIL");
}
Start = 2;
bCentered = 0;
break;
case SCAN_EDIT_STATE_DONE:
text_centered = true;
strcpy(String, "SAVE ?");
break;
}
UI_PrintString(String, Start, bCentered ? 127 : 0, 5, 8);
UI_PrintString(String, text_centered ? 0 : 2, text_centered ? 127 : 0, 5, 8);
ST7565_BlitFullScreen();
}