From 99587d3c26f5b952cb7dc87a56be91b08c5d277b Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期一, 06 七月 2020 11:54:27 +0800
Subject: [PATCH] 添加轴状态监听
---
src/Bro.Common.Device/DeviceBase/MotionCardBase.cs | 2 +-
src/Bro.Common.Model/Model/MonitorSet.cs | 2 +-
src/Bro.Common.Model/Model/MotionCardRelated.cs | 46 ++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs b/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs
index 7fb7839..e826d28 100644
--- a/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs
+++ b/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs
@@ -55,7 +55,7 @@
/// <summary>
/// 杞寸殑杩愬姩鐘舵�佸��
/// </summary>
- public List<MovingOption> AxisMovingOptionValues { get; set; } = new List<MovingOption>();
+ public List<AxisMovingStatus> AxisMovingOptionValues { get; set; } = new List<AxisMovingStatus>();
public abstract void WriteOutput(short index, IOValue value);
}
diff --git a/src/Bro.Common.Model/Model/MonitorSet.cs b/src/Bro.Common.Model/Model/MonitorSet.cs
index ce109aa..6151b49 100644
--- a/src/Bro.Common.Model/Model/MonitorSet.cs
+++ b/src/Bro.Common.Model/Model/MonitorSet.cs
@@ -178,7 +178,7 @@
}
/// <summary>
- /// 杩愬姩鏉垮崱鐩戝惉閰嶇疆瀵硅薄
+ /// 杩愬姩鏉垮崱IO鐩戝惉閰嶇疆瀵硅薄
/// </summary>
public class MotionCardMonitorSet : MonitorSetBase
{
diff --git a/src/Bro.Common.Model/Model/MotionCardRelated.cs b/src/Bro.Common.Model/Model/MotionCardRelated.cs
index 0e5d746..757cb42 100644
--- a/src/Bro.Common.Model/Model/MotionCardRelated.cs
+++ b/src/Bro.Common.Model/Model/MotionCardRelated.cs
@@ -193,6 +193,52 @@
}
/// <summary>
+ /// 鏉垮崱杩愬姩鐘舵�佸璞�
+ /// </summary>
+ public class AxisMovingStatus : IComplexDisplay
+ {
+ /// <summary>
+ /// 杞寸储寮�
+ /// </summary>
+ public int AxisIndex { get; set; }
+
+ /// <summary>
+ /// 杞村悕绉�
+ /// </summary>
+ public string AxisName { get; set; }
+
+ /// <summary>
+ /// 杩愬姩妯″紡
+ /// </summary>
+ public MotionMode MoveMode { get; set; }
+
+ /// <summary>
+ /// 褰撳墠浣嶇疆
+ /// </summary>
+ public int CurPosition { get; set; }
+
+ /// <summary>
+ /// 鐩殑鍦�
+ /// </summary>
+ public int Destination { get; set; }
+
+ /// <summary>
+ /// 褰撳墠閫熷害鍙傛暟
+ /// </summary>
+ public VelocityPara CurVelocityPara { get; set; }
+
+ /// <summary>
+ /// 瑙勫垝閫熷害鍙傛暟
+ /// </summary>
+ public VelocityPara VelocityPara { get; set; }
+
+ public string GetDisplayText()
+ {
+ return $"杞磠AxisIndex}:{AxisName}-{MoveMode.ToString()}-褰撳墠锛歿CurPosition}-瑙勫垝锛歿Destination}";
+ }
+ }
+
+ /// <summary>
/// 杩愬姩瀵硅薄
/// </summary>
public class MovingOption : INotifyPropertyChanged, IComplexDisplay
--
Gitblit v1.8.0