From 8cbf4a6b9f334246d88c8101ae3db9a21f1bab3f Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期三, 28 四月 2021 11:40:08 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.cs
index 02042d2..a3e774e 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.cs
@@ -39,17 +39,17 @@
_axisMovingStatus = MotionCard.AxisStatusList.FirstOrDefault(u => u.AxisIndex == _axisIndex);
if (_axisMovingStatus != null)
{
- textBoxPrfPositon.Text = _axisMovingStatus.Destination.ToString();
+ 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;//姝ｉ檺浣�
- 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;//姝ｉ檺浣�
+ ioIndicatorCtrl8.IsOn = (axis_sts & 0x40) != 0;//璐熼檺浣�
+ ioIndicatorCtrl9.IsOn = (axis_sts & 0x400) != 0;//杩愬姩鐘舵��
+ ioIndicatorCtrl10.IsOn = (axis_sts & 0x10) != 0;//杩愬姩鍑洪敊
}
}
--
Gitblit v1.8.0