BRNSystems/brnQuanFW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fix Voxless not functional menus

Browse Source
This commit is contained in:
Armel FAUVEAU
2025-02-12 02:13:55 +01:00
parent f2996f2430
commit c384a682bb
4 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
compile-with-docker.sh
View File

@@ -119,6 +119,7 @@ case "$1" in
bandscope bandscope
broadcast broadcast
rescueops rescueops
voxless
;; ;;
*) *)
echo "Usage: $0 {custom|bandscope|broadcast|voxless|standard|all}" echo "Usage: $0 {custom|bandscope|broadcast|voxless|standard|all}"

2
main.c
View File

@@ -164,7 +164,7 @@ void Main(void)
gEeprom.KEY_LOCK = 0; gEeprom.KEY_LOCK = 0;
SETTINGS_SaveSettings(); SETTINGS_SaveSettings();
#ifndef ENABLE_VOX #ifndef ENABLE_VOX
gMenuCursor = 65; // move to hidden section, fix me if change... !!! Remove VOX and Mic Bar gMenuCursor = 67; // move to hidden section, fix me if change... !!! Remove VOX and Mic Bar
#else #else
gMenuCursor = 68; // move to hidden section, fix me if change... !!! gMenuCursor = 68; // move to hidden section, fix me if change... !!!
#endif #endif

24
ui/menu.c
View File

@@ -86,9 +86,7 @@ const t_menu_item MenuList[] =
{"BatSav", MENU_SAVE }, // was "SAVE" {"BatSav", MENU_SAVE }, // was "SAVE"
{"BatTxt", MENU_BAT_TXT }, {"BatTxt", MENU_BAT_TXT },
{"Mic", MENU_MIC }, {"Mic", MENU_MIC },
#ifdef ENABLE_AUDIO_BAR
{"MicBar", MENU_MIC_BAR }, {"MicBar", MENU_MIC_BAR },
#endif
{"ChDisp", MENU_MDF }, // was "MDF" {"ChDisp", MENU_MDF }, // was "MDF"
{"POnMsg", MENU_PONMSG }, {"POnMsg", MENU_PONMSG },
{"BLTime", MENU_ABR }, // was "ABR" {"BLTime", MENU_ABR }, // was "ABR"
@@ -128,9 +126,7 @@ const t_menu_item MenuList[] =
{"AM Fix", MENU_AM_FIX }, {"AM Fix", MENU_AM_FIX },
#endif #endif
#endif #endif
#ifdef ENABLE_VOX
{"VOX", MENU_VOX }, {"VOX", MENU_VOX },
#endif
#ifdef ENABLE_FEAT_F4HWN #ifdef ENABLE_FEAT_F4HWN
{"SysInf", MENU_VOL }, // was "VOL" {"SysInf", MENU_VOL }, // was "VOL"
#else #else
@@ -614,11 +610,13 @@ void UI_DisplayMenu(void)
} }
break; break;
#ifdef ENABLE_AUDIO_BAR case MENU_MIC_BAR:
case MENU_MIC_BAR: #ifdef ENABLE_AUDIO_BAR
strcpy(String, gSubMenu_OFF_ON[gSubMenuSelection]); strcpy(String, gSubMenu_OFF_ON[gSubMenuSelection]);
break; #else
#endif strcpy(String, gSubMenu_OFF_ON[0]);
#endif
break;
case MENU_STEP: { case MENU_STEP: {
uint16_t step = gStepFrequencyTable[FREQUENCY_GetStepIdxFromSortedIdx(gSubMenuSelection)]; uint16_t step = gStepFrequencyTable[FREQUENCY_GetStepIdxFromSortedIdx(gSubMenuSelection)];
@@ -695,11 +693,13 @@ void UI_DisplayMenu(void)
break; break;
#endif #endif
#ifdef ENABLE_VOX case MENU_VOX:
case MENU_VOX: #ifdef ENABLE_VOX
sprintf(String, gSubMenuSelection == 0 ? "OFF" : "%u", gSubMenuSelection); sprintf(String, gSubMenuSelection == 0 ? "OFF" : "%u", gSubMenuSelection);
break; #else
#endif strcpy(String, gSubMenu_OFF_ON[0]);
#endif
break;
case MENU_ABR: case MENU_ABR:
if(gSubMenuSelection == 0) if(gSubMenuSelection == 0)

4
ui/menu.h
View File

@@ -53,9 +53,7 @@ enum
MENU_MEM_NAME, MENU_MEM_NAME,
MENU_MDF, MENU_MDF,
MENU_SAVE, MENU_SAVE,
#ifdef ENABLE_VOX
MENU_VOX, MENU_VOX,
#endif
MENU_ABR, MENU_ABR,
MENU_ABR_ON_TX_RX, MENU_ABR_ON_TX_RX,
MENU_ABR_MIN, MENU_ABR_MIN,
@@ -73,9 +71,7 @@ enum
MENU_STE, MENU_STE,
MENU_RP_STE, MENU_RP_STE,
MENU_MIC, MENU_MIC,
#ifdef ENABLE_AUDIO_BAR
MENU_MIC_BAR, MENU_MIC_BAR,
#endif
MENU_COMPAND, MENU_COMPAND,
MENU_1_CALL, MENU_1_CALL,
MENU_S_LIST, MENU_S_LIST,