From 2edc3c54ba7a42d5e9bb9120b9881d418e6bd408 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期五, 13 八月 2021 09:38:29 +0800
Subject: [PATCH] 1. GTS回原点修改,避免来回 2. 添加单键测量结果补偿 3. 部分条件限制,日志修改 4. 来料检debug,添加退出条件判断

---
 src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.cs |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.cs
index 7411bd0..a3e774e 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.cs
@@ -24,8 +24,8 @@
         private int _axisIndex { get; set; }
         private string _axisName { get; set; }
 
-        public AxisMovingStatus _axisMovingStatus = new AxisMovingStatus();
-        public CtrlMotionCardAxisStatus(IDevice device,int axisIndex,string axisName)
+        public AxisMovingStatus _axisMovingStatus;
+        public CtrlMotionCardAxisStatus(IDevice device, int axisIndex, string axisName)
         {
             InitializeComponent();
             Device = device;
@@ -37,19 +37,21 @@
         private void RefreshStatus(object sender, EventArgs e)
         {
             _axisMovingStatus = MotionCard.AxisStatusList.FirstOrDefault(u => u.AxisIndex == _axisIndex);
-            textBoxPrfPositon.Text = _axisMovingStatus.Destination.ToString();
-            textBoxCurPosition.Text = _axisMovingStatus.CurPosition.ToString();
-            textBoxPrfVel.Text = _axisMovingStatus.PrfVelocity.ToString();
-            textBoxCurVel.Text = _axisMovingStatus.CurVelocity.ToString();
-            int axis_sts = _axisMovingStatus.AxisStatus;
+            if (_axisMovingStatus != null)
+            {
+                textBoxPrfPositon.Text = _axisMovingStatus.CurPosition.ToString();
+                textBoxPrfVel.Text = _axisMovingStatus.PrfVelocity.ToString();
+                textBoxCurVel.Text = _axisMovingStatus.CurVelocity.ToString();
+                int axis_sts = _axisMovingStatus.AxisStatus;
 
-            ioIndicatorCtrl1.IsOn = (axis_sts & 0x2) == 0;//椹卞姩鎶ヨ
-            ioIndicatorCtrl2.IsOn = (axis_sts & 0x200) == 0;//浼烘湇浣胯兘
-            ioIndicatorCtrl6.IsOn = (axis_sts & 0x20) == 0;//姝i檺浣�
-            ioIndicatorCtrl8.IsOn = (axis_sts & 0x40) == 0;//璐熼檺浣�
-            ioIndicatorCtrl9.IsOn = (axis_sts & 0x400) == 0;//杩愬姩鐘舵��
-            ioIndicatorCtrl10.IsOn = (axis_sts & 0x10) == 0;//杩愬姩鍑洪敊
+                ioIndicatorCtrl1.IsOn = (axis_sts & 0x2) != 0;//椹卞姩鎶ヨ
+                ioIndicatorCtrl2.IsOn = (axis_sts & 0x200) != 0;//浼烘湇浣胯兘 1涓哄紑鍚�
+                ioIndicatorCtrl6.IsOn = (axis_sts & 0x20) != 0;//姝i檺浣�
+                ioIndicatorCtrl8.IsOn = (axis_sts & 0x40) != 0;//璐熼檺浣�
+                ioIndicatorCtrl9.IsOn = (axis_sts & 0x400) != 0;//杩愬姩鐘舵��
+                ioIndicatorCtrl10.IsOn = (axis_sts & 0x10) != 0;//杩愬姩鍑洪敊
 
+            }
         }
     }
 }

--
Gitblit v1.8.0