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

Try up/down butts with squelch off/monitor enabled

Browse Source
This commit is contained in:
OneOfEleven
2023-10-16 06:43:42 +01:00
parent 798f0f97f3
commit 244c4f1091
35 changed files with 623 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ui/main.c
View File

@ -283,7 +283,7 @@ void UI_drawBars(uint8_t *p, const unsigned int level)
}
#endif
void UI_UpdateRSSI(const int16_t rssi, const int vfo)
void UI_update_rssi(const int16_t rssi, const int vfo)
{
#ifdef ENABLE_RSSI_BAR
@ -809,7 +809,7 @@ void UI_DisplayMain(void)
}
// show the DTMF decoding symbol
if (g_eeprom.vfo_info[vfo_num].dtmf_decoding_enable || g_setting_killed)
if (g_eeprom.vfo_info[vfo_num].dtmf_decoding_enable || g_setting_radio_disabled)
UI_PrintStringSmall("DTMF", LCD_WIDTH + 78, 0, line + 1);
// show the audio scramble symbol

2
ui/main.h
View File

@ -37,7 +37,7 @@ extern center_line_t center_line;
#ifdef ENABLE_AUDIO_BAR
bool UI_DisplayAudioBar(const bool now);
#endif
void UI_UpdateRSSI(const int16_t rssi, const int vfo);
void UI_update_rssi(const int16_t rssi, const int vfo);
void UI_DisplayMain(void);
#endif

23
ui/menu.c
View File

@ -130,9 +130,9 @@ const t_menu_item g_menu_list[] =
// enabled by pressing both the PTT and upper side button at power-on
{"F LOCK", VOICE_ID_INVALID, MENU_FREQ_LOCK }, // country/area specific
{"Tx 200", VOICE_ID_INVALID, MENU_200TX }, // was "200TX"
{"Tx 174", VOICE_ID_INVALID, MENU_174TX }, // was "200TX"
{"Tx 350", VOICE_ID_INVALID, MENU_350TX }, // was "350TX"
{"Tx 500", VOICE_ID_INVALID, MENU_500TX }, // was "500TX"
{"Tx 470", VOICE_ID_INVALID, MENU_470TX }, // was "500TX"
{"350 EN", VOICE_ID_INVALID, MENU_350EN }, // was "350EN"
{"SCR EN", VOICE_ID_INVALID, MENU_SCREN }, // was "SCREN"
{"Tx EN", VOICE_ID_INVALID, MENU_TX_EN }, // enable TX
@ -752,10 +752,23 @@ void UI_DisplayMenu(void)
#endif
case MENU_350TX:
case MENU_200TX:
case MENU_500TX:
strcpy(String, "350 ~ 400\n");
strcat(String, g_sub_menu_DIS_EN[g_sub_menu_selection]);
break;
case MENU_174TX:
strcpy(String, "174 ~ 350\n");
strcat(String, g_sub_menu_DIS_EN[g_sub_menu_selection]);
break;
case MENU_470TX:
strcpy(String, "470 ~ 600\n");
strcat(String, g_sub_menu_DIS_EN[g_sub_menu_selection]);
break;
case MENU_350EN:
strcpy(String, g_sub_menu_DIS_EN[g_sub_menu_selection]);
strcpy(String, "350 ~ 400\n");
strcat(String, g_sub_menu_DIS_EN[g_sub_menu_selection]);
break;
case MENU_SCREN:

4
ui/menu.h
View File

@ -124,9 +124,9 @@ enum
// items after here are normally hidden
MENU_FREQ_LOCK,
MENU_200TX,
MENU_174TX,
MENU_350TX,
MENU_500TX,
MENU_470TX,
MENU_350EN,
MENU_SCREN,

15
ui/status.c
View File

@ -79,7 +79,7 @@ void UI_DisplayStatus(const bool test_display)
// hmmm, what to put in it's place
#endif
if (g_setting_killed)
if (g_setting_radio_disabled)
{
memset(line + x, 0xFF, 10);
x1 = x + 10;
@ -131,10 +131,17 @@ void UI_DisplayStatus(const bool test_display)
// DUAL-WATCH indicator
if (g_eeprom.dual_watch != DUAL_WATCH_OFF || test_display)
{
if (g_dual_watch_active || test_display)
memmove(line + x, BITMAP_TDR1, sizeof(BITMAP_TDR1));
if (g_scan_state_dir == SCAN_STATE_DIR_OFF ||
g_squelch_lost ||
g_current_function == FUNCTION_INCOMING ||
g_current_function == FUNCTION_MONITOR ||
g_screen_to_display == DISPLAY_SEARCH ||
test_display)
{
memmove(line + x, BITMAP_TDR1, sizeof(BITMAP_TDR1)); // dual-watch is paused
}
else
memmove(line + x, BITMAP_TDR2, sizeof(BITMAP_TDR2));
memmove(line + x, BITMAP_TDR2, sizeof(BITMAP_TDR2)); // dual-watch is running
}
x += sizeof(BITMAP_TDR1);