Added VOX enable/disable compile option

app/action.c

@@ -224,16 +224,18 @@ void ACTION_Scan(bool bRestart)
 	}
 }
 
-void ACTION_Vox(void)
-{
-	gEeprom.VOX_SWITCH   = !gEeprom.VOX_SWITCH;
-	gRequestSaveSettings = true;
-	gFlagReconfigureVfos = true;
-	#ifdef ENABLE_VOICE
-		gAnotherVoiceID  = VOICE_ID_VOX;
-	#endif
-	gUpdateStatus        = true;
-}
+#ifdef ENABLE_VOX
+	void ACTION_Vox(void)
+	{
+		gEeprom.VOX_SWITCH   = !gEeprom.VOX_SWITCH;
+		gRequestSaveSettings = true;
+		gFlagReconfigureVfos = true;
+		#ifdef ENABLE_VOICE
+			gAnotherVoiceID  = VOICE_ID_VOX;
+		#endif
+		gUpdateStatus        = true;
+	}
+#endif
 
 #if defined(ENABLE_ALARM) || defined(ENABLE_TX1750)
 	static void ACTION_AlarmOr1750(const bool b1750)
@@ -268,7 +270,9 @@ void ACTION_Vox(void)
 				FM_TurnOff();
 
 				gInputBoxIndex        = 0;
-				gVoxResumeCountdown   = 80;
+				#ifdef ENABLE_VOX
+					gVoxResumeCountdown = 80;
+				#endif
 				gFlagReconfigureVfos  = true;
 
 				gRequestDisplayScreen = DISPLAY_MAIN;
@@ -369,7 +373,9 @@ void ACTION_Handle(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 			ACTION_Scan(true);
 			break;
 		case ACTION_OPT_VOX:
-			ACTION_Vox();
+			#ifdef ENABLE_VOX
+				ACTION_Vox();
+			#endif
 			break;
 		case ACTION_OPT_ALARM:
 			#ifdef ENABLE_ALARM

app/action.h

@@ -23,7 +23,9 @@
 void ACTION_Power(void);
 void ACTION_Monitor(void);
 void ACTION_Scan(bool bFlag);
-void ACTION_Vox(void);
+#ifdef ENABLE_VOX
+	void ACTION_Vox(void);
+#endif
 #ifdef ENABLE_ALARM
 	//static void ACTION_AlarmOr1750(bool b1750)
 #endif

app/app.c

@@ -486,7 +486,7 @@ void APP_StartListening(FUNCTION_Type_t Function, const bool reset_am_fix)
 
 	gEnableSpeaker = true;
 
-	if (gSetting_backlight_on_rx)
+	if (gSetting_backlight_on_tx_rx)
 		BACKLIGHT_TurnOn();
 
 	if (gScanState != SCAN_OFF)
@@ -850,36 +850,38 @@ void APP_CheckRadioInterrupts(void)
 		if (interrupt_status_bits & BK4819_REG_02_CTCSS_FOUND)
 			g_CTCSS_Lost = false;
 
-		if (interrupt_status_bits & BK4819_REG_02_VOX_LOST)
-		{
-			g_VOX_Lost         = true;
-			gVoxPauseCountdown = 10;
-
-			if (gEeprom.VOX_SWITCH)
+		#ifdef ENABLE_VOX
+			if (interrupt_status_bits & BK4819_REG_02_VOX_LOST)
 			{
-				if (gCurrentFunction == FUNCTION_POWER_SAVE && !gRxIdleMode)
+				g_VOX_Lost         = true;
+				gVoxPauseCountdown = 10;
+	
+				if (gEeprom.VOX_SWITCH)
 				{
-					gPowerSave_10ms            = power_save2_10ms;
-					gPowerSaveCountdownExpired = 0;
-				}
-
-				if (gEeprom.DUAL_WATCH != DUAL_WATCH_OFF && (gScheduleDualWatch || gDualWatchCountdown_10ms < dual_watch_count_after_vox_10ms))
-				{
-					gDualWatchCountdown_10ms = dual_watch_count_after_vox_10ms;
-					gScheduleDualWatch = false;
-
-					// let the user see DW is not active
-					gDualWatchActive = false;
-					gUpdateStatus    = true;
+					if (gCurrentFunction == FUNCTION_POWER_SAVE && !gRxIdleMode)
+					{
+						gPowerSave_10ms            = power_save2_10ms;
+						gPowerSaveCountdownExpired = 0;
+					}
+	
+					if (gEeprom.DUAL_WATCH != DUAL_WATCH_OFF && (gScheduleDualWatch || gDualWatchCountdown_10ms < dual_watch_count_after_vox_10ms))
+					{
+						gDualWatchCountdown_10ms = dual_watch_count_after_vox_10ms;
+						gScheduleDualWatch = false;
+	
+						// let the user see DW is not active
+						gDualWatchActive = false;
+						gUpdateStatus    = true;
+					}
 				}
 			}
-		}
 
-		if (interrupt_status_bits & BK4819_REG_02_VOX_FOUND)
-		{
-			g_VOX_Lost         = false;
-			gVoxPauseCountdown = 0;
-		}
+			if (interrupt_status_bits & BK4819_REG_02_VOX_FOUND)
+			{
+				g_VOX_Lost         = false;
+				gVoxPauseCountdown = 0;
+			}
+		#endif
 
 		if (interrupt_status_bits & BK4819_REG_02_SQUELCH_LOST)
 		{
@@ -934,83 +936,85 @@ void APP_EndTransmission(void)
 	RADIO_SetupRegisters(false);
 }
 
-static void APP_HandleVox(void)
-{
-	if (gSetting_KILLED)
-		return;
-
-	if (gVoxResumeCountdown == 0)
+#ifdef ENABLE_VOX
+	static void APP_HandleVox(void)
 	{
-		if (gVoxPauseCountdown)
+		if (gSetting_KILLED)
 			return;
-	}
-	else
-	{
-		g_VOX_Lost         = false;
-		gVoxPauseCountdown = 0;
-	}
-
-	#ifdef ENABLE_FMRADIO
-		if (gFmRadioMode)
-			return;
-	#endif
-
-	if (gCurrentFunction == FUNCTION_RECEIVE || gCurrentFunction == FUNCTION_MONITOR)
-		return;
-
-	if (gScanState != SCAN_OFF || gCssScanMode != CSS_SCAN_MODE_OFF)
-		return;
-
-	if (gVOX_NoiseDetected)
-	{
-		if (g_VOX_Lost)
-			gVoxStopCountdown_10ms = vox_stop_count_down_10ms;
-		else
-		if (gVoxStopCountdown_10ms == 0)
-			gVOX_NoiseDetected = false;
-
-		if (gCurrentFunction == FUNCTION_TRANSMIT && !gPttIsPressed && !gVOX_NoiseDetected)
+	
+		if (gVoxResumeCountdown == 0)
 		{
-			if (gFlagEndTransmission)
-			{
-				//if (gCurrentFunction != FUNCTION_FOREGROUND)
-					FUNCTION_Select(FUNCTION_FOREGROUND);
-			}
+			if (gVoxPauseCountdown)
+				return;
+		}
+		else
+		{
+			g_VOX_Lost         = false;
+			gVoxPauseCountdown = 0;
+		}
+	
+		#ifdef ENABLE_FMRADIO
+			if (gFmRadioMode)
+				return;
+		#endif
+	
+		if (gCurrentFunction == FUNCTION_RECEIVE || gCurrentFunction == FUNCTION_MONITOR)
+			return;
+	
+		if (gScanState != SCAN_OFF || gCssScanMode != CSS_SCAN_MODE_OFF)
+			return;
+	
+		if (gVOX_NoiseDetected)
+		{
+			if (g_VOX_Lost)
+				gVoxStopCountdown_10ms = vox_stop_count_down_10ms;
 			else
+			if (gVoxStopCountdown_10ms == 0)
+				gVOX_NoiseDetected = false;
+	
+			if (gCurrentFunction == FUNCTION_TRANSMIT && !gPttIsPressed && !gVOX_NoiseDetected)
 			{
-				APP_EndTransmission();
-
-				if (gEeprom.REPEATER_TAIL_TONE_ELIMINATION == 0)
+				if (gFlagEndTransmission)
 				{
 					//if (gCurrentFunction != FUNCTION_FOREGROUND)
 						FUNCTION_Select(FUNCTION_FOREGROUND);
 				}
 				else
-					gRTTECountdown = gEeprom.REPEATER_TAIL_TONE_ELIMINATION * 10;
+				{
+					APP_EndTransmission();
+	
+					if (gEeprom.REPEATER_TAIL_TONE_ELIMINATION == 0)
+					{
+						//if (gCurrentFunction != FUNCTION_FOREGROUND)
+							FUNCTION_Select(FUNCTION_FOREGROUND);
+					}
+					else
+						gRTTECountdown = gEeprom.REPEATER_TAIL_TONE_ELIMINATION * 10;
+				}
+	
+				gUpdateStatus        = true;
+				gUpdateDisplay       = true;
+				gFlagEndTransmission = false;
 			}
-
-			gUpdateStatus        = true;
-			gUpdateDisplay       = true;
-			gFlagEndTransmission = false;
+			return;
 		}
-		return;
-	}
-
-	if (g_VOX_Lost)
-	{
-		gVOX_NoiseDetected = true;
-
-		if (gCurrentFunction == FUNCTION_POWER_SAVE)
-			FUNCTION_Select(FUNCTION_FOREGROUND);
-
-		if (gCurrentFunction != FUNCTION_TRANSMIT && gSerialConfigCountDown_500ms == 0)
+	
+		if (g_VOX_Lost)
 		{
-			gDTMF_ReplyState = DTMF_REPLY_NONE;
-			RADIO_PrepareTX();
-			gUpdateDisplay = true;
+			gVOX_NoiseDetected = true;
+	
+			if (gCurrentFunction == FUNCTION_POWER_SAVE)
+				FUNCTION_Select(FUNCTION_FOREGROUND);
+	
+			if (gCurrentFunction != FUNCTION_TRANSMIT && gSerialConfigCountDown_500ms == 0)
+			{
+				gDTMF_ReplyState = DTMF_REPLY_NONE;
+				RADIO_PrepareTX();
+				gUpdateDisplay = true;
+			}
 		}
 	}
-}
+#endif
 
 void APP_Update(void)
 {
@@ -1144,8 +1148,10 @@ void APP_Update(void)
 		}
 	#endif
 
-	if (gEeprom.VOX_SWITCH)
-		APP_HandleVox();
+	#ifdef ENABLE_VOX
+		if (gEeprom.VOX_SWITCH)
+			APP_HandleVox();
+	#endif
 
 	if (gSchedulePowerSave)
 	{
@@ -1210,8 +1216,10 @@ void APP_Update(void)
 		{
 			BK4819_Conditional_RX_TurnOn_and_GPIO6_Enable();
 
-			if (gEeprom.VOX_SWITCH)
-				BK4819_EnableVox(gEeprom.VOX1_THRESHOLD, gEeprom.VOX0_THRESHOLD);
+			#ifdef ENABLE_VOX
+				if (gEeprom.VOX_SWITCH)
+					BK4819_EnableVox(gEeprom.VOX1_THRESHOLD, gEeprom.VOX0_THRESHOLD);
+			#endif
 
 			if (gEeprom.DUAL_WATCH != DUAL_WATCH_OFF &&
 			    gScanState == SCAN_OFF &&
@@ -1447,11 +1455,13 @@ void APP_TimeSlice10ms(void)
 	if (gFlashLightState == FLASHLIGHT_BLINK && (gFlashLightBlinkCounter & 15u) == 0)
 		GPIO_FlipBit(&GPIOC->DATA, GPIOC_PIN_FLASHLIGHT);
 
-	if (gVoxResumeCountdown > 0)
-		gVoxResumeCountdown--;
-
-	if (gVoxPauseCountdown > 0)
-		gVoxPauseCountdown--;
+	#ifdef ENABLE_VOX
+		if (gVoxResumeCountdown > 0)
+			gVoxResumeCountdown--;
+	
+		if (gVoxPauseCountdown > 0)
+			gVoxPauseCountdown--;
+	#endif
 
 	if (gCurrentFunction == FUNCTION_TRANSMIT)
 	{
@@ -1997,7 +2007,9 @@ void APP_TimeSlice500ms(void)
 			RADIO_EnableCxCSS();
 		}
 
-		gVoxResumeCountdown = 80;
+		#ifdef ENABLE_VOX
+			gVoxResumeCountdown = 80;
+		#endif
 
 		SYSTEM_DelayMs(5);
 

app/generic.c

@@ -127,7 +127,9 @@ void GENERIC_Key_PTT(bool bKeyPressed)
 				}
 
 				gFlagEndTransmission = false;
-				gVOX_NoiseDetected   = false;
+				#ifdef ENABLE_VOX
+					gVOX_NoiseDetected = false;
+				#endif
 			}
 
 			RADIO_SetVfoState(VFO_STATE_NORMAL);

app/main.c

@@ -209,7 +209,15 @@ static void processFKeyFunction(const KEY_Code_t Key, const bool beep)
 			break;
 
 		case KEY_7:
-			ACTION_Vox();
+			#ifdef ENABLE_VOX
+				ACTION_Vox();
+			#else
+	
+
+				// TODO: make use of the function key press
+
+
+			#endif
 			break;
 
 		case KEY_8:

app/menu.c

@@ -219,7 +219,7 @@ int MENU_GetLimits(uint8_t Cursor, int32_t *pMin, int32_t *pMax)
 		#ifdef ENABLE_AUDIO_BAR
 			case MENU_MIC_BAR:
 		#endif
-		case MENU_ABR_ON_RX:
+		case MENU_ABR_ON_TX_RX:
 		case MENU_BCL:
 		case MENU_BEEP:
 		case MENU_AUTOLK:
@@ -253,7 +253,9 @@ int MENU_GetLimits(uint8_t Cursor, int32_t *pMin, int32_t *pMax)
 			*pMax = ARRAY_SIZE(gSubMenu_TOT) - 1;
 			break;
 
-		case MENU_VOX:
+		#ifdef ENABLE_VOX
+			case MENU_VOX:
+		#endif
 		case MENU_RP_STE:
 			*pMin = 0;
 			*pMax = 10;
@@ -499,21 +501,23 @@ void MENU_AcceptSetting(void)
 			gEeprom.BATTERY_SAVE = gSubMenuSelection;
 			break;
 
-		case MENU_VOX:
-			gEeprom.VOX_SWITCH = gSubMenuSelection != 0;
-			if (gEeprom.VOX_SWITCH)
-				gEeprom.VOX_LEVEL = gSubMenuSelection - 1;
-			BOARD_EEPROM_LoadMoreSettings();
-			gFlagReconfigureVfos = true;
-			gUpdateStatus        = true;
-			break;
+		#ifdef ENABLE_VOX
+			case MENU_VOX:
+				gEeprom.VOX_SWITCH = gSubMenuSelection != 0;
+				if (gEeprom.VOX_SWITCH)
+					gEeprom.VOX_LEVEL = gSubMenuSelection - 1;
+				BOARD_EEPROM_LoadMoreSettings();
+				gFlagReconfigureVfos = true;
+				gUpdateStatus        = true;
+				break;
+		#endif
 
 		case MENU_ABR:
 			gEeprom.BACKLIGHT = gSubMenuSelection;
 			break;
 
-		case MENU_ABR_ON_RX:
-			gSetting_backlight_on_rx = gSubMenuSelection;
+		case MENU_ABR_ON_TX_RX:
+			gSetting_backlight_on_tx_rx = gSubMenuSelection;
 			break;
 
 		case MENU_TDR:
@@ -917,10 +921,12 @@ void MENU_ShowCurrentSetting(void)
 			gSubMenuSelection = gEeprom.BATTERY_SAVE;
 			break;
 
-		case MENU_VOX:
-			gSubMenuSelection = gEeprom.VOX_SWITCH ? gEeprom.VOX_LEVEL + 1 : 0;
-			break;
-
+		#ifdef ENABLE_VOX
+			case MENU_VOX:
+				gSubMenuSelection = gEeprom.VOX_SWITCH ? gEeprom.VOX_LEVEL + 1 : 0;
+				break;
+		#endif
+			
 		case MENU_ABR:
 			gSubMenuSelection = gEeprom.BACKLIGHT;
 
@@ -928,8 +934,8 @@ void MENU_ShowCurrentSetting(void)
 			GPIO_SetBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT);  	// turn the backlight ON while in backlight menu
 			break;
 
-		case MENU_ABR_ON_RX:
-			gSubMenuSelection = gSetting_backlight_on_rx;
+		case MENU_ABR_ON_TX_RX:
+			gSubMenuSelection = gSetting_backlight_on_tx_rx;
 			break;
 
 		case MENU_TDR:

app/scanner.c

@@ -412,7 +412,9 @@ void SCANNER_Start(void)
 	g_CDCSS_Lost           = false;
 	gCDCSSCodeType         = 0;
 	g_CTCSS_Lost           = false;
-	g_VOX_Lost             = false;
+	#ifdef ENABLE_VOX
+		g_VOX_Lost         = false;
+	#endif
 	g_SquelchLost          = false;
 	gScannerEditState      = 0;
 	gScanProgressIndicator = 0;