From 875a4c2ad21ec2b7c937955773e9687f1c43bb64 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期五, 10 七月 2020 17:36:39 +0800
Subject: [PATCH] 板卡暂停/恢复提至板卡基类 流程方法修改参数
---
src/Bro.Device.GTSCard/GTSCardDriver.cs | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/Bro.Device.GTSCard/GTSCardDriver.cs b/src/Bro.Device.GTSCard/GTSCardDriver.cs
index ed10b08..0f06173 100644
--- a/src/Bro.Device.GTSCard/GTSCardDriver.cs
+++ b/src/Bro.Device.GTSCard/GTSCardDriver.cs
@@ -220,7 +220,7 @@
/// <summary>
/// 鍚姩绔嬪嵆鏆傚仠
/// </summary>
- public void SetImmediatePause()
+ public override void SetImmediatePause()
{
if (!_isResetting)
{
@@ -240,7 +240,7 @@
/// <summary>
/// 鎭㈠绔嬪嵆鏆傚仠
/// </summary>
- public void ResetImmediatePause()
+ public override void ResetImmediatePause()
{
var immediatePauseAxis = IConfig.AxisSettings.FindAll(a => a.IsAxisEnabled && a.IsImmediatePause).Select(u => u.AxisIndex).ToList();
@@ -1029,27 +1029,27 @@
public override void OnMethodInvoked(IAsyncResult ar)
{
- MotionCardMonitorSet monitorSet = ar.AsyncState as MotionCardMonitorSet;
- ProcessResponse resValues = monitorSet.Response;
- if (resValues.ResultValue == (int)ReplyValue.IGNORE)
- {
- return;
- }
+ //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()}");
+ //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)
--
Gitblit v1.8.0