Refactor

egzumer · Nov 27, 2023 · dc47842 · dc47842
1 parent 9f22e8a
commit dc47842
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 71 deletions.
diff --git a/app/app.c b/app/app.c
@@ -1906,22 +1906,16 @@ static void ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 				}
 #endif
 		}
-		else if (Key != KEY_SIDE1 && Key != KEY_SIDE2)
-		{
-			switch (gScreenToDisplay)
-			{
+		else if (Key != KEY_SIDE1 && Key != KEY_SIDE2) {
+			switch (gScreenToDisplay) {
 				case DISPLAY_MAIN:
-
 					MAIN_ProcessKeys(Key, bKeyPressed, bKeyHeld);
-//					bKeyHeld = false;	// allow the channel setting to be saved
 					break;
-
-				#ifdef ENABLE_FMRADIO
-					case DISPLAY_FM:
-						FM_ProcessKeys(Key, bKeyPressed, bKeyHeld);
-						break;
-				#endif
-
+#ifdef ENABLE_FMRADIO
+				case DISPLAY_FM:
+					FM_ProcessKeys(Key, bKeyPressed, bKeyHeld);
+					break;
+#endif
 				case DISPLAY_MENU:
 					MENU_ProcessKeys(Key, bKeyPressed, bKeyHeld);
 					break;
@@ -1930,12 +1924,11 @@ static void ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 					SCANNER_ProcessKeys(Key, bKeyPressed, bKeyHeld);
 					break;
 
-				#ifdef ENABLE_AIRCOPY
-					case DISPLAY_AIRCOPY:
-						AIRCOPY_ProcessKeys(Key, bKeyPressed, bKeyHeld);
-						break;
-				#endif
-
+#ifdef ENABLE_AIRCOPY
+				case DISPLAY_AIRCOPY:
+					AIRCOPY_ProcessKeys(Key, bKeyPressed, bKeyHeld);
+					break;
+#endif
 				case DISPLAY_INVALID:
 				default:
 					break;

diff --git a/app/fm.c b/app/fm.c
@@ -225,30 +225,22 @@ int FM_CheckFrequencyLock(uint16_t Frequency, uint16_t LowerLimit)
 
 static void FM_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 {
-	#define STATE_FREQ_MODE 0
-	#define STATE_MR_MODE   1
-	#define STATE_SAVE      2
+	enum { STATE_FREQ_MODE, STATE_MR_MODE, STATE_SAVE };
 
-	if (!bKeyHeld && bKeyPressed)
-	{
-		if (!gWasFKeyPressed)
-		{
+	if (!bKeyHeld && bKeyPressed) {
+		if (!gWasFKeyPressed) {
 			uint8_t State;
 
-			if (gAskToDelete)
-			{
+			if (gAskToDelete) {
 				gBeepToPlay = BEEP_500HZ_60MS_DOUBLE_BEEP_OPTIONAL;
 				return;
 			}
 
-			if (gAskToSave)
-			{
+			if (gAskToSave) {
 				State = STATE_SAVE;
 			}
-			else
-			{
-				if (gFM_ScanState != FM_SCAN_OFF)
-				{
+			else {
+				if (gFM_ScanState != FM_SCAN_OFF) {
 					gBeepToPlay = BEEP_500HZ_60MS_DOUBLE_BEEP_OPTIONAL;
 					return;
 				}
@@ -260,72 +252,58 @@ static void FM_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 
 			gRequestDisplayScreen = DISPLAY_FM;
 
-			if (State == STATE_FREQ_MODE)
-			{
-				if (gInputBoxIndex == 1)
-				{
-					if (gInputBox[0] > 1)
-					{
+			if (State == STATE_FREQ_MODE) {
+				if (gInputBoxIndex == 1) {
+					if (gInputBox[0] > 1) {
 						gInputBox[1] = gInputBox[0];
 						gInputBox[0] = 0;
 						gInputBoxIndex = 2;
 					}
 				}
-				else
-				if (gInputBoxIndex > 3)
-				{
+				else if (gInputBoxIndex > 3) {
 					uint32_t Frequency;
 
 					gInputBoxIndex = 0;
 					Frequency = StrToUL(INPUTBOX_GetAscii());
 
-					if (Frequency < gEeprom.FM_LowerLimit || gEeprom.FM_UpperLimit < Frequency)
-					{
+					if (Frequency < gEeprom.FM_LowerLimit || gEeprom.FM_UpperLimit < Frequency) {
 						gBeepToPlay           = BEEP_500HZ_60MS_DOUBLE_BEEP_OPTIONAL;
 						gRequestDisplayScreen = DISPLAY_FM;
 						return;
 					}
 
 					gEeprom.FM_SelectedFrequency = (uint16_t)Frequency;
-
-					#ifdef ENABLE_VOICE
-						gAnotherVoiceID = (VOICE_ID_t)Key;
-					#endif
-
+#ifdef ENABLE_VOICE
+					gAnotherVoiceID = (VOICE_ID_t)Key;
+#endif
 					gEeprom.FM_FrequencyPlaying = gEeprom.FM_SelectedFrequency;
 					BK1080_SetFrequency(gEeprom.FM_FrequencyPlaying);
 					gRequestSaveFM = true;
 					return;
 				}
 			}
-			else
-			if (gInputBoxIndex == 2)
-			{
+			else if (gInputBoxIndex == 2) {
 				uint8_t Channel;
 
 				gInputBoxIndex = 0;
 				Channel = ((gInputBox[0] * 10) + gInputBox[1]) - 1;
 
-				if (State == STATE_MR_MODE)
-				{
-					if (FM_CheckValidChannel(Channel))
-					{
-						#ifdef ENABLE_VOICE
-							gAnotherVoiceID = (VOICE_ID_t)Key;
-						#endif
+				if (State == STATE_MR_MODE) {
+					if (FM_CheckValidChannel(Channel)) {
+#ifdef ENABLE_VOICE
+						gAnotherVoiceID = (VOICE_ID_t)Key;
+#endif
 						gEeprom.FM_SelectedChannel = Channel;
 						gEeprom.FM_FrequencyPlaying = gFM_Channels[Channel];
 						BK1080_SetFrequency(gEeprom.FM_FrequencyPlaying);
 						gRequestSaveFM = true;
 						return;
 					}
 				}
-				else
-				if (Channel < 20)
-				{
-					#ifdef ENABLE_VOICE
-						gAnotherVoiceID = (VOICE_ID_t)Key;
-					#endif
+				else if (Channel < 20) {
+#ifdef ENABLE_VOICE
+					gAnotherVoiceID = (VOICE_ID_t)Key;
+#endif
 					gRequestDisplayScreen = DISPLAY_FM;
 					gInputBoxIndex = 0;
 					gFM_ChannelPosition = Channel;
@@ -336,9 +314,9 @@ static void FM_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 				return;
 			}
 
-			#ifdef ENABLE_VOICE
-				gAnotherVoiceID = (VOICE_ID_t)Key;
-			#endif
+#ifdef ENABLE_VOICE
+			gAnotherVoiceID = (VOICE_ID_t)Key;
+#endif
 
 			return;
 		}
@@ -348,8 +326,7 @@ static void FM_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 		gUpdateStatus         = true;
 		gRequestDisplayScreen = DISPLAY_FM;
 
-		switch (Key)
-		{
+		switch (Key) {
 			case KEY_0:
 				ACTION_FM();
 				break;