From 0d10528b430721512e0e93e0d455fcec44207ec9 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期二, 14 七月 2020 18:27:10 +0800
Subject: [PATCH] 1. 板卡驱动实现运动暂停/继续功能，板卡动作衔接实现暂停/继续 2. 修复部分调试bug 3. 安全光幕/安全门功能调整
---
src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.cs | 41 ++++++++++++++++++++++++++---------------
1 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.cs
index 488561c..2613cbf 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.cs
@@ -37,21 +37,8 @@
groupBoxAxisOperration.Text = $"杩愬姩杞达細{axisIndex}-{axisName}";
}
- private void buttonPositive_Click(object sender, EventArgs e)
- {
- var opConfig = new MotionOperationCollection();
- MovingOption movingOption = new MovingOption();
- movingOption.AxisIndex = _axisIndex;
- movingOption.MoveMode = MotionMode.Jog;
- movingOption.VelocityPara.Acc = Convert.ToDouble(textBoxJogAcc.Text);
- movingOption.VelocityPara.Dec = Convert.ToDouble(textBoxJogDec.Text);
- movingOption.VelocityPara.Velocity= Convert.ToDouble(textBoxJogVel.Text);
- opConfig.MovingOps.Add(movingOption);
- MotionCard.MoveToPoint(opConfig);
- }
-
- private void buttonNegative_Click(object sender, EventArgs e)
+ private void buttonPositive_MouseDown(object sender, MouseEventArgs e)
{
var opConfig = new MotionOperationCollection();
MovingOption movingOption = new MovingOption();
@@ -60,6 +47,30 @@
movingOption.VelocityPara.Acc = Convert.ToDouble(textBoxJogAcc.Text);
movingOption.VelocityPara.Dec = Convert.ToDouble(textBoxJogDec.Text);
movingOption.VelocityPara.Velocity = Convert.ToDouble(textBoxJogVel.Text);
+
+ opConfig.MovingOps.Add(movingOption);
+ MotionCard.MoveToPoint(opConfig);
+ }
+
+ private void buttonPositive_MouseUp(object sender, MouseEventArgs e)
+ {
+ MotionCard.MoveStop(_axisIndex, 0);
+ }
+
+ private void buttonNegative_MouseUp(object sender, MouseEventArgs e)
+ {
+ MotionCard.MoveStop(_axisIndex, 0);
+ }
+
+ private void buttonNegative_MouseDown(object sender, MouseEventArgs e)
+ {
+ var opConfig = new MotionOperationCollection();
+ MovingOption movingOption = new MovingOption();
+ movingOption.AxisIndex = _axisIndex;
+ movingOption.MoveMode = MotionMode.Jog;
+ movingOption.VelocityPara.Acc = Convert.ToDouble(textBoxJogAcc.Text);
+ movingOption.VelocityPara.Dec = Convert.ToDouble(textBoxJogDec.Text);
+ movingOption.VelocityPara.Velocity = -Convert.ToDouble(textBoxJogVel.Text);
opConfig.MovingOps.Add(movingOption);
MotionCard.MoveToPoint(opConfig);
@@ -82,7 +93,7 @@
private void buttonStop_Click(object sender, EventArgs e)
{
- MotionCard.StateChange(DeviceState.DSPause);
+ MotionCard.MoveStop(_axisIndex, 0);
}
}
}
--
Gitblit v1.8.0