From b83a01eec16b236d099dcea3e7a5051c8cae9c6c Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期五, 03 七月 2020 10:48:37 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.Device.GTSCard/GTSCardDriver.cs | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/Bro.Device.GTSCard/GTSCardDriver.cs b/src/Bro.Device.GTSCard/GTSCardDriver.cs
index de90301..2cb1a6d 100644
--- a/src/Bro.Device.GTSCard/GTSCardDriver.cs
+++ b/src/Bro.Device.GTSCard/GTSCardDriver.cs
@@ -23,7 +23,7 @@
// 寮傚父浜嬩欢
public Action<Exception> OnExceptionRaised;
- public GTSCardInitialConfig IConfig
+ public GTSCardInitialConfig IIConfig
{
get
{
@@ -77,7 +77,10 @@
public override ResponseMessage Run(IOperationConfig config)
{
- throw new NotImplementedException();
+ ResponseMessage responseMessage = new ResponseMessage();
+
+
+ return responseMessage;
}
#endregion
@@ -707,13 +710,13 @@
{
IONum = index,
Value = (inValue & (1 << index)) == 0 ? 1 : 0,
- IOType = IOType.In
+ IOType = IOType.INPUT
};
IOItem outItem = new IOItem()
{
IONum = index,
Value = (outValue & (1 << index)) == 0 ? 1 : 0,
- IOType = IOType.Out
+ IOType = IOType.OUTPUT
};
result.Add(inItem);
result.Add(outItem);
@@ -784,7 +787,7 @@
foreach (var replyIOData in monitorSet.ReplyIODatas)
{
//鍐欏叆IO杈撳嚭
- if (replyIOData.IOType == IOType.Out)
+ if (replyIOData.IOType == IOType.OUTPUT)
{
GTSCardAPI.GT_SetDoBit((short)IConfig.CardNum, GTSCardAPI.MC_GPI, (short)replyIOData.IONum, (short)replyIOData.Value);
}
@@ -840,7 +843,7 @@
// return tempNew[index].Value;
//}).ToList();
- ExcuteMonitorInvok(DateTime.Now, monitorSet.InvokeDevice, this, monitorSet);
+ ExcuteMonitorInvok(DateTime.Now, monitorSet.InvokeDevice, this, monitorSet, OnMethodInvoked);
}
}
});
--
Gitblit v1.8.0