From 5918194fccdb2a2303e713b8d2f3335243b9e2ef Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期二, 07 七月 2020 14:53:13 +0800
Subject: [PATCH] 板卡驱动
---
src/Bro.Common.Model/Model/MotionCardRelated.cs | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 6 deletions(-)
diff --git a/src/Bro.Common.Model/Model/MotionCardRelated.cs b/src/Bro.Common.Model/Model/MotionCardRelated.cs
index a285cdc..6342b0a 100644
--- a/src/Bro.Common.Model/Model/MotionCardRelated.cs
+++ b/src/Bro.Common.Model/Model/MotionCardRelated.cs
@@ -84,10 +84,10 @@
//[Description("IsUseWarning锛氭槸鍚﹀惎鐢ㄦ姤璀�")]
//public bool IsUseWarning { get; set; } = false;
- //[Category("鏆傚仠閰嶇疆")]
- //[DisplayName("鏄惁鍚敤绔嬪嵆鏆傚仠")]
- //[Description("IsImmediatePause锛氭槸鍚﹀惎鐢ㄧ珛鍗虫殏鍋�")]
- //public bool IsImmediatePause { get; set; } = false;
+ [Category("鏆傚仠閰嶇疆")]
+ [DisplayName("鏄惁鍚敤绔嬪嵆鏆傚仠")]
+ [Description("IsImmediatePause锛氭槸鍚﹀惎鐢ㄧ珛鍗虫殏鍋�")]
+ public bool IsImmediatePause { get; set; } = false;
//[Category("鏆傚仠閰嶇疆")]
//[DisplayName("杞翠綅缃浜庡尯闂村唴鏃堕�傜敤鐨勬殏鍋滄搷浣�")]
@@ -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 int CurPosition { get; set; }
+
+ /// <summary>
+ /// 鐩殑鍦�
+ /// </summary>
+ public int Destination { get; set; }
+
+ /// <summary>
+ /// 褰撳墠閫熷害鍙傛暟
+ /// </summary>
+ public double CurVelocity { get; set; }
+
+ /// <summary>
+ /// 瑙勫垝閫熷害鍙傛暟
+ /// </summary>
+ public double PrfVelocity { get; set; }
+
+ /// <summary>
+ /// 杞寸姸鎬�
+ /// </summary>
+ public int AxisStatus { get; set; }
+
+ public string GetDisplayText()
+ {
+ return $"杞磠AxisIndex}:{AxisName}-褰撳墠锛歿CurPosition}-瑙勫垝锛歿Destination}";
+ }
+ }
+
+ /// <summary>
/// 杩愬姩瀵硅薄
/// </summary>
public class MovingOption : INotifyPropertyChanged, IComplexDisplay
@@ -216,11 +262,11 @@
}
}
- private MotorMoveMode moveMode = MotorMoveMode.Normal;
+ private MotionMode moveMode = MotionMode.Normal;
[Category("杩愬姩閰嶇疆")]
[DisplayName("杩愬姩妯″紡")]
[Description("MoveMode锛氳繍鍔ㄦā寮�")]
- public MotorMoveMode MoveMode
+ public MotionMode MoveMode
{
get => moveMode;
set
--
Gitblit v1.8.0