Merge pull request #122 from kamilsss655/rc.20.4

Rc.20.4
kamilsss655 · Feb 2, 2024 · 5fbb556 · 5fbb556
2 parents faf4947 + f124343
commit 5fbb556
Show file tree

Hide file tree

Showing 5 changed files with 196 additions and 412 deletions.
diff --git a/app/app.c b/app/app.c
@@ -1865,44 +1865,48 @@ static void ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 				}
 #endif
 		}
-		switch (gScreenToDisplay) {
-			case DISPLAY_MAIN:
-				if ((Key == KEY_SIDE1 || Key == KEY_SIDE2) && !SCANNER_IsScanning())
-					{
-						ACTION_Handle(Key, bKeyPressed, bKeyHeld);
-					}
-				else
-					MAIN_ProcessKeys(Key, bKeyPressed, bKeyHeld);
+		else
+		{
+			switch (gScreenToDisplay)
+			{
+				case DISPLAY_MAIN:
+					if ((Key == KEY_SIDE1 || Key == KEY_SIDE2) && !SCANNER_IsScanning())
+						{
+							ACTION_Handle(Key, bKeyPressed, bKeyHeld);
+						}
+					else
+						MAIN_ProcessKeys(Key, bKeyPressed, bKeyHeld);
 
-				break;
-#ifdef ENABLE_FMRADIO
-			case DISPLAY_FM:
-				FM_ProcessKeys(Key, bKeyPressed, bKeyHeld);
-				break;
-#endif
-			case DISPLAY_MENU:
-				MENU_ProcessKeys(Key, bKeyPressed, bKeyHeld);
-				break;
-
-			#ifdef ENABLE_MESSENGER
-				case DISPLAY_MSG:
-					MSG_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;
+
+				#ifdef ENABLE_MESSENGER
+					case DISPLAY_MSG:
+						MSG_ProcessKeys(Key, bKeyPressed, bKeyHeld);
+						break;
+				#endif
 
-			case DISPLAY_SCANNER:
-				SCANNER_ProcessKeys(Key, bKeyPressed, bKeyHeld);
-				break;
+				case DISPLAY_SCANNER:
+					SCANNER_ProcessKeys(Key, bKeyPressed, bKeyHeld);
+					break;
 
-#ifdef ENABLE_AIRCOPY
-			case DISPLAY_AIRCOPY:
-				AIRCOPY_ProcessKeys(Key, bKeyPressed, bKeyHeld);
-				break;
-#endif
-			case DISPLAY_INVALID:
-			default:
-				gBeepToPlay = BEEP_500HZ_60MS_DOUBLE_BEEP_OPTIONAL;
-				break;
+				#ifdef ENABLE_AIRCOPY
+					case DISPLAY_AIRCOPY:
+						AIRCOPY_ProcessKeys(Key, bKeyPressed, bKeyHeld);
+						break;
+				#endif
+				case DISPLAY_INVALID:
+				default:
+					gBeepToPlay = BEEP_500HZ_60MS_DOUBLE_BEEP_OPTIONAL;
+					break;
+			}
 		}
 	}