From 8bd46da0c9fbfe39a65d75b1d85692d8783f5905 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期三, 15 九月 2021 10:50:54 +0800
Subject: [PATCH] 现场修改
---
src/Bro.Device.GTSCard/GTSCardDriver.cs | 74 +++++++++++++++++++++++++------------
1 files changed, 50 insertions(+), 24 deletions(-)
diff --git a/src/Bro.Device.GTSCard/GTSCardDriver.cs b/src/Bro.Device.GTSCard/GTSCardDriver.cs
index 303ddb4..14b4c25 100644
--- a/src/Bro.Device.GTSCard/GTSCardDriver.cs
+++ b/src/Bro.Device.GTSCard/GTSCardDriver.cs
@@ -312,7 +312,6 @@
}
}
-
public override bool AllAxisOn()
{
List<Task<bool>> taskList = new List<Task<bool>>(); ;
@@ -387,7 +386,7 @@
responseMessage.Result = resultList.All(u => u == true);
if (!responseMessage.Result)
{
- responseMessage.Message = $"鐐逛綅杩愬姩寮傚父";
+ responseMessage.Message = $"鐐逛綅杩愬姩寮傚父,杩愬姩缁撴灉锛歿string.Join(" ", resultList.Select(u => u ? "1" : "0"))}";
}
}
return responseMessage;
@@ -400,24 +399,28 @@
/// <returns></returns>
private bool SetAxisParam(MovingOption optionPara)
{
- List<short> resultCode = new List<short>() { 0 };
+ List<short> resultCode = new List<short>();
GTSCardAPI.TTrapPrm trapprm = new GTSCardAPI.TTrapPrm();
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;
- if (optionPara.VelocityPara.Acc != 0)
+ if (optionPara.VelocityPara.Acc != 0 || optionPara.VelocityPara.Dec != 0)
{
- trapprm.acc = optionPara.VelocityPara.Acc;
- }
+ resultCode.Add(GTSCardAPI.GT_GetTrapPrm((short)IConfig.CardNum, axisIndex, out trapprm));
+ trapprm.smoothTime = 1;
- if (optionPara.VelocityPara.Dec != 0)
- {
- trapprm.dec = optionPara.VelocityPara.Dec;
- }
+ if (optionPara.VelocityPara.Acc != 0)
+ {
+ trapprm.acc = optionPara.VelocityPara.Acc;
+ }
- resultCode.Add(GTSCardAPI.GT_SetTrapPrm((short)IConfig.CardNum, axisIndex, ref trapprm));
+ if (optionPara.VelocityPara.Dec != 0)
+ {
+ trapprm.dec = optionPara.VelocityPara.Dec;
+ }
+
+ resultCode.Add(GTSCardAPI.GT_SetTrapPrm((short)IConfig.CardNum, axisIndex, ref trapprm));
+ }
if (optionPara.VelocityPara.Velocity != 0)
{
@@ -427,9 +430,10 @@
var resultOK = resultCode.All(u => u == (short)GTSRetCode.GRCRunOK);
if (!resultOK)
{
- throw new ProcessException("杞�" + optionPara.AxisIndex + "璁剧疆鍙傛暟寮傚父锛岄敊璇爜锛�" + string.Join(",", resultCode));
+ //throw new ProcessException("杞�" + optionPara.AxisIndex + "璁剧疆鍙傛暟寮傚父锛岄敊璇爜锛�" + string.Join(",", resultCode));
+ LogAsync(DateTime.Now, $"杞磠optionPara.AxisIndex}璁剧疆鍙傛暟寮傚父锛岄敊璇爜锛歿string.Join(",", resultCode)}", "");
}
- return resultOK;
+ return true;
}
TaskFactory taskFactory = new TaskFactory(TaskCreationOptions.LongRunning, TaskContinuationOptions.LongRunning);
@@ -765,7 +769,14 @@
repeatTime--;
}
- return (ret == (short)GTSRetCode.GRCRunOK) && isStop;
+ if (repeatTime <= 0)
+ {
+ LogAsync(DateTime.Now, "杞�" + optionPara.AxisIndex + "APS_absolute_move鏈仠姝�", "");
+ return false;
+ }
+
+ //return (ret == (short)GTSRetCode.GRCRunOK) && isStop;
+ return true;
}
catch (Exception ex)
{
@@ -987,18 +998,26 @@
capture = 0;
//姝ｉ檺浣�
- if ((axisStatus.AxisStatus & 0x20) != 0 && !goHomePara.IsCaptureDirPositive)
+ if ((axisStatus.AxisStatus & 0x20) != 0)
{
- isRightLimitReached = true;
+ homeDirection = false;
+
+ if (!goHomePara.IsCaptureDirPositive)
+ {
+ isRightLimitReached = true;
+ }
}
//璐熼檺浣�
- if ((axisStatus.AxisStatus & 0x40) != 0 && goHomePara.IsCaptureDirPositive)
+ if ((axisStatus.AxisStatus & 0x40) != 0)
{
- isRightLimitReached = true;
- }
+ homeDirection = true;
- homeDirection = !homeDirection;
+ if (goHomePara.IsCaptureDirPositive)
+ {
+ isRightLimitReached = true;
+ }
+ }
LogAsync(DateTime.Now, $"杞磠movingOption.AxisIndex}鏋侀檺浣嶇疆鎹㈠悜", "");
}
@@ -1050,6 +1069,10 @@
AllMoveStop(true);
OnExceptionOccured?.Invoke(DateTime.Now, ex);
return false;
+ }
+ finally
+ {
+
}
}
@@ -1230,7 +1253,9 @@
}
});
- _positionWait.SpinOnce();
+ Task.Delay(100).Wait();
+
+ //_positionWait.SpinOnce();
}
catch (Exception ex)
{
@@ -1267,7 +1292,8 @@
}
});
- _statusWait.SpinOnce();
+ Thread.Sleep(10);
+ //Task.Delay(10).Wait();
}
catch (Exception ex)
{
--
Gitblit v1.8.0