From e2f93c2ca9a7c58ed2a7a1ab901a30de241208a8 Mon Sep 17 00:00:00 2001
From: wu58430 <wu58430@126.com>
Date: Mon, 4 Dec 2023 20:04:58 +0800
Subject: [PATCH] MDC RX

---
 .idea/workspace.xml | 13 ++++++++++---
 app/menu.c          | 12 +++++++-----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4b6b7f2..2f264d2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -21,7 +21,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="cea36e80-e289-4d69-9030-7186d540ac0e" name="更改" comment="MDC RX">
-      <change beforePath="$PROJECT_DIR$/ui/menu.c" beforeDir="false" afterPath="$PROJECT_DIR$/ui/menu.c" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/menu.c" beforeDir="false" afterPath="$PROJECT_DIR$/app/menu.c" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -128,7 +128,7 @@
       <workItem from="1701413653518" duration="3544000" />
       <workItem from="1701430185864" duration="10115000" />
       <workItem from="1701559895523" duration="22519000" />
-      <workItem from="1701678199532" duration="11352000" />
+      <workItem from="1701678199532" duration="12135000" />
     </task>
     <task id="LOCAL-00001" summary="bug fix">
       <created>1701136012311</created>
@@ -396,7 +396,14 @@
       <option name="project" value="LOCAL" />
       <updated>1701690210457</updated>
     </task>
-    <option name="localTasksCounter" value="39" />
+    <task id="LOCAL-00039" summary="MDC RX">
+      <created>1701690633183</created>
+      <option name="number" value="00039" />
+      <option name="presentableId" value="LOCAL-00039" />
+      <option name="project" value="LOCAL" />
+      <updated>1701690633183</updated>
+    </task>
+    <option name="localTasksCounter" value="40" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
diff --git a/app/menu.c b/app/menu.c
index c8f7335..9457490 100644
--- a/app/menu.c
+++ b/app/menu.c
@@ -1203,17 +1203,18 @@ static void MENU_Key_0_to_9(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 		return;
 
 	gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL;
-
-	if (UI_MENU_GetCurrentMenuId() == MENU_MEM_NAME && edit_index >= 0)
+uint8_t now_menu=UI_MENU_GetCurrentMenuId();
+        uint8_t end_index=now_menu==MENU_MEM_NAME?10:4;
+	if (( now_menu== MENU_MEM_NAME||now_menu==MENU_MDC_ID) && edit_index >= 0)
 	{	// currently editing the channel name
 
-		if (edit_index < 10)
+		if (edit_index < end_index)
 		{
 			if (Key <= KEY_9)
 			{
 				edit[edit_index] = '0' + Key - KEY_0;
 
-				if (++edit_index >= 10)
+				if (++edit_index >= end_index)
 				{	// exit edit
 					gFlagAcceptSetting  = false;
 					gAskForConfirmation = 1;
@@ -1533,7 +1534,8 @@ else
 		if (UI_MENU_GetCurrentMenuId() == MENU_RESET  ||
 			UI_MENU_GetCurrentMenuId() == MENU_MEM_CH ||
 			UI_MENU_GetCurrentMenuId() == MENU_DEL_CH ||
-			UI_MENU_GetCurrentMenuId() == MENU_MEM_NAME)
+			UI_MENU_GetCurrentMenuId() == MENU_MEM_NAME||
+                UI_MENU_GetCurrentMenuId() == MENU_MDC_ID)
 		{
 			switch (gAskForConfirmation)
 			{