Added Roger Mario (2x speed)

Matoz asked this for Xmas.
spm81 · Feb 7, 2024 · baa31fe · baa31fe
1 parent ba9a505
commit baa31fe
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 25 deletions.
diff --git a/driver/bk4819.c b/driver/bk4819.c
@@ -1015,10 +1015,22 @@ void BK4819_PlayRoger(int t)
       BK4819_PlayBeep(1075, 60);
 	break;
 
-	case 7: //  // Baofeng UV-5RC
+	case 7: // Baofeng UV-5RC
       BK4819_PlayBeep(1120, 135);
       BK4819_PlayBeep(861, 200);
 	break;
+
+ 	case 8: // Mario Dies
+      BK4819_PlayBeep(494, 286/2);
+      BK4819_PlayBeep(698, 190/2);
+      BK4819_PlayBeep(0, 306/2);
+      BK4819_PlayBeep(698, 258/2);
+      BK4819_PlayBeep(698, 340/2);
+      BK4819_PlayBeep(659, 328/2);
+      BK4819_PlayBeep(587, 344/2);
+      BK4819_PlayBeep(523, 262/2);
+	break;
+
 
 #endif	
 

diff --git a/radio.c b/radio.c
@@ -920,6 +920,8 @@ void RADIO_SendEndOfTransmission(void) {
 	BK4819_PlayRoger(6);
   } else if (gEeprom.ROGER == ROGER_MODE_UV5RC) { 
 	BK4819_PlayRoger(7);	
+  } else if (gEeprom.ROGER == ROGER_MODE_MARIO) { 
+	BK4819_PlayRoger(8);	
   } else if (gEeprom.ROGER == ROGER_MODE_MDC) {
     BK4819_PlayRogerMDC();
   }
@@ -944,12 +946,9 @@ void RADIO_SendEndOfTransmission(void) {
   } else if (gEeprom.ROGER == ROGER_MODE_POLICE_ITA) { 
 	BK4819_PlayRoger(6);
   } else if (gEeprom.ROGER == ROGER_MODE_UV5RC) { 
-	BK4819_PlayRoger(7);	
-	/*
-	
-  } else if (gEeprom.ROGER == ROGER_MODE_ROGERMARIO) {
-	BK4819_PlayRogerMario();
-  }*/
+	BK4819_PlayRoger(7);
+  } else if (gEeprom.ROGER == ROGER_MODE_MARIO) { 
+	BK4819_PlayRoger(8);
   }  
 #elif !defined (ENABLE_ROGERBEEP) && defined (ENABLE_MDC)
   if (gEeprom.ROGER == ROGER_MODE_MDC) {

diff --git a/settings.h b/settings.h
@@ -99,7 +99,8 @@ enum ROGER_Mode_t {
 	ROGER_MODE_MOTOTRBOTLKRT80,
 	ROGER_MODE_ROGERCOBRAAM845,
 	ROGER_MODE_POLICE_ITA,
-	ROGER_MODE_UV5RC,	
+	ROGER_MODE_UV5RC,
+	ROGER_MODE_MARIO,
 	ROGER_MODE_MDC,
 };
 #elif defined (ENABLE_ROGERBEEP) && !defined (ENABLE_MDC)
@@ -112,8 +113,8 @@ enum ROGER_Mode_t {
 	ROGER_MODE_MOTOTRBOTLKRT80,
 	ROGER_MODE_ROGERCOBRAAM845,
 	ROGER_MODE_POLICE_ITA,
-	ROGER_MODE_UV5RC,/*
-	ROGER_MODE_ROGERMARIO,*/
+	ROGER_MODE_UV5RC,
+	ROGER_MODE_MARIO,
 };
 #elif !defined (ENABLE_ROGERBEEP) && defined (ENABLE_MDC)
 enum ROGER_Mode_t {

diff --git a/ui/menu.c b/ui/menu.c
@@ -213,30 +213,31 @@ static const char gSubMenu_PONMSG[3][5] = {
 
 #if defined(ENABLE_ROGERBEEP) && defined(ENABLE_MDC)
 const char gSubMenu_ROGER[][9] = {
-    "OFF",
-    "DEFAULT",
+  "OFF",
+  "DEFAULT",
 	"MOTOTRBO",
-    "MOTO TPT",
+  "MOTO TPT",
 	"MOTO T40",
 	"MOTO T80",
 	"C.AM845",
 	"POLIZIA", // Thanks to IU0PUW , Roger Beep Italy Police
 	"B.UV-5RC",
+  "MARIO",
 	"MDC",
 };
 
 #elif defined (ENABLE_ROGERBEEP)
 const char gSubMenu_ROGER[][9] = {
-    "OFF",
-    "DEFAULT",
-	"MOTOTRBO",
-    "MOTO TPT",
-	"MOTO T40",
-	"MOTO T80",
-	"C.AM845",
-	"POLIZIA", // Thanks to IU0PUW , Roger Beep Italy Police
-	"B.UV-5RC",
-/*	"MARIO",*/
+  "OFF",
+  "DEFAULT",
+  "MOTOTRBO",
+  "MOTO TPT",
+  "MOTO T40",
+  "MOTO T80",
+  "C.AM845",
+  "POLIZIA", // Thanks to IU0PUW , Roger Beep Italy Police
+  "B.UV-5RC",
+  "MARIO",
 };
 
 #ifdef ENABLE_MESSENGER

diff --git a/ui/menu.h b/ui/menu.h
@@ -111,9 +111,9 @@ extern uint8_t gMenuCursor;
 extern int8_t gMenuScrollDirection;
 extern uint32_t gSubMenuSelection;
 #if defined (ENABLE_ROGERBEEP) && defined (ENABLE_MDC)
-extern const char gSubMenu_ROGER[10][9];
+extern const char gSubMenu_ROGER[11][9];
 #elif defined (ENABLE_ROGERBEEP) && !defined (ENABLE_MDC)
-extern const char gSubMenu_ROGER[9][9];
+extern const char gSubMenu_ROGER[10][9];
 #elif defined (ENABLE_MDC) && !defined (ENABLE_ROGERBEEP)
 extern const char gSubMenu_ROGER[2][4];
 #endif