mirrors/uv-k5-firmware-custom
0
Fork 0
mirror of https://github.com/OneOfEleven/uv-k5-firmware-custom.git synced 2025-05-06 02:01:24 +03:00
Code Issues Releases Activity

Menu SIDE_BUTT can be disabled to save 300 bytes.

Browse Source 
This is a very rough version as I just did some search and replace.
This commit is contained in:
cloudwindy 2023-10-20 20:29:25 +08:00
parent 7e4508436f
commit da52374496
No known key found for this signature in database
GPG Key ID: 7E77DCD8B06BEDFA
4 changed files with 92 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -53,6 +53,7 @@ ENABLE_RX_SIGNAL_BAR := 1
ENABLE_TX_TIMEOUT_BAR := 0 ENABLE_TX_TIMEOUT_BAR := 0
ENABLE_TX_AUDIO_BAR := 1 ENABLE_TX_AUDIO_BAR := 1
ENABLE_COPY_CHAN_TO_VFO_TO_CHAN := 1 ENABLE_COPY_CHAN_TO_VFO_TO_CHAN := 1
ENABLE_SIDE_BUTT_MENU := 1
#ENABLE_PANADAPTER := 0 #ENABLE_PANADAPTER := 0
#ENABLE_SINGLE_VFO_CHAN := 0 #ENABLE_SINGLE_VFO_CHAN := 0
@ -381,6 +382,9 @@ endif
ifeq ($(ENABLE_COPY_CHAN_TO_VFO_TO_CHAN),1) ifeq ($(ENABLE_COPY_CHAN_TO_VFO_TO_CHAN),1)
CFLAGS += -DENABLE_COPY_CHAN_TO_VFO_TO_CHAN CFLAGS += -DENABLE_COPY_CHAN_TO_VFO_TO_CHAN
endif endif
ifeq ($(ENABLE_SIDE_BUTT_MENU),1)
CFLAGS += -DENABLE_SIDE_BUTT_MENU
endif
ifeq ($(ENABLE_SINGLE_VFO_CHAN),1) ifeq ($(ENABLE_SINGLE_VFO_CHAN),1)
CFLAGS += -DENABLE_SINGLE_VFO_CHAN CFLAGS += -DENABLE_SINGLE_VFO_CHAN
endif endif

6
app/menu.c
View File

@ -201,6 +201,7 @@ int MENU_GetLimits(uint8_t Cursor, int32_t *pMin, int32_t *pMax)
break; break;
#endif #endif
#ifdef ENABLE_SIDE_BUTT_MENU
case MENU_SIDE1_SHORT: case MENU_SIDE1_SHORT:
case MENU_SIDE1_LONG: case MENU_SIDE1_LONG:
case MENU_SIDE2_SHORT: case MENU_SIDE2_SHORT:
@ -208,6 +209,7 @@ int MENU_GetLimits(uint8_t Cursor, int32_t *pMin, int32_t *pMax)
*pMin = 0; *pMin = 0;
*pMax = ARRAY_SIZE(g_sub_menu_SIDE_BUTT) - 1; *pMax = ARRAY_SIZE(g_sub_menu_SIDE_BUTT) - 1;
break; break;
#endif
case MENU_RESET: case MENU_RESET:
*pMin = 0; *pMin = 0;
@ -793,6 +795,7 @@ void MENU_AcceptSetting(void)
g_flag_reset_vfos = true; g_flag_reset_vfos = true;
return; return;
#ifdef ENABLE_SIDE_BUTT_MENU
case MENU_SIDE1_SHORT: case MENU_SIDE1_SHORT:
g_eeprom.key1_short_press_action = g_sub_menu_selection; g_eeprom.key1_short_press_action = g_sub_menu_selection;
break; break;
@ -808,6 +811,7 @@ void MENU_AcceptSetting(void)
case MENU_SIDE2_LONG: case MENU_SIDE2_LONG:
g_eeprom.key2_long_press_action = g_sub_menu_selection; g_eeprom.key2_long_press_action = g_sub_menu_selection;
break; break;
#endif
case MENU_RESET: case MENU_RESET:
BOARD_FactoryReset(g_sub_menu_selection); BOARD_FactoryReset(g_sub_menu_selection);
@ -1247,6 +1251,7 @@ void MENU_ShowCurrentSetting(void)
#endif #endif
break; break;
#ifdef ENABLE_SIDE_BUTT_MENU
case MENU_SIDE1_SHORT: case MENU_SIDE1_SHORT:
g_sub_menu_selection = g_eeprom.key1_short_press_action; g_sub_menu_selection = g_eeprom.key1_short_press_action;
break; break;
@ -1262,6 +1267,7 @@ void MENU_ShowCurrentSetting(void)
case MENU_SIDE2_LONG: case MENU_SIDE2_LONG:
g_sub_menu_selection = g_eeprom.key2_long_press_action; g_sub_menu_selection = g_eeprom.key2_long_press_action;
break; break;
#endif
case MENU_350_TX: case MENU_350_TX:
g_sub_menu_selection = g_setting_350_tx_enable; g_sub_menu_selection = g_setting_350_tx_enable;

6
ui/menu.c
View File

@ -127,10 +127,12 @@ const t_menu_item g_menu_list[] =
#ifdef ENABLE_NOAA #ifdef ENABLE_NOAA
{"NOAA-S", VOICE_ID_INVALID, MENU_NOAA_SCAN }, {"NOAA-S", VOICE_ID_INVALID, MENU_NOAA_SCAN },
#endif #endif
#ifdef ENABLE_SIDE_BUTT_MENU
{"Side1S", VOICE_ID_INVALID, MENU_SIDE1_SHORT }, {"Side1S", VOICE_ID_INVALID, MENU_SIDE1_SHORT },
{"Side1L", VOICE_ID_INVALID, MENU_SIDE1_LONG }, {"Side1L", VOICE_ID_INVALID, MENU_SIDE1_LONG },
{"Side2S", VOICE_ID_INVALID, MENU_SIDE2_SHORT }, {"Side2S", VOICE_ID_INVALID, MENU_SIDE2_SHORT },
{"Side2L", VOICE_ID_INVALID, MENU_SIDE2_LONG }, {"Side2L", VOICE_ID_INVALID, MENU_SIDE2_LONG },
#endif
{"VER", VOICE_ID_INVALID, MENU_VERSION }, {"VER", VOICE_ID_INVALID, MENU_VERSION },
{"RESET", VOICE_ID_INITIALISATION, MENU_RESET }, // might be better to move this to the hidden menu items ? {"RESET", VOICE_ID_INITIALISATION, MENU_RESET }, // might be better to move this to the hidden menu items ?
@ -356,6 +358,7 @@ const char g_sub_MENU_SCRAMBLERAMBLER[11][7] =
"3500Hz" "3500Hz"
}; };
#ifdef ENABLE_SIDE_BUTT_MENU
const char g_sub_menu_SIDE_BUTT[9][16] = const char g_sub_menu_SIDE_BUTT[9][16] =
//const char g_sub_menu_SIDE_BUTT[10][16] = //const char g_sub_menu_SIDE_BUTT[10][16] =
{ {
@ -370,6 +373,7 @@ const char g_sub_menu_SIDE_BUTT[9][16] =
"TX\n1750Hz", "TX\n1750Hz",
// "2nd PTT", // "2nd PTT",
}; };
#endif
// *************************************************************************************** // ***************************************************************************************
@ -1025,12 +1029,14 @@ void UI_DisplayMenu(void)
g_usb_current); g_usb_current);
break; break;
#ifdef ENABLE_SIDE_BUTT_MENU
case MENU_SIDE1_SHORT: case MENU_SIDE1_SHORT:
case MENU_SIDE1_LONG: case MENU_SIDE1_LONG:
case MENU_SIDE2_SHORT: case MENU_SIDE2_SHORT:
case MENU_SIDE2_LONG: case MENU_SIDE2_LONG:
strcpy(String, g_sub_menu_SIDE_BUTT[g_sub_menu_selection]); strcpy(String, g_sub_menu_SIDE_BUTT[g_sub_menu_selection]);
break; break;
#endif
case MENU_VERSION: case MENU_VERSION:
{ // show the version string on multiple lines - if need be { // show the version string on multiple lines - if need be

4
ui/menu.h
View File

@ -120,10 +120,12 @@ enum
MENU_VOICE, MENU_VOICE,
#endif #endif
MENU_AUTO_KEY_LOCK, MENU_AUTO_KEY_LOCK,
#ifdef ENABLE_SIDE_BUTT_MENU
MENU_SIDE1_SHORT, MENU_SIDE1_SHORT,
MENU_SIDE1_LONG, MENU_SIDE1_LONG,
MENU_SIDE2_SHORT, MENU_SIDE2_SHORT,
MENU_SIDE2_LONG, MENU_SIDE2_LONG,
#endif
MENU_VERSION, MENU_VERSION,
MENU_RESET, MENU_RESET,
@ -183,7 +185,9 @@ extern const char g_sub_menu_rx_tx[4][6];
extern const char g_sub_menu_BAT_TXT[3][8]; extern const char g_sub_menu_BAT_TXT[3][8];
extern const char g_sub_menu_DIS_EN[2][9]; extern const char g_sub_menu_DIS_EN[2][9];
extern const char g_sub_MENU_SCRAMBLERAMBLER[11][7]; extern const char g_sub_MENU_SCRAMBLERAMBLER[11][7];
#ifdef ENABLE_SIDE_BUTT_MENU
extern const char g_sub_menu_SIDE_BUTT[9][16]; extern const char g_sub_menu_SIDE_BUTT[9][16];
#endif
extern bool g_is_in_sub_menu; extern bool g_is_in_sub_menu;