From dbae9c048fa0cd67c2e1161e5b6b693f87064154 Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期三, 01 七月 2020 17:53:15 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.Common.Device/DeviceBase/PLCBase.cs | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/Bro.Common.Device/DeviceBase/PLCBase.cs b/src/Bro.Common.Device/DeviceBase/PLCBase.cs
index 0ea73fa..0f56fbb 100644
--- a/src/Bro.Common.Device/DeviceBase/PLCBase.cs
+++ b/src/Bro.Common.Device/DeviceBase/PLCBase.cs
@@ -36,8 +36,8 @@
public abstract void WriteSingleAddress(int address, int writeValue, bool waitForReply = true);
#region IMonitor
- public event Action<DateTime, string, IDevice, MonitorSet> OnMonitorInvoke;
- public event Action<DateTime, IDevice, WarningSet> OnMonitorAlarm;
+ public event Action<DateTime, string, IDevice, IMonitorSet> OnMonitorInvoke;
+ public event Action<DateTime, IDevice, IWarningSet> OnMonitorAlarm;
public List<int> MonitorValues { get; set; } = new List<int>();
@@ -157,7 +157,7 @@
ProcessResponse resValues = monitorSet.Response;
- if (resValues.ResultValue == (int)PLCReplyValue.IGNORE)
+ if (resValues.ResultValue == (int)ReplyValue.IGNORE)
{
return;
}
@@ -279,6 +279,11 @@
}).ToList();
return locations;
+ }
+
+ public bool MoveToPoint(IOperationConfig opConfig)
+ {
+ throw new NotImplementedException();
}
#endregion
}
@@ -552,7 +557,7 @@
public class PLCDeviceConverter : ComboBoxItemTypeConvert
{
- public override Hashtable GetConvertHash()
+ public override Hashtable GetConvertHash(ITypeDescriptorContext context)
{
Hashtable table = new Hashtable();
using (var scope = GlobalVar.Container.BeginLifetimeScope())
--
Gitblit v1.8.0