From 3322022068ab818912d6f5d9e5eb31f51cc639c2 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期四, 24 二月 2022 09:12:30 +0800
Subject: [PATCH] 添加配置文件的DataShift2
---
src/Bro.Common.Device/DeviceBase/MotionCardBase.cs | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs b/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs
index f5214fe..ef22a40 100644
--- a/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs
+++ b/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs
@@ -22,7 +22,8 @@
public event Action<DateTime, IDevice, IWarningSet> OnMonitorAlarm;
public event Action<int, string> OnAxisAlarmRaised;
public event Action<int, int, int> OnAxisStatusChanged;
-
+ public event Action<int, int> OnAxisPositionChanged;
+
public void AxisAlarmRaised(int axisIndex, string msg)
{
OnAxisAlarmRaised?.Invoke(axisIndex, msg);
@@ -33,8 +34,22 @@
OnAxisStatusChanged?.Invoke(axisIndex, preStatus, curStatus);
}
+ public void AxisPositionChanged(int axisIndex, int currentPosition)
+ {
+ OnAxisPositionChanged?.Invoke(axisIndex, currentPosition);
+ }
+
protected override void Start()
{
+ AxisStatusList = IConfig.AxisSettings.Where(a => a.IsAxisEnabled).ToList().ConvertAll(a =>
+ {
+ AxisMovingStatus axisSts = new AxisMovingStatus();
+ axisSts.AxisIndex = a.AxisIndex;
+ axisSts.AxisName = a.AxisName;
+
+ return axisSts;
+ });
+
Task.Run(() =>
{
Monitor();
--
Gitblit v1.8.0