重构

Sharkbia · Jan 30, 2024 · c0f71c8 · c0f71c8
1 parent 91fc4b2
commit c0f71c8
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/app/app.c b/app/app.c
@@ -252,7 +252,7 @@ static void HandleReceive(void)
 
     uint8_t Mode = END_OF_RX_MODE_SKIP;
 
-    if (gFlagTailNoteEliminationComplete)
+    if (gFlagTailToneEliminationComplete)
     {
         Mode = END_OF_RX_MODE_END;
         goto Skip;
@@ -414,8 +414,8 @@ static void HandleReceive(void)
             {
                 AUDIO_AudioPathOff();
 
-                gTailNoteEliminationCountdown_10ms = 20;
-                gFlagTailNoteEliminationComplete   = false;
+                gTailToneEliminationCountdown_10ms = 20;
+                gFlagTailToneEliminationComplete   = false;
                 gEndOfRxDetectedMaybe = true;
                 gEnableSpeaker        = false;
             }

diff --git a/driver/bk4819.c b/driver/bk4819.c
@@ -1461,7 +1461,7 @@ void BK4819_GenTail(uint8_t Tail)
     }
 }
 
-void BK4819_EnableCDCSS(void)
+void BK4819_PlayCDCSSTail(void)
 {
     BK4819_GenTail(0);     // CTC134
     //亚音
@@ -1470,7 +1470,7 @@ void BK4819_EnableCDCSS(void)
 
 }
 
-void BK4819_EnableCTCSS(void)
+void BK4819_PlayCTCSSTail(void)
 {
 #ifdef ENABLE_CTCSS_TAIL_PHASE_SHIFT
     //BK4819_GenTail(1);     // 120° phase shift

diff --git a/driver/bk4819.h b/driver/bk4819.h
@@ -133,8 +133,8 @@ void     BK4819_PlayDTMFString(const char *pString, bool bDelayFirst, uint16_t F
 void     BK4819_TransmitTone(bool bLocalLoopback, uint32_t Frequency);
 
 void     BK4819_GenTail(uint8_t Tail);
-void     BK4819_EnableCDCSS(void);
-void     BK4819_EnableCTCSS(void);
+void     BK4819_PlayCDCSSTail(void);
+void     BK4819_PlayCTCSSTail(void);
 
 uint16_t BK4819_GetRSSI(void);
 uint8_t  BK4819_GetGlitchIndicator(void);

diff --git a/functions.c b/functions.c
@@ -64,8 +64,8 @@ void FUNCTION_Init(void)
 
     g_SquelchLost      = false;
 
-    gFlagTailNoteEliminationComplete   = false;
-    gTailNoteEliminationCountdown_10ms = 0;
+    gFlagTailToneEliminationComplete   = false;
+    gTailToneEliminationCountdown_10ms = 0;
     gFoundCTCSS                        = false;
     gFoundCDCSS                        = false;
     gFoundCTCSSCountdown_10ms          = 0;

diff --git a/misc.c b/misc.c
@@ -130,7 +130,7 @@ volatile bool     gNextTimeslice_500ms;
 volatile uint16_t gTxTimerCountdown_500ms;
 volatile bool     gTxTimeoutReached;
 
-volatile uint16_t gTailNoteEliminationCountdown_10ms;
+volatile uint16_t gTailToneEliminationCountdown_10ms;
 
 volatile uint8_t    gVFOStateResumeCountdown_500ms;
 
@@ -239,7 +239,7 @@ volatile bool     gNextTimeslice40ms;
 volatile uint16_t gNOAACountdown_10ms = 0;
 	volatile bool     gScheduleNOAA       = true;
 #endif
-volatile bool     gFlagTailNoteEliminationComplete;
+volatile bool     gFlagTailToneEliminationComplete;
 #ifdef ENABLE_FMRADIO
 volatile bool gScheduleFM;
 #endif

diff --git a/misc.h b/misc.h
@@ -201,7 +201,7 @@ extern volatile bool         gNextTimeslice_500ms;
 extern volatile uint16_t     gTxTimerCountdown_500ms;
 extern volatile bool         gTxTimeoutReached;
 
-extern volatile uint16_t     gTailNoteEliminationCountdown_10ms;
+extern volatile uint16_t     gTailToneEliminationCountdown_10ms;
 
 #ifdef ENABLE_FMRADIO
 extern volatile uint16_t gFmPlayCountdown_10ms;
@@ -319,7 +319,7 @@ extern volatile bool         gNextTimeslice40ms;
 extern volatile uint16_t gNOAACountdown_10ms;
 	extern volatile bool     gScheduleNOAA;
 #endif
-extern volatile bool         gFlagTailNoteEliminationComplete;
+extern volatile bool         gFlagTailToneEliminationComplete;
 extern volatile uint8_t      gVFOStateResumeCountdown_500ms;
 #ifdef ENABLE_FMRADIO
 extern volatile bool     gScheduleFM;

diff --git a/radio.c b/radio.c
@@ -1069,10 +1069,10 @@ void RADIO_EnableCxCSS(void)
     switch (gCurrentVfo->pTX->CodeType) {
         case CODE_TYPE_DIGITAL:
         case CODE_TYPE_REVERSE_DIGITAL:
-            BK4819_EnableCDCSS();
+            BK4819_PlayCDCSSTail();
             break;
         default:
-            BK4819_EnableCTCSS();
+            BK4819_PlayCTCSSTail();
             break;
     }
 

diff --git a/scheduler.c b/scheduler.c
@@ -93,7 +93,7 @@ void SystickHandler(void)
 		if (gCurrentFunction != FUNCTION_MONITOR && gCurrentFunction != FUNCTION_TRANSMIT)
 			DECREMENT_AND_TRIGGER(gScanPauseDelayIn_10ms, gScheduleScanListen);
 
-	DECREMENT_AND_TRIGGER(gTailNoteEliminationCountdown_10ms, gFlagTailNoteEliminationComplete);
+	DECREMENT_AND_TRIGGER(gTailToneEliminationCountdown_10ms, gFlagTailToneEliminationComplete);
 
 	#ifdef ENABLE_VOICE
 		DECREMENT_AND_TRIGGER(gCountdownToPlayNextVoice_10ms, gFlagPlayQueuedVoice);