Reorder audio.c

audio.c

@@ -31,6 +31,144 @@
 #include "settings.h"
 #include "ui/ui.h"
 
+
+BEEP_Type_t gBeepToPlay = BEEP_NONE;
+
+void AUDIO_PlayBeep(BEEP_Type_t Beep)
+{
+
+	if (Beep != BEEP_880HZ_60MS_TRIPLE_BEEP &&
+	    Beep != BEEP_500HZ_60MS_DOUBLE_BEEP &&
+	    Beep != BEEP_440HZ_500MS &&
+	    Beep != BEEP_880HZ_200MS &&
+	    Beep != BEEP_880HZ_500MS &&
+	   !gEeprom.BEEP_CONTROL)
+		return;
+
+#ifdef ENABLE_AIRCOPY
+	if (gScreenToDisplay == DISPLAY_AIRCOPY)
+		return;
+#endif
+
+	if (gCurrentFunction == FUNCTION_RECEIVE)
+		return;
+
+	if (gCurrentFunction == FUNCTION_MONITOR)
+		return;
+
+#ifdef ENABLE_FMRADIO
+	if (gFmRadioMode)
+		BK1080_Mute(true);
+#endif
+
+	AUDIO_AudioPathOff();
+
+	if (gCurrentFunction == FUNCTION_POWER_SAVE && gRxIdleMode)
+		BK4819_RX_TurnOn();
+
+	SYSTEM_DelayMs(20);
+
+	uint16_t ToneConfig = BK4819_ReadRegister(BK4819_REG_71);
+
+	uint16_t ToneFrequency;
+	switch (Beep)
+	{
+		default:
+		case BEEP_NONE:
+			ToneFrequency = 220;
+			break;
+		case BEEP_1KHZ_60MS_OPTIONAL:
+			ToneFrequency = 1000;
+			break;
+		case BEEP_500HZ_60MS_DOUBLE_BEEP_OPTIONAL:
+		case BEEP_500HZ_60MS_DOUBLE_BEEP:
+			ToneFrequency = 500;
+			break;
+		case BEEP_440HZ_40MS_OPTIONAL:
+		case BEEP_440HZ_500MS:
+			ToneFrequency = 440;
+			break;
+		case BEEP_880HZ_40MS_OPTIONAL:
+		case BEEP_880HZ_60MS_TRIPLE_BEEP:
+		case BEEP_880HZ_200MS:
+		case BEEP_880HZ_500MS:
+			ToneFrequency = 880;
+			break;
+	}
+
+	BK4819_PlayTone(ToneFrequency, true);
+
+	SYSTEM_DelayMs(2);
+
+	AUDIO_AudioPathOn();
+
+	SYSTEM_DelayMs(60);
+
+	uint16_t Duration;
+	switch (Beep)
+	{
+		case BEEP_880HZ_60MS_TRIPLE_BEEP:
+			BK4819_ExitTxMute();
+			SYSTEM_DelayMs(60);
+			BK4819_EnterTxMute();
+			SYSTEM_DelayMs(20);
+			[[fallthrough]];
+		case BEEP_500HZ_60MS_DOUBLE_BEEP_OPTIONAL:
+		case BEEP_500HZ_60MS_DOUBLE_BEEP:
+			BK4819_ExitTxMute();
+			SYSTEM_DelayMs(60);
+			BK4819_EnterTxMute();
+			SYSTEM_DelayMs(20);
+			[[fallthrough]];
+		case BEEP_1KHZ_60MS_OPTIONAL:
+			BK4819_ExitTxMute();
+			Duration = 60;
+			break;
+		case BEEP_880HZ_40MS_OPTIONAL:
+		case BEEP_440HZ_40MS_OPTIONAL:
+			BK4819_ExitTxMute();
+			Duration = 40;
+			break;
+		case BEEP_880HZ_200MS:
+			BK4819_ExitTxMute();
+			Duration = 200;
+			break;
+		case BEEP_440HZ_500MS:
+		case BEEP_880HZ_500MS:
+		default:
+			BK4819_ExitTxMute();
+			Duration = 500;
+			break;
+	}
+
+	SYSTEM_DelayMs(Duration);
+	BK4819_EnterTxMute();
+	SYSTEM_DelayMs(20);
+
+	AUDIO_AudioPathOff();
+
+	SYSTEM_DelayMs(5);
+	BK4819_TurnsOffTones_TurnsOnRX();
+	SYSTEM_DelayMs(5);
+	BK4819_WriteRegister(BK4819_REG_71, ToneConfig);
+
+	if (gEnableSpeaker)
+		AUDIO_AudioPathOn();
+
+#ifdef ENABLE_FMRADIO
+	if (gFmRadioMode)
+		BK1080_Mute(false);
+#endif
+
+	if (gCurrentFunction == FUNCTION_POWER_SAVE && gRxIdleMode)
+		BK4819_Sleep();
+
+#ifdef ENABLE_VOX
+	gVoxResumeCountdown = 80;
+#endif
+
+}
+
 #ifdef ENABLE_VOICE
 
 static const uint8_t VoiceClipLengthChinese[58] =
@@ -66,149 +204,6 @@
 volatile bool     gFlagPlayQueuedVoice;
 VOICE_ID_t        gAnotherVoiceID = VOICE_ID_INVALID;
 
-#endif
-
-BEEP_Type_t gBeepToPlay = BEEP_NONE;
-
-void AUDIO_PlayBeep(BEEP_Type_t Beep)
-{
-	uint16_t ToneConfig;
-	uint16_t ToneFrequency;
-	uint16_t Duration;
-
-	if (Beep != BEEP_880HZ_60MS_TRIPLE_BEEP &&
-	    Beep != BEEP_500HZ_60MS_DOUBLE_BEEP &&
-	    Beep != BEEP_440HZ_500MS &&
-	    Beep != BEEP_880HZ_200MS &&
-	    Beep != BEEP_880HZ_500MS &&
-	   !gEeprom.BEEP_CONTROL)
-		return;
-
-	#ifdef ENABLE_AIRCOPY
-		if (gScreenToDisplay == DISPLAY_AIRCOPY)
-			return;
-	#endif
-	
-	if (gCurrentFunction == FUNCTION_RECEIVE)
-		return;
-
-	if (gCurrentFunction == FUNCTION_MONITOR)
-		return;
-
-	ToneConfig = BK4819_ReadRegister(BK4819_REG_71);
-
-	AUDIO_AudioPathOff();
-
-	if (gCurrentFunction == FUNCTION_POWER_SAVE && gRxIdleMode)
-		BK4819_RX_TurnOn();
-
-	#ifdef ENABLE_FMRADIO
-		if (gFmRadioMode)
-			BK1080_Mute(true);
-	#endif
-	
-	SYSTEM_DelayMs(20);
-
-	switch (Beep)
-	{
-		default:
-		case BEEP_NONE:
-			ToneFrequency = 220;
-			break;
-		case BEEP_1KHZ_60MS_OPTIONAL:
-			ToneFrequency = 1000;
-			break;
-		case BEEP_500HZ_60MS_DOUBLE_BEEP_OPTIONAL:
-		case BEEP_500HZ_60MS_DOUBLE_BEEP:
-			ToneFrequency = 500;
-			break;
-		case BEEP_440HZ_40MS_OPTIONAL:
-		case BEEP_440HZ_500MS:
-			ToneFrequency = 440;
-			break;
-		case BEEP_880HZ_40MS_OPTIONAL:
-		case BEEP_880HZ_60MS_TRIPLE_BEEP:
-		case BEEP_880HZ_200MS:
-		case BEEP_880HZ_500MS:
-			ToneFrequency = 880;
-			break;
-	}
-	
-	BK4819_PlayTone(ToneFrequency, true);
-
-	SYSTEM_DelayMs(2);
-
-	AUDIO_AudioPathOn();
-
-	SYSTEM_DelayMs(60);
-
-	switch (Beep)
-	{
-		case BEEP_880HZ_60MS_TRIPLE_BEEP:
-			BK4819_ExitTxMute();
-			SYSTEM_DelayMs(60);
-			BK4819_EnterTxMute();
-			SYSTEM_DelayMs(20);
-			[[fallthrough]];
-		case BEEP_500HZ_60MS_DOUBLE_BEEP_OPTIONAL:
-		case BEEP_500HZ_60MS_DOUBLE_BEEP:
-			BK4819_ExitTxMute();
-			SYSTEM_DelayMs(60);
-			BK4819_EnterTxMute();
-			SYSTEM_DelayMs(20);
-			[[fallthrough]];
-		case BEEP_1KHZ_60MS_OPTIONAL:
-			BK4819_ExitTxMute();
-			Duration = 60;
-			break;
-
-		case BEEP_880HZ_40MS_OPTIONAL:
-		case BEEP_440HZ_40MS_OPTIONAL:
-			BK4819_ExitTxMute();
-			Duration = 40;
-			break;
-			
-		case BEEP_880HZ_200MS:
-			BK4819_ExitTxMute();
-			Duration = 200;
-			break;
-
-		case BEEP_440HZ_500MS:
-		case BEEP_880HZ_500MS:
-		default:
-			BK4819_ExitTxMute();
-			Duration = 500;
-			break;
-	}
-
-	SYSTEM_DelayMs(Duration);
-	BK4819_EnterTxMute();
-	SYSTEM_DelayMs(20);
-
-	AUDIO_AudioPathOff();
-
-	#ifdef ENABLE_VOX
-		gVoxResumeCountdown = 80;
-	#endif
-
-	SYSTEM_DelayMs(5);
-	BK4819_TurnsOffTones_TurnsOnRX();
-	SYSTEM_DelayMs(5);
-	BK4819_WriteRegister(BK4819_REG_71, ToneConfig);
-
-	if (gEnableSpeaker)
-		AUDIO_AudioPathOn();
-
-	#ifdef ENABLE_FMRADIO
-		if (gFmRadioMode)
-			BK1080_Mute(false);
-	#endif
-	
-	if (gCurrentFunction == FUNCTION_POWER_SAVE && gRxIdleMode)
-		BK4819_Sleep();
-}
-
-#ifdef ENABLE_VOICE
 
 void AUDIO_PlayVoice(uint8_t VoiceID)
 {
@@ -429,8 +424,10 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
 
 	if (gCurrentFunction == FUNCTION_RECEIVE ||
 		gCurrentFunction == FUNCTION_MONITOR ||
-		    gCurrentFunction == FUNCTION_INCOMING)    // 1of11
+		gCurrentFunction == FUNCTION_INCOMING)
-			RADIO_SetModulation(gRxVfo->Modulation);
+	{
+		RADIO_SetModulation(gRxVfo->Modulation); // 1of11
+	}
 
 	#ifdef ENABLE_FMRADIO
 		if (gFmRadioMode)
@@ -449,4 +446,3 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
 }
 
 #endif
-