串口初始化优化

Author: SmallRob

CommunTools/Enums/FuncItemCom.cs

@@ -76,7 +76,7 @@ public enum Com_BaseFuncItem
             /// WebSocket
             /// </summary>
             [Description("    UDP通讯")]
-            [FuncURI("Frm_ComWebSocket")]
+            [FuncURI("Frm_ComUDP")]
             COM_ComUDP = 9
         }
 

CommunTools/FrmBaseCom/Frm_ComWebSocket.cs

@@ -74,7 +74,8 @@ private void OpenWSServer()
         private void MessageReceived()
         {
             //注册消息接收事件，接收服务端发送的数据
-            wsClient.MessageReceived += (data) => {
+            wsClient.MessageReceived += (data) =>
+            {
 
                 StringBuilder sb = new StringBuilder();
                 sb.AppendFormat("[{0}]# \n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"));
@@ -83,7 +84,7 @@ private void MessageReceived()
                 txtShowMsg.Text += sb.ToString();
             };
         }
-     
+
         void ShowMsg(string str)
         {
             txtShowMsg.AppendText(str + "\r\n");
@@ -94,15 +95,16 @@ private void btnSend_BtnClick(object sender, EventArgs e)
             if (!string.IsNullOrWhiteSpace(richTextBox_Send.Text.Trim()))
             {
                 string inputMsg = richTextBox_Send.Text.ToString();
-              
+
                 wsClient.SendMessage(inputMsg);
                 MessageReceived();
             }
         }
 
         private void Frm_ComWebSocket_FormClosed(object sender, FormClosedEventArgs e)
         {
-            wsClient.Dispose();
+            if (wsClient != null)
+                wsClient.Dispose();
         }
     }
 }

CommunTools/FrmBaseCom/Frm_SerialPort.cs

@@ -121,13 +121,15 @@ private void btnOpenServer_BtnClick(object sender, EventArgs e)
                 serialPort1.StopBits = (StopBits)System.Enum.Parse(typeof(StopBits), cmbStopBits.Text);
                 serialPort1.Handshake = (Handshake)System.Enum.Parse(typeof(Handshake), cmbHandShake.Text);
 
+                serialPort1.ReceivedBytesThreshold = 1;
+
                 serialPort1.RtsEnable = ckbRts.Checked;
                 serialPort1.DtrEnable = ckbDtr.Checked;
 
                 serialPort1.WriteBufferSize = 1048576;   /* 输出缓冲区的大小为1048576字节 = 1MB */
                 serialPort1.ReadBufferSize = 2097152;    /* 输入缓冲区的大小为2097152字节 = 2MB */
 
-                SetSeriaPortEncoding();
+                serialPort1.Encoding = SetSeriaPortEncoding((EnumEncoding)System.Enum.Parse(typeof(EnumEncoding), cmbEncoding.Text));
 
                 try
                 {
@@ -155,31 +157,18 @@ private void btnOpenServer_BtnClick(object sender, EventArgs e)
             }
         }
 
-        private void SetSeriaPortEncoding()
-        {
-            EnumEncoding encoding = (EnumEncoding)System.Enum.Parse(typeof(EnumEncoding), cmbEncoding.Text);
-            switch (encoding)
-            {
-                case EnumEncoding.ASCII:
-
-                    serialPort1.Encoding = System.Text.Encoding.ASCII;
-                    break;
-                case EnumEncoding.UTF8:
-
-                    serialPort1.Encoding = System.Text.Encoding.UTF8;
-                    break;
-                case EnumEncoding.Unicode:
+        // EnumEncoding encoding = (EnumEncoding)System.Enum.Parse(typeof(EnumEncoding), cmbEncoding.Text);
 
-                    serialPort1.Encoding = System.Text.Encoding.Unicode;
-                    break;
-                case EnumEncoding.UTF32:
+        private Encoding SetSeriaPortEncoding(EnumEncoding encoding) =>
+            encoding switch
+            {
+                EnumEncoding.ASCII => Encoding.ASCII,
+                EnumEncoding.UTF8 => Encoding.UTF8,
+                EnumEncoding.Unicode => Encoding.Unicode,
+                EnumEncoding.UTF32 => Encoding.UTF32,
+                _ => throw new ArgumentException(message: "invalid enum value", paramName: nameof(encoding))
 
-                    serialPort1.Encoding = System.Text.Encoding.UTF32;
-                    break;
-                default:
-                    break;
-            }
-        }
+            };
 
         private void SetBtnEnable(bool isEnable)
         {
@@ -659,7 +648,7 @@ private void cmbEncoding_SelectedIndexChanged(object sender, EventArgs e)
         {
             if (cmbEncoding.SelectedIndex >= 0)
             {
-                SetSeriaPortEncoding();
+                serialPort1.Encoding = SetSeriaPortEncoding((EnumEncoding)System.Enum.Parse(typeof(EnumEncoding), cmbEncoding.Text));
             }
         }
     }

CommunTools/FrmBaseCom/Frm_SerialServer.Designer.cs

@@ -42,7 +42,8 @@ private void InitializeSerialSet()
                 (cmbPortParity,EnumHelper.GetEnumList(typeof(sp.PortParity))),
                 (cmbBandRate,EnumHelper.GetEnumList(typeof(sp.BandRate))),
                 (cmbStopBits,EnumHelper.GetEnumList(typeof(sp.StopBits))),
-                (cmbDataBits,EnumHelper.GetEnumList(typeof(sp.DataBit)))
+                (cmbDataBits,EnumHelper.GetEnumList(typeof(sp.DataBit))),
+                (cmbHandShake,EnumHelper.GetEnumList(typeof(sp.HandShake)))
             };
 
             foreach ((SkinComboBox box, IList<EnumListModel> enumModel) item in ps)
@@ -159,7 +160,7 @@ private bool InitSerialPort(TCPComServer comServer)
                 comServer.EntitySerialPort.WriteTimeout = 3000;
 
                 //设置数据流控制；数据传输的握手协议
-                comServer.EntitySerialPort.Handshake = Handshake.None;
+                comServer.EntitySerialPort.Handshake = (Handshake)System.Enum.Parse(typeof(Handshake), cmbHandShake.Text);
                 comServer.EntitySerialPort.ReceivedBytesThreshold = 1;
                 comServer.EntitySerialPort.RtsEnable = true;
 
@@ -287,7 +288,8 @@ private void ListenClient(object comServer)
                     server.TCPClient = server.EntityTCPListen.AcceptTcpClient();
                 }
                 catch
-                { }
+                {
+                }
                 if (server.TCPClient == null)
                 {
                     continue;