..

Cs_HMI/SubProject/AGV/Narumi.cs

@@ -11,15 +11,13 @@ using AR;
 
 namespace arDev
 {
-    public partial class Narumi : arRS232
+    public partial class Narumi : arDev.NarumiSerialComm
     {
         Hashtable SystemCheck, ErrorCheck;
         private Queue Errlog;                                               // 에러발생시 코드 임시 저장용(쓰레드 동기화용)
 
-
         public int nBatteryNo { get; set; } = 0;
 
-
         public Narumi()
         {
             SystemCheck = new Hashtable();
@@ -124,75 +122,18 @@ namespace arDev
             return bComplete;
         }
 
-        public class Dataframe
-        {
-            public byte STX { get; private set; }
-            public byte ETX { get; private set; }
-            public byte[] Data { get; private set; }
-            public string DataString { get; private set; }
-            public byte[] checksum { get; private set; } = new byte[2];
-            public bool Valid { get; private set; } = false;
-            public string Message { get; private set; } = string.Empty;
-            public byte[] Buffer { get; private set; }
-            public string Cmd { get; private set; } = string.Empty;
-
-            public bool Parse(byte[] data, int MinRecvLength = 0)
-            {
-                if (data == null || data.Any() == false)
-                {
-                    this.Message = string.Format("수신 데이터가 없습니다");
-                    return false;
-                }
-                else if (data.Length < 5)
-                {
-                    this.Message = $"데이터의 길이가 5보다 작습니다 길이={data.Length}";
-                    return false;
-                }
-                else if (MinRecvLength > 0 && data.Length < MinRecvLength)
-                {
-                    this.Message = $"데이터의 길이가 {MinRecvLength}보다 작습니다 길이={data.Length}";
-                    return false;
-                }
-                else if (data[0] != 0x02 || data[data.Length - 1] != 0x03)
-                {
-                    this.Message = $"STX/ETX Error";
-                    return false;
-                }
-                Buffer = new byte[data.Length];
-                Array.Copy(data, Buffer, data.Length);
-                STX = data[0];
-                ETX = data[data.Length - 1];
-                Array.Copy(data, data.Length - 3, checksum, 0, 2);
-
-                Data = new byte[data.Length - 4];
-                Array.Copy(data, 1, Data, 0, data.Length - 4);
-
-                if (data.Length > 2) Cmd = System.Text.Encoding.Default.GetString(Data, 0, 3);
-
-                this.DataString = System.Text.Encoding.Default.GetString(Data);
-
-
-                Valid = true;
-                return true;
-            }
-            public Dataframe(byte[] buffer = null, int minlen = 0)
-            {
-                if (buffer != null) Parse(buffer);
-            }
-        }
-
         public override bool ProcessRecvData(byte[] data)
         {
             //LastReceiveBuffer
             var frame = new Dataframe(data, MinRecvLength);
             if (frame.Valid == false)
             {
-                RaiseMessage(arRS232.MessageType.Error, frame.Message);
+                RaiseMessage(MessageType.Error, frame.Message);
                 return false;
             }
             else if (frame.DataString.StartsWith("$") == false && CheckSum(data) == false)
             {
-                RaiseMessage(arRS232.MessageType.Error, "Checksum Error MSG=" + frame.DataString);
+                RaiseMessage(MessageType.Error, "Checksum Error MSG=" + frame.DataString);
                 return false;
             }
 
@@ -218,7 +159,7 @@ namespace arDev
                 // $로 시작되는 AGV 상태 표시
                 //var text_Sts_Etc = Encoding.Default.GetString(bRcvData, 3, bRcvData.Length - 2).TrimStart(' ');   //20210311 김정만 - SmartX FrameWork 사용 안함으로 주석처리
                 //var sMessageOther = Encoding.Default.GetString(bRcvData, 3, bRcvData.Length - 2).TrimStart(' ');
-                RaiseMessage(arRS232.MessageType.Normal, "$메세지수신:" + frame.DataString);
+                RaiseMessage(MessageType.Normal, "$메세지수신:" + frame.DataString);
             }
             else
             {
@@ -228,7 +169,7 @@ namespace arDev
                 }
                 catch (Exception ex)
                 {
-                    RaiseMessage(arRS232.MessageType.Error, ex.Message);
+                    RaiseMessage(MessageType.Error, ex.Message);
                     retval = false;
                 }
             }