변경 (1.4 -> 15ver)

1. 용량표시에 % 빠진 것 추가. 2. error 상태일 때 소리 변경( 3초 중 2초만 삑) 3. Restart버튼 누르는 것을 컴퓨터가 보낸 메시지로도 동작할 수 있도록 기능 추가.
yeonSG · Dec 10, 2021 · 45ca95f · 45ca95f
1 parent a382fbf
commit 45ca95f
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 8 deletions.
diff --git a/TubeFeederProject/TubeFeeder/MemoryManager.cs b/TubeFeederProject/TubeFeeder/MemoryManager.cs
@@ -38,7 +38,7 @@ public string getUsageString()
             m_memoryUsePercent = System.Math.Round(use_Kb * 100.0 / totla_Kb, 1);
 
             return use_Mb.ToString() + "/" + total_Mb.ToString()
-                + "Mb (" + m_memoryUsePercent.ToString() + ")";
+                + "Mb (" + m_memoryUsePercent.ToString() + "%)";
         }
 
         public double getMemoryUseagePercent()

diff --git a/TubeFeederProject/TubeFeeder/MessageProtocol.cs b/TubeFeederProject/TubeFeeder/MessageProtocol.cs
@@ -36,6 +36,7 @@ public class MessageProtocol
         public const byte CMD_ORDER_START = (byte)'S';
         public const byte CMD_ORDER_STOP = (byte)'T';
         public const byte CMD_ORDER_RESTART = (byte)'R';
+        public const byte CMD_ORDER_RESTARTCLICK = (byte)'R';
         public const byte CMD_ORDER_ERROR = (byte)'E';
 
         public const byte CMD_ORDER_START_BARCODE_ON  = 0xF0;
@@ -71,6 +72,7 @@ public enum ReciveMessage
             order_Start,
             order_Stop,
             order_Error,
+            order_RestartClick,
             inform_Ack,
             inform_Scanned,
             inform_Error,

diff --git a/TubeFeederProject/TubeFeeder/MessageReciver.cs b/TubeFeederProject/TubeFeeder/MessageReciver.cs
@@ -61,6 +61,9 @@ public MessageProtocol.ReciveMessage messageProcessing()
                             case MessageProtocol.CMD_ORDER_ERROR:
                                 LogFunction("Recived : Order_Error");
                                 return MessageProtocol.ReciveMessage.order_Error;
+                            case MessageProtocol.CMD_ORDER_RESTARTCLICK:
+                                LogFunction("Recived : Order_RestartClick");
+                                return MessageProtocol.ReciveMessage.order_RestartClick;
                         }
 
                     }

diff --git a/TubeFeederProject/TubeFeeder/TubeFeeder.Designer.cs b/TubeFeederProject/TubeFeeder/TubeFeeder.Designer.cs
diff --git a/TubeFeederProject/TubeFeeder/TubeFeeder.cs b/TubeFeederProject/TubeFeeder/TubeFeeder.cs
@@ -42,6 +42,8 @@ public partial class Form1 : Form
 
         private SettingValues m_settingValues;
 
+        RestartDialogForm restartDialog;
+
         private Queue<byte> reciveQueue = new Queue<byte>();
 
         public Form1()
@@ -528,6 +530,9 @@ public void msgRecive(MessageProtocol.ReciveMessage reciveMsg)
                     m_isOnError = true;
                     showRestartDialog();    // ysys
                     break;
+                case MessageProtocol.ReciveMessage.order_RestartClick:
+                    closeRestartDialog();
+                    break;
                 default:
                     break;
 
@@ -536,10 +541,10 @@ public void msgRecive(MessageProtocol.ReciveMessage reciveMsg)
 
         public void showRestartDialog()
         {
-            RestartDialogForm restartDialog = new RestartDialogForm();
-            DialogResult dr = restartDialog.ShowDialog();
+            restartDialog = new RestartDialogForm();
+            DialogResult result = restartDialog.ShowDialog();
 
-            if (dr == DialogResult.OK)
+            if (result == DialogResult.OK)
             {
                 m_ControlBoard.SendMessage(MessageGenerator.Meesage_DeviceReStart());
                 setIndicatorColor(Color.Green);
@@ -552,6 +557,15 @@ public void showRestartDialog()
             }
         }
 
+        public void closeRestartDialog()
+        {
+            if (restartDialog != null)
+            {
+                restartDialog.DialogResult = DialogResult.OK;
+                restartDialog.Close();
+            }
+        }
+
         public void btnStart_buttonUp()
         {
             if (this.btn_start.InvokeRequired)
@@ -636,7 +650,10 @@ private void smartTimer1_Tick(object sender, EventArgs e)
 
             if(m_isOnError==true)
             {
-                MessageBeep(64);
+                if ((runTime.Seconds/3) != 0)    // 3초 중 2초 소리냄 ( 삑-삑-X ... )
+                {
+                    MessageBeep(48);
+                }
                 if (label_indicator.BackColor == Color.Red) // 1초간격 점멸 
                 {
                     setIndicatorColor(Color.Black);
@@ -662,7 +679,7 @@ private void smartTimer1_Tick(object sender, EventArgs e)
 
             try
             {
-                if (runTime.Seconds == 0)
+                if (runTime.Seconds == 10)  // x분 10초마다 메모리 상태 업데이트
                 {
                     setMemoryLabelText(m_memoryManger.getUsageString());
                 }