From 0f71990dc60af6e96c9f4c2f2095ca6711e2c870 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期一, 06 七月 2020 11:29:37 +0800
Subject: [PATCH] merge
---
src/Bro.Common.Device/DeviceBase/MotionCardBase.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs b/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs
index 117a980..01222e2 100644
--- a/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs
+++ b/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs
@@ -49,7 +49,7 @@
public List<IOItem> MonitorValues { get; set; } = new List<IOItem>();
- public abstract void WriteOutput(short cardNum, short index, IOValue value);
+ public abstract void WriteOutput(short index, IOValue value);
}
public class MotionCardInitialConfigBase : InitialConfigBase, IMonitorConfig
@@ -156,6 +156,7 @@
[TypeConverter(typeof(CollectionCountConvert))]
[Editor(typeof(IORefrenceItemCollectionEditor), typeof(UITypeEditor))]
public List<IORefrenceItem> PreCheckIOCollection { get; set; } = new List<IORefrenceItem>();
+
[Category("IO鎿嶄綔閰嶇疆")]
[Description("瓒呮椂璁剧疆锛屽崟浣嶏細ms")]
[DisplayName("IO棰勬鏌ヨ秴鏃�")]
--
Gitblit v1.8.0