From 3cba54c4ee8d29d33ed21a2c749a9d2f2d03e22d Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期五, 03 七月 2020 18:33:30 +0800
Subject: [PATCH] 板卡IO定义修改。板卡预定义操作功能实现
---
src/Bro.Device.GTSCard/GTSCardDriver.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/Bro.Device.GTSCard/GTSCardDriver.cs b/src/Bro.Device.GTSCard/GTSCardDriver.cs
index b9bc5de..5b60b6d 100644
--- a/src/Bro.Device.GTSCard/GTSCardDriver.cs
+++ b/src/Bro.Device.GTSCard/GTSCardDriver.cs
@@ -652,16 +652,17 @@
/// <param name="cardNum">鍗″彿</param>
/// <param name="index">杈撳嚭鍙�,杩斿洖1-16</param>
/// <param name="value">false琛ㄧず杈撳嚭锛宼rue琛ㄧず鍏抽棴</param>
- public void WriteOut(short cardNum, short index, bool value)
+ public override void WriteOutput(short cardNum, short index, IOValue value)
{
short outNum = (short)(index % 100 + 1);
- if (value)
+ if ((int)value <= 1)
{
- GTSCardAPI.GT_SetDoBit(cardNum, GTSCardAPI.MC_GPO, outNum, 0);
+ GTSCardAPI.GT_SetDoBit(cardNum, GTSCardAPI.MC_GPO, outNum, (short)value);
}
else
{
- GTSCardAPI.GT_SetDoBit(cardNum, GTSCardAPI.MC_GPO, outNum, 1);
+ var currentValue = (int)MonitorValues.FirstOrDefault(u => u.IONum == outNum && u.IOType == IOType.OUTPUT).Value;
+ GTSCardAPI.GT_SetDoBit(cardNum, GTSCardAPI.MC_GPO, outNum, (short)(currentValue == 1 ? 0 : 1));
}
}
@@ -687,7 +688,7 @@
#region IMonitor
- public List<IOItem> MonitorValues { get; set; } = new List<IOItem>();
+ //public List<IOItem> MonitorValues { get; set; } = new List<IOItem>();
public List<IOItem> GetMonitorValues()
@@ -706,13 +707,13 @@
IOItem inItem = new IOItem()
{
IONum = index,
- Value = (inValue & (1 << index)) == 0 ? 1 : 0,
+ Value = (inValue & (1 << index)) == 0 ? IOValue.TRUE : IOValue.FALSE,
IOType = IOType.INPUT
};
IOItem outItem = new IOItem()
{
IONum = index,
- Value = (outValue & (1 << index)) == 0 ? 1 : 0,
+ Value = (outValue & (1 << index)) == 0 ? IOValue.TRUE : IOValue.FALSE,
IOType = IOType.OUTPUT
};
result.Add(inItem);
@@ -801,13 +802,12 @@
{
MotionCardWarningSet warningSet = wSet as MotionCardWarningSet;
- bool isOn = ((tempNew.FirstOrDefault(u => u.IONum == warningSet.TriggerIndex && u.IOType == warningSet.WarningIOModel)?.Value >> warningSet.TriggerIndex) & 1) == (warningSet.TriggerValue ? 1 : 0);
+ bool isOn = (((int)((tempNew.FirstOrDefault(u => u.IONum == warningSet.TriggerIndex && u.IOType == warningSet.WarningIOModel)?.Value)) >> warningSet.TriggerIndex) & 1) == (warningSet.TriggerValue ? 1 : 0);
if (warningSet.CurrentStatus != isOn)
{
warningSet.CurrentStatus = isOn;
warningSet.TriggerTime = DateTime.Now;
- warningSet.WarningDescription = $"璀︽姤锛歿warningSet.Name}-瑙﹀彂绱㈠紩锛歿warningSet.TriggerIndex}-{warningSet.WarningIOModel.GetEnumDescription()}:{warningSet.WarningCode}";
SaveAlarmCSVAsync(DateTime.Now, this.Name, warningSet);
ExcuteMonitorAlarm(DateTime.Now, this, warningSet);
}
@@ -828,7 +828,7 @@
if (newIOItem?.Value != oldIOItem?.Value)
{
- if (monitorSet.TriggerValue == -999 || newIOItem.Value == monitorSet.TriggerValue)
+ if (monitorSet.TriggerValue == -999 || (int)newIOItem.Value == monitorSet.TriggerValue)
{
if (monitorSet.OpConfig == null)
{
@@ -840,7 +840,7 @@
// return tempNew[index].Value;
//}).ToList();
- ExcuteMonitorInvok(DateTime.Now, monitorSet.InvokeDevice, this, monitorSet);
+ ExcuteMonitorInvoke(DateTime.Now, monitorSet.InvokeDevice, this, monitorSet);
}
}
});
--
Gitblit v1.8.0