..

Cs_HMI/Project/Device/Xbee.cs

@@ -14,11 +14,11 @@ using System.Windows.Forms;
 
 namespace Project.Device
 {
-    public class Xbee : SerialPort
+    public class Xbee : SerialPort, arDev.ISerialComm
     {
         public string buffer = string.Empty;
         public System.Text.StringBuilder newbuffer = new StringBuilder();
-        public string errorMessage = string.Empty;
+        public string ErrorMessage { get; set; } = string.Empty;
         public DateTime LastStatusSendTime { get; set; } = DateTime.Now;
         private EEProtocol proto;
 
@@ -67,11 +67,23 @@ namespace Project.Device
             }
             catch (Exception ex)
             {
-                errorMessage = ex.Message;
+                ErrorMessage = ex.Message;
                 return false;
             }
         }
+        public new bool Close()
+        {
+            try
+            {
+                base.Close();
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
 
+        }
         public new bool Open()
         {
             try
@@ -81,8 +93,8 @@ namespace Project.Device
             }
             catch (Exception ex)
             {
-                errorMessage = ex.Message;
-                PUB.logxbee.AddE(errorMessage);
+                ErrorMessage = ex.Message;
+                PUB.logxbee.AddE(ErrorMessage);
                 return false;
             }
         }
@@ -145,10 +157,12 @@ namespace Project.Device
             byte cmd = (byte)ENIGProtocol.AGVCommandEH.Error;
             if (errormessage.Length > 30) errormessage = errormessage.Substring(0, 29);
 
-            var data = new byte[] { (byte)errcode };
+            var data = new List<byte>();
+            data.Add((byte)errcode);
             var datamsg = System.Text.Encoding.Default.GetBytes(errormessage);
+            data.AddRange(datamsg);
 
-            var packet = proto.CreatePacket(id, cmd, data);
+            var packet = proto.CreatePacket(id, cmd, data.ToArray());
             Send(packet);
         }
 
@@ -173,7 +187,7 @@ namespace Project.Device
         public void SendStatus()
         {
             if (this.IsOpen == false) return;
-            if ( sendlock.WaitOne() == false) return;
+            if (sendlock.WaitOne() == false) return;
             sendlock.Reset();
 
             /*
@@ -257,8 +271,8 @@ namespace Project.Device
             }
             catch (Exception ex)
             {
-                errorMessage = ex.Message;
-                PUB.logxbee.AddE(errorMessage);
+                ErrorMessage = ex.Message;
+                PUB.logxbee.AddE(ErrorMessage);
             }
             finally
             {