From 9a2f369bcee572ba086ca83d76a562a0ecaa587b Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期四, 16 七月 2020 17:22:09 +0800
Subject: [PATCH] 板卡修复回原点bug 主流程注释部分log信息，添加部分图片对象主动释放操作 修复Excel输出Alignment最后一项第一次无数据bug 添加平面补偿
---
src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs b/src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs
index 4ca0748..b26aa01 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 = "浼烘湇宸插叧闂�";
}
}
@@ -76,17 +76,17 @@
private void btnStart_Click(object sender, EventArgs e)
{
- MotionCard.SingleAxisMoving(MotionCardMovingOption).Start();
+ MotionCard.SingleAxisMoving(MotionCardMovingOption);
}
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