Remove Scrambler

app/menu.c

@@ -257,10 +257,12 @@ int MENU_GetLimits(uint8_t menu_id, int32_t *pMin, int32_t *pMax)
 			*pMax = ARRAY_SIZE(gModulationStr) - 1;
 			break;
 
+#ifndef ENABLE_FEAT_F4HWN
 		case MENU_SCR:
 			*pMin = 0;
 			*pMax = ARRAY_SIZE(gSubMenu_SCRAMBLER) - 1;
 			break;
+#endif
 
 		case MENU_TOT:
 			*pMin = 0;
@@ -481,6 +483,7 @@ void MENU_AcceptSetting(void)
 			gRequestSaveChannel       = 1;
 			return;
 
+#ifndef ENABLE_FEAT_F4HWN
 		case MENU_SCR:
 			gTxVfo->SCRAMBLING_TYPE = gSubMenuSelection;
 			#if 0
@@ -491,6 +494,7 @@ void MENU_AcceptSetting(void)
 			#endif
 			gRequestSaveChannel     = 1;
 			return;
+#endif
 
 		case MENU_BCL:
 			gTxVfo->BUSY_CHANNEL_LOCK = gSubMenuSelection;
@@ -929,9 +933,11 @@ void MENU_ShowCurrentSetting(void)
 			gSubMenuSelection = gTxVfo->CHANNEL_BANDWIDTH;
 			break;
 
+#ifndef ENABLE_FEAT_F4HWN
 		case MENU_SCR:
 			gSubMenuSelection = gTxVfo->SCRAMBLING_TYPE;
 			break;
+#endif
 
 		case MENU_BCL:
 			gSubMenuSelection = gTxVfo->BUSY_CHANNEL_LOCK;

radio.c

@@ -232,8 +232,10 @@ void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure
 		pVfo->StepFrequency = gStepFrequencyTable[tmp];
 
 		tmp = data[7];
+#ifndef ENABLE_FEAT_F4HWN
 		if (tmp > (ARRAY_SIZE(gSubMenu_SCRAMBLER) - 1))
 			tmp = 0;
+#endif
 		pVfo->SCRAMBLING_TYPE = tmp;
 
 		pVfo->freq_config_RX.CodeType = (data[2] >> 0) & 0x0F;

ui/menu.c

@@ -49,7 +49,9 @@ const t_menu_item MenuList[] =
 	{"TxODir", VOICE_ID_TX_OFFSET_FREQUENCY_DIRECTION, MENU_SFT_D         }, // was "SFT_D"
 	{"TxOffs", VOICE_ID_TX_OFFSET_FREQUENCY,           MENU_OFFSET        }, // was "OFFSET"
 	{"W/N",    VOICE_ID_CHANNEL_BANDWIDTH,             MENU_W_N           },
+#ifndef ENABLE_FEAT_F4HWN
 	{"Scramb", VOICE_ID_SCRAMBLER_ON,                  MENU_SCR           }, // was "SCR"
+#endif
 	{"BusyCL", VOICE_ID_BUSY_LOCKOUT,                  MENU_BCL           }, // was "BCL"
 	{"Compnd", VOICE_ID_INVALID,                       MENU_COMPAND       },
 	{"Demodu", VOICE_ID_INVALID,                       MENU_AM            }, // was "AM"
@@ -323,6 +325,7 @@ const char gSubMenu_BATTYP[][9] =
 	"2200mAh"
 };
 
+#ifndef ENABLE_FEAT_F4HWN
 const char gSubMenu_SCRAMBLER[][7] =
 {
 	"OFF",
@@ -337,6 +340,7 @@ const char gSubMenu_SCRAMBLER[][7] =
 	"3400Hz",
 	"3500Hz"
 };
+#endif
 
 #ifdef ENABLE_FEAT_F4HWN
 	const char gSubMenu_SET_LOW[][7] =
@@ -604,6 +608,7 @@ void UI_DisplayMenu(void)
 			strcpy(String, gSubMenu_W_N[gSubMenuSelection]);
 			break;
 
+#ifndef ENABLE_FEAT_F4HWN
 		case MENU_SCR:
 			strcpy(String, gSubMenu_SCRAMBLER[gSubMenuSelection]);
 			#if 1
@@ -613,6 +618,7 @@ void UI_DisplayMenu(void)
 					BK4819_DisableScramble();
 			#endif
 			break;
+#endif
 
 		#ifdef ENABLE_VOX
 			case MENU_VOX:

ui/menu.h

@@ -42,7 +42,9 @@ enum
 	MENU_OFFSET,
 	MENU_TOT,
 	MENU_W_N,
+#ifndef ENABLE_FEAT_F4HWN
 	MENU_SCR,
+#endif
 	MENU_BCL,
 	MENU_MEM_CH,
 	MENU_DEL_CH,
@@ -169,7 +171,10 @@ extern const char        gSubMenu_BACKLIGHT[8][7];
 extern const char        gSubMenu_RX_TX[4][6];
 extern const char        gSubMenu_BAT_TXT[3][8];
 extern const char 		 gSubMenu_BATTYP[2][9];
+
+#ifndef ENABLE_FEAT_F4HWN
 extern const char        gSubMenu_SCRAMBLER[11][7];
+#endif
 
 typedef struct {char* name; uint8_t id;} t_sidefunction;
 extern const uint8_t 		 gSubMenu_SIDEFUNCTIONS_size;