From 78289c64a16dd02cc9fec595bf758a9e30a30926 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期六, 20 二月 2021 10:51:11 +0800
Subject: [PATCH] gocator修改异步模式下图片获取操作
---
src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs b/src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs
index 7aa4294..b26aa01 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs
@@ -45,6 +45,7 @@
}
+ MotionCardMovingOption.SetAxisSetting(MotionCard.IConfig.AxisSettings);
propGrid.SelectedObject = MotionCardMovingOption;
}
@@ -58,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 = "浼烘湇宸插叧闂�";
}
}
@@ -75,17 +76,17 @@
private void btnStart_Click(object sender, EventArgs e)
{
- MotionCard.SingleAxisMoving(MotionCardMovingOption).GetAwaiter().GetResult();
+ 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