Add Rogerbeep Messenger Menu notification

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

Hide file tree

Showing 8 changed files with 58 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@ ENABLE_DTMF_CALLING         			:= 0
 ENABLE_DTMF_SIDETONES				    := 1
 ENABLE_TX1750 							:= 0
 # Keep this in stock options, and add option in mods for extra rogers
-ENABLE_ROGERBEEP            			:= 1
+ENABLE_ROGERBEEP            			:= 0
 ENABLE_MDC                  			:= 0
 
 #============== MODIFICATIONS =============#
@@ -56,7 +56,7 @@ ENABLE_MESSENGER_SHOW_RX_TX_FREQ		:= 1
 # 156 bytes
 ENABLE_MESSENGER_UART					:= 1
 # 3408 bytes
-ENABLE_MESSENGER_ENCRYPTION             := 1
+ENABLE_MESSENGER_ENCRYPTION             := 0
 # 140 bytes
 ENABLE_MESSENGER_ROGERBEEP_NOTIFICATION := 1
 

diff --git a/app/menu.c b/app/menu.c
@@ -158,7 +158,10 @@ int MENU_GetLimits(uint8_t Cursor, uint8_t *pMin, uint8_t *pMax) {
 #endif
 #ifdef ENABLE_MESSENGER
 		case MENU_MSG_ACK:
-#endif  
+#endif
+#ifdef ENABLE_MESSENGER_ROGERBEEP_NOTIFICATION
+		case MENU_MSG_NOTIFICATION:
+#endif		
     //*pMin = 0;
     *pMax = 1;
     break;
@@ -587,7 +590,11 @@ void MENU_AcceptSetting(void) {
 		#endif
 
 		#ifdef ENABLE_MESSENGER
-
+			#ifdef ENABLE_MESSENGER_ROGERBEEP_NOTIFICATION
+				case MENU_MSG_NOTIFICATION:
+				gEeprom.MESSENGER_CONFIG.data.notification = gSubMenuSelection;
+				break;
+			#endif
 			case MENU_MSG_ACK:
 				gEeprom.MESSENGER_CONFIG.data.ack = gSubMenuSelection;
 				break;
@@ -939,7 +946,11 @@ void MENU_ShowCurrentSetting(void) {
 			case MENU_MSG_ACK:
 				gSubMenuSelection = gEeprom.MESSENGER_CONFIG.data.ack;
 				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;

diff --git a/app/messenger.c b/app/messenger.c
@@ -738,14 +738,34 @@ void MSG_StorePacket(const uint16_t interrupt_bits)
 						SYSTEM_DelayMs(500);
 						BK4819_ExitTxMute();
 					#ifdef ENABLE_MESSENGER_ROGERBEEP_NOTIFICATION	
+					if(gEeprom.MESSENGER_CONFIG.data.notification) {
 						BK4819_PlayRoger(99);
+					}
 					#endif
 						// Transmit a message to the sender that we have received the message (Unless it's a service message)
 						if (dataPacket.data.payload[2] != 0x1b)
 						{
 							MSG_Send("\x1b\x1b\x1bRCVD                       ", true);
 						}
 					}
+
+					#ifdef ENABLE_MESSENGER_ROGERBEEP_NOTIFICATION	
+
+					if(!gEeprom.MESSENGER_CONFIG.data.ack && gEeprom.MESSENGER_CONFIG.data.notification) {
+						BK4819_DisableDTMF();
+						RADIO_SetTxParameters();
+						SYSTEM_DelayMs(500);
+						BK4819_ExitTxMute();
+						BK4819_PlayRoger(99);
+					}
+					#endif
+
+
+
+
+
+
+
 				}
 
 			}

diff --git a/app/messenger.h b/app/messenger.h
@@ -24,12 +24,13 @@ typedef enum ModemModulation {
 typedef union {
   struct {
     uint8_t      
-	  unused0    :1,
-      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
-      unused2    :2;
+	  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
+      encrypt    	:1, // determines whether outgoing messages will be encrypted
+      unused1    	:1,
+      modulation 	:2, // determines FSK modulation type
+      unused2    	:2;
   } data;
   uint8_t __val;
 } MessengerConfig;

diff --git a/helper/boot.c b/helper/boot.c
@@ -153,6 +153,9 @@ void BOOT_ProcessMode(BOOT_Mode_t Mode)
 #endif
 #ifdef ENABLE_MESSENGER
     gMenuListCount += 2;
+		#ifdef ENABLE_MESSENGER_ROGERBEEP_NOTIFICATION
+			    gMenuListCount++;
+		#endif
 #endif
 #ifdef ENABLE_MESSENGER_ENCRYPTION
     gMenuListCount += 2;

diff --git a/main.c b/main.c
@@ -167,6 +167,9 @@ void Main(void) {
 #endif
 #ifdef ENABLE_MESSENGER
     gMenuListCount += 2;
+		#ifdef ENABLE_MESSENGER_ROGERBEEP_NOTIFICATION
+			    gMenuListCount++;
+		#endif	
 #endif
 #ifdef ENABLE_MESSENGER_ENCRYPTION
     gMenuListCount += 2;

diff --git a/ui/menu.c b/ui/menu.c
@@ -82,6 +82,9 @@ static const char MenuList[][8] = {
 #endif
 #ifdef ENABLE_MESSENGER
 	  "MsgAck",
+			#ifdef ENABLE_MESSENGER_ROGERBEEP_NOTIFICATION
+				"MsgRBN",
+			#endif
 	  "MsgMod",
 #endif    
     "Beep",
@@ -431,6 +434,9 @@ void UI_DisplayMenu(void) {
 #endif
 #ifdef ENABLE_MESSENGER
   case MENU_MSG_ACK:
+	#ifdef ENABLE_MESSENGER_ROGERBEEP_NOTIFICATION
+		case MENU_MSG_NOTIFICATION:
+	#endif	
 #endif
   case MENU_BCL:
   case MENU_BEEP:

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