From 1161ebd25831a44067b7272df348d93c6f85a6c0 Mon Sep 17 00:00:00 2001
From: wells <123>
Date: 星期六, 11 七月 2020 16:53:49 +0800
Subject: [PATCH] 板卡修复
---
src/Bro.Device.GTSCard/GTSCardDriver.cs | 253 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 175 insertions(+), 78 deletions(-)
diff --git a/src/Bro.Device.GTSCard/GTSCardDriver.cs b/src/Bro.Device.GTSCard/GTSCardDriver.cs
index 5d5bf1c..c472ba4 100644
--- a/src/Bro.Device.GTSCard/GTSCardDriver.cs
+++ b/src/Bro.Device.GTSCard/GTSCardDriver.cs
@@ -96,6 +96,8 @@
protected override void Start()
{
AllAxisOn();
+
+ base.Start();
}
protected override void Stop()
@@ -341,8 +343,8 @@
{
var task = SingleAxisMoving(movingOp);
taskList.Add(task);
+ task.Start();
}
-
Task.WaitAll(taskList.ToArray());
responseMessage.Result = taskList.All(u => u.GetAwaiter().GetResult());
if (!responseMessage.Result)
@@ -380,69 +382,71 @@
return resultOK;
}
+ TaskFactory taskFactory = new TaskFactory(TaskCreationOptions.LongRunning, TaskContinuationOptions.LongRunning);
/// <summary>
/// 鍗曚釜杞� 杩愬姩(鐐瑰埌鐐� jog 鍥為浂...锛�
/// </summary>
/// <param name="optionPara">杩愬姩鍙傛暟瀵硅薄</param>
- public override async Task<bool> SingleAxisMoving(MovingOption optionPara)
+ public override Task<bool> SingleAxisMoving(MovingOption optionPara)
{
- return await Task.Run(() =>
- {
- 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();
+ 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:yyyy-MM-dd HH:mm:ss.fff},{optionPara.AxisIndex},{motionType},{GetPosition(optionPara.AxisIndex)},{GetPrfPosition(optionPara.AxisIndex)},{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 MotionMode.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 MotionMode.FindOri:
- {
- isSuccessAndStop = GoHome(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;
- });
+ }
+ 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>
@@ -459,8 +463,8 @@
{
throw new Exception("杞�" + axisNum + "鑾峰彇瑙勫垝浣嶇疆寮傚父锛岄敊璇爜锛�" + ret);
}
- var AxisRatio = IConfig.AxisSettings.FirstOrDefault(u => u.AxisIndex == axisNum) == null ? 1 : IConfig.AxisSettings.FirstOrDefault(u => u.AxisIndex == axisNum).AxisRatio;
- position = prfpos / AxisRatio;
+ //var AxisRatio = IConfig.AxisSettings.FirstOrDefault(u => u.AxisIndex == axisNum) == null ? 1 : IConfig.AxisSettings.FirstOrDefault(u => u.AxisIndex == axisNum).AxisRatio;
+ position = prfpos;
return position;
}
@@ -474,14 +478,14 @@
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);
}
- var AxisRatio = IConfig.AxisSettings.FirstOrDefault(u => u.AxisIndex == axisNum) == null ? 1 : IConfig.AxisSettings.FirstOrDefault(u => u.AxisIndex == axisNum).AxisRatio;
- position = pPos / AxisRatio;
+ //var AxisRatio = IConfig.AxisSettings.FirstOrDefault(u => u.AxisIndex == axisNum) == null ? 1 : IConfig.AxisSettings.FirstOrDefault(u => u.AxisIndex == axisNum).AxisRatio;
+ position = pPos;
return position;
}
}
@@ -605,7 +609,7 @@
{
//璁剧疆 杩愬姩鍙傛暟
isSuccessSetAxisParam = SetAxisParam(optionPara);
- ret = GTSCardAPI.GT_SetPrfPos((short)IConfig.CardNum, (short)optionPara.AxisIndex, (int)(dPosition * AxisRatio));// 璁剧疆瑙勫垝浣嶇疆
+ 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)
@@ -625,8 +629,8 @@
repeatTime = 1000;
do
{
- isStop = IsStop((short)optionPara.AxisIndex);
Thread.Sleep(50);
+ isStop = IsStop((short)optionPara.AxisIndex);
repeatTime--;
} while (!isStop && repeatTime > 0);
@@ -681,7 +685,7 @@
{
//璁剧疆 杩愬姩鍙傛暟
isSuccessSetAxisParam = SetAxisParam(optionPara);
- ret = GTSCardAPI.GT_SetPrfPos((short)IConfig.CardNum, (short)optionPara.AxisIndex, (int)(optionPara.Destination * AxisRatio));// 璁剧疆瑙勫垝浣嶇疆
+ 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)
@@ -700,8 +704,8 @@
repeatTime = 1000;
while (!isStop && repeatTime > 0)
{
- isStop = IsStop((short)optionPara.AxisIndex);
Thread.Sleep(50);
+ isStop = IsStop((short)optionPara.AxisIndex);
repeatTime--;
}
@@ -743,8 +747,8 @@
int repeatTime = 100;
do
{
- isStop = IsStop((short)axisNum);
Thread.Sleep(10);
+ isStop = IsStop((short)axisNum);
repeatTime--;
} while (!isStop && repeatTime > 0);
@@ -783,7 +787,13 @@
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;
@@ -791,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); //鍚姩鍥為浂
@@ -813,6 +823,93 @@
} while (!isStop && repeatTime > 0);
return isStop;
+ }
+ catch (Exception ex)
+ {
+ AllMoveStop(true);
+ 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 Exception($"杩愬姩杞磠movingOption.AxisIndex} 锛屽洖鍘熺偣瓒呮椂寮傚父");
+ }
+ if (isStop && capture != 1)
+ {
+
+ ClearStatus((short)movingOption.AxisIndex, 1);
+ throw new Exception($"杩愬姩杞磠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)
{
@@ -854,10 +951,10 @@
/// 鎸変綅璁剧疆鏁板瓧 IO 杈撳嚭鐘舵��
/// </summary>
/// <param name="index">杈撳嚭鍙�,杩斿洖1-16</param>
- /// <param name="value">false琛ㄧず杈撳嚭锛宼rue琛ㄧず鍏抽棴</param>
+ /// <param name="value">false琛ㄧず鍏筹紝true琛ㄧず寮�锛屾澘鍗¤璁剧疆鍙栧弽</param>
public override void WriteOutput(short index, IOValue value)
{
- short outNum = (short)(index % 100);
+ short outNum = (short)(index % 100 + 1);
if ((int)value <= 1)
{
GTSCardAPI.GT_SetDoBit((short)IConfig.CardNum, GTSCardAPI.MC_GPO, outNum, (short)value);
@@ -931,10 +1028,10 @@
AxisMovingStatus axisMovingStatus = new AxisMovingStatus();
axisMovingStatus.AxisIndex = axisConfig.AxisIndex;
axisMovingStatus.AxisName = axisConfig.AxisName;
- axisMovingStatus.CurPosition = Convert.ToInt32(GetPosition(axisMovingStatus.AxisIndex));
+ //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.CurVelocity = GetVelocity(axisMovingStatus.AxisIndex);
+ //axisMovingStatus.PrfVelocity = GetPrfVelocity(axisMovingStatus.AxisIndex);
axisMovingStatus.AxisStatus = GetAxisStatus(axisMovingStatus.AxisIndex);
axisMovingStatusesList.Add(axisMovingStatus);
@@ -956,7 +1053,7 @@
GTSCardAPI.GT_GetDo((short)IConfig.CardNum, GTSCardAPI.MC_GPO, out outValue);
//瑙ｆ瀽缁撴灉
- for (var index = 1; index <= 16; index++)
+ for (var index = 0; index < 16; index++)
{
IOItem inItem = new IOItem()
{
@@ -1126,10 +1223,10 @@
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();
ExcuteMonitorInvoke(DateTime.Now, monitorSet.InvokeDevice, this, monitorSet);
}
--
Gitblit v1.8.0