From f06ae0e33e33f1ed5f198827b9b5a53e765b3eee Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期一, 11 一月 2021 10:58:26 +0800
Subject: [PATCH] 1. 来料检测添加线体代码 2. 添加检测数据区间压缩配置和功能
---
src/Bro.Common.Device/DeviceBase/MotionCardBase.cs | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs b/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs
index 52e6582..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();
@@ -131,7 +146,7 @@
/// <summary>
/// 鎭㈠绔嬪嵆鏆傚仠
/// </summary>
- public abstract void ResetImmediatePause();
+ public abstract void ResetImmediatePause(bool isResumeMoving);
#endregion
}
--
Gitblit v1.8.0