From fccc60d8897642ef5c39176b8c872b63fe819ae2 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期五, 20 十一月 2020 10:44:57 +0800
Subject: [PATCH] gocator添加int4类型数据，暂时注释
---
src/Bro.Device.GTSCard/GTSCardDriver.cs | 487 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 326 insertions(+), 161 deletions(-)
diff --git a/src/Bro.Device.GTSCard/GTSCardDriver.cs b/src/Bro.Device.GTSCard/GTSCardDriver.cs
index a917333..dbea577 100644
--- a/src/Bro.Device.GTSCard/GTSCardDriver.cs
+++ b/src/Bro.Device.GTSCard/GTSCardDriver.cs
@@ -46,6 +46,8 @@
/// 杩愬姩杞寸珛鍗虫殏鍋�
/// </summary>
Dictionary<int, ManualResetEvent> axisImmediatePauseHandleDict = new Dictionary<int, ManualResetEvent>();
+ Dictionary<int, bool> axisImmediatePauseFlag = new Dictionary<int, bool>();
+ Dictionary<int, bool> axisPauseResumeFlag = new Dictionary<int, bool>();
//Dictionary<int, CancellationTokenSource> axisMoveCancelDict = new Dictionary<int, CancellationTokenSource>();
@@ -97,6 +99,9 @@
{
AllAxisOn();
+ MonitorPosition();
+ MonitorAxisStatus();
+
base.Start();
}
@@ -145,16 +150,22 @@
{
foreach (var preCheck in operationSet.PreCheckIOCollection)
{
- int timeout = operationSet.PreCheckIOTimeout;
+ _pauseHandle.Wait();
+
IOValue? ioData = null;
- while (CurrentState == DeviceState.DSOpen)
+ if (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))
+ int timeout = operationSet.PreCheckIOTimeout;
+
+ while (CurrentState == DeviceState.DSOpen)
{
- break;
+ 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;
+ }
}
}
@@ -170,10 +181,15 @@
// 2.鏉垮崱杩愬姩
if (CurrentState == DeviceState.DSOpen)
{
- responseMessage = MoveToPoint(new MotionOperationCollection() { MovingOps = operationSet.MovingOps });
- if (!responseMessage.Result)
+ _pauseHandle.Wait();
+
+ if (CurrentState == DeviceState.DSOpen)
{
- return responseMessage;
+ responseMessage = MoveToPoint(new MotionOperationCollection() { MovingOps = operationSet.MovingOps });
+ if (!responseMessage.Result)
+ {
+ return responseMessage;
+ }
}
}
@@ -181,18 +197,24 @@
// 3.IO杈撳嚭 涓嶉渶瑕佽秴鏃�
if (CurrentState == DeviceState.DSOpen)
{
+
foreach (var ioOutput in operationSet.IOOutputCollection)
{
- WriteOutput((short)ioOutput.IOItem.IONum, ioOutput.CheckValue);
+ _pauseHandle.Wait();
- //var ioData = MonitorValues.FirstOrDefault(u => u.IONum == ioOutput.IOItem.IONum && u.IOType == ioOutput.IOItem.IOType)?.Value;//IO 鏄紑銆佸叧 浠嶮onitorValues 鑾峰彇
+ if (CurrentState == DeviceState.DSOpen)
+ {
+ WriteOutput((short)ioOutput.IOItem.IONum, ioOutput.CheckValue);
- //if (ioOutput.CheckValue != ioData)
- //{
- // responseMessage.Result = false;
- // responseMessage.Message = $"IO杈撳嚭涓嶉�氳繃锛岄厤缃細{ioOutput.GetDisplayText()}锛屽綋鍓嶅�硷細{ioData}";
- // return responseMessage;
- //}
+ //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;
+ //}
+ }
}
}
@@ -228,6 +250,8 @@
#endregion
#region ImmediatePause
+ ManualResetEventSlim _pauseHandle = new ManualResetEventSlim(true);
+
/// <summary>
/// 鍚姩绔嬪嵆鏆傚仠
/// </summary>
@@ -236,12 +260,11 @@
if (!_isResetting)
{
var immediatePauseAxis = IConfig.AxisSettings.FindAll(a => a.IsAxisEnabled && a.IsImmediatePause).Select(u => u.AxisIndex).ToList();
-
+ _pauseHandle.Reset();
immediatePauseAxis.ForEach(async axisIndex =>
{
axisImmediatePauseHandleDict[axisIndex].Reset();
-
- //axisMoveCancelDict[axisIndex].Cancel();
+ axisImmediatePauseFlag[axisIndex] = true;
await MoveStop(axisIndex, 0);//鎵�鏈夎酱閮芥殏鍋�
});
@@ -251,15 +274,22 @@
/// <summary>
/// 鎭㈠绔嬪嵆鏆傚仠
/// </summary>
- public override void ResetImmediatePause()
+ public override void ResetImmediatePause(bool isResumeMoving)
{
var immediatePauseAxis = IConfig.AxisSettings.FindAll(a => a.IsAxisEnabled && a.IsImmediatePause).Select(u => u.AxisIndex).ToList();
-
+ _pauseHandle.Set();
immediatePauseAxis.ForEach(axisIndex =>
{
- //axisMoveCancelDict[axisIndex] = new CancellationTokenSource();
-
+ axisImmediatePauseFlag[axisIndex] = false;
axisImmediatePauseHandleDict[axisIndex].Set();
+ if (isResumeMoving)
+ {
+ axisPauseResumeFlag[axisIndex] = true;
+ }
+ else
+ {
+ axisPauseResumeFlag[axisIndex] = false;
+ }
});
}
#endregion
@@ -347,19 +377,11 @@
ResponseMessage responseMessage = new ResponseMessage();
if (opConfig is MotionOperationCollection gtsOperationCollection)
{
- //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());
-
List<bool> resultList = new List<bool>();
Parallel.ForEach(gtsOperationCollection.MovingOps, movingOp =>
{
+ axisImmediatePauseFlag[movingOp.AxisIndex] = false;
+ axisPauseResumeFlag[movingOp.AxisIndex] = true;
resultList.Add(SingleAxisMoving(movingOp).Result);
});
responseMessage.Result = resultList.All(u => u == true);
@@ -418,63 +440,64 @@
public override Task<bool> SingleAxisMoving(MovingOption optionPara)
{
return 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();
+ {
+ bool isSuccessAndStop = false;
+ do
+ {
+ axisImmediatePauseHandleDict[optionPara.AxisIndex].WaitOne();
- // _position = $"{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff},{optionPara.AxisIndex},{motionType},{GetPosition(optionPara.AxisIndex)},{GetPrfPosition(optionPara.AxisIndex)},{optionPara.Destination},";
+ if (axisPauseResumeFlag.ContainsKey(optionPara.AxisIndex) && !axisPauseResumeFlag[optionPara.AxisIndex])
+ return true;
- switch (optionPara.MoveMode)
- {
- case MotionMode.Normal:
- {
- if (_isResetting)
- {
- LogAsync(DateTime.Now, "澶嶄綅涓惎鍔ㄨ繍鍔ㄥ紓甯�", optionPara.AxisIndex + "鍚姩杩愬姩寮傚父");
- return false;
- }
+ try
+ {
+ if (IConfig.AxisSettings.FirstOrDefault(a => a.AxisIndex == optionPara.AxisIndex)?.IsAxisEnabled ?? false)
+ {
+ string motionType = optionPara.MoveMode == EnumHelper.MotionMode.Normal ? (optionPara.IsAbsolute ? "Abs" : "Rel") : optionPara.MoveMode.ToString();
- if (optionPara.IsAbsolute)
- {
- isSuccessAndStop = P2PMoveAbs(optionPara);
- }
- else
- {
- isSuccessAndStop = P2PMoveRel(optionPara);
- }
+ switch (optionPara.MoveMode)
+ {
+ case MotionMode.Normal:
+ {
+ if (_isResetting)
+ {
+ LogAsync(DateTime.Now, "澶嶄綅涓惎鍔ㄨ繍鍔ㄥ紓甯�", optionPara.AxisIndex + "鍚姩杩愬姩寮傚父");
+ return false;
+ }
- }
- 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;
- });
+ if (optionPara.IsAbsolute)
+ {
+ isSuccessAndStop = P2PMoveAbs(optionPara);
+ }
+ //else
+ //{
+ // isSuccessAndStop = P2PMoveRel(optionPara);
+ //}
+
+ }
+ break;
+ case MotionMode.FindOri:
+ {
+ //isSuccessAndStop = GoHome(optionPara);
+ isSuccessAndStop = P2PGoHome(optionPara);
+ }
+ break;
+ case MotionMode.Jog:
+ {
+ isSuccessAndStop = JogMove(optionPara);
+ }
+ break;
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ isSuccessAndStop = false;
+ LogAsync(DateTime.Now, $"杞磠optionPara.AxisIndex}杩愬姩寮傚父", ex.GetExceptionMessage());
+ }
+ } while (axisImmediatePauseFlag.ContainsKey(optionPara.AxisIndex) && axisImmediatePauseFlag[optionPara.AxisIndex]);
+ return isSuccessAndStop;
+ });
}
/// <summary>
@@ -503,7 +526,7 @@
/// <returns></returns>
public double GetPosition(int axisNum)
{
- lock (moveLock)
+ //lock (moveLock)
{
double position = 0;
double pPos = 0;
@@ -868,18 +891,17 @@
{
try
{
- StartCapture:
+ Thread.CurrentThread.Priority = ThreadPriority.AboveNormal;
- PositionReset(movingOption.AxisIndex, 1);
- ClearStatus(movingOption.AxisIndex, 1);
+ var goHomePara = IConfig.AxisSettings.FirstOrDefault(u => u.AxisIndex == movingOption.AxisIndex).GoHomePara;
+ bool homeDirection = goHomePara.IsHomeDirPositive;
+ bool isRightLimitReached = false;
+ short capture = 0;
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);
+ short 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;
@@ -887,73 +909,138 @@
// 璁剧疆鐐逛綅妯″紡杩愬姩鍙傛暟
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_SetVel((short)IConfig.CardNum, (short)movingOption.AxisIndex, goHomePara.HomeVelocity);
- // 璁剧疆鐐逛綅妯″紡鐩爣浣嶇疆锛屽嵆鍘熺偣鎼滅储璺濈
- sRtn = GTSCardAPI.GT_SetPos((short)IConfig.CardNum, (short)movingOption.AxisIndex, movingOption.GoHomePara.HomeDir == 1 ? 99999999 : -99999999);
- // 鍚姩杩愬姩
- 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));
+ PositionReset(movingOption.AxisIndex, 1);
+ ClearStatus(movingOption.AxisIndex, 1);
- if (repeatTime <= 0)
- {
- MoveStop((short)movingOption.AxisIndex, 0);
- throw new ProcessException($"杩愬姩杞磠movingOption.AxisIndex} 锛屽洖鍘熺偣瓒呮椂寮傚父");
- }
+ //LogAsync(DateTime.Now, $"{Name}浣嶇疆缃浂", "");
- if (isStop && capture != 1)
- {
- ClearStatus((short)movingOption.AxisIndex, 1);
+ if (goHomePara.IsCaptureMode)
+ {
+ //鎼滅储璺濈 闃舵1
+ // 鍚姩Home鎹曡幏
+ sRtn = GTSCardAPI.GT_SetCaptureMode((short)IConfig.CardNum, (short)movingOption.AxisIndex, GTSCardAPI.CAPTURE_HOME);
+ }
+
+ // 璁剧疆鐐逛綅妯″紡鐩爣浣嶇疆锛屽嵆鍘熺偣鎼滅储璺濈
+ sRtn = GTSCardAPI.GT_SetPos((short)IConfig.CardNum, (short)movingOption.AxisIndex, homeDirection ? 999999999 : -999999999);
+ // 鍚姩杩愬姩
+ sRtn = GTSCardAPI.GT_Update((short)IConfig.CardNum, 1 << (movingOption.AxisIndex - 1));
+
+ int repeatTime = goHomePara.GoHomeTimeOut * 1000;
+
+ bool isStop = false;
+ int pos = 0;
+ uint clk;//鏃堕挓鍙傛暟
+
+ int checkInterval = IConfig.MonitorInterval;
+ if (IConfig.MonitorInterval <= 0)
+ {
+ checkInterval = 10;
+ }
+
+ do
+ {
+ Thread.Sleep(checkInterval);
+
+ if (goHomePara.IsCaptureMode)
+ {
+ // 璇诲彇鎹曡幏鐘舵��
+ GTSCardAPI.GT_GetCaptureStatus((short)IConfig.CardNum, (short)movingOption.AxisIndex, out capture, out pos, 1, out clk);
+ }
+ else
+ {
+ GTSCardAPI.GT_GetDi((short)IConfig.CardNum, GTSCardAPI.MC_HOME, out int pValue);
+ capture = (short)((pValue & (1 << (movingOption.AxisIndex - 1))) == 0 ? 1 : 0);
+ //LogAsync(DateTime.Now, $"鍘熺偣鐘舵�亄pValue}锛岃酱{movingOption.AxisIndex}鍘熺偣{capture}", "");
+ }
+ isStop = IsStop((short)movingOption.AxisIndex);
+ repeatTime -= checkInterval;
+ } while (!(isStop || capture == 1 || repeatTime <= 0));
+
+ if (repeatTime <= 0)
+ {
+ MoveStop((short)movingOption.AxisIndex, 0);
+ throw new ProcessException($"杩愬姩杞磠movingOption.AxisIndex} 锛屽洖鍘熺偣瓒呮椂寮傚父");
+ }
var axisStatus = AxisStatusList.FirstOrDefault(u => u.AxisIndex == movingOption.AxisIndex);
- if (((axisStatus.AxisStatus & 0x20) != 0) || ((axisStatus.AxisStatus & 0x40) != 0))
+ //if (isStop)
+ //{
+ // LogAsync(DateTime.Now, $"杞磠movingOption.AxisIndex}澶嶄綅涓仠姝�", $"Capture鐘舵�亄capture}");
+ //}
+
+ if (isStop && capture != 1)
{
- movingOption.GoHomePara.HomeDir = (short)(movingOption.GoHomePara.HomeDir == 1 ? -1 : 1);
- goto StartCapture;
+ if (((axisStatus.AxisStatus & 0x20) != 0) || ((axisStatus.AxisStatus & 0x40) != 0))
+ {
+ capture = 0;
+
+ //姝ｉ檺浣�
+ if ((axisStatus.AxisStatus & 0x20) != 0 && !goHomePara.IsCaptureDirPositive)
+ {
+ isRightLimitReached = true;
+ }
+
+ //璐熼檺浣�
+ if ((axisStatus.AxisStatus & 0x40) != 0 && goHomePara.IsCaptureDirPositive)
+ {
+ isRightLimitReached = true;
+ }
+
+ homeDirection = !homeDirection;
+
+ LogAsync(DateTime.Now, $"杞磠movingOption.AxisIndex}鏋侀檺浣嶇疆鎹㈠悜", "");
+ }
+
+ ClearStatus(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
+ if (capture == 1)
{
- Thread.Sleep(20);
- isStop = IsStop((short)movingOption.AxisIndex);
- repeatTime--;
- } while (!isStop && repeatTime > 0);
- PositionReset(movingOption.AxisIndex, 1);
- return (sRtn == (short)GTSRetCode.GRCRunOK) && isStop;
- }
+ if (!isRightLimitReached)
+ {
+ capture = 0;
+ ClearStatus(movingOption.AxisIndex, 1);
+ //GTSCardAPI.GT_SetCaptureMode((short)IConfig.CardNum, (short)movingOption.AxisIndex, GTSCardAPI.CAPTURE_HOME);
+ continue;
+ }
+
+ //鍏坰top
+ MoveStop((short)movingOption.AxisIndex, 0);
+ ClearStatus((short)movingOption.AxisIndex, 1);
+
+ //宸茬粡鎹曡幏鍒癏ome鎵嶅彲浠ュ洖闆� 闃舵2
+ // 杩愬姩鍒�"鎹曡幏浣嶇疆+鍋忕Щ閲�"
+ sRtn = GTSCardAPI.GT_SetPos((short)IConfig.CardNum, (short)movingOption.AxisIndex, pos + 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);
+ LogAsync(DateTime.Now, $"杞磠movingOption.AxisIndex}澶嶄綅瀹屾垚锛屼綅缃竻闆�", "");
+
+ return (sRtn == (short)GTSRetCode.GRCRunOK) && isStop;
+ }
+
+ } while (!(capture == 1 && isRightLimitReached));
+
return false;
}
catch (Exception ex)
{
+ LogAsync(DateTime.Now, $"{Name}鍥炲師鐐瑰紓甯�", ex.GetExceptionMessage());
AllMoveStop(true);
OnExceptionOccured?.Invoke(DateTime.Now, ex);
return false;
@@ -1027,7 +1114,7 @@
/// <returns></returns>
public override int GetAxisStatus(int axisNum)
{
- lock (moveLock)
+ //lock (moveLock)
{
int sts = 0;
uint pclock = 0;
@@ -1050,7 +1137,7 @@
/// <returns></returns>
public override bool PositionReset(int startAxisIndex, int count)
{
- lock (moveLock)
+ //lock (moveLock)
{
var rtn = GTSCardAPI.GT_ZeroPos((short)IConfig.CardNum, (short)startAxisIndex, (short)count);
return rtn == (short)GTSRetCode.GRCRunOK;
@@ -1081,7 +1168,6 @@
return axisMovingStatusesList;
}
-
public List<IOItem> GetMonitorValues()
{
@@ -1115,6 +1201,79 @@
return result;
}
+ SpinWait _positionWait = new SpinWait();
+ private async void MonitorPosition()
+ {
+ await Task.Run(() =>
+ {
+ while (CurrentState != EnumHelper.DeviceState.DSClose && CurrentState != EnumHelper.DeviceState.DSExcept && CurrentState != EnumHelper.DeviceState.DSUninit)
+ {
+ try
+ {
+ if (!IConfig.IsEnableMonitor)
+ return;
+
+ AxisStatusList.ForEach(a =>
+ {
+ int curPosition = (int)GetPrfPosition(a.AxisIndex);
+
+ if (a.CurPosition != curPosition)
+ {
+ a.CurPosition = curPosition;
+ AxisPositionChanged(a.AxisIndex, curPosition);
+ }
+ });
+
+ _positionWait.SpinOnce();
+ }
+ catch (Exception ex)
+ {
+ if (CurrentState == DeviceState.DSOpen)
+ {
+ LogAsync(DateTime.Now, $"{this.Name}鐩戝惉杞翠俊鎭紓甯�", ex.GetExceptionMessage());
+ }
+ }
+ }
+ });
+ }
+
+ SpinWait _statusWait = new SpinWait();
+ private async void MonitorAxisStatus()
+ {
+ await Task.Run(() =>
+ {
+ while (CurrentState != EnumHelper.DeviceState.DSClose && CurrentState != EnumHelper.DeviceState.DSExcept && CurrentState != EnumHelper.DeviceState.DSUninit)
+ {
+ try
+ {
+ if (!IConfig.IsEnableMonitor)
+ return;
+
+ AxisStatusList.ForEach(a =>
+ {
+ int curStatus = GetAxisStatus(a.AxisIndex);
+
+ if (a.AxisStatus != curStatus)
+ {
+ int temp = a.AxisStatus;
+ a.AxisStatus = curStatus;
+ AxisStatusChanged(a.AxisIndex, temp, curStatus);
+ }
+ });
+
+ _statusWait.SpinOnce();
+ }
+ catch (Exception ex)
+ {
+ if (CurrentState == DeviceState.DSOpen)
+ {
+ LogAsync(DateTime.Now, $"{this.Name}鐩戝惉杞翠俊鎭紓甯�", ex.GetExceptionMessage());
+ }
+ }
+ }
+ });
+ }
+
public async override void Monitor()
{
await Task.Run(() =>
@@ -1127,9 +1286,9 @@
return;
var newValues = GetMonitorValues();
- var newAxisMovingStatus = GetAxisMovingStatus();
+ //var newAxisMovingStatus = GetAxisMovingStatus();
- if (newValues == null || newValues.Count == 0 || newAxisMovingStatus == null || newAxisMovingStatus.Count == 0)
+ if (newValues == null || newValues.Count == 0)
continue;
//Stopwatch sw = new Stopwatch();
@@ -1143,14 +1302,14 @@
MonitorCheckAndInvoke(tempNew, tempOld);
}
- if (AxisStatusList.Count == newAxisMovingStatus.Count)
- {
- var tempNew = new List<AxisMovingStatus>(newAxisMovingStatus);//clone
- var tempOld = new List<AxisMovingStatus>(AxisStatusList);
- AxisStatusCheck(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);
+ //AxisStatusList = new List<AxisMovingStatus>(newAxisMovingStatus);
MonitorValues = new List<IOItem>(newValues);
//sw.Stop();
@@ -1282,10 +1441,16 @@
int axis_sts;
var axisSettings = IConfig.AxisSettings.FindAll(u => u.IsAxisEnabled);
ClearStatus(1, axisSettings.Count);
+
+ if (AxisStatusList.Count == 0)
+ {
+ Thread.Sleep(10);
+ }
+
foreach (var axisSetting in axisSettings)
{
//axis_sts = GetAxisStatus((short)axisSetting.AxisIndex);
- axis_sts = AxisStatusList.FirstOrDefault(u => u.AxisIndex == axisSetting.AxisIndex).AxisStatus;
+ axis_sts = AxisStatusList.FirstOrDefault(u => u.AxisIndex == axisSetting.AxisIndex)?.AxisStatus ?? 0;
if ((axis_sts & 0x200) == 0)
{
var rst = GTSCardAPI.GT_AxisOn((short)IConfig.CardNum, (short)axisSetting.AxisIndex);
--
Gitblit v1.8.0