Change MSG RogerBeep Position

spm81 · Feb 20, 2024 · 341b455 · 341b455
1 parent 04e9cbf
commit 341b455
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 28 deletions.
diff --git a/app/menu.c b/app/menu.c
@@ -156,18 +156,19 @@ int MENU_GetLimits(uint8_t Cursor, uint8_t *pMin, uint8_t *pMax) {
 #ifdef ENABLE_MESSENGER_ENCRYPTION
 		case MENU_MSG_ENC:
 #endif
+#ifdef ENABLE_MESSENGER_ROGERBEEP_NOTIFICATION
+		case MENU_MSG_NOTIFICATION:
+#endif	
 #ifdef ENABLE_MESSENGER
 		case MENU_MSG_ACK:
 #endif
-#ifdef ENABLE_MESSENGER_ROGERBEEP_NOTIFICATION
-		case MENU_MSG_NOTIFICATION:
-#endif		
+
     //*pMin = 0;
     *pMax = 1;
     break;
 #ifdef ENABLE_MESSENGER
 		case MENU_MSG_MODULATION:
-			*pMin = 0;
+			//*pMin = 0;
 			*pMax = ARRAY_SIZE(gSubMenu_MSG_MODULATION) - 1;
 			break;
 #endif    
@@ -942,18 +943,17 @@ void MENU_ShowCurrentSetting(void) {
 		#endif
 
 		#ifdef ENABLE_MESSENGER
-
 			case MENU_MSG_ACK:
 				gSubMenuSelection = gEeprom.MESSENGER_CONFIG.data.ack;
 				break;
+			case MENU_MSG_MODULATION:
+				gSubMenuSelection = gEeprom.MESSENGER_CONFIG.data.modulation;
+				break;
 			#ifdef ENABLE_MESSENGER_ROGERBEEP_NOTIFICATION
 				case MENU_MSG_NOTIFICATION:
 				gSubMenuSelection = gEeprom.MESSENGER_CONFIG.data.notification;
 				break;
-			#endif	
-			case MENU_MSG_MODULATION:
-				gSubMenuSelection = gEeprom.MESSENGER_CONFIG.data.modulation;
-				break;
+			#endif				
 		#endif
 
 #ifdef ENABLE_STATUS_BATTERY_PERC	

diff --git a/app/messenger.h b/app/messenger.h
@@ -25,8 +25,8 @@ typedef union {
   struct {
     uint8_t      
 	  unused0    	:1,
-      ack        	:1, // determines whether the radio will automatically respond to messages with ACK
 	  notification	:1, // determines whether the radio will automatically respond to messages with Roger Notification
+      ack        	:1, // determines whether the radio will automatically respond to messages with ACK
       encrypt    	:1, // determines whether outgoing messages will be encrypted
       unused1    	:1,
       modulation 	:2, // determines FSK modulation type

diff --git a/ui/menu.c b/ui/menu.c
@@ -70,22 +70,22 @@ static const char MenuList[][8] = {
     #ifdef ENABLE_LCD_INVERT_OPTION
     "Invert",
     #endif*/
-    #ifdef ENABLE_LCD_CONTRAST_OPTION
+#ifdef ENABLE_LCD_CONTRAST_OPTION
     "Contras",
-    #endif
+#endif
     // 0x10
     "DualRx",
     "XBand",
 #ifdef ENABLE_MESSENGER_ENCRYPTION
-	  "EncKey",
-	  "MsgEnc",
+    "EncKey",
+	"MsgEnc",
 #endif
 #ifdef ENABLE_MESSENGER
-	  "MsgAck",
-			#ifdef ENABLE_MESSENGER_ROGERBEEP_NOTIFICATION
-				"MsgRBN",
-			#endif
-	  "MsgMod",
+	"MsgAck",
+	"MsgMod",
+	#ifdef ENABLE_MESSENGER_ROGERBEEP_NOTIFICATION
+	"MsgRBN",
+	#endif	
 #endif    
     "Beep",
     "TxTime",
@@ -251,8 +251,7 @@ const char gSubMenu_ROGER[][4] = {
 #endif
 
 #ifdef ENABLE_MESSENGER
-const char gSubMenu_MSG_MODULATION[3][10] =
-{
+const char gSubMenu_MSG_MODULATION[3][10] = {
     "AFSK 1.2K",
     "FSK 700",
     "FSK 450",
@@ -271,7 +270,7 @@ const char gSubMenuBacklight[8][7] = {"OFF",   "5 sec", "10 sec", "20 sec",
                                       "1 min", "2 min", "ON"};
 
 static const char *defaultEnableDisable[3] = {"DEFAULT", "ENABLE", "DISABLE"};
-static const char *offOn[3] = {"OFF", "ON"};
+static const char *offOn[2] = {"OFF", "ON"};
 static const char *upconverterFreqNames[7] = {"OFF", "50M", "70M", "106M", "125M", "140M", "200M"};
 bool gIsInSubMenu;
 
@@ -427,16 +426,16 @@ void UI_DisplayMenu(void) {
     break;
 
 #ifdef ENABLE_DOCK
-	case MENU_REMOTE_UI:
+  case MENU_REMOTE_UI:
 #endif
 #ifdef ENABLE_MESSENGER_ENCRYPTION
   case MENU_MSG_ENC:
 #endif
 #ifdef ENABLE_MESSENGER
-  case MENU_MSG_ACK:
 	#ifdef ENABLE_MESSENGER_ROGERBEEP_NOTIFICATION
 		case MENU_MSG_NOTIFICATION:
-	#endif	
+	#endif
+  case MENU_MSG_ACK:	
 #endif
   case MENU_BCL:
   case MENU_BEEP:

diff --git a/ui/menu.h b/ui/menu.h
@@ -53,10 +53,10 @@ enum {
 #endif
 #ifdef ENABLE_MESSENGER
 	MENU_MSG_ACK,
-	#ifdef ENABLE_MESSENGER_ROGERBEEP_NOTIFICATION
-		MENU_MSG_NOTIFICATION,
-	#endif	
 	MENU_MSG_MODULATION,
+	#ifdef ENABLE_MESSENGER_ROGERBEEP_NOTIFICATION
+	MENU_MSG_NOTIFICATION,
+	#endif		
 #endif	
 	MENU_BEEP,
 	MENU_TOT,