From 799808db1ace43141760a1fe74b2cbf28ddb2e39 Mon Sep 17 00:00:00 2001
From: wells <123>
Date: 星期五, 10 七月 2020 18:41:25 +0800
Subject: [PATCH] 合并
---
src/Bro.Common.Device/DeviceBase/MotionCardBase.cs | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs b/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs
index cba431b..4e539a0 100644
--- a/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs
+++ b/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs
@@ -20,6 +20,18 @@
{
public event Action<DateTime, string, IDevice, IMonitorSet> OnMonitorInvoke;
public event Action<DateTime, IDevice, IWarningSet> OnMonitorAlarm;
+ public event Action<int, string> OnAxisAlarmRaised;
+ public event Action<int, int, int> OnAxisStatusChanged;
+
+ public void AxisAlarmRaised(int axisIndex, string msg)
+ {
+ OnAxisAlarmRaised?.Invoke(axisIndex, msg);
+ }
+
+ public void AxisStatusChanged(int axisIndex, int preStatus, int curStatus)
+ {
+ OnAxisStatusChanged?.Invoke(axisIndex, preStatus, curStatus);
+ }
public abstract List<AxisInfo> GetCurrentAxisInfo(params string[] axisName);
public abstract void Monitor();
@@ -99,7 +111,7 @@
/// <summary>
/// 杞寸殑杩愬姩鐘舵�佸��
/// </summary>
- public List<AxisMovingStatus> AxisMovingOptionValues { get; set; } = new List<AxisMovingStatus>();
+ public List<AxisMovingStatus> AxisStatusList { get; set; } = new List<AxisMovingStatus>();
public abstract void WriteOutput(short index, IOValue value);
--
Gitblit v1.8.0