Refactor

app/main.c

@@ -459,9 +459,7 @@ static void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 
 static void MAIN_Key_EXIT(bool bKeyPressed, bool bKeyHeld)
 {
-	if (!bKeyHeld && bKeyPressed)
-	{	// exit key pressed
-
+	if (!bKeyHeld && bKeyPressed) { // exit key pressed
 		gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL;
 
 #ifdef ENABLE_DTMF_CALLING
@@ -477,8 +475,7 @@ static void MAIN_Key_EXIT(bool bKeyPressed, bool bKeyHeld)
 		if (!gFmRadioMode)
 #endif
 		{
-			if (gScanStateDir == SCAN_OFF)
-			{
+			if (gScanStateDir == SCAN_OFF) {
 				if (gInputBoxIndex == 0)
 					return;
 				gInputBox[--gInputBoxIndex] = 10;
@@ -490,8 +487,7 @@ static void MAIN_Key_EXIT(bool bKeyPressed, bool bKeyHeld)
 					gAnotherVoiceID = VOICE_ID_CANCEL;
 #endif
 			}
-			else
-			{
+			else {
 				gScanKeepResult = false;
 				CHFRSCANNER_Stop();
 
@@ -507,13 +503,10 @@ static void MAIN_Key_EXIT(bool bKeyPressed, bool bKeyHeld)
 #ifdef ENABLE_FMRADIO
 		ACTION_FM();
 #endif
-
 		return;
 	}
 
-	if (bKeyHeld && bKeyPressed)
-	{	// exit key held down
-
+	if (bKeyHeld && bKeyPressed) { // exit key held down
 		if (gInputBoxIndex > 0 || gDTMF_InputBox_Index > 0 || gDTMF_InputMode)
 		{	// cancel key input mode (channel/frequency entry)
 			gDTMF_InputMode       = false;

functions.c

@@ -233,15 +233,13 @@ void FUNCTION_Select(FUNCTION_Type_t Function)
 
 	gCurrentFunction = Function;
 
-	if (bWasPowerSave && Function != FUNCTION_POWER_SAVE)
-	{
+	if (bWasPowerSave && Function != FUNCTION_POWER_SAVE) {
 		BK4819_Conditional_RX_TurnOn_and_GPIO6_Enable();
 		gRxIdleMode = false;
 		UI_DisplayStatus();
 	}
 
-	switch (Function)
-	{
+	switch (Function) {
 		case FUNCTION_FOREGROUND:
 			FUNCTION_Foreground(PreviousFunction);
 			return;

misc.h

@@ -207,9 +207,6 @@ extern volatile bool         gTxTimeoutReached;
 
 extern volatile uint16_t     gTailNoteEliminationCountdown_10ms;
 
-#ifdef ENABLE_FMRADIO
-	extern volatile uint16_t gFmPlayCountdown_10ms;
-#endif
 #ifdef ENABLE_NOAA
 	extern volatile uint16_t gNOAA_Countdown_10ms;
 #endif

scheduler.c

@@ -53,8 +53,7 @@ void SystickHandler(void)
 	
 	gNextTimeslice = true;
 
-	if ((gGlobalSysTickCounter % 50) == 0)
-	{
+	if ((gGlobalSysTickCounter % 50) == 0) {
 		gNextTimeslice_500ms = true;
 		
 		DECREMENT_AND_TRIGGER(gTxTimerCountdown_500ms, gTxTimeoutReached);