Remove AM Fix menu
This commit is contained in:
@@ -225,9 +225,11 @@ int MENU_GetLimits(uint8_t menu_id, int32_t *pMin, int32_t *pMax)
|
|||||||
*pMax = ARRAY_SIZE(gSubMenu_RX_TX) - 1;
|
*pMax = ARRAY_SIZE(gSubMenu_RX_TX) - 1;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
#ifndef ENABLE_FEAT_F4HWN
|
||||||
#ifdef ENABLE_AM_FIX
|
#ifdef ENABLE_AM_FIX
|
||||||
case MENU_AM_FIX:
|
case MENU_AM_FIX:
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
#ifdef ENABLE_AUDIO_BAR
|
#ifdef ENABLE_AUDIO_BAR
|
||||||
case MENU_MIC_BAR:
|
case MENU_MIC_BAR:
|
||||||
#endif
|
#endif
|
||||||
@@ -748,6 +750,7 @@ void MENU_AcceptSetting(void)
|
|||||||
gRequestSaveChannel = 1;
|
gRequestSaveChannel = 1;
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
#ifndef ENABLE_FEAT_F4HWN
|
||||||
#ifdef ENABLE_AM_FIX
|
#ifdef ENABLE_AM_FIX
|
||||||
case MENU_AM_FIX:
|
case MENU_AM_FIX:
|
||||||
gSetting_AM_fix = gSubMenuSelection;
|
gSetting_AM_fix = gSubMenuSelection;
|
||||||
@@ -755,6 +758,7 @@ void MENU_AcceptSetting(void)
|
|||||||
gFlagResetVfos = true;
|
gFlagResetVfos = true;
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef ENABLE_NOAA
|
#ifdef ENABLE_NOAA
|
||||||
case MENU_NOAA_S:
|
case MENU_NOAA_S:
|
||||||
@@ -1177,11 +1181,14 @@ void MENU_ShowCurrentSetting(void)
|
|||||||
gSubMenuSelection = gTxVfo->Modulation;
|
gSubMenuSelection = gTxVfo->Modulation;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
#ifndef ENABLE_FEAT_F4HWN
|
||||||
#ifdef ENABLE_AM_FIX
|
#ifdef ENABLE_AM_FIX
|
||||||
case MENU_AM_FIX:
|
case MENU_AM_FIX:
|
||||||
gSubMenuSelection = gSetting_AM_fix;
|
gSubMenuSelection = gSetting_AM_fix;
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef ENABLE_NOAA
|
#ifdef ENABLE_NOAA
|
||||||
case MENU_NOAA_S:
|
case MENU_NOAA_S:
|
||||||
gSubMenuSelection = gEeprom.NOAA_AUTO_SCAN;
|
gSubMenuSelection = gEeprom.NOAA_AUTO_SCAN;
|
||||||
|
2
misc.c
2
misc.c
@@ -101,7 +101,7 @@ bool gSetting_ScrambleEnable;
|
|||||||
enum BacklightOnRxTx_t gSetting_backlight_on_tx_rx;
|
enum BacklightOnRxTx_t gSetting_backlight_on_tx_rx;
|
||||||
|
|
||||||
#ifdef ENABLE_AM_FIX
|
#ifdef ENABLE_AM_FIX
|
||||||
bool gSetting_AM_fix;
|
bool gSetting_AM_fix = true;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef ENABLE_FEAT_F4HWN
|
#ifdef ENABLE_FEAT_F4HWN
|
||||||
|
@@ -257,9 +257,11 @@ void SETTINGS_InitEEPROM(void)
|
|||||||
#ifdef ENABLE_AUDIO_BAR
|
#ifdef ENABLE_AUDIO_BAR
|
||||||
gSetting_mic_bar = !!(Data[7] & (1u << 4));
|
gSetting_mic_bar = !!(Data[7] & (1u << 4));
|
||||||
#endif
|
#endif
|
||||||
|
#ifndef ENABLE_FEAT_F4HWN
|
||||||
#ifdef ENABLE_AM_FIX
|
#ifdef ENABLE_AM_FIX
|
||||||
gSetting_AM_fix = !!(Data[7] & (1u << 5));
|
gSetting_AM_fix = !!(Data[7] & (1u << 5));
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
gSetting_backlight_on_tx_rx = (Data[7] >> 6) & 3u;
|
gSetting_backlight_on_tx_rx = (Data[7] >> 6) & 3u;
|
||||||
|
|
||||||
if (!gEeprom.VFO_OPEN)
|
if (!gEeprom.VFO_OPEN)
|
||||||
@@ -646,9 +648,11 @@ void SETTINGS_SaveSettings(void)
|
|||||||
#ifdef ENABLE_AUDIO_BAR
|
#ifdef ENABLE_AUDIO_BAR
|
||||||
if (!gSetting_mic_bar) State[7] &= ~(1u << 4);
|
if (!gSetting_mic_bar) State[7] &= ~(1u << 4);
|
||||||
#endif
|
#endif
|
||||||
|
#ifndef ENABLE_FEAT_F4HWN
|
||||||
#ifdef ENABLE_AM_FIX
|
#ifdef ENABLE_AM_FIX
|
||||||
if (!gSetting_AM_fix) State[7] &= ~(1u << 5);
|
if (!gSetting_AM_fix) State[7] &= ~(1u << 5);
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
State[7] = (State[7] & ~(3u << 6)) | ((gSetting_backlight_on_tx_rx & 3u) << 6);
|
State[7] = (State[7] & ~(3u << 6)) | ((gSetting_backlight_on_tx_rx & 3u) << 6);
|
||||||
|
|
||||||
EEPROM_WriteBuffer(0x0F40, State);
|
EEPROM_WriteBuffer(0x0F40, State);
|
||||||
|
@@ -116,9 +116,11 @@ const t_menu_item MenuList[] =
|
|||||||
{"D List", MENU_D_LIST },
|
{"D List", MENU_D_LIST },
|
||||||
#endif
|
#endif
|
||||||
{"D Live", MENU_D_LIVE_DEC }, // live DTMF decoder
|
{"D Live", MENU_D_LIVE_DEC }, // live DTMF decoder
|
||||||
|
#ifndef ENABLE_FEAT_F4HWN
|
||||||
#ifdef ENABLE_AM_FIX
|
#ifdef ENABLE_AM_FIX
|
||||||
{"AM Fix", MENU_AM_FIX },
|
{"AM Fix", MENU_AM_FIX },
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
#ifdef ENABLE_VOX
|
#ifdef ENABLE_VOX
|
||||||
{"VOX", MENU_VOX },
|
{"VOX", MENU_VOX },
|
||||||
#endif
|
#endif
|
||||||
@@ -684,9 +686,11 @@ void UI_DisplayMenu(void)
|
|||||||
strcpy(String, gSubMenu_RX_TX[gSubMenuSelection]);
|
strcpy(String, gSubMenu_RX_TX[gSubMenuSelection]);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
#ifndef ENABLE_FEAT_F4HWN
|
||||||
#ifdef ENABLE_AM_FIX
|
#ifdef ENABLE_AM_FIX
|
||||||
case MENU_AM_FIX:
|
case MENU_AM_FIX:
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
case MENU_BCL:
|
case MENU_BCL:
|
||||||
case MENU_BEEP:
|
case MENU_BEEP:
|
||||||
case MENU_S_ADD1:
|
case MENU_S_ADD1:
|
||||||
|
Reference in New Issue
Block a user