Fixes

spm81 · Feb 21, 2024 · c2bf47e · c2bf47e
1 parent 4af4a8a
commit c2bf47e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/app/menu.c b/app/menu.c
@@ -156,7 +156,7 @@ 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
+#if defined (ENABLE_MESSENGER) && defined(ENABLE_MESSENGER_ROGERBEEP_NOTIFICATION)
 		case MENU_MSG_NOTIFICATION:
 #endif	
 #ifdef ENABLE_MESSENGER
@@ -573,7 +573,8 @@ void MENU_AcceptSetting(void) {
     gFlagReconfigureVfos = true;
     return;
 
-#ifdef ENABLE_MESSENGER_ENCRYPTION
+#ifdef ENABLE_MESSENGER
+	#ifdef ENABLE_MESSENGER_ENCRYPTION
 			case MENU_ENC_KEY:
 				memset(gEeprom.ENC_KEY, 0, sizeof(gEeprom.ENC_KEY));
 				memmove(gEeprom.ENC_KEY, edit, sizeof(gEeprom.ENC_KEY));
@@ -588,9 +589,9 @@ void MENU_AcceptSetting(void) {
         //  SETTINGS_ClearEncryptionKey();
         //}
 				break;
-		#endif
+	#endif
 
-		#ifdef ENABLE_MESSENGER
+
 			#ifdef ENABLE_MESSENGER_ROGERBEEP_NOTIFICATION
 				case MENU_MSG_NOTIFICATION:
 				gEeprom.MESSENGER_CONFIG.data.notification = gSubMenuSelection;
@@ -602,9 +603,8 @@ void MENU_AcceptSetting(void) {
 
 			case MENU_MSG_MODULATION:
 				gEeprom.MESSENGER_CONFIG.data.modulation = gSubMenuSelection;
-				break;
-		#endif    
-
+				break;   
+#endif
   default:
     return;
   }
@@ -936,13 +936,14 @@ void MENU_ShowCurrentSetting(void) {
   case MENU_SCREN:
     gSubMenuSelection = gSetting_ScrambleEnable;
     break;
+#ifdef ENABLE_MESSENGER	
 #ifdef ENABLE_MESSENGER_ENCRYPTION
 			case MENU_MSG_ENC:
 				gSubMenuSelection = gEeprom.MESSENGER_CONFIG.data.encrypt;
 				break;
-		#endif
+#endif
 
-		#ifdef ENABLE_MESSENGER
+
 			case MENU_MSG_ACK:
 				gSubMenuSelection = gEeprom.MESSENGER_CONFIG.data.ack;
 				break;
@@ -954,7 +955,7 @@ void MENU_ShowCurrentSetting(void) {
 				gSubMenuSelection = gEeprom.MESSENGER_CONFIG.data.notification;
 				break;
 			#endif				
-		#endif
+#endif
 
 #ifdef ENABLE_STATUS_BATTERY_PERC	
   case MENU_BATTYP:

diff --git a/driver/bk4819.c b/driver/bk4819.c
@@ -1041,7 +1041,7 @@ void BK4819_EnterExitTxMuteSequence3(void) {
 }
 */
 
-#if defined(ENABLE_ROGERBEEP) || defined(ENABLE_MESSENGER_ROGERBEEP_NOTIFICATION)
+#if defined(ENABLE_ROGERBEEP) || defined(ENABLE_MESSENGER_ROGERBEEP_NOTIFICATION) || defined(ENABLE_TIMEOUT_ROGERBEEP_NOTIFICATION)
 void BK4819_PlayBeep(const uint16_t freq, const int delay)
 {
 	BK4819_WriteRegister(BK4819_REG_71, scale_freq(freq));

diff --git a/driver/bk4819.h b/driver/bk4819.h
@@ -150,7 +150,7 @@ void BK4819_PrepareFSKReceive(void);
 void BK4819_PlayBeep(const uint16_t freq, const int delay);
 
 
-#if defined(ENABLE_ROGERBEEP) || defined(ENABLE_MESSENGER)
+#if defined(ENABLE_ROGERBEEP) || defined(ENABLE_MESSENGER) || defined(ENABLE_TIMEOUT_ROGERBEEP_NOTIFICATION)
 void BK4819_PlayRoger(int);
 #endif
 #if defined(ENABLE_MDC)