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

renames to reduce confusion

Browse Source
This commit is contained in:
OneOfEleven
2023-10-23 14:02:54 +01:00
parent 74f52f9d14
commit 3b4178d59d
22 changed files with 177 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ui/main.c
View File

@ -361,7 +361,7 @@ void UI_update_rssi(const int16_t rssi, const int vfo)
else
if (rssi >= level0 ||
g_current_function == FUNCTION_MONITOR ||
g_current_function == FUNCTION_INCOMING)
g_current_function == FUNCTION_NEW_RECEIVE)
{
rssi_level = 1;
}
@ -569,7 +569,7 @@ void UI_DisplayMain(void)
mode = 2;
if ((g_current_function == FUNCTION_RECEIVE ||
g_current_function == FUNCTION_MONITOR ||
g_current_function == FUNCTION_INCOMING) &&
g_current_function == FUNCTION_NEW_RECEIVE) &&
g_eeprom.rx_vfo == vfo_num)
{
#ifdef ENABLE_SMALL_BOLD
@ -690,7 +690,6 @@ void UI_DisplayMain(void)
case MDF_NAME_FREQ: // channel name and frequency
BOARD_fetchChannelName(String, g_eeprom.screen_channel[vfo_num]);
if (String[0] == 0)
{ // no channel name available, channel number instead
sprintf(String, "CH-%03u", 1 + g_eeprom.screen_channel[vfo_num]);
@ -698,16 +697,16 @@ void UI_DisplayMain(void)
if (g_eeprom.channel_display_mode == MDF_NAME)
{ // just the name
UI_PrintString(String, x, 0, line, 8);
UI_PrintString(String, x + 4, 0, line, 8);
}
else
{ // name & frequency
// name
#ifdef ENABLE_SMALL_BOLD
UI_PrintStringSmallBold(String, x, 0, line);
UI_PrintStringSmallBold(String, x + 4, 0, line);
#else
UI_PrintStringSmall(String, x, 0, line);
UI_PrintStringSmall(String, x + 4, 0, line);
#endif
// frequency
@ -715,7 +714,7 @@ void UI_DisplayMain(void)
#ifdef ENABLE_TRIM_TRAILING_ZEROS
NUMBER_trim_trailing_zeros(String);
#endif
UI_PrintStringSmall(String, x, 0, line + 1);
UI_PrintStringSmall(String, x + 4, 0, line + 1);
}
break;
@ -890,7 +889,7 @@ void UI_DisplayMain(void)
const bool rx = (g_current_function == FUNCTION_RECEIVE ||
g_current_function == FUNCTION_MONITOR ||
g_current_function == FUNCTION_INCOMING);
g_current_function == FUNCTION_NEW_RECEIVE);
#ifdef ENABLE_TX_TIMEOUT_BAR
// show the TX timeout count down

2
ui/menu.h
View File

@ -54,6 +54,7 @@ enum
MENU_TX_TO,
MENU_CROSS_VFO,
MENU_DUAL_WATCH,
MENU_SCAN_CAR_RESUME,
MENU_SCAN_HOLD,
MENU_SCRAMBLER,
MENU_BUSY_CHAN_LOCK,
@ -70,7 +71,6 @@ enum
#ifdef ENABLE_CONTRAST
MENU_CONTRAST,
#endif
MENU_SCAN_CAR_RESUME,
MENU_S_ADD1,
MENU_S_ADD2,
#ifdef ENABLE_NOAA

2
ui/status.c
View File

@ -55,7 +55,7 @@ void UI_DisplayStatus(const bool test_display)
else
if (g_current_function == FUNCTION_RECEIVE ||
g_current_function == FUNCTION_MONITOR ||
g_current_function == FUNCTION_INCOMING)
g_current_function == FUNCTION_NEW_RECEIVE)
{
memmove(line + x, BITMAP_RX, sizeof(BITMAP_RX));
x1 = x + sizeof(BITMAP_RX);