From aeae986de8bed7dbae02d3632cda82f291fff0ec Mon Sep 17 00:00:00 2001
From: wells <123>
Date: 星期六, 11 七月 2020 16:59:04 +0800
Subject: [PATCH] 固高板卡配置输出ProcessException

---
 src/Bro.Device.GTSCard/GTSCardDriver.cs |  790 ++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 589 insertions(+), 201 deletions(-)

diff --git a/src/Bro.Device.GTSCard/GTSCardDriver.cs b/src/Bro.Device.GTSCard/GTSCardDriver.cs
index de90301..a09fda2 100644
--- a/src/Bro.Device.GTSCard/GTSCardDriver.cs
+++ b/src/Bro.Device.GTSCard/GTSCardDriver.cs
@@ -21,9 +21,9 @@
     public class GTSCardDriver : MotionCardBase
     {
         // 寮傚父浜嬩欢
-        public Action<Exception> OnExceptionRaised;
+        //public Action<Exception> OnExceptionRaised;
 
-        public GTSCardInitialConfig IConfig
+        public GTSCardInitialConfig IIConfig
         {
             get
             {
@@ -37,6 +37,18 @@
         /// </summary>
         bool _isResetting = false;
 
+        /// <summary>
+        /// 鏄惁鏆傚仠涓�
+        /// </summary>
+        bool _isPause = false;
+
+        /// <summary>
+        /// 杩愬姩杞寸珛鍗虫殏鍋�
+        /// </summary>
+        Dictionary<int, ManualResetEvent> axisImmediatePauseHandleDict = new Dictionary<int, ManualResetEvent>();
+
+        //Dictionary<int, CancellationTokenSource> axisMoveCancelDict = new Dictionary<int, CancellationTokenSource>();
+
         public void SetResetFlag(bool isReset)
         {
             _isResetting = isReset;
@@ -44,7 +56,17 @@
 
         public override List<AxisInfo> GetCurrentAxisInfo(params string[] axisName)
         {
-            throw new NotImplementedException();
+            List<AxisInfo> axisInfos = new List<AxisInfo>();
+            IConfig.AxisSettings.FindAll(a => a.IsAxisEnabled).ForEach(axisSetting =>
+            {
+                AxisInfo axisInfo = new AxisInfo();
+                axisInfo.AxisName = axisSetting.AxisName;
+                var axisMovingStatus = AxisStatusList.FirstOrDefault(u => u.AxisIndex == axisSetting.AxisIndex);
+                axisInfo.AxisLocation = axisMovingStatus == null ? 0 : Convert.ToDouble(axisMovingStatus.CurPosition);
+
+                axisInfos.Add(axisInfo);
+            });
+            return axisInfos;
         }
 
         #region DeviceBase
@@ -52,21 +74,30 @@
         protected override void Init()
         {
             InitialMotionCard();
+            axisImmediatePauseHandleDict = IConfig.AxisSettings.FindAll(a => a.IsAxisEnabled).ToDictionary(a => a.AxisIndex, a => new ManualResetEvent(true));
+            //axisMoveCancelDict = IConfig.AxisSettings.FindAll(a => a.IsAxisEnabled).ToDictionary(a => a.AxisIndex, a => new CancellationTokenSource());
+
+            //axisMoveCancelDict.Values.ToList().ForEach(c =>
+            //{
+            //    c = new CancellationTokenSource();
+            //});
         }
 
         protected override void Pause()
         {
-            throw new NotImplementedException();
+
         }
 
         protected override void Resume()
         {
-            throw new NotImplementedException();
+
         }
 
         protected override void Start()
         {
             AllAxisOn();
+
+            base.Start();
         }
 
         protected override void Stop()
@@ -75,9 +106,152 @@
             AllAxisOff();
         }
 
+        /// <summary>
+        /// 璁惧 杩愯锛堟墽琛� 鏉垮崱绯诲垪鐨勬搷浣滅殑 闆嗗悎锛�
+        /// </summary>
+        /// <param name="config"></param>
+        /// <returns></returns>
         public override ResponseMessage Run(IOperationConfig config)
         {
-            throw new NotImplementedException();
+            ResponseMessage responseMessage = new ResponseMessage();
+            if (config is MotionCardOperationConfigBase motionCardOperationConfig)
+            {
+                foreach (var operationSet in motionCardOperationConfig.OperationCollection)
+                {
+                    responseMessage = RunOperationSet(operationSet);
+                    if (!responseMessage.Result)
+                    {
+                        return responseMessage;
+                    }
+                }
+            }
+            return responseMessage;
+        }
+
+        /// <summary>
+        /// 鎵ц 涓�涓郴鍒楃殑鎿嶄綔
+        /// </summary>
+        private ResponseMessage RunOperationSet(MotionCardOperationSet operationSet)
+        {
+            ResponseMessage responseMessage = new ResponseMessage();
+            // 1.棰勬鏌�
+            if (CurrentState == DeviceState.DSOpen)
+            {
+                foreach (var preCheck in operationSet.PreCheckIOCollection)
+                {
+                    int timeout = operationSet.PreCheckIOTimeout;
+                    IOValue? ioData = null;
+                    while (CurrentState == DeviceState.DSOpen)
+                    {
+                        Thread.Sleep(10);
+                        ioData = MonitorValues.FirstOrDefault(u => u.IONum == preCheck.IOItem.IONum && u.IOType == preCheck.IOItem.IOType)?.Value;//IO 鏄紑銆佸叧 浠嶮onitorValues 鑾峰彇
+                        timeout -= 10;
+                        if (preCheck.CheckValue == ioData || (operationSet.PreCheckIOTimeout > 0 && timeout < 0))
+                        {
+                            break;
+                        }
+                    }
+
+                    if (preCheck.CheckValue != ioData)
+                    {
+                        responseMessage.Result = false;
+                        responseMessage.Message = $"棰勬鏌ヤ笉閫氳繃锛岄厤缃細{preCheck.GetDisplayText()}锛屽綋鍓嶅�硷細{ioData}";
+                        return responseMessage;
+                    }
+                }
+            }
+
+            // 2.鏉垮崱杩愬姩
+            if (CurrentState == DeviceState.DSOpen)
+            {
+                responseMessage = MoveToPoint(new MotionOperationCollection() { MovingOps = operationSet.MovingOps });
+                if (!responseMessage.Result)
+                {
+                    return responseMessage;
+                }
+            }
+
+
+            // 3.IO杈撳嚭 涓嶉渶瑕佽秴鏃�
+            if (CurrentState == DeviceState.DSOpen)
+            {
+                foreach (var ioOutput in operationSet.IOOutputCollection)
+                {
+                    var ioData = MonitorValues.FirstOrDefault(u => u.IONum == ioOutput.IOItem.IONum && u.IOType == ioOutput.IOItem.IOType)?.Value;//IO 鏄紑銆佸叧 浠嶮onitorValues 鑾峰彇
+                    if (ioOutput.CheckValue != ioData)
+                    {
+                        responseMessage.Result = false;
+                        responseMessage.Message = $"IO杈撳嚭涓嶉�氳繃锛岄厤缃細{ioOutput.GetDisplayText()}锛屽綋鍓嶅�硷細{ioData}";
+                        return responseMessage;
+                    }
+                }
+            }
+
+            // 4.IO纭
+            if (CurrentState == DeviceState.DSOpen)
+            {
+                foreach (var ioConfirm in operationSet.IOConfirmCollection)
+                {
+                    int timeout = operationSet.IOConfirmTimeout;
+                    IOValue? ioData = null;
+                    while (CurrentState == DeviceState.DSOpen)
+                    {
+                        Thread.Sleep(10);
+                        ioData = MonitorValues.FirstOrDefault(u => u.IONum == ioConfirm.IOItem.IONum && u.IOType == ioConfirm.IOItem.IOType)?.Value;//IO 鏄紑銆佸叧 浠嶮onitorValues 鑾峰彇
+                        timeout -= 10;
+                        if (ioConfirm.CheckValue == ioData || (operationSet.IOConfirmTimeout > 0 && timeout < 0))
+                        {
+                            break;
+                        }
+                    }
+
+                    if (ioConfirm.CheckValue != ioData)
+                    {
+                        responseMessage.Result = false;
+                        responseMessage.Message = $"IO纭涓嶉�氳繃锛岄厤缃細{ioConfirm.GetDisplayText()}锛屽綋鍓嶅�硷細{ioData}";
+                        return responseMessage;
+                    }
+                }
+            }
+
+            return responseMessage;
+        }
+        #endregion
+
+        #region ImmediatePause
+        /// <summary>
+        /// 鍚姩绔嬪嵆鏆傚仠
+        /// </summary>
+        public override void SetImmediatePause()
+        {
+            if (!_isResetting)
+            {
+                var immediatePauseAxis = IConfig.AxisSettings.FindAll(a => a.IsAxisEnabled && a.IsImmediatePause).Select(u => u.AxisIndex).ToList();
+
+                immediatePauseAxis.ForEach(async axisIndex =>
+                {
+                    axisImmediatePauseHandleDict[axisIndex].Reset();
+
+                    //axisMoveCancelDict[axisIndex].Cancel();
+
+                    await MoveStop(axisIndex, 0);//鎵�鏈夎酱閮芥殏鍋�
+                });
+            }
+        }
+
+        /// <summary>
+        /// 鎭㈠绔嬪嵆鏆傚仠
+        /// </summary>
+        public override void ResetImmediatePause()
+        {
+            var immediatePauseAxis = IConfig.AxisSettings.FindAll(a => a.IsAxisEnabled && a.IsImmediatePause).Select(u => u.AxisIndex).ToList();
+
+            immediatePauseAxis.ForEach(axisIndex =>
+            {
+                //axisMoveCancelDict[axisIndex] = new CancellationTokenSource();
+
+                axisImmediatePauseHandleDict[axisIndex].Set();
+            });
         }
         #endregion
 
@@ -92,21 +266,21 @@
         {
             var res = GTSCardAPI.GT_Open((short)IConfig.CardNum, 0, 1); //鎵撳紑杩愬姩鎺у埗鍣ㄣ�傚弬鏁板繀椤讳负锛�0,1锛夛紝涓嶈兘淇敼銆�     
             res += GTSCardAPI.GT_LoadConfig((short)IConfig.CardNum, IConfig.InitialConfigFilePath);
-            res += GTSCardAPI.GT_ClrSts(0, 1, 8);
+            ClearStatus(1, IConfig.AxisSettings.FindAll(u => u.IsAxisEnabled).Count);
             if (res != (short)GTSRetCode.GRCRunOK)
             {
-                throw new Exception("鏉垮崱杞藉叆閰嶇疆鏂囦欢寮傚父锛岄敊璇爜锛�" + res);
+                throw new ProcessException("鏉垮崱杞藉叆閰嶇疆鏂囦欢寮傚父锛岄敊璇爜锛�" + res);
             }
         }
 
 
-        public bool AllAxisOn()
+        public override bool AllAxisOn()
         {
             List<Task<bool>> taskList = new List<Task<bool>>(); ;
             // 濡傛灉鏄涓酱鐨勮繍鍔� 绛夋瘡涓酱寮�鍚�
-            IConfig.AxisSettings.Where(a => a.IsAxisEnabled).ToList().ForEach(axisNum =>
+            IConfig.AxisSettings.FindAll(a => a.IsAxisEnabled).ForEach(axisNum =>
             {
-                var task = AxisOnAsync((short)IConfig.CardNum, (short)axisNum.AxisIndex);
+                var task = AxisOnAsync(axisNum.AxisIndex);
                 taskList.Add(task);
             });
             Task.WaitAll(taskList.ToArray());
@@ -114,13 +288,13 @@
             return resultOK;
         }
 
-        public bool AllAxisOff()
+        public override bool AllAxisOff()
         {
             List<Task<bool>> taskList = new List<Task<bool>>(); ;
             // 濡傛灉鏄涓酱鐨勮繍鍔� 绛夋瘡涓酱鍏抽棴
-            IConfig.AxisSettings.Where(a => a.IsAxisEnabled).ToList().ForEach(axisNum =>
+            IConfig.AxisSettings.FindAll(a => a.IsAxisEnabled).ForEach(axisNum =>
             {
-                var task = AxisOffAsync((short)IConfig.CardNum, (short)axisNum.AxisIndex);
+                var task = AxisOffAsync(axisNum.AxisIndex);
                 taskList.Add(task);
             });
             Task.WaitAll(taskList.ToArray());
@@ -132,11 +306,11 @@
         /// 鍗曚釜杞村紑鍚�
         /// </summary>
         /// <returns></returns>
-        public async Task<bool> AxisOnAsync(short cardNum, short axisNum)
+        public override async Task<bool> AxisOnAsync(int axisNum)
         {
             return await Task.Run(() =>
             {
-                var ret = GTSCardAPI.GT_AxisOn(cardNum, axisNum);
+                var ret = GTSCardAPI.GT_AxisOn((short)IConfig.CardNum, (short)axisNum);
                 return ret == (short)GTSRetCode.GRCRunOK;
             });
         }
@@ -145,11 +319,11 @@
         /// 鍗曚釜杞村叧闂�
         /// </summary>
         /// <returns></returns>
-        public async Task<bool> AxisOffAsync(short cardNum, short axisNum)
+        public override async Task<bool> AxisOffAsync(int axisNum)
         {
             return await Task.Run(() =>
             {
-                var ret = GTSCardAPI.GT_AxisOff(cardNum, axisNum);
+                var ret = GTSCardAPI.GT_AxisOff((short)IConfig.CardNum, (short)axisNum);
                 return ret == (short)GTSRetCode.GRCRunOK;
             });
         }
@@ -161,25 +335,24 @@
         /// <returns>杩愬姩鎺у埗+鍋滄鍒ゆ柇</returns>
         public override ResponseMessage MoveToPoint(IOperationConfig opConfig)
         {
-            bool resultOK = false;
-            var gtsOperationConfig = opConfig as GTSCardOperationConfig;
-            List<Task<bool>> taskList = new List<Task<bool>>();
-            //TaskFactory factory = new TaskFactory(TaskCreationOptions.LongRunning, TaskContinuationOptions.None);
-            // 濡傛灉鏄涓酱鐨勮繍鍔� 绛夋瘡涓酱杩愬姩缁撴潫
-            foreach (var movingOp in gtsOperationConfig.MovingOps)
+            ResponseMessage responseMessage = new ResponseMessage();
+            if (opConfig is MotionOperationCollection gtsOperationCollection)
             {
-                //var task = factory.StartNew<bool>((op) =>
-                //{
-                //    return SingleAxisMoving(op as MovingOption);
-                //}, movingOp);
-                var task = SingleAxisMoving(movingOp);
-                taskList.Add(task);
+                List<Task<bool>> taskList = new List<Task<bool>>();
+                foreach (var movingOp in gtsOperationCollection.MovingOps)
+                {
+                    var task = SingleAxisMoving(movingOp);
+                    taskList.Add(task);
+                    task.Start();
+                }
+                Task.WaitAll(taskList.ToArray());
+                responseMessage.Result = taskList.All(u => u.GetAwaiter().GetResult());
+                if (!responseMessage.Result)
+                {
+                    responseMessage.Message = $"鐐逛綅杩愬姩寮傚父";
+                }
             }
-            Task.WaitAll(taskList.ToArray());
-            resultOK = taskList.All(u => u.GetAwaiter().GetResult());
-
-            //return resultOK;
-            throw new NotImplementedException();
+            return responseMessage;
         }
 
         /// <summary>
@@ -191,77 +364,89 @@
         {
             List<short> resultCode = new List<short>() { 0 };
             GTSCardAPI.TTrapPrm trapprm = new GTSCardAPI.TTrapPrm();
-            resultCode.Add(GTSCardAPI.GT_PrfTrap((short)IConfig.CardNum, (short)optionPara.AxisIndex));
-            resultCode.Add(GTSCardAPI.GT_GetTrapPrm((short)IConfig.CardNum, (short)optionPara.AxisIndex, out trapprm));
+            short axisIndex = short.Parse(optionPara.AxisIndexStr);
+            resultCode.Add(GTSCardAPI.GT_PrfTrap((short)IConfig.CardNum, axisIndex));
+            resultCode.Add(GTSCardAPI.GT_GetTrapPrm((short)IConfig.CardNum, axisIndex, out trapprm));
             trapprm.smoothTime = 1;
             trapprm.acc = optionPara.VelocityPara.Acc != 0 ? optionPara.VelocityPara.Acc : 1;
             trapprm.dec = optionPara.VelocityPara.Dec != 0 ? optionPara.VelocityPara.Dec : 1;
 
-            resultCode.Add(GTSCardAPI.GT_SetTrapPrm((short)IConfig.CardNum, (short)optionPara.AxisIndex, ref trapprm));
-            resultCode.Add(GTSCardAPI.GT_SetVel((short)IConfig.CardNum, (short)optionPara.AxisIndex, optionPara.VelocityPara.Velocity * IConfig.AxisVelocityRatio));
+            resultCode.Add(GTSCardAPI.GT_SetTrapPrm((short)IConfig.CardNum, axisIndex, ref trapprm));
+            resultCode.Add(GTSCardAPI.GT_SetVel((short)IConfig.CardNum, axisIndex, optionPara.VelocityPara.Velocity * IConfig.AxisVelocityRatio));
 
             var resultOK = resultCode.All(u => u == (short)GTSRetCode.GRCRunOK);
             if (!resultOK)
             {
-                throw new Exception("杞�" + optionPara.AxisIndex + "璁剧疆鍙傛暟寮傚父锛岄敊璇爜锛�" + string.Join(",", resultCode));
+                throw new ProcessException("杞�" + optionPara.AxisIndex + "璁剧疆鍙傛暟寮傚父锛岄敊璇爜锛�" + string.Join(",", resultCode));
             }
             return resultOK;
         }
 
+        TaskFactory taskFactory = new TaskFactory(TaskCreationOptions.LongRunning, TaskContinuationOptions.LongRunning);
         /// <summary>
         /// 鍗曚釜杞� 杩愬姩(鐐瑰埌鐐� jog 鍥為浂...锛�
         /// </summary>
         /// <param name="optionPara">杩愬姩鍙傛暟瀵硅薄</param>
-        public async Task<bool> SingleAxisMoving(MovingOption optionPara)
+        public override Task<bool> SingleAxisMoving(MovingOption optionPara)
         {
-            return await Task.Run(() =>
-            {
-                bool isSuccessAndStop = false;
-                if (IConfig.AxisSettings.FirstOrDefault(a => a.AxisIndex == optionPara.AxisIndex)?.IsAxisEnabled ?? false)
-                {
-                    string _position = "";
-                    string motionType = optionPara.MoveMode == EnumHelper.MotorMoveMode.Normal ? (optionPara.IsAbsolute ? "Abs" : "Rel") : optionPara.MoveMode.ToString();
+            return new Task<bool>(() =>
+             {
+                 axisImmediatePauseHandleDict[optionPara.AxisIndex].WaitOne();
+                 bool isSuccessAndStop = false;
+                 try
+                 {
+                     if (IConfig.AxisSettings.FirstOrDefault(a => a.AxisIndex == optionPara.AxisIndex)?.IsAxisEnabled ?? false)
+                     {
+                         string _position = "";
+                         string motionType = optionPara.MoveMode == EnumHelper.MotionMode.Normal ? (optionPara.IsAbsolute ? "Abs" : "Rel") : optionPara.MoveMode.ToString();
 
-                    _position = $"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff")},{optionPara.AxisIndex},{motionType},{GetPosition(optionPara.AxisIndex).ToString()},{GetPrfPosition(optionPara.AxisIndex).ToString()},{optionPara.Destination},";
+                         _position = $"{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff},{optionPara.AxisIndex},{motionType},{GetPosition(optionPara.AxisIndex)},{GetPrfPosition(optionPara.AxisIndex)},{optionPara.Destination},";
 
-                    switch (optionPara.MoveMode)
-                    {
-                        case MotorMoveMode.Normal:
-                            {
-                                if (_isResetting)
-                                {
-                                    LogAsync(DateTime.Now, "澶嶄綅涓惎鍔ㄨ繍鍔ㄥ紓甯�", optionPara.AxisIndex + "鍚姩杩愬姩寮傚父");
-                                    return false;
-                                }
+                         switch (optionPara.MoveMode)
+                         {
+                             case MotionMode.Normal:
+                                 {
+                                     if (_isResetting)
+                                     {
+                                         LogAsync(DateTime.Now, "澶嶄綅涓惎鍔ㄨ繍鍔ㄥ紓甯�", optionPara.AxisIndex + "鍚姩杩愬姩寮傚父");
+                                         return false;
+                                     }
 
-                                if (optionPara.IsAbsolute)
-                                {
-                                    isSuccessAndStop = P2PMoveAbs(optionPara);
-                                }
-                                else
-                                {
-                                    isSuccessAndStop = P2PMoveRel(optionPara);
-                                }
+                                     if (optionPara.IsAbsolute)
+                                     {
+                                         isSuccessAndStop = P2PMoveAbs(optionPara);
+                                     }
+                                     else
+                                     {
+                                         isSuccessAndStop = P2PMoveRel(optionPara);
+                                     }
 
-                            }
-                            break;
-                        case MotorMoveMode.FindOri:
-                            {
-                                isSuccessAndStop = GoHome(optionPara);
-                            }
-                            break;
-                        case MotorMoveMode.Jog:
-                            {
-                                isSuccessAndStop = JogMove(optionPara);
-                            }
-                            break;
-                    }
-                    _position += $"{GetPosition(optionPara.AxisIndex)},";
-                    _position += $"{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}";
-                    LogAsync(DateTime.Now, "", _position);
-                }
-                return isSuccessAndStop;
-            });
+                                 }
+                                 break;
+                             case MotionMode.FindOri:
+                                 {
+                                     //isSuccessAndStop = GoHome(optionPara);  
+                                     isSuccessAndStop = P2PGoHome(optionPara);
+                                 }
+                                 break;
+                             case MotionMode.Jog:
+                                 {
+                                     isSuccessAndStop = JogMove(optionPara);
+                                 }
+                                 break;
+                         }
+                         _position += $"{GetPosition(optionPara.AxisIndex)},";
+                         _position += $"{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}";
+                         LogAsync(DateTime.Now, "", _position);
+                     }
+                 }
+                 catch (Exception ex)
+                 {
+                     isSuccessAndStop = false;
+                     LogAsync(DateTime.Now, $"杞磠optionPara.AxisIndex}杩愬姩寮傚父", ex.GetExceptionMessage());
+                 }
+                 return isSuccessAndStop;
+             });
         }
 
         /// <summary>
@@ -276,9 +461,10 @@
             var ret = GTSCardAPI.GT_GetPrfPos((short)IConfig.CardNum, (short)axisNum, out prfpos, 1, out pclock);
             if (ret != (short)GTSRetCode.GRCRunOK)
             {
-                throw new Exception("杞�" + axisNum + "鑾峰彇瑙勫垝浣嶇疆寮傚父锛岄敊璇爜锛�" + ret);
+                throw new ProcessException("杞�" + axisNum + "鑾峰彇瑙勫垝浣嶇疆寮傚父锛岄敊璇爜锛�" + ret);
             }
-            position = prfpos / IConfig.AxisVelocityRatio;
+            //var AxisRatio = IConfig.AxisSettings.FirstOrDefault(u => u.AxisIndex == axisNum) == null ? 1 : IConfig.AxisSettings.FirstOrDefault(u => u.AxisIndex == axisNum).AxisRatio;
+            position = prfpos;
             return position;
         }
 
@@ -292,15 +478,49 @@
             lock (moveLock)
             {
                 double position = 0;
-                int pPos = 0;
-                var ret = GTSCardAPI.GT_GetPos((short)IConfig.CardNum, (short)axisNum, out pPos);
+                double pPos = 0;
+                var ret = GTSCardAPI.GT_GetPrfPos((short)IConfig.CardNum, (short)axisNum, out pPos, 1, out uint pclock);
                 if (ret != (short)GTSRetCode.GRCRunOK)
                 {
-                    throw new Exception("杞�" + axisNum + "鑾峰彇鐩爣浣嶇疆寮傚父锛岄敊璇爜锛�" + ret);
+                    throw new ProcessException("杞�" + axisNum + "鑾峰彇鐩爣浣嶇疆寮傚父锛岄敊璇爜锛�" + ret);
                 }
-                position = pPos / IConfig.AxisVelocityRatio;
+                //var AxisRatio = IConfig.AxisSettings.FirstOrDefault(u => u.AxisIndex == axisNum) == null ? 1 : IConfig.AxisSettings.FirstOrDefault(u => u.AxisIndex == axisNum).AxisRatio;
+                position = pPos;
                 return position;
             }
+        }
+
+        /// <summary>
+        /// 鑾峰彇瑙勫垝閫熷害
+        /// </summary>
+        /// <param name="axisNum">Axis number</param>
+        /// <returns>閫熷害鑴夊啿</returns>
+        public double GetPrfVelocity(int axisNum)
+        {
+            double prfVel = 0;
+            uint pclock = 0;
+            var ret = GTSCardAPI.GT_GetPrfVel((short)IConfig.CardNum, (short)axisNum, out prfVel, 1, out pclock);
+            if (ret != (short)GTSRetCode.GRCRunOK)
+            {
+                throw new ProcessException("杞�" + axisNum + "鑾峰彇瑙勫垝閫熷害寮傚父锛岄敊璇爜锛�" + ret);
+            }
+            return prfVel;
+        }
+
+        /// <summary>
+        /// 鑾峰彇褰撳墠閫熷害
+        /// </summary>
+        /// <param name="axisNum">Axis number</param>
+        /// <returns>閫熷害鑴夊啿</returns>
+        public double GetVelocity(int axisNum)
+        {
+            double vel = 0;
+            var ret = GTSCardAPI.GT_GetVel((short)IConfig.CardNum, (short)axisNum, out vel);
+            if (ret != (short)GTSRetCode.GRCRunOK)
+            {
+                throw new ProcessException("杞�" + axisNum + "鑾峰彇褰撳墠閫熷害寮傚父锛岄敊璇爜锛�" + ret);
+            }
+            return vel;
         }
 
         /// <summary>
@@ -328,8 +548,8 @@
 
                     if (ret != (short)GTSRetCode.GRCRunOK)
                     {
-                        LogAsync(DateTime.Now, "杞�" + optionPara.AxisIndex + "APS_absolute_move寮傚父", "閿欒鐮侊細" + ret + ";" + "閲嶈瘯娆℃暟锛�" + repeatTime);
-                        Thread.Sleep(50);
+                        LogAsync(DateTime.Now, "杞�" + optionPara.AxisIndex + "JogMove寮傚父", "閿欒鐮侊細" + ret + ";" + "閲嶈瘯娆℃暟锛�" + repeatTime);
+                        Thread.Sleep(10);
                     }
                     repeatTime--;
                 } while (ret != (short)GTSRetCode.GRCRunOK && repeatTime > 0);
@@ -338,32 +558,9 @@
             catch (Exception ex)
             {
                 AllMoveStop(true);
-                OnExceptionRaised?.Invoke(ex);
+                OnExceptionOccured?.Invoke(DateTime.Now, ex);
                 return false;
             }
-
-        }
-
-        /// <summary>
-        /// Set Single Axis Do stop Jog Move  
-        /// </summary>
-        /// <param name="axisNum">AxisNo</param>
-        /// <returns></returns>
-        public bool StopJog(int axisNum)
-        {
-            //鍋滄杩愬姩
-            MoveStop(axisNum, 0);
-            //杩愬姩寮�濮嬪悗 妫�鏌ヨ繍鍔ㄦ槸鍚﹀仠姝�
-            bool isStop = false;
-            int repeatTime = 1000;
-            do
-            {
-                isStop = IsStop((short)IConfig.CardNum, (short)axisNum);
-                Thread.Sleep(50);
-                repeatTime--;
-            } while (!isStop && repeatTime > 0);
-
-            return isStop;
         }
 
         /// <summary>
@@ -379,7 +576,7 @@
                 if (_isResetting)
                 {
                     LogAsync(DateTime.Now, "澶嶄綅杩囩▼寮傚父", "杞�" + optionPara.AxisIndex + "璇曞浘鍦ㄥ浣嶈繃绋嬩腑杩愬姩");
-                    throw new Exception("杞�" + optionPara.AxisIndex + "璇曞浘鍦ㄥ浣嶈繃绋嬩腑杩愬姩");
+                    throw new ProcessException("杞�" + optionPara.AxisIndex + "璇曞浘鍦ㄥ浣嶈繃绋嬩腑杩愬姩");
                 }
 
                 int repeatTime = 30;
@@ -398,20 +595,21 @@
                 if (CurrentState != EnumHelper.DeviceState.DSOpen)
                 {
                     LogAsync(DateTime.Now, "闈炴甯哥姸鎬佸紓甯�", "杞�" + optionPara.AxisIndex + "璇曞浘鍦ㄩ潪姝e父鐘舵�佽繍鍔�");
-                    throw new Exception("杞�" + optionPara.AxisIndex + "璇曞浘鍦ㄩ潪姝e父鐘舵�佽繍鍔�", null);
+                    throw new ProcessException("杞�" + optionPara.AxisIndex + "璇曞浘鍦ㄩ潪姝e父鐘舵�佽繍鍔�", null);
                 }
 
                 LogAsync(DateTime.Now, "杞�" + optionPara.AxisIndex + "寮�濮嬭繍鍔�", "鐩爣鍧愭爣锛�" + optionPara.Destination);
                 short ret = 0;
-                repeatTime = 100;
                 bool isSuccessSetAxisParam = false;
                 int currentPosition = (int)GetPosition(optionPara.AxisIndex);
                 int dPosition = optionPara.Destination + currentPosition;
-                do
+                int timeout = optionPara.MovingTimeout;
+                var AxisRatio = IConfig.AxisSettings.FirstOrDefault(u => u.AxisIndex == optionPara.AxisIndex) == null ? 1 : IConfig.AxisSettings.FirstOrDefault(u => u.AxisIndex == optionPara.AxisIndex).AxisRatio;
+                while (CurrentState == DeviceState.DSOpen)
                 {
                     //璁剧疆 杩愬姩鍙傛暟
                     isSuccessSetAxisParam = SetAxisParam(optionPara);
-                    ret = GTSCardAPI.GT_SetPrfPos((short)IConfig.CardNum, (short)optionPara.AxisIndex, (int)(dPosition * IConfig.AxisVelocityRatio));// 璁剧疆瑙勫垝浣嶇疆
+                    ret = GTSCardAPI.GT_SetPos((short)IConfig.CardNum, (short)optionPara.AxisIndex, (int)(dPosition));// 璁剧疆鐩殑浣嶇疆
                     ret = GTSCardAPI.GT_Update((short)IConfig.CardNum, 1 << (optionPara.AxisIndex - 1));//鏇存柊杩愬姩
 
                     if (ret != (short)GTSRetCode.GRCRunOK)
@@ -419,16 +617,20 @@
                         LogAsync(DateTime.Now, "杞�" + optionPara.AxisIndex + "APS_absolute_move寮傚父", "閿欒鐮侊細" + ret + ";" + "閲嶈瘯娆℃暟锛�" + repeatTime);
                         Thread.Sleep(50);
                     }
-                    repeatTime--;
-                } while (ret != (short)GTSRetCode.GRCRunOK && !isSuccessSetAxisParam && repeatTime > 0);
+                    timeout -= 50;
+                    if ((ret == (short)GTSRetCode.GRCRunOK && isSuccessSetAxisParam) || (optionPara.MovingTimeout > 0 && timeout < 0))
+                    {
+                        break;
+                    }
+                }
 
                 //杩愬姩寮�濮嬪悗 妫�鏌ヨ繍鍔ㄦ槸鍚﹀仠姝�
                 bool isStop = false;
                 repeatTime = 1000;
                 do
                 {
-                    isStop = IsStop((short)IConfig.CardNum, (short)optionPara.AxisIndex);
                     Thread.Sleep(50);
+                    isStop = IsStop((short)optionPara.AxisIndex);
                     repeatTime--;
                 } while (!isStop && repeatTime > 0);
 
@@ -437,7 +639,7 @@
             catch (Exception ex)
             {
                 AllMoveStop(true);
-                OnExceptionRaised?.Invoke(ex);
+                OnExceptionOccured?.Invoke(DateTime.Now, ex);
                 return false;
             }
         }
@@ -450,10 +652,12 @@
         {
             try
             {
+                axisImmediatePauseHandleDict[optionPara.AxisIndex].WaitOne();
+
                 if (_isResetting)
                 {
                     LogAsync(DateTime.Now, "澶嶄綅杩囩▼寮傚父", "杞�" + optionPara.AxisIndex + "璇曞浘鍦ㄥ浣嶈繃绋嬩腑杩愬姩");
-                    throw new Exception("杞�" + optionPara.AxisIndex + "璇曞浘鍦ㄥ浣嶈繃绋嬩腑杩愬姩");
+                    throw new ProcessException("杞�" + optionPara.AxisIndex + "璇曞浘鍦ㄥ浣嶈繃绋嬩腑杩愬姩");
                 }
                 int repeatTime = 30;
                 while (CurrentState != EnumHelper.DeviceState.DSOpen && repeatTime > 0)
@@ -470,17 +674,18 @@
                 if (CurrentState != EnumHelper.DeviceState.DSOpen)
                 {
                     LogAsync(DateTime.Now, "闈炴甯哥姸鎬佸紓甯�", "杞�" + optionPara.AxisIndex + "璇曞浘鍦ㄩ潪姝e父鐘舵�佽繍鍔�");
-                    throw new Exception("杞�" + optionPara.AxisIndex + "璇曞浘鍦ㄩ潪姝e父鐘舵�佽繍鍔�", null);
+                    throw new ProcessException("杞�" + optionPara.AxisIndex + "璇曞浘鍦ㄩ潪姝e父鐘舵�佽繍鍔�", null);
                 }
                 LogAsync(DateTime.Now, "杞�" + optionPara.AxisIndex + "寮�濮嬭繍鍔�", "鐩爣鍧愭爣锛�" + optionPara.Destination);
                 short ret = 0;
-                repeatTime = 100;
                 bool isSuccessSetAxisParam = false;
-                do
+                int timeout = optionPara.MovingTimeout;
+                var AxisRatio = IConfig.AxisSettings.FirstOrDefault(u => u.AxisIndex == optionPara.AxisIndex) == null ? 1 : IConfig.AxisSettings.FirstOrDefault(u => u.AxisIndex == optionPara.AxisIndex).AxisRatio;
+                while (CurrentState == DeviceState.DSOpen && !_isPause)
                 {
                     //璁剧疆 杩愬姩鍙傛暟
                     isSuccessSetAxisParam = SetAxisParam(optionPara);
-                    ret = GTSCardAPI.GT_SetPrfPos((short)IConfig.CardNum, (short)optionPara.AxisIndex, (int)(optionPara.Destination * IConfig.AxisVelocityRatio));// 璁剧疆瑙勫垝浣嶇疆
+                    ret = GTSCardAPI.GT_SetPos((short)IConfig.CardNum, (short)optionPara.AxisIndex, (int)(optionPara.Destination));// 璁剧疆鐩爣浣嶇疆
                     ret = GTSCardAPI.GT_Update((short)IConfig.CardNum, 1 << (optionPara.AxisIndex - 1));//鏇存柊杩愬姩
 
                     if (ret != (short)GTSRetCode.GRCRunOK)
@@ -488,24 +693,28 @@
                         LogAsync(DateTime.Now, "杞�" + optionPara.AxisIndex + "APS_absolute_move寮傚父", "閿欒鐮侊細" + ret + ";" + "閲嶈瘯娆℃暟锛�" + repeatTime);
                         Thread.Sleep(50);
                     }
-                    repeatTime--;
-                } while (ret != (short)GTSRetCode.GRCRunOK && !isSuccessSetAxisParam && repeatTime > 0);
+                    timeout -= 50;
+                    if ((ret == (short)GTSRetCode.GRCRunOK && isSuccessSetAxisParam) || (optionPara.MovingTimeout > 0 && timeout < 0))
+                    {
+                        break;
+                    }
+                }
 
                 bool isStop = false;
                 repeatTime = 1000;
-                do
+                while (!isStop && repeatTime > 0)
                 {
-                    isStop = IsStop((short)IConfig.CardNum, (short)optionPara.AxisIndex);
                     Thread.Sleep(50);
+                    isStop = IsStop((short)optionPara.AxisIndex);
                     repeatTime--;
-                } while (!isStop && repeatTime > 0);
+                }
 
                 return (ret == (short)GTSRetCode.GRCRunOK) && isStop;
             }
             catch (Exception ex)
             {
                 AllMoveStop(true);
-                OnExceptionRaised?.Invoke(ex);
+                OnExceptionOccured?.Invoke(DateTime.Now, ex);
                 return false;
             }
         }
@@ -516,7 +725,7 @@
         /// <param name="axisNum">axisNo</param>
         /// <param name="option">0琛ㄧず骞虫粦鍋滄锛�1琛ㄧず绱ф�ュ仠姝�</param>
         /// <returns></returns>
-        public async Task<bool> MoveStop(int axisNum, int option)
+        public override async Task<bool> MoveStop(int axisNum, int option)
         {
             return await Task.Run(() =>
             {
@@ -529,7 +738,7 @@
                 if (ret != (short)GTSRetCode.GRCRunOK)
                 {
                     LogAsync(DateTime.Now, "杞�" + axisNum + "杩愬姩鍋滄寮傚父", "閿欒鐮侊細" + ret);
-                    throw new Exception("杞�" + axisNum + "杩愬姩鍋滄寮傚父锛岄敊璇爜锛�" + ret);
+                    throw new ProcessException("杞�" + axisNum + "杩愬姩鍋滄寮傚父锛岄敊璇爜锛�" + ret);
                 }
                 else
                 {
@@ -538,8 +747,8 @@
                 int repeatTime = 100;
                 do
                 {
-                    isStop = IsStop((short)IConfig.CardNum, (short)axisNum);
                     Thread.Sleep(10);
+                    isStop = IsStop((short)axisNum);
                     repeatTime--;
                 } while (!isStop && repeatTime > 0);
 
@@ -575,10 +784,16 @@
         {
             try
             {
-                GTSCardAPI.GT_ZeroPos((short)IConfig.CardNum, (short)movingOption.AxisIndex, 1);
+                PositionReset(movingOption.AxisIndex, 1);
                 GTSCardAPI.THomePrm thomeprm;
                 GTSCardAPI.THomeStatus homests;
-                short rtn = GTSCardAPI.GT_GetHomePrm((short)IConfig.CardNum, (short)movingOption.AxisIndex, out thomeprm);
+                // 鍚姩Home鎹曡幏
+                short rtn = GTSCardAPI.GT_SetCaptureMode((short)IConfig.CardNum, (short)movingOption.AxisIndex, GTSCardAPI.CAPTURE_HOME);
+                // 鍒囨崲鍒扮偣浣嶈繍鍔ㄦā寮�
+                rtn = GTSCardAPI.GT_PrfTrap((short)IConfig.CardNum, (short)movingOption.AxisIndex);
+                // 璇诲彇鐐逛綅妯″紡杩愬姩鍙傛暟
+                rtn = GTSCardAPI.GT_GetHomePrm((short)IConfig.CardNum, (short)movingOption.AxisIndex, out thomeprm);
+
                 thomeprm.mode = movingOption.GoHomePara.HomeMode;//鍥為浂鏂瑰紡
                 thomeprm.moveDir = movingOption.GoHomePara.HomeDir;//鍥為浂鏂瑰悜
                 thomeprm.edge = movingOption.GoHomePara.Edge;
@@ -586,7 +801,7 @@
                 thomeprm.velLow = movingOption.GoHomePara.LowVelocity;
                 thomeprm.acc = movingOption.VelocityPara.Acc;
                 thomeprm.dec = movingOption.VelocityPara.Dec;
-                thomeprm.searchHomeDistance = movingOption.GoHomePara.SearchHomeDistance;//鎼滄悳璺濈
+                thomeprm.searchHomeDistance = movingOption.GoHomePara.SearchHomeDistance;//鎼滅储璺濈
                 thomeprm.homeOffset = movingOption.GoHomePara.HomeOffset;  //鍋忕Щ璺濈
                 thomeprm.escapeStep = movingOption.GoHomePara.EscapeStep;
                 rtn = GTSCardAPI.GT_GoHome((short)IConfig.CardNum, (short)movingOption.AxisIndex, ref thomeprm);  //鍚姩鍥為浂
@@ -602,7 +817,7 @@
                     if (isStop && homests.error == 0)
                     {
                         Thread.Sleep(200);
-                        GTSCardAPI.GT_ZeroPos((short)IConfig.CardNum, (short)movingOption.AxisIndex, 1);
+                        PositionReset(movingOption.AxisIndex, 1);
                     }
                     repeatTime--;
                 } while (!isStop && repeatTime > 0);
@@ -612,7 +827,94 @@
             catch (Exception ex)
             {
                 AllMoveStop(true);
-                OnExceptionRaised?.Invoke(ex);
+                OnExceptionOccured?.Invoke(DateTime.Now, ex);
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// P2P鏂瑰紡鍥炲師鐐�
+        /// </summary>
+        /// <param name="movingOption">杩愬姩鍙傛暟</param>
+        public bool P2PGoHome(MovingOption movingOption)
+        {
+            try
+            {
+                PositionReset(movingOption.AxisIndex, 1);
+                ClearStatus(movingOption.AxisIndex, 1);
+                GTSCardAPI.TTrapPrm trapPrm;
+                bool isStop = false;
+                //鎼滅储璺濈 闃舵1
+                // 鍚姩Home鎹曡幏
+                short sRtn = GTSCardAPI.GT_SetCaptureMode((short)IConfig.CardNum, (short)movingOption.AxisIndex, GTSCardAPI.CAPTURE_HOME);
+                // 鍒囨崲鍒扮偣浣嶈繍鍔ㄦā寮�
+                sRtn = GTSCardAPI.GT_PrfTrap((short)IConfig.CardNum, (short)movingOption.AxisIndex);
+                // 璇诲彇鐐逛綅妯″紡杩愬姩鍙傛暟
+                sRtn = GTSCardAPI.GT_GetTrapPrm((short)IConfig.CardNum, (short)movingOption.AxisIndex, out trapPrm);
+                trapPrm.acc = movingOption.VelocityPara.Acc;
+                trapPrm.dec = movingOption.VelocityPara.Dec;
+                // 璁剧疆鐐逛綅妯″紡杩愬姩鍙傛暟
+                sRtn = GTSCardAPI.GT_SetTrapPrm((short)IConfig.CardNum, (short)movingOption.AxisIndex, ref trapPrm);
+                // 璁剧疆鐐逛綅妯″紡鐩爣閫熷害锛屽嵆鍥炲師鐐归�熷害
+                sRtn = GTSCardAPI.GT_SetVel((short)IConfig.CardNum, (short)movingOption.AxisIndex, movingOption.GoHomePara.HighVelocity);
+                // 璁剧疆鐐逛綅妯″紡鐩爣浣嶇疆锛屽嵆鍘熺偣鎼滅储璺濈
+                sRtn = GTSCardAPI.GT_SetPos((short)IConfig.CardNum, (short)movingOption.AxisIndex, movingOption.GoHomePara.SearchHomeDistance);
+                // 鍚姩杩愬姩
+                sRtn = GTSCardAPI.GT_Update((short)IConfig.CardNum, 1 << (movingOption.AxisIndex - 1));
+
+                int repeatTime = 1000;
+                short capture;
+                int pos;
+                uint clk;//鏃堕挓鍙傛暟
+                do
+                {
+                    Thread.Sleep(20);
+                    // 璇诲彇鎹曡幏鐘舵��
+                    GTSCardAPI.GT_GetCaptureStatus((short)IConfig.CardNum, (short)movingOption.AxisIndex, out capture, out pos, 1, out clk);
+                    isStop = IsStop((short)movingOption.AxisIndex);
+                    repeatTime--;
+                } while (!(isStop || capture == 1 || repeatTime <= 0));
+
+                if (repeatTime <= 0)
+                {
+                    MoveStop((short)movingOption.AxisIndex, 0);
+                    throw new ProcessException($"杩愬姩杞磠movingOption.AxisIndex} 锛屽洖鍘熺偣瓒呮椂寮傚父");
+                }
+                if (isStop && capture != 1)
+                {
+
+                    ClearStatus((short)movingOption.AxisIndex, 1);
+                    throw new ProcessException($"杩愬姩杞磠movingOption.AxisIndex} 锛屽洖鍘熺偣瓒呮椂寮傚父");
+                }
+
+                if (capture == 1)
+                {
+                    //鍏坰top
+                    MoveStop((short)movingOption.AxisIndex, 0);
+                    ClearStatus((short)movingOption.AxisIndex, 1);
+                    //宸茬粡鎹曡幏鍒癏ome鎵嶅彲浠ュ洖闆� 闃舵2
+                    // 杩愬姩鍒�"鎹曡幏浣嶇疆+鍋忕Щ閲�"
+                    sRtn = GTSCardAPI.GT_SetPos((short)IConfig.CardNum, (short)movingOption.AxisIndex, pos + movingOption.GoHomePara.HomeOffset);
+                    // 鍦ㄨ繍鍔ㄧ姸鎬佷笅鏇存柊鐩爣浣嶇疆
+                    sRtn = GTSCardAPI.GT_Update((short)IConfig.CardNum, 1 << (movingOption.AxisIndex - 1));
+                    isStop = false;
+
+                    repeatTime = 1000;
+                    do
+                    {
+                        Thread.Sleep(20);
+                        isStop = IsStop((short)movingOption.AxisIndex);
+                        repeatTime--;
+                    } while (!isStop && repeatTime > 0);
+                    PositionReset(movingOption.AxisIndex, 1);
+                    return (sRtn == (short)GTSRetCode.GRCRunOK) && isStop;
+                }
+                return false;
+            }
+            catch (Exception ex)
+            {
+                AllMoveStop(true);
+                OnExceptionOccured?.Invoke(DateTime.Now, ex);
                 return false;
             }
         }
@@ -634,14 +936,13 @@
         /// <summary>
         /// 璇诲彇IO杈撳嚭
         /// </summary>
-        /// <param name="cardNum"></param>
-        /// <param name="index"></param>
+        /// <param name="index">io绱㈠紩</param>
         /// <returns></returns>
-        public bool GetDoSts(short cardNum, short index)
+        public bool GetDoSts(short index)
         {
             int outSts;
             short outNum = (short)(index % 100);
-            GTSCardAPI.GT_GetDo(cardNum, GTSCardAPI.MC_GPO, out outSts);
+            GTSCardAPI.GT_GetDo((short)IConfig.CardNum, GTSCardAPI.MC_GPO, out outSts);
             if ((outSts & (1 << outNum)) == 0) return true;
             else return false;
         }
@@ -649,19 +950,19 @@
         /// <summary>
         /// 鎸変綅璁剧疆鏁板瓧 IO 杈撳嚭鐘舵��
         /// </summary>
-        /// <param name="cardNum">鍗″彿</param>
         /// <param name="index">杈撳嚭鍙�,杩斿洖1-16</param>
-        /// <param name="value">false琛ㄧず杈撳嚭锛宼rue琛ㄧず鍏抽棴</param>
-        public void WriteOut(short cardNum, short index, bool value)
+        /// <param name="value">false琛ㄧず鍏筹紝true琛ㄧず寮�锛屾澘鍗¤璁剧疆鍙栧弽</param>
+        public override void WriteOutput(short index, IOValue value)
         {
             short outNum = (short)(index % 100 + 1);
-            if (value)
+            if ((int)value <= 1)
             {
-                GTSCardAPI.GT_SetDoBit(cardNum, GTSCardAPI.MC_GPO, outNum, 0);
+                GTSCardAPI.GT_SetDoBit((short)IConfig.CardNum, GTSCardAPI.MC_GPO, outNum, (short)value);
             }
             else
             {
-                GTSCardAPI.GT_SetDoBit(cardNum, GTSCardAPI.MC_GPO, outNum, 1);
+                var currentValue = (int)MonitorValues.FirstOrDefault(u => u.IONum == outNum && u.IOType == IOType.OUTPUT).Value;
+                GTSCardAPI.GT_SetDoBit((short)IConfig.CardNum, GTSCardAPI.MC_GPO, outNum, (short)(currentValue == 1 ? 0 : 1));
             }
         }
 
@@ -671,15 +972,47 @@
         /// <param name="cardNum">鏉垮崱鍙�</param>
         /// <param name="axisNum">杞村彿</param>
         /// <returns></returns>
-        public bool IsStop(short cardNum, short axisNum)
+        public bool IsStop(short axisNum)
+        {
+            int sts = AxisStatusList.FirstOrDefault(u => u.AxisIndex == axisNum).AxisStatus;
+            if ((sts & 0x400) == 0) return true;//鍋滄杩斿洖true
+            else return false;              //杩愯涓繑鍥瀎alse
+        }
+
+        /// <summary>
+        /// 璇诲彇杞寸姸鎬�
+        /// </summary>
+        /// <param name="axisNum">杞村彿</param>
+        /// <returns></returns>
+        public override int GetAxisStatus(int axisNum)
         {
             lock (moveLock)
             {
                 int sts = 0;
                 uint pclock = 0;
-                GTSCardAPI.GT_GetSts(cardNum, axisNum, out sts, 1, out pclock);
-                if ((sts & 0x400) == 0) return true;//鍋滄杩斿洖true
-                else return false;              //杩愯涓繑鍥瀎alse
+                GTSCardAPI.GT_GetSts((short)IConfig.CardNum, (short)axisNum, out sts, 1, out pclock);
+                return sts;
+            }
+        }
+
+        public override bool ClearStatus(int startAxisIndex, int count)
+        {
+            var rtn = GTSCardAPI.GT_ClrSts((short)IConfig.CardNum, (short)startAxisIndex, (short)count);
+            return rtn == (short)GTSRetCode.GRCRunOK;
+        }
+
+        /// <summary>
+        /// 浣嶇疆鍥為浂
+        /// </summary>
+        /// <param name="startAxisIndex"></param>
+        /// <param name="count"></param>
+        /// <returns></returns>
+        public override bool PositionReset(int startAxisIndex, int count)
+        {
+            lock (moveLock)
+            {
+                var rtn = GTSCardAPI.GT_ZeroPos((short)IConfig.CardNum, (short)startAxisIndex, (short)count);
+                return rtn == (short)GTSRetCode.GRCRunOK;
             }
         }
 
@@ -687,7 +1020,26 @@
 
         #region IMonitor
 
-        public List<IOItem> MonitorValues { get; set; } = new List<IOItem>();
+        public List<AxisMovingStatus> GetAxisMovingStatus()
+        {
+            List<AxisMovingStatus> axisMovingStatusesList = new List<AxisMovingStatus>();
+            foreach (var axisConfig in IConfig.AxisSettings.FindAll(u => u.IsAxisEnabled))
+            {
+                AxisMovingStatus axisMovingStatus = new AxisMovingStatus();
+                axisMovingStatus.AxisIndex = axisConfig.AxisIndex;
+                axisMovingStatus.AxisName = axisConfig.AxisName;
+                //axisMovingStatus.CurPosition = Convert.ToInt32(GetPosition(axisMovingStatus.AxisIndex));
+                axisMovingStatus.Destination = Convert.ToInt32(GetPrfPosition(axisMovingStatus.AxisIndex));
+                //axisMovingStatus.CurVelocity = GetVelocity(axisMovingStatus.AxisIndex);
+                //axisMovingStatus.PrfVelocity = GetPrfVelocity(axisMovingStatus.AxisIndex);
+                axisMovingStatus.AxisStatus = GetAxisStatus(axisMovingStatus.AxisIndex);
+
+                axisMovingStatusesList.Add(axisMovingStatus);
+
+            }
+
+            return axisMovingStatusesList;
+        }
 
 
         public List<IOItem> GetMonitorValues()
@@ -701,19 +1053,19 @@
             GTSCardAPI.GT_GetDo((short)IConfig.CardNum, GTSCardAPI.MC_GPO, out outValue);
 
             //瑙f瀽缁撴灉
-            for (var index = 1; index <= 16; index++)
+            for (var index = 0; index < 16; index++)
             {
                 IOItem inItem = new IOItem()
                 {
                     IONum = index,
-                    Value = (inValue & (1 << index)) == 0 ? 1 : 0,
-                    IOType = IOType.In
+                    Value = (inValue & (1 << index)) == 0 ? IOValue.TRUE : IOValue.FALSE,
+                    IOType = IOType.INPUT
                 };
                 IOItem outItem = new IOItem()
                 {
                     IONum = index,
-                    Value = (outValue & (1 << index)) == 0 ? 1 : 0,
-                    IOType = IOType.Out
+                    Value = (outValue & (1 << index)) == 0 ? IOValue.TRUE : IOValue.FALSE,
+                    IOType = IOType.OUTPUT
                 };
                 result.Add(inItem);
                 result.Add(outItem);
@@ -732,18 +1084,32 @@
                     {
                         if (!IConfig.IsEnableMonitor)
                             return;
+
                         var newValues = GetMonitorValues();
-                        if (newValues == null || newValues.Count == 0)
+                        var newAxisMovingStatus = GetAxisMovingStatus();
+
+                        if (newValues == null || newValues.Count == 0 || newAxisMovingStatus == null || newAxisMovingStatus.Count == 0)
                             continue;
 
                         Stopwatch sw = new Stopwatch();
                         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);
                         }
+
+                        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();
 
@@ -769,29 +1135,52 @@
             });
         }
 
-        private void OnMethodInvoked(IAsyncResult ar)
+        private async void AxisStatusCheck(List<AxisMovingStatus> tempNew, List<AxisMovingStatus> tempOld)
         {
-            MotionCardMonitorSet monitorSet = ar.AsyncState as MotionCardMonitorSet;
-            ProcessResponse resValues = monitorSet.Response;
-            if (resValues.ResultValue == (int)ReplyValue.IGNORE)
+            await Task.Run(() =>
             {
-                return;
-            }
-
-            Stopwatch sw = new Stopwatch();
-            sw.Start();
-            // 灏嗘寚瀹欼OItem鍐欏叆鏉垮崱
-            foreach (var replyIOData in monitorSet.ReplyIODatas)
-            {
-                //鍐欏叆IO杈撳嚭
-                if (replyIOData.IOType == IOType.Out)
+                foreach (var newSts in tempNew)
                 {
-                    GTSCardAPI.GT_SetDoBit((short)IConfig.CardNum, GTSCardAPI.MC_GPI, (short)replyIOData.IONum, (short)replyIOData.Value);
+                    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}杞翠己鏈嶆姤璀�");
+                        }
+                    }
                 }
-                // in鍙涓嶈兘鍐�
-            }
-            sw.Stop();
-            LogAsync(DateTime.Now, $"{Name}鍙嶉瀹屾垚锛岃�楁椂{sw.ElapsedMilliseconds}ms", $"{resValues.GetDisplayText()}");
+            });
+        }
+
+        public override void OnMethodInvoked(IAsyncResult ar)
+        {
+            //MotionCardMonitorSet monitorSet = ar.AsyncState as MotionCardMonitorSet;
+            //ProcessResponse resValues = monitorSet.Response;
+            //if (resValues.ResultValue == (int)ReplyValue.IGNORE)
+            //{
+            //    return;
+            //}
+
+            //Stopwatch sw = new Stopwatch();
+            //sw.Start();
+            //// 灏嗘寚瀹欼OItem鍐欏叆鏉垮崱
+            //foreach (var replyIOData in monitorSet.ReplyIODatas)
+            //{
+            //    //鍐欏叆IO杈撳嚭
+            //    if (replyIOData.IOType == IOType.OUTPUT)
+            //    {
+            //        GTSCardAPI.GT_SetDoBit((short)IConfig.CardNum, GTSCardAPI.MC_GPI, (short)replyIOData.IONum, (short)replyIOData.Value);
+            //    }
+            //    // in鍙涓嶈兘鍐�
+            //}
+            //sw.Stop();
+            //LogAsync(DateTime.Now, $"{Name}鍙嶉瀹屾垚锛岃�楁椂{sw.ElapsedMilliseconds}ms", $"{resValues.GetDisplayText()}");
         }
 
         protected void MonitorCheckAndInvoke(List<IOItem> tempNew, List<IOItem> tempOld)
@@ -801,13 +1190,12 @@
             {
                 MotionCardWarningSet warningSet = wSet as MotionCardWarningSet;
 
-                bool isOn = ((tempNew.FirstOrDefault(u => u.IONum == warningSet.TriggerIndex && u.IOType == warningSet.WarningIOModel)?.Value >> warningSet.TriggerIndex) & 1) == (warningSet.TriggerValue ? 1 : 0);
+                bool isOn = (((int)((tempNew.FirstOrDefault(u => u.IONum == warningSet.TriggerIndex && u.IOType == warningSet.WarningIOModel)?.Value)) >> warningSet.TriggerIndex) & 1) == (warningSet.TriggerValue ? 1 : 0);
 
                 if (warningSet.CurrentStatus != isOn)
                 {
                     warningSet.CurrentStatus = isOn;
                     warningSet.TriggerTime = DateTime.Now;
-                    warningSet.WarningDescription = $"璀︽姤锛歿warningSet.Name}-瑙﹀彂绱㈠紩锛歿warningSet.TriggerIndex}-{warningSet.WarningIOModel.GetEnumDescription()}:{warningSet.WarningCode}";
                     SaveAlarmCSVAsync(DateTime.Now, this.Name, warningSet);
                     ExcuteMonitorAlarm(DateTime.Now, this, warningSet);
                 }
@@ -828,19 +1216,19 @@
 
                 if (newIOItem?.Value != oldIOItem?.Value)
                 {
-                    if (monitorSet.TriggerValue == -999 || newIOItem.Value == monitorSet.TriggerValue)
+                    if (monitorSet.TriggerValue == -999 || (int)newIOItem.Value == monitorSet.TriggerValue)
                     {
                         if (monitorSet.OpConfig == null)
                         {
                             monitorSet.OpConfig = new OperationConfigBase();
                         }
 
-                        //monitorSet.OpConfig.InputPara = monitorSet.InputDataIndex.ConvertAll(index =>
-                        //{
-                        //    return tempNew[index].Value;
-                        //}).ToList();
+                        monitorSet.OpConfig.InputPara = monitorSet.InputDataIndex.ConvertAll(index =>
+                        {
+                            return tempNew[index].Value == IOValue.TRUE ? 1 : 0;
+                        }).ToList();
 
-                        ExcuteMonitorInvok(DateTime.Now, monitorSet.InvokeDevice, this, monitorSet);
+                        ExcuteMonitorInvoke(DateTime.Now, monitorSet.InvokeDevice, this, monitorSet);
                     }
                 }
             });
@@ -850,18 +1238,18 @@
         public override void ResetAlarm()
         {
             int axis_sts;
-            uint clk;
             var axisSettings = IConfig.AxisSettings.FindAll(u => u.IsAxisEnabled);
-            GTSCardAPI.GT_ClrSts((short)IConfig.CardNum, 1, (short)axisSettings.Count);
+            ClearStatus(1, axisSettings.Count);
             foreach (var axisSetting in axisSettings)
             {
-                GTSCardAPI.GT_GetSts((short)IConfig.CardNum, (short)axisSetting.AxisIndex, out axis_sts, 1, out clk);
+                //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);
                 }
-                // 浣嶇疆璇烽浂
-                GTSCardAPI.GT_ZeroPos((short)IConfig.CardNum, 1, (short)axisSettings.Count);
+                // 鎵�鏈変綅缃闆�
+                PositionReset(1, axisSettings.Count);
                 // 姝f瀬闄愭姤璀�
                 if ((axis_sts & 0x20) != 0)
                 {
@@ -886,7 +1274,7 @@
             }
 
             // 娓呴櫎鐘舵��
-            GTSCardAPI.GT_ClrSts((short)IConfig.CardNum, 1, (short)IConfig.AxisSettings.FindAll(u => u.IsAxisEnabled).Count);
+            ClearStatus(1, axisSettings.Count);
         }
 
         object _alarmLock = new object();

--
Gitblit v1.8.0