From 54f0329172de152cf95644f6d427971542e9f42c Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期一, 13 七月 2020 18:36:55 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.Common.Model/Model/MotionCardRelated.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/Bro.Common.Model/Model/MotionCardRelated.cs b/src/Bro.Common.Model/Model/MotionCardRelated.cs
index 7083a14..1037012 100644
--- a/src/Bro.Common.Model/Model/MotionCardRelated.cs
+++ b/src/Bro.Common.Model/Model/MotionCardRelated.cs
@@ -138,12 +138,12 @@
[Category("閫熷害閰嶇疆")]
[DisplayName("鍔犻�熷害")]
[Description("Acc锛氬姞閫熷害,涓�0鏃惰〃绀轰笉淇敼褰撳墠璁剧疆")]
- public double Acc { get; set; } = 1;
+ public double Acc { get; set; } = 0;
[Category("閫熷害閰嶇疆")]
[DisplayName("鍑忛�熷害")]
[Description("鍑忛�熷害,涓�0鏃惰〃绀轰笉淇敼褰撳墠璁剧疆")]
- public double Dec { get; set; } = 1;
+ public double Dec { get; set; } = 0;
}
/// <summary>
@@ -162,8 +162,8 @@
public short HomeDir { get; set; } = 1;
[Category("鍥炲師鐐瑰弬鏁�")]
- [DisplayName("鍥炲師鐐规柟鍚�")]
- [Description("HomeDir锛�1 姝ｅ悜锛�-1 璐熷悜")]
+ [DisplayName("杈圭紭")]
+ [Description("edge锛氳竟缂�")]
public short Edge { get; set; } = 0;
[Category("鍥炲師鐐瑰弬鏁�")]
@@ -177,10 +177,10 @@
[Description("HighVelocity锛氶�熷害,涓�0鏃惰〃绀轰笉淇敼褰撳墠璁剧疆")]
public double HighVelocity { get; set; } = 50;
- [Category("鍥炲師鐐瑰弬鏁�")]
- [DisplayName("鎼滄悳璺濈")]
- [Description("SearchHomeDistance锛氭悳鎼滆窛绂�")]
- public int SearchHomeDistance { get; set; } = 9999999;
+ //[Category("鍥炲師鐐瑰弬鏁�")]
+ //[DisplayName("鎼滅储璺濈")]
+ //[Description("SearchHomeDistance锛氭悳绱㈣窛绂�")]
+ //public int SearchHomeDistance { get; set; } = 9999999;
[Category("鍥炲師鐐瑰弬鏁�")]
[DisplayName("鍋忕Щ璺濈")]
@@ -236,7 +236,7 @@
public string GetDisplayText()
{
- return $"杞磠AxisIndex}:{AxisName}-褰撳墠锛歿CurPosition}-瑙勫垝锛歿Destination}";
+ return $"杞磠AxisIndex}:{AxisName}-褰撳墠鐘舵�侊細{AxisStatus}-褰撳墠浣嶇疆锛歿CurPosition}-瑙勫垝浣嶇疆锛歿Destination}";
}
}
@@ -249,7 +249,7 @@
[DisplayName("杩愬姩杞寸储寮�")]
[Description("AxisIndex锛氳繍鍔ㄨ酱绱㈠紩")]
[TypeConverter(typeof(AxisIndexConvert))]
- public string AxisIndexStr { get; set; } = "0";
+ public string AxisIndexStr { get; set; } = "1";
[Browsable(false)]
[JsonIgnore]
--
Gitblit v1.8.0