Add compile options

Makefile

@@ -4,57 +4,59 @@
 # 1 = enable
 
 # ---- STOCK QUANSHENG FERATURES ----
-ENABLE_FMRADIO                ?= 0
+ENABLE_FMRADIO                	?= 0
-ENABLE_UART                   ?= 1
+ENABLE_UART                   	?= 1
-ENABLE_AIRCOPY                ?= 0
+ENABLE_AIRCOPY                	?= 0
-ENABLE_NOAA                   ?= 0
+ENABLE_NOAA                   	?= 0
-ENABLE_VOICE                  ?= 0
+ENABLE_VOICE                  	?= 0
-ENABLE_VOX                    ?= 1
+ENABLE_VOX                    	?= 1
-ENABLE_ALARM                  ?= 0
+ENABLE_ALARM                  	?= 0
-ENABLE_TX1750                 ?= 1
+ENABLE_TX1750                 	?= 1
-ENABLE_PWRON_PASSWORD         ?= 0
+ENABLE_PWRON_PASSWORD         	?= 0
-ENABLE_DTMF_CALLING           ?= 0
+ENABLE_DTMF_CALLING           	?= 0
-ENABLE_FLASHLIGHT             ?= 1
+ENABLE_FLASHLIGHT             	?= 1
 
 # ---- CUSTOM MODS ----
-ENABLE_SPECTRUM               ?= 1
+ENABLE_SPECTRUM               	?= 1
-ENABLE_BIG_FREQ               ?= 1
+ENABLE_BIG_FREQ               	?= 1
-ENABLE_SMALL_BOLD             ?= 1
+ENABLE_SMALL_BOLD             	?= 1
-ENABLE_CUSTOM_MENU_LAYOUT     ?= 1
+ENABLE_CUSTOM_MENU_LAYOUT     	?= 1
-ENABLE_KEEP_MEM_NAME          ?= 1
+ENABLE_KEEP_MEM_NAME          	?= 1
-ENABLE_WIDE_RX                ?= 1
+ENABLE_WIDE_RX                	?= 1
-ENABLE_TX_WHEN_AM             ?= 0
+ENABLE_TX_WHEN_AM             	?= 0
-ENABLE_F_CAL_MENU             ?= 0
+ENABLE_F_CAL_MENU             	?= 0
-ENABLE_CTCSS_TAIL_PHASE_SHIFT ?= 0
+ENABLE_CTCSS_TAIL_PHASE_SHIFT 	?= 0
-ENABLE_BOOT_BEEPS             ?= 0
+ENABLE_BOOT_BEEPS             	?= 0
-ENABLE_SHOW_CHARGE_LEVEL      ?= 0
+ENABLE_SHOW_CHARGE_LEVEL      	?= 0
-ENABLE_REVERSE_BAT_SYMBOL     ?= 0
+ENABLE_REVERSE_BAT_SYMBOL     	?= 0
-ENABLE_NO_CODE_SCAN_TIMEOUT   ?= 1
+ENABLE_NO_CODE_SCAN_TIMEOUT   	?= 1
-ENABLE_AM_FIX                 ?= 1
+ENABLE_AM_FIX                 	?= 1
-ENABLE_SQUELCH_MORE_SENSITIVE ?= 1
+ENABLE_SQUELCH_MORE_SENSITIVE 	?= 1
-ENABLE_FASTER_CHANNEL_SCAN    ?= 1
+ENABLE_FASTER_CHANNEL_SCAN    	?= 1
-ENABLE_RSSI_BAR               ?= 1
+ENABLE_RSSI_BAR               	?= 1
-ENABLE_AUDIO_BAR              ?= 1
+ENABLE_AUDIO_BAR              	?= 1
-ENABLE_COPY_CHAN_TO_VFO       ?= 1
+ENABLE_COPY_CHAN_TO_VFO       	?= 1
-ENABLE_REDUCE_LOW_MID_TX_POWER?= 0
+ENABLE_REDUCE_LOW_MID_TX_POWER	?= 0
-ENABLE_BYP_RAW_DEMODULATORS   ?= 0
+ENABLE_BYP_RAW_DEMODULATORS   	?= 0
-ENABLE_BLMIN_TMP_OFF          ?= 0
+ENABLE_BLMIN_TMP_OFF          	?= 0
-ENABLE_SCAN_RANGES            ?= 1
+ENABLE_SCAN_RANGES            	?= 1
-ENABLE_FEAT_F4HWN             ?= 1
+ENABLE_FEAT_F4HWN             	?= 1
-ENABLE_FEAT_F4HWN_SCREENSHOT  ?= 0
+ENABLE_FEAT_F4HWN_SCREENSHOT  	?= 0
-ENABLE_FEAT_F4HWN_PMR         ?= 1
+ENABLE_FEAT_F4HWN_SPECTRUM    	?= 1
-ENABLE_FEAT_F4HWN_SPECTRUM    ?= 1
+ENABLE_FEAT_F4HWN_PMR         	?= 1
+ENABLE_FEAT_F4HWN_GMRS_FRS_MURS	?= 1
+ENABLE_FEAT_F4HWN_CA         	?= 1
 
 # ---- DEBUGGING ----
-ENABLE_AM_FIX_SHOW_DATA       ?= 0
+ENABLE_AM_FIX_SHOW_DATA       	?= 0
-ENABLE_AGC_SHOW_DATA          ?= 0
+ENABLE_AGC_SHOW_DATA          	?= 0
-ENABLE_UART_RW_BK_REGS        ?= 0
+ENABLE_UART_RW_BK_REGS        	?= 0
 
 # ---- COMPILER/LINKER OPTIONS ----
-ENABLE_CLANG                  ?= 0
+ENABLE_CLANG                  	?= 0
-ENABLE_SWD                    ?= 0
+ENABLE_SWD                    	?= 0
-ENABLE_OVERLAY                ?= 0
+ENABLE_OVERLAY                	?= 0
-ENABLE_LTO                    ?= 1
+ENABLE_LTO                    	?= 1
 
 #############################################################
 
@@ -405,11 +407,17 @@ endif
 ifeq ($(ENABLE_FEAT_F4HWN_SCREENSHOT),1)
 	CFLAGS  += -DENABLE_FEAT_F4HWN_SCREENSHOT
 endif
+ifeq ($(ENABLE_FEAT_F4HWN_SPECTRUM),1)
+	CFLAGS  += -DENABLE_FEAT_F4HWN_SPECTRUM
+endif
 ifeq ($(ENABLE_FEAT_F4HWN_PMR),1)
 	CFLAGS  += -DENABLE_FEAT_F4HWN_PMR
 endif
-ifeq ($(ENABLE_FEAT_F4HWN_SPECTRUM),1)
+ifeq ($(ENABLE_FEAT_F4HWN_GMRS_FRS_MURS),1)
-	CFLAGS  += -DENABLE_FEAT_F4HWN_SPECTRUM
+	CFLAGS  += -DENABLE_FEAT_F4HWN_GMRS_FRS_MURS
+endif
+ifeq ($(ENABLE_FEAT_F4HWN_CA),1)
+	CFLAGS  += -DENABLE_FEAT_F4HWN_CA
 endif
 
 LDFLAGS =

frequencies.c

@@ -227,7 +227,9 @@ int32_t TX_freq_check(const uint32_t Frequency)
 			if (Frequency >= 44600625 && Frequency <= 44619375)
 				return 0;
 			break;
+#endif
 
+#ifdef ENABLE_FEAT_F4HWN_GMRS_FRS_MURS
 		case F_LOCK_GMRS_FRS_MURS:
 			// https://forums.radioreference.com/threads/the-great-unofficial-radioreference-frs-gmrs-murs-fact-sheet.275370/
 			if ((Frequency >= 46255000 && Frequency <= 46272500) ||
@@ -240,7 +242,9 @@ int32_t TX_freq_check(const uint32_t Frequency)
 				Frequency == 15460000) // MURS
 				return 0;
 			break;
+#endif
 
+#ifdef ENABLE_FEAT_F4HWN_CA	
 		case F_LOCK_CA:
 			if (Frequency >= 14400000 && Frequency < 14800000)
 				return 0;

settings.h

@@ -41,7 +41,7 @@ typedef enum POWER_OnDisplayMode_t POWER_OnDisplayMode_t;
 enum TxLockModes_t {
 	F_LOCK_DEF, //all default frequencies + configurable
 	F_LOCK_FCC,
-#ifdef ENABLE_FEAT_F4HWN_PMR
+#ifdef ENABLE_FEAT_F4HWN_CA
 	F_LOCK_CA,
 #endif
 	F_LOCK_CE,
@@ -50,6 +50,8 @@ enum TxLockModes_t {
 	F_LOCK_438,
 #ifdef ENABLE_FEAT_F4HWN_PMR
 	F_LOCK_PMR,
+#endif
+#ifdef ENABLE_FEAT_F4HWN_GMRS_FRS_MURS
 	F_LOCK_GMRS_FRS_MURS,
 #endif
 	F_LOCK_ALL,	// disable TX on all frequencies

ui/menu.c

@@ -295,7 +295,7 @@ const char * const gSubMenu_F_LOCK[] =
 {
 	"DEFAULT+\n137-174\n400-470",
 	"FCC HAM\n144-148\n420-450",
-#ifdef ENABLE_FEAT_F4HWN_PMR
+#ifdef ENABLE_FEAT_F4HWN_CA
 	"CA HAM\n144-148\n430-450",
 #endif
 	"CE HAM\n144-146\n430-440",
@@ -304,6 +304,8 @@ const char * const gSubMenu_F_LOCK[] =
 	"137-174\n400-438",
 #ifdef ENABLE_FEAT_F4HWN_PMR
 	"PMR 446",
+#endif
+#ifdef ENABLE_FEAT_F4HWN_GMRS_FRS_MURS
 	"GMRS\nFRS\nMURS",
 #endif
 	"DISABLE\nALL",