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

fix RF scanning

Browse Source
This commit is contained in:
OneOfEleven
2023-10-24 18:16:16 +01:00
parent fa1cbeb049
commit 0b0cf75db6
7 changed files with 54 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
ui/menu.c
View File

@ -61,6 +61,7 @@ const t_menu_item g_menu_list[] =
{"Tx TO", VOICE_ID_TRANSMIT_OVER_TIME, MENU_TX_TO }, // was "TOT"
{"Tx VFO", VOICE_ID_INVALID, MENU_CROSS_VFO }, // was "WX"
{"Dual W", VOICE_ID_DUAL_STANDBY, MENU_DUAL_WATCH }, // was "TDR"
{"SC REV", VOICE_ID_INVALID, MENU_SCAN_CAR_RESUME }, // was "SC_REV"
{"S HOLD", VOICE_ID_INVALID, MENU_SCAN_HOLD },
{"SCRAM", VOICE_ID_SCRAMBLER_ON, MENU_SCRAMBLER }, // was "SCR"
{"BCL", VOICE_ID_BUSY_LOCKOUT, MENU_BUSY_CHAN_LOCK },
@ -81,7 +82,6 @@ const t_menu_item g_menu_list[] =
#ifdef ENABLE_VOICE
{"VOICE", VOICE_ID_VOICE_PROMPT, MENU_VOICE },
#endif
{"SC REV", VOICE_ID_INVALID, MENU_SCAN_CAR_RESUME }, // was "SC_REV"
#ifdef ENABLE_KEYLOCK
{"KeyLOC", VOICE_ID_INVALID, MENU_AUTO_KEY_LOCK }, // was "AUTOLk"
#endif
@ -241,11 +241,12 @@ const char g_sub_menu_cross_vfo[3][10] =
};
#endif
const char g_sub_menu_scan_car_resume[3][13] =
const char g_sub_menu_scan_car_resume[3][8] =
{
"TIME",
"TIME ",
"CARRIER",
"SEARCH"
// "SEARCH"
"NO"
};
const char g_sub_menu_mem_disp[4][15] =
@ -881,16 +882,6 @@ void UI_DisplayMenu(void)
strcpy(str, g_sub_menu_bat_save[g_sub_menu_selection]);
break;
case MENU_DUAL_WATCH:
// strcpy(String, g_sub_menu_dual_watch[g_sub_menu_selection]);
strcpy(str, g_sub_menu_off_on[g_sub_menu_selection]);
break;
case MENU_SCAN_HOLD:
strcpy(str, "SCAN HOLD\n");
sprintf(str + strlen(str), "%d.%d sec", g_sub_menu_selection / 2, 5 * (g_sub_menu_selection % 2));
break;
case MENU_CROSS_VFO:
strcpy(str, g_sub_menu_cross_vfo[g_sub_menu_selection]);
break;
@ -905,9 +896,21 @@ void UI_DisplayMenu(void)
break;
#endif
case MENU_DUAL_WATCH:
// strcpy(String, g_sub_menu_dual_watch[g_sub_menu_selection]);
strcpy(str, g_sub_menu_off_on[g_sub_menu_selection]);
break;
case MENU_SCAN_CAR_RESUME:
strcpy(str, "SCAN\nRESUME\n");
strcat(str, g_sub_menu_scan_car_resume[g_sub_menu_selection]);
if (g_sub_menu_selection == SCAN_RESUME_TIME)
sprintf(str + strlen(str), "%d.%ds", g_eeprom.scan_hold_time_500ms / 2, 5 * (g_eeprom.scan_hold_time_500ms % 2));
break;
case MENU_SCAN_HOLD:
strcpy(str, "SCAN HOLD\n");
sprintf(str + strlen(str), "%d.%d sec", g_sub_menu_selection / 2, 5 * (g_sub_menu_selection % 2));
break;
case MENU_MEM_DISP:

2
ui/menu.h
View File

@ -169,7 +169,7 @@ extern const char g_sub_menu_cross_vfo[3][10];
#ifdef ENABLE_VOICE
extern const char g_sub_menu_voice[3][4];
#endif
extern const char g_sub_menu_scan_car_resume[3][13];
extern const char g_sub_menu_scan_car_resume[3][8];
extern const char g_sub_menu_mem_disp[4][15];
#ifdef ENABLE_ALARM
extern const char g_sub_menu_alarm_mode[2][5];