mirror of
https://github.com/OneOfEleven/uv-k5-firmware-custom.git
synced 2025-05-19 08:21:18 +03:00
bat-cal menu input update
This commit is contained in:
OneOfEleven
parent
5f13884e88
commit
e1dfb56335
BIN
firmware.bin
BIN
firmware.bin
Binary file not shown.
Binary file not shown.
48
ui/menu.c
48
ui/menu.c
@ -78,7 +78,7 @@ const t_menu_item g_menu_list[] =
|
||||
{"CTRAST", VOICE_ID_INVALID, MENU_CONTRAST },
|
||||
#endif
|
||||
{"BEEP", VOICE_ID_BEEP_PROMPT, MENU_BEEP },
|
||||
#ifdef ENABLE_VOICE
|
||||
#ifdef ENABLE_VOICE
|
||||
{"VOICE", VOICE_ID_VOICE_PROMPT, MENU_VOICE },
|
||||
#endif
|
||||
{"SC REV", VOICE_ID_INVALID, MENU_SCAN_CAR_RESUME }, // was "SC_REV"
|
||||
@ -91,19 +91,19 @@ const t_menu_item g_menu_list[] =
|
||||
{"RP STE", VOICE_ID_INVALID, MENU_RP_STE },
|
||||
{"MIC GN", VOICE_ID_INVALID, MENU_MIC_GAIN },
|
||||
{"COMPND", VOICE_ID_INVALID, MENU_COMPAND },
|
||||
#ifdef ENABLE_TX_AUDIO_BAR
|
||||
#ifdef ENABLE_TX_AUDIO_BAR
|
||||
{"Tx BAR", VOICE_ID_INVALID, MENU_TX_BAR },
|
||||
#endif
|
||||
#ifdef ENABLE_RX_SIGNAL_BAR
|
||||
#endif
|
||||
#ifdef ENABLE_RX_SIGNAL_BAR
|
||||
{"Rx BAR", VOICE_ID_INVALID, MENU_RX_BAR },
|
||||
#endif
|
||||
#endif
|
||||
{"1 CALL", VOICE_ID_INVALID, MENU_1_CALL },
|
||||
{"SLIST", VOICE_ID_INVALID, MENU_S_LIST },
|
||||
{"SLIST1", VOICE_ID_INVALID, MENU_SLIST1 },
|
||||
{"SLIST2", VOICE_ID_INVALID, MENU_SLIST2 },
|
||||
#ifdef ENABLE_ALARM
|
||||
{"SOS AL", VOICE_ID_INVALID, MENU_ALARM_MODE }, // was "ALMODE"
|
||||
#endif
|
||||
#endif
|
||||
{"ANI ID", VOICE_ID_ANI_CODE, MENU_ANI_ID },
|
||||
{"UpCODE", VOICE_ID_INVALID, MENU_UP_CODE },
|
||||
{"DnCODE", VOICE_ID_INVALID, MENU_DN_CODE }, // was "DWCODE"
|
||||
@ -120,15 +120,15 @@ const t_menu_item g_menu_list[] =
|
||||
{"BatVOL", VOICE_ID_INVALID, MENU_VOLTAGE }, // was "VOL"
|
||||
{"BatTXT", VOICE_ID_INVALID, MENU_BAT_TXT },
|
||||
{"MODE", VOICE_ID_INVALID, MENU_MOD_MODE }, // was "AM"
|
||||
#ifdef ENABLE_AM_FIX
|
||||
#ifdef ENABLE_AM_FIX
|
||||
{"AM FIX", VOICE_ID_INVALID, MENU_AM_FIX },
|
||||
#endif
|
||||
#ifdef ENABLE_AM_FIX_TEST1
|
||||
#endif
|
||||
#ifdef ENABLE_AM_FIX_TEST1
|
||||
{"AM FT1", VOICE_ID_INVALID, MENU_AM_FIX_TEST1 },
|
||||
#endif
|
||||
#ifdef ENABLE_NOAA
|
||||
#endif
|
||||
#ifdef ENABLE_NOAA
|
||||
{"NOAA-S", VOICE_ID_INVALID, MENU_NOAA_SCAN },
|
||||
#endif
|
||||
#endif
|
||||
#ifdef ENABLE_SIDE_BUTT_MENU
|
||||
{"Side1S", VOICE_ID_INVALID, MENU_SIDE1_SHORT },
|
||||
{"Side1L", VOICE_ID_INVALID, MENU_SIDE1_LONG },
|
||||
@ -146,9 +146,9 @@ const t_menu_item g_menu_list[] =
|
||||
|
||||
{"BatCAL", VOICE_ID_INVALID, MENU_BAT_CAL }, // battery voltage calibration
|
||||
|
||||
#ifdef ENABLE_F_CAL_MENU
|
||||
#ifdef ENABLE_F_CAL_MENU
|
||||
{"F CAL", VOICE_ID_INVALID, MENU_F_CALI }, // reference xtal calibration
|
||||
#endif
|
||||
#endif
|
||||
|
||||
{"F LOCK", VOICE_ID_INVALID, MENU_FREQ_LOCK }, // country/area specific
|
||||
{"Tx 174", VOICE_ID_INVALID, MENU_174_TX }, // was "200TX"
|
||||
@ -584,7 +584,7 @@ void UI_DisplayMenu(void)
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
case MENU_TX_POWER:
|
||||
strcpy(String, g_sub_MENU_TX_POWER[g_sub_menu_selection]);
|
||||
break;
|
||||
@ -615,7 +615,7 @@ void UI_DisplayMenu(void)
|
||||
|
||||
if (pConfig->code_type != CODE_TYPE_CONTINUOUS_TONE)
|
||||
break;
|
||||
|
||||
|
||||
Code = 0;
|
||||
pConfig->code_type = CODE_TYPE_NONE;
|
||||
pConfig->code = Code;
|
||||
@ -679,7 +679,7 @@ void UI_DisplayMenu(void)
|
||||
case MENU_SCRAMBLER:
|
||||
strcpy(String, "INVERT\n");
|
||||
strcat(String, g_sub_MENU_SCRAMBLERAMBLER[g_sub_menu_selection]);
|
||||
|
||||
|
||||
#if 1
|
||||
if (g_sub_menu_selection > 0 && g_setting_scramble_enable)
|
||||
BK4819_EnableScramble(g_sub_menu_selection - 1);
|
||||
@ -740,7 +740,7 @@ void UI_DisplayMenu(void)
|
||||
g_update_display = true;
|
||||
break;
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef ENABLE_TX_AUDIO_BAR
|
||||
case MENU_TX_BAR:
|
||||
#endif
|
||||
@ -817,7 +817,7 @@ void UI_DisplayMenu(void)
|
||||
strcpy(String, "TX\n");
|
||||
strcat(String, g_sub_menu_DIS_EN[g_sub_menu_selection]);
|
||||
break;
|
||||
|
||||
|
||||
case MENU_MEM_SAVE:
|
||||
case MENU_1_CALL:
|
||||
case MENU_MEM_DEL:
|
||||
@ -831,7 +831,7 @@ void UI_DisplayMenu(void)
|
||||
BOARD_fetchChannelName(s, g_sub_menu_selection);
|
||||
strcat(String, "\n");
|
||||
strcat(String, (s[0] == 0) ? "--" : s);
|
||||
|
||||
|
||||
if (valid && !g_ask_for_confirmation)
|
||||
{ // show the frequency so that the user knows the channels frequency
|
||||
const uint32_t frequency = BOARD_fetchChannelFrequency(g_sub_menu_selection);
|
||||
@ -894,7 +894,7 @@ void UI_DisplayMenu(void)
|
||||
strcpy(String, "SCAN HOLD\n");
|
||||
sprintf(String + strlen(String), "%d.%d sec", g_sub_menu_selection / 2, 5 * (g_sub_menu_selection % 2));
|
||||
break;
|
||||
|
||||
|
||||
case MENU_CROSS_VFO:
|
||||
strcpy(String, g_sub_MENU_CROSS_VFO[g_sub_menu_selection]);
|
||||
break;
|
||||
@ -1079,7 +1079,7 @@ void UI_DisplayMenu(void)
|
||||
strcat(String, "\n \n" __DATE__ "\n" __TIME__);
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
case MENU_RESET:
|
||||
strcpy(String, g_sub_menu_RESET[g_sub_menu_selection]);
|
||||
break;
|
||||
@ -1134,10 +1134,10 @@ void UI_DisplayMenu(void)
|
||||
case MENU_BAT_CAL:
|
||||
{
|
||||
const uint16_t vol = (uint32_t)g_battery_voltage_average * g_battery_calibration[3] / g_sub_menu_selection;
|
||||
if (!g_in_sub_menu || g_input_box_index == 0)
|
||||
if (!g_in_sub_menu)
|
||||
sprintf(String, "%u.%02uV\n%d", vol / 100, vol % 100, g_sub_menu_selection);
|
||||
else
|
||||
sprintf(String, "%u.%02uV\n%d\n%04d", vol / 100, vol % 100, g_battery_calibration[3], g_sub_menu_selection);
|
||||
sprintf(String, "%u.%02uV\n(%#4d)\n%#4d", vol / 100, vol % 100, g_battery_calibration[3], g_sub_menu_selection);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user