From be33a18112638699efe66912889f56302f9bcff8 Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期六, 11 七月 2020 17:09:04 +0800
Subject: [PATCH] 板卡 操作
---
src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs | 8 ++++----
src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.cs | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.cs
index 02042d2..77966fd 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.cs
@@ -45,7 +45,7 @@
int axis_sts = _axisMovingStatus.AxisStatus;
ioIndicatorCtrl1.IsOn = (axis_sts & 0x2) == 0;//椹卞姩鎶ヨ
- ioIndicatorCtrl2.IsOn = (axis_sts & 0x200) != 0;//浼烘湇浣胯兘
+ ioIndicatorCtrl2.IsOn = (axis_sts & 0x200) == 1;//浼烘湇浣胯兘 1涓哄紑鍚�
ioIndicatorCtrl6.IsOn = (axis_sts & 0x20) == 0;//姝ｉ檺浣�
ioIndicatorCtrl8.IsOn = (axis_sts & 0x40) == 0;//璐熼檺浣�
ioIndicatorCtrl9.IsOn = (axis_sts & 0x400) == 0;//杩愬姩鐘舵��
diff --git a/src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs b/src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs
index 4ca0748..aa8c728 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs
@@ -59,12 +59,12 @@
int sts = MotionCard.GetAxisStatus(MotionCardMovingOption.AxisIndex);
if ((sts & 0x200) == 0)//鍏抽棴鐘舵��
{
- MotionCard.AxisOnAsync(MotionCardMovingOption.AxisIndex).GetAwaiter().GetResult();
+ MotionCard.AxisOnAsync(MotionCardMovingOption.AxisIndex);
buttonServoEnable.Text = "浼烘湇宸插紑鍚�";
}
else
{
- MotionCard.AxisOffAsync(MotionCardMovingOption.AxisIndex).GetAwaiter().GetResult();
+ MotionCard.AxisOffAsync(MotionCardMovingOption.AxisIndex);
buttonServoEnable.Text = "浼烘湇宸插叧闂�";
}
}
@@ -81,12 +81,12 @@
private void buttonSmoothStop_Click(object sender, EventArgs e)
{
- MotionCard.MoveStop(MotionCardMovingOption.AxisIndex, 0).GetAwaiter().GetResult();
+ MotionCard.MoveStop(MotionCardMovingOption.AxisIndex, 0);
}
private void buttonEmergencyStop_Click(object sender, EventArgs e)
{
- MotionCard.MoveStop(MotionCardMovingOption.AxisIndex, 1).GetAwaiter().GetResult();
+ MotionCard.MoveStop(MotionCardMovingOption.AxisIndex, 1);
}
}
--
Gitblit v1.8.0