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

Fix F+4 and F+* search bug

Browse Source
This commit is contained in:
OneOfEleven
2023-10-13 17:46:28 +01:00
parent 7f7c9490eb
commit bb79d51377
6 changed files with 60 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ui/lock.c
View File

@ -50,8 +50,12 @@ static void Render(void)
void UI_DisplayLock(void)
{
key_code_t Key;
beep_type_t Beep;
unsigned int g_debounce_counter = 0;
// bool g_key_being_held = false;
key_code_t g_key_reading_0 = KEY_INVALID;
// key_code_t g_key_reading_1;
key_code_t Key;
beep_type_t Beep;
g_update_display = true;
@ -73,11 +77,11 @@ void UI_DisplayLock(void)
{
if (Key == KEY_INVALID)
{
g_key_reading_1 = KEY_INVALID;
// g_key_reading_1 = KEY_INVALID;
}
else
{
g_key_reading_1 = Key;
// g_key_reading_1 = Key;
switch (Key)
{
@ -135,13 +139,13 @@ void UI_DisplayLock(void)
}
}
g_key_being_held = false;
// g_key_being_held = false;
}
}
else
{
g_debounce_counter = 0;
g_key_reading_0 = Key;
g_key_reading_0 = Key;
}
if (UART_IsCommandAvailable())

30
ui/scanner.c
View File

@ -93,21 +93,23 @@ void UI_DisplaySearch(void)
case SEARCH_CSS_STATE_FOUND:
case SEARCH_CSS_STATE_REPEAT:
switch (g_search_css_result_type)
strcpy(String, "CODE none found");
if (g_search_use_css_result)
{
default:
case CODE_TYPE_NONE:
strcpy(String, "CODE none found");
break;
case CODE_TYPE_CONTINUOUS_TONE:
sprintf(String, "CTCSS %u.%uHz", CTCSS_OPTIONS[g_search_css_result_code] / 10, CTCSS_OPTIONS[g_search_css_result_code] % 10);
break;
case CODE_TYPE_DIGITAL:
case CODE_TYPE_REVERSE_DIGITAL:
sprintf(String, "CDCSS D%03oN", DCS_OPTIONS[g_search_css_result_code]);
break;
}
switch (g_search_css_result_type)
{
default:
case CODE_TYPE_NONE:
break;
case CODE_TYPE_CONTINUOUS_TONE:
sprintf(String, "CTCSS %u.%uHz", CTCSS_OPTIONS[g_search_css_result_code] / 10, CTCSS_OPTIONS[g_search_css_result_code] % 10);
break;
case CODE_TYPE_DIGITAL:
case CODE_TYPE_REVERSE_DIGITAL:
sprintf(String, "CDCSS D%03oN", DCS_OPTIONS[g_search_css_result_code]);
break;
}
}
break;
case SEARCH_CSS_STATE_FAILED: