From 799808db1ace43141760a1fe74b2cbf28ddb2e39 Mon Sep 17 00:00:00 2001
From: wells <123>
Date: 星期五, 10 七月 2020 18:41:25 +0800
Subject: [PATCH] 合并

---
 src/Bro.Device.GTSCard/GTSCardDriver.cs |   57 ++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/src/Bro.Device.GTSCard/GTSCardDriver.cs b/src/Bro.Device.GTSCard/GTSCardDriver.cs
index ef7a20d..5d5bf1c 100644
--- a/src/Bro.Device.GTSCard/GTSCardDriver.cs
+++ b/src/Bro.Device.GTSCard/GTSCardDriver.cs
@@ -21,7 +21,7 @@
     public class GTSCardDriver : MotionCardBase
     {
         // 寮傚父浜嬩欢
-        public Action<Exception> OnExceptionRaised;
+        //public Action<Exception> OnExceptionRaised;
 
         public GTSCardInitialConfig IIConfig
         {
@@ -61,7 +61,7 @@
             {
                 AxisInfo axisInfo = new AxisInfo();
                 axisInfo.AxisName = axisSetting.AxisName;
-                var axisMovingStatus = AxisMovingOptionValues.FirstOrDefault(u => u.AxisIndex == axisSetting.AxisIndex);
+                var axisMovingStatus = AxisStatusList.FirstOrDefault(u => u.AxisIndex == axisSetting.AxisIndex);
                 axisInfo.AxisLocation = axisMovingStatus == null ? 0 : Convert.ToDouble(axisMovingStatus.CurPosition);
 
                 axisInfos.Add(axisInfo);
@@ -554,7 +554,7 @@
             catch (Exception ex)
             {
                 AllMoveStop(true);
-                OnExceptionRaised?.Invoke(ex);
+                OnExceptionOccured?.Invoke(DateTime.Now, ex);
                 return false;
             }
         }
@@ -635,7 +635,7 @@
             catch (Exception ex)
             {
                 AllMoveStop(true);
-                OnExceptionRaised?.Invoke(ex);
+                OnExceptionOccured?.Invoke(DateTime.Now, ex);
                 return false;
             }
         }
@@ -710,7 +710,7 @@
             catch (Exception ex)
             {
                 AllMoveStop(true);
-                OnExceptionRaised?.Invoke(ex);
+                OnExceptionOccured?.Invoke(DateTime.Now, ex);
                 return false;
             }
         }
@@ -817,7 +817,7 @@
             catch (Exception ex)
             {
                 AllMoveStop(true);
-                OnExceptionRaised?.Invoke(ex);
+                OnExceptionOccured?.Invoke(DateTime.Now, ex);
                 return false;
             }
         }
@@ -877,7 +877,7 @@
         /// <returns></returns>
         public bool IsStop(short axisNum)
         {
-            int sts = GetAxisStatus(axisNum);
+            int sts = AxisStatusList.FirstOrDefault(u => u.AxisIndex == axisNum).AxisStatus;
             if ((sts & 0x400) == 0) return true;//鍋滄杩斿洖true
             else return false;              //杩愯涓繑鍥瀎alse
         }
@@ -987,8 +987,10 @@
                     {
                         if (!IConfig.IsEnableMonitor)
                             return;
+
                         var newValues = GetMonitorValues();
                         var newAxisMovingStatus = GetAxisMovingStatus();
+
                         if (newValues == null || newValues.Count == 0 || newAxisMovingStatus == null || newAxisMovingStatus.Count == 0)
                             continue;
 
@@ -996,12 +998,21 @@
                         sw.Start();
                         if (MonitorValues.Count == newValues.Count)
                         {
-                            var tempNew = newValues.DeepSerializeClone();//clone
-                            var tempOld = MonitorValues.DeepSerializeClone();
+                            //var tempNew = newValues.DeepSerializeClone();//clone
+                            //var tempOld = MonitorValues.DeepSerializeClone();
+                            var tempNew = new List<IOItem>(newValues);//clone
+                            var tempOld = new List<IOItem>(MonitorValues);
                             MonitorCheckAndInvoke(tempNew, tempOld);
                         }
 
-                        AxisMovingOptionValues = new List<AxisMovingStatus>(newAxisMovingStatus);
+                        if (AxisStatusList.Count == newAxisMovingStatus.Count)
+                        {
+                            var tempNew = new List<AxisMovingStatus>(newAxisMovingStatus);//clone
+                            var tempOld = new List<AxisMovingStatus>(AxisStatusList);
+                            AxisStatusCheck(tempNew, tempOld);
+                        }
+
+                        AxisStatusList = new List<AxisMovingStatus>(newAxisMovingStatus);
                         MonitorValues = new List<IOItem>(newValues);
                         sw.Stop();
 
@@ -1021,6 +1032,29 @@
                         if (CurrentState == DeviceState.DSOpen)
                         {
                             LogAsync(DateTime.Now, $"{this.Name}鐩戝惉寮傚父", ex.GetExceptionMessage());
+                        }
+                    }
+                }
+            });
+        }
+
+        private async void AxisStatusCheck(List<AxisMovingStatus> tempNew, List<AxisMovingStatus> tempOld)
+        {
+            await Task.Run(() =>
+            {
+                foreach (var newSts in tempNew)
+                {
+                    var oldSts = tempOld.FirstOrDefault(u => u.AxisIndex == newSts.AxisIndex);
+                    if (oldSts != null)
+                    {
+                        if (oldSts.AxisStatus != newSts.AxisStatus)
+                        {
+                            AxisStatusChanged(newSts.AxisIndex, oldSts.AxisStatus, newSts.AxisStatus);
+                        }
+
+                        if (((newSts.AxisStatus >> 1 & 1) == 1) && ((oldSts.AxisStatus >> 1 & 1) == 0)) //鍒濇鎶ヨ
+                        {
+                            AxisAlarmRaised(newSts.AxisStatus, $"杞磠newSts.AxisIndex}:{newSts.AxisName}杞翠己鏈嶆姤璀�");
                         }
                     }
                 }
@@ -1111,7 +1145,8 @@
             ClearStatus(1, axisSettings.Count);
             foreach (var axisSetting in axisSettings)
             {
-                axis_sts = GetAxisStatus((short)axisSetting.AxisIndex);
+                //axis_sts = GetAxisStatus((short)axisSetting.AxisIndex);
+                axis_sts = AxisStatusList.FirstOrDefault(u => u.AxisIndex == axisSetting.AxisIndex).AxisStatus;
                 if ((axis_sts & 0x200) == 0)
                 {
                     var rst = GTSCardAPI.GT_AxisOn((short)IConfig.CardNum, (short)axisSetting.AxisIndex);

--
Gitblit v1.8.0