From a94f99130fe1748d34a3db4999c19100dea1d050 Mon Sep 17 00:00:00 2001 From: OneOfEleven Date: Tue, 24 Oct 2023 18:36:29 +0100 Subject: [PATCH] removed something --- app/menu.c | 10 +++++----- board.c | 2 +- misc.c | 2 +- settings.c | 2 +- ui/menu.c | 4 ++-- ui/menu.h | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/menu.c b/app/menu.c index 084ecd7..68e40fa 100644 --- a/app/menu.c +++ b/app/menu.c @@ -239,7 +239,7 @@ int MENU_GetLimits(uint8_t Cursor, int32_t *pMin, int32_t *pMax) #endif #ifdef ENABLE_AM_FIX - case MENU_AM_FIX: +// case MENU_AM_FIX: #endif #ifdef ENABLE_TX_AUDIO_BAR case MENU_TX_BAR: @@ -769,7 +769,7 @@ void MENU_AcceptSetting(void) g_tx_vfo->am_mode = g_sub_menu_selection; g_request_save_channel = 1; return; - +/* #ifdef ENABLE_AM_FIX case MENU_AM_FIX: g_setting_am_fix = g_sub_menu_selection; @@ -777,7 +777,7 @@ void MENU_AcceptSetting(void) g_flag_reset_vfos = true; break; #endif - +*/ #ifdef ENABLE_AM_FIX_TEST1 case MENU_AM_FIX_TEST1: g_setting_am_fix_test1 = g_sub_menu_selection; @@ -1230,13 +1230,13 @@ void MENU_ShowCurrentSetting(void) case MENU_MOD_MODE: g_sub_menu_selection = g_tx_vfo->am_mode; break; - +/* #ifdef ENABLE_AM_FIX case MENU_AM_FIX: g_sub_menu_selection = g_setting_am_fix; break; #endif - +*/ #ifdef ENABLE_AM_FIX_TEST1 case MENU_AM_FIX_TEST1: g_sub_menu_selection = g_setting_am_fix_test1; diff --git a/board.c b/board.c index 5f36479..79c4249 100644 --- a/board.c +++ b/board.c @@ -747,7 +747,7 @@ void BOARD_EEPROM_load(void) g_setting_mic_bar = (Data[7] & (1u << 4)) ? true : false; #endif #ifdef ENABLE_AM_FIX - g_setting_am_fix = (Data[7] & (1u << 5)) ? true : false; +// g_setting_am_fix = (Data[7] & (1u << 5)) ? true : false; #endif g_setting_backlight_on_tx_rx = (Data[7] >> 6) & 3u; diff --git a/misc.c b/misc.c index 106929f..d15382b 100644 --- a/misc.c +++ b/misc.c @@ -103,7 +103,7 @@ bool g_setting_scramble_enable; uint8_t g_setting_backlight_on_tx_rx; #ifdef ENABLE_AM_FIX - bool g_setting_am_fix; + bool g_setting_am_fix = true; #endif #ifdef ENABLE_AM_FIX_TEST1 uint8_t g_setting_am_fix_test1 = 0; diff --git a/settings.c b/settings.c index a5ab8b9..a6910fb 100644 --- a/settings.c +++ b/settings.c @@ -337,7 +337,7 @@ void SETTINGS_save(void) if (!g_setting_mic_bar) State[7] &= ~(1u << 4); #endif #ifdef ENABLE_AM_FIX - if (!g_setting_am_fix) State[7] &= ~(1u << 5); +// if (!g_setting_am_fix) State[7] &= ~(1u << 5); #endif State[7] = (State[7] & ~(3u << 6)) | ((g_setting_backlight_on_tx_rx & 3u) << 6); EEPROM_WriteBuffer8(0x0F40, State); diff --git a/ui/menu.c b/ui/menu.c index 24009a7..6f3412b 100644 --- a/ui/menu.c +++ b/ui/menu.c @@ -121,7 +121,7 @@ const t_menu_item g_menu_list[] = {"BatTXT", VOICE_ID_INVALID, MENU_BAT_TXT }, {"MODE", VOICE_ID_INVALID, MENU_MOD_MODE }, // was "AM" #ifdef ENABLE_AM_FIX - {"AM FIX", VOICE_ID_INVALID, MENU_AM_FIX }, +// {"AM FIX", VOICE_ID_INVALID, MENU_AM_FIX }, #endif #ifdef ENABLE_AM_FIX_TEST1 {"AM FT1", VOICE_ID_INVALID, MENU_AM_FIX_TEST1 }, @@ -745,7 +745,7 @@ void UI_DisplayMenu(void) case MENU_RX_BAR: #endif #ifdef ENABLE_AM_FIX - case MENU_AM_FIX: +// case MENU_AM_FIX: #endif case MENU_S_ADD1: case MENU_S_ADD2: diff --git a/ui/menu.h b/ui/menu.h index 5b656ed..01224f5 100644 --- a/ui/menu.h +++ b/ui/menu.h @@ -110,7 +110,7 @@ enum MENU_BAT_TXT, MENU_MOD_MODE, #ifdef ENABLE_AM_FIX - MENU_AM_FIX, +// MENU_AM_FIX, #endif #ifdef ENABLE_AM_FIX_TEST1 MENU_AM_FIX_TEST1,