WIP removing shite

JuantAldea · Dec 13, 2023 · 29a5654 · 29a5654
1 parent 1f680fe
commit 29a5654
Show file tree

Hide file tree

Showing 10 changed files with 99 additions and 107 deletions.
diff --git a/Makefile b/Makefile
@@ -4,21 +4,21 @@
 # 1 = enable
 
 # ---- COMPILER/LINKER OPTIONS ----
-ENABLE_CLANG                  ?= 0
-ENABLE_SWD                    ?= 0
-ENABLE_OVERLAY                ?= 0
+ENABLE_CLANG                  ?= 1
+ENABLE_SWD                    ?= 1
+ENABLE_OVERLAY                ?= 1
 ENABLE_LTO                    ?= 1
 
 # ---- STOCK QUANSHENG FERATURES ----
 ENABLE_UART                   ?= 1
-ENABLE_AIRCOPY                ?= 0
+ENABLE_AIRCOPY                ?= 1
 ENABLE_FMRADIO                ?= 1
-ENABLE_NOAA                   ?= 0
-ENABLE_VOICE                  ?= 0
+ENABLE_NOAA                   ?= 1
+ENABLE_VOICE                  ?= 1
 ENABLE_VOX                    ?= 1
-ENABLE_ALARM                  ?= 0
-ENABLE_TX1750                 ?= 0
-ENABLE_PWRON_PASSWORD         ?= 0
+ENABLE_ALARM                  ?= 1
+ENABLE_TX1750                 ?= 1
+ENABLE_PWRON_PASSWORD         ?= 1
 ENABLE_DTMF_CALLING           ?= 1
 ENABLE_FLASHLIGHT             ?= 1
 
@@ -27,12 +27,12 @@ ENABLE_BIG_FREQ               ?= 1
 ENABLE_SMALL_BOLD             ?= 1
 ENABLE_KEEP_MEM_NAME          ?= 1
 ENABLE_WIDE_RX                ?= 1
-ENABLE_TX_WHEN_AM             ?= 0
-ENABLE_F_CAL_MENU             ?= 0
-ENABLE_CTCSS_TAIL_PHASE_SHIFT ?= 0
-ENABLE_BOOT_BEEPS             ?= 0
-ENABLE_SHOW_CHARGE_LEVEL      ?= 0
-ENABLE_REVERSE_BAT_SYMBOL     ?= 0
+ENABLE_TX_WHEN_AM             ?= 1
+ENABLE_F_CAL_MENU             ?= 1
+ENABLE_CTCSS_TAIL_PHASE_SHIFT ?= 1
+ENABLE_BOOT_BEEPS             ?= 1
+ENABLE_SHOW_CHARGE_LEVEL      ?= 1
+ENABLE_REVERSE_BAT_SYMBOL     ?= 1
 ENABLE_NO_CODE_SCAN_TIMEOUT   ?= 1
 ENABLE_AM_FIX                 ?= 1
 ENABLE_SQUELCH_MORE_SENSITIVE ?= 1
@@ -41,14 +41,14 @@ ENABLE_RSSI_BAR               ?= 1
 ENABLE_AUDIO_BAR              ?= 1
 ENABLE_COPY_CHAN_TO_VFO       ?= 1
 ENABLE_SPECTRUM               ?= 1
-ENABLE_REDUCE_LOW_MID_TX_POWER?= 0
-ENABLE_BYP_RAW_DEMODULATORS   ?= 0
-ENABLE_BLMIN_TMP_OFF          ?= 0
+ENABLE_REDUCE_LOW_MID_TX_POWER?= 1
+ENABLE_BYP_RAW_DEMODULATORS   ?= 1
+ENABLE_BLMIN_TMP_OFF          ?= 1
 ENABLE_SCAN_RANGES            ?= 1
 
 # ---- DEBUGGING ----
-ENABLE_AM_FIX_SHOW_DATA       ?= 0
-ENABLE_AGC_SHOW_DATA          ?= 0
+ENABLE_AM_FIX_SHOW_DATA       ?= 1
+ENABLE_AGC_SHOW_DATA          ?= 1
 
 #############################################################
 

diff --git a/app/app.c b/app/app.c
@@ -403,7 +403,6 @@ static void HandleReceive(void)
 				gTailNoteEliminationCountdown_10ms = 20;
 				gFlagTailNoteEliminationComplete   = false;
 				gEndOfRxDetectedMaybe = true;
-				gEnableSpeaker        = false;
 			}
 			break;
 	}
@@ -459,7 +458,6 @@ void APP_StartListening(FUNCTION_Type_t function)
 	gVFO_RSSI_bar_level[!vfo] = 0;
 
 	AUDIO_AudioPathOn();
-	gEnableSpeaker = true;
 
 	if (gSetting_backlight_on_tx_rx != BACKLIGHT_ON_TR_OFF) {
 		BACKLIGHT_TurnOn();
@@ -828,8 +826,7 @@ void APP_Update(void)
 {
 #ifdef ENABLE_VOICE
 	if (gFlagPlayQueuedVoice) {
-			AUDIO_PlayQueuedVoice();
-			gFlagPlayQueuedVoice = false;
+		AUDIO_PlayQueuedVoice();
 	}
 #endif
 
@@ -1244,7 +1241,6 @@ void APP_TimeSlice10ms(void)
 						SYSTEM_DelayMs(2);
 						AUDIO_AudioPathOn();
 
-						gEnableSpeaker    = true;
 						gAlarmToneCounter = 0;
 					}
 				}
@@ -1570,7 +1566,6 @@ void APP_TimeSlice500ms(void)
 static void ALARM_Off(void)
 {
 	AUDIO_AudioPathOff();
-	gEnableSpeaker = false;
 
 	if (gAlarmState == ALARM_STATE_TXALARM) {
 		RADIO_SendEndOfTransmission();
@@ -1815,8 +1810,6 @@ static void ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 					{
 						AUDIO_AudioPathOff();
 
-						gEnableSpeaker = false;
-
 						BK4819_ExitDTMF_TX(false);
 
 						if (gCurrentVfo->SCRAMBLING_TYPE == 0 || !gSetting_ScrambleEnable)
@@ -1830,7 +1823,6 @@ static void ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 					if (gEeprom.DTMF_SIDE_TONE)
 					{	// user will here the DTMF tones in speaker
 						AUDIO_AudioPathOn();
-						gEnableSpeaker = true;
 					}
 
 					BK4819_DisableScramble();

diff --git a/app/dtmf.c b/app/dtmf.c
@@ -456,7 +456,6 @@ void DTMF_Reply(void)
 	if (gEeprom.DTMF_SIDE_TONE)
 	{	// the user will also hear the transmitted tones
 		AUDIO_AudioPathOn();
-		gEnableSpeaker = true;
 	}
 
 	SYSTEM_DelayMs(Delay);
@@ -473,7 +472,5 @@ void DTMF_Reply(void)
 
 	AUDIO_AudioPathOff();
 
-	gEnableSpeaker = false;
-
 	BK4819_ExitDTMF_TX(false);
 }
diff --git a/app/fm.c b/app/fm.c
@@ -88,18 +88,20 @@ int FM_ConfigureChannelState(void)
 {
 	gEeprom.FM_FrequencyPlaying = gEeprom.FM_SelectedFrequency;
 
-	if (gEeprom.FM_IsMrMode)
-	{
-		const uint8_t Channel = FM_FindNextChannel(gEeprom.FM_SelectedChannel, FM_CHANNEL_UP);
-		if (Channel == 0xFF)
-		{
-			gEeprom.FM_IsMrMode = false;
-			return -1;
-		}
-		gEeprom.FM_SelectedChannel  = Channel;
-		gEeprom.FM_FrequencyPlaying = gFM_Channels[Channel];
+	if (!gEeprom.FM_IsMrMode) {
+		return 0;
+	}
+
+	const uint8_t Channel = FM_FindNextChannel(gEeprom.FM_SelectedChannel, FM_CHANNEL_UP);
+
+	if (Channel == 0xFF) {
+		gEeprom.FM_IsMrMode = false;
+		return -1;
 	}
 
+	gEeprom.FM_SelectedChannel  = Channel;
+	gEeprom.FM_FrequencyPlaying = gFM_Channels[Channel];
+
 	return 0;
 }
 
@@ -110,21 +112,18 @@ void FM_TurnOff(void)
 	gFM_RestoreCountdown_10ms = 0;
 
 	AUDIO_AudioPathOff();
-
-	gEnableSpeaker = false;
-
 	BK1080_Init(0, false);
 
 	gUpdateStatus  = true;
 }
 
 void FM_EraseChannels(void)
 {
-	unsigned int i;
-	uint8_t      Template[8];
+
+	uint8_t Template[8];
 
 	memset(Template, 0xFF, sizeof(Template));
-	for (i = 0; i < 5; i++)
+	for (unsigned int i = 0; i < 5; i++)
 		EEPROM_WriteBuffer(0x0E40 + (i * 8), Template);
 
 	memset(gFM_Channels, 0xFF, sizeof(gFM_Channels));
@@ -134,8 +133,6 @@ void FM_Tune(uint16_t Frequency, int8_t Step, bool bFlag)
 {
 	AUDIO_AudioPathOff();
 
-	gEnableSpeaker = false;
-
 	gFmPlayCountdown_10ms = (gFM_ScanState == FM_SCAN_OFF) ? fm_play_countdown_noscan_10ms : fm_play_countdown_scan_10ms;
 
 	gScheduleFM                 = false;
@@ -180,8 +177,6 @@ void FM_PlayAndUpdate(void)
 	gAskToSave            = false;
 
 	AUDIO_AudioPathOn();
-
-	gEnableSpeaker   = true;
 }
 
 int FM_CheckFrequencyLock(uint16_t Frequency, uint16_t LowerLimit)
@@ -596,7 +591,6 @@ void FM_Play(void)
 				gEeprom.FM_SelectedFrequency = gEeprom.FM_FrequencyPlaying;
 
 			AUDIO_AudioPathOn();
-			gEnableSpeaker = true;
 
 			GUI_SelectNextDisplay(DISPLAY_FM);
 			return;
@@ -632,7 +626,6 @@ void FM_Start(void)
 
 	AUDIO_AudioPathOn();
 
-	gEnableSpeaker       = true;
 	gUpdateStatus        = true;
 }
 

diff --git a/audio.c b/audio.c
@@ -145,14 +145,16 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
 	BK4819_EnterTxMute();
 	SYSTEM_DelayMs(20);
 
+	const uint8_t audioPathStateWasOn = AUDIO_AudioPathState();
+
 	AUDIO_AudioPathOff();
 
 	SYSTEM_DelayMs(5);
 	BK4819_TurnsOffTones_TurnsOnRX();
 	SYSTEM_DelayMs(5);
 	BK4819_WriteRegister(BK4819_REG_71, ToneConfig);
 
-	if (gEnableSpeaker)
+	if (audioPathStateWasOn)
 		AUDIO_AudioPathOn();
 
 #ifdef ENABLE_FMRADIO
@@ -183,6 +185,8 @@ static const uint8_t VoiceClipLengthChinese[58] =
 	0x5A, 0x64,
 };
 
+static const uint8_t VoiceClipLengthChineseLen = ARRAY_SIZE(VoiceClipLengthChinese);
+
 static const uint8_t VoiceClipLengthEnglish[76] =
 {
 	0x50, 0x32, 0x2D, 0x2D, 0x2D, 0x37, 0x37, 0x37,
@@ -197,6 +201,8 @@ static const uint8_t VoiceClipLengthEnglish[76] =
 	0x41, 0x32, 0x3C, 0x37,
 };
 
+static const uint8_t VoiceClipLengthEnglishLen = ARRAY_SIZE(VoiceClipLengthEnglish);
+
 VOICE_ID_t        gVoiceID[8];
 uint8_t           gVoiceReadIndex;
 uint8_t           gVoiceWriteIndex;
@@ -262,7 +268,8 @@ void AUDIO_PlaySingleVoice(bool bFlag)
 			if (gFmRadioMode)
 				BK1080_Mute(true);
 		#endif
-
+
+		const uint8_t audioPathWasOn = AUDIO_AudioPathState();
 		AUDIO_AudioPathOn();
 
 		#ifdef ENABLE_VOX
@@ -287,8 +294,9 @@ void AUDIO_PlaySingleVoice(bool bFlag)
 					BK1080_Mute(false);
 			#endif
 
-			if (!gEnableSpeaker)
+			if (!audioPathWasOn) {
 				AUDIO_AudioPathOff();
+			}
 
 			gVoiceWriteIndex    = 0;
 			gVoiceReadIndex     = 0;
@@ -302,7 +310,6 @@ void AUDIO_PlaySingleVoice(bool bFlag)
 
 		gVoiceReadIndex                = 1;
 		gCountdownToPlayNextVoice_10ms = Delay;
-		gFlagPlayQueuedVoice           = false;
 
 		return;
 	}
@@ -368,6 +375,8 @@ uint8_t AUDIO_SetDigitVoice(uint8_t Index, uint16_t Value)
 
 void AUDIO_PlayQueuedVoice(void)
 {
+	gFlagPlayQueuedVoice = false;
+
 	uint8_t VoiceID;
 	uint8_t Delay;
 	bool    Skip;
@@ -377,6 +386,8 @@ void AUDIO_PlayQueuedVoice(void)
 	if (gVoiceReadIndex != gVoiceWriteIndex && gEeprom.VOICE_PROMPT != VOICE_PROMPT_OFF)
 	{
 		VoiceID = gVoiceID[gVoiceReadIndex];
+		gEeprom.VOICE_PROMPT == VOICE_PROMPT_CHINESE
+
 		if (gEeprom.VOICE_PROMPT == VOICE_PROMPT_CHINESE)
 		{
 			if (VoiceID < ARRAY_SIZE(VoiceClipLengthChinese))
@@ -400,40 +411,40 @@ void AUDIO_PlayQueuedVoice(void)
 
 		gVoiceReadIndex++;
 
-		if (!Skip)
-		{
-			if (gVoiceReadIndex == gVoiceWriteIndex)
-				Delay += 3;
+		if (Skip) {
+			return;
+		}
+
+		if (gVoiceReadIndex == gVoiceWriteIndex)
+			Delay += 3;
 
-			AUDIO_PlayVoice(VoiceID);
+		AUDIO_PlayVoice(VoiceID);
 
-			gCountdownToPlayNextVoice_10ms = Delay;
-			gFlagPlayQueuedVoice           = false;
+		gCountdownToPlayNextVoice_10ms = Delay;
 
-			#ifdef ENABLE_VOX
-				gVoxResumeCountdown = 2000;
-			#endif
+	#ifdef ENABLE_VOX
+		gVoxResumeCountdown = 2000;
+	#endif
 
-			return;
-		}
+		return;
 	}
 
-	if (FUNCTION_IsRx())
-	{
+	if (FUNCTION_IsRx()) {
 		RADIO_SetModulation(gRxVfo->Modulation); // 1of11
 	}
 
-	#ifdef ENABLE_FMRADIO
-		if (gFmRadioMode)
-			BK1080_Mute(false);
-	#endif
+#ifdef ENABLE_FMRADIO
+	if (gFmRadioMode)
+		BK1080_Mute(false);
+#endif
 
-	if (!gEnableSpeaker)
+	//if (!gEnableSpeaker)
 		AUDIO_AudioPathOff();
+
 
-	#ifdef ENABLE_VOX
-		gVoxResumeCountdown = 80;
-	#endif
+#ifdef ENABLE_VOX
+	gVoxResumeCountdown = 80;
+#endif
 
 	gVoiceWriteIndex    = 0;
 	gVoiceReadIndex     = 0;