Убран PONMSG

rebezhir · Sep 10, 2023 · 2b9279b · 2b9279b
1 parent caac8ee
commit 2b9279b
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 32 deletions.
diff --git a/app/menu.c b/app/menu.c
@@ -132,7 +132,6 @@ int MENU_GetLimits(uint8_t Cursor, uint8_t *pMin, uint8_t *pMax) {
         case MENU_VOICE:
         case MENU_SC_REV:
         case MENU_MDF:
-        case MENU_PONMSG:
         case MENU_ROGER:
             *pMin = 0;
             *pMax = 2;
@@ -465,9 +464,6 @@ void MENU_AcceptSetting(void) {
             }
             return;
 
-        case MENU_PONMSG:
-            gEeprom.POWER_ON_DISPLAY_MODE = gSubMenuSelection;
-            break;
 
         case MENU_ROGER:
             gEeprom.ROGER = gSubMenuSelection;
@@ -780,10 +776,6 @@ void MENU_ShowCurrentSetting(void) {
             gSubMenuSelection = gDTMFChosenContact + 1;
             break;
 
-        case MENU_PONMSG:
-            gSubMenuSelection = gEeprom.POWER_ON_DISPLAY_MODE;
-            break;
-
         case MENU_ROGER:
             gSubMenuSelection = gEeprom.ROGER;
             break;

diff --git a/firmware.packed.bin b/firmware.packed.bin
diff --git a/helper/boot.c b/helper/boot.c
@@ -56,7 +56,7 @@ void BOOT_ProcessMode(BOOT_Mode_t Mode)
 		gMenuCursor = MENU_ALL_TX;
 		gSubMenuSelection = gSetting_ALL_TX;
 		GUI_SelectNextDisplay(DISPLAY_MENU);
-		gMenuListCount = 56;
+		gMenuListCount = 55;
 		gF_LOCK = true;
 	} else {
 		GUI_SelectNextDisplay(DISPLAY_MAIN);

diff --git a/main.c b/main.c
@@ -96,7 +96,7 @@ void Main(void)
 		//UI_DisplayWelcome();
 		BACKLIGHT_TurnOn();
 		//SYSTEM_DelayMs(1000);
-		gMenuListCount = 50;
+		gMenuListCount = 49;
 
 		BootMode = BOOT_GetMode();
 		if (gEeprom.POWER_ON_PASSWORD < 1000000) {

diff --git a/ui/menu.c b/ui/menu.c
@@ -46,7 +46,7 @@ static const char MenuList[][7] = {
 	"DWCODE", "D-ST",    "D-RSP",  "D-HOLD",
 	// 0x28
 	"D-PRE",  "PTT-ID",  "D-DCD",  "D-LIST",
-	/*"PONMSG"*/"DUMMY", "ROGER",   "ACCUM",    "AM",
+	 "ROGER",   "ACCUM",    "AM",
 	// 0x30
 	"DEL-CH",  "RESET",  "ALL TX", "F-LOCK",
     "200TX",   "500TX",  "350EN", "SCREN",
@@ -136,11 +136,6 @@ static const char gSubMenu_PTT_ID[4][5] = {
 	"BOTH",
 };
 
-static const char gSubMenu_PONMSG[3][5] = {
-	"FULL",
-	"MSG",
-	"VOL",
-};
 
 static const char gSubMenu_ROGER[3][6] = {
 	"OFF",
@@ -388,10 +383,6 @@ void UI_DisplayMenu(void)
 		}
 		break;
 
-	case MENU_PONMSG:
-		strcpy(String, gSubMenu_PONMSG[gSubMenuSelection]);
-		break;
-
 	case MENU_ROGER:
 		strcpy(String, gSubMenu_ROGER[gSubMenuSelection]);
 		break;

diff --git a/ui/menu.h b/ui/menu.h
@@ -65,18 +65,17 @@ enum {
 	MENU_PTT_ID		= 41,
 	MENU_D_DCD		= 42,
 	MENU_D_LIST		= 43,
-	MENU_PONMSG		= 44,
-	MENU_ROGER		= 45,
-	MENU_VOL		= 46,
-	MENU_AM			= 47,
-	MENU_DEL_CH		= 48,
-	MENU_RESET		= 49,
-	MENU_ALL_TX		= 50,
-	MENU_F_LOCK		= 51,
-	MENU_200TX		= 52,
-	MENU_500TX		= 53,
-	MENU_350EN		= 54,
-	MENU_SCREN		= 55,
+	MENU_ROGER		= 44,
+	MENU_VOL		= 45,
+	MENU_AM			= 46,
+	MENU_DEL_CH		= 47,
+	MENU_RESET		= 48,
+	MENU_ALL_TX		= 49,
+	MENU_F_LOCK		= 50,
+	MENU_200TX		= 51,
+	MENU_500TX		= 52,
+	MENU_350EN		= 53,
+	MENU_SCREN		= 54,
 };
 
 extern bool gIsInSubMenu;