From 78584911d0457ad9fc26d9dfc6f374b7ef531c0f Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期日, 22 十一月 2020 13:45:09 +0800
Subject: [PATCH] 1. 添加操作员输入和界面显示 2. 添加通过输入窗体 3. 添加webservice调用帮助类 4. M071添加MES数据检查和数据上传功能，添加相关界面显示和流程控制
---
src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs b/src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs
index 3502964..b26aa01 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs
@@ -17,7 +17,7 @@
public IDevice Device { get; set; }
- public MotionCardOperationConfigBase MotionCardOperationConfig { get; set; }
+ public MovingOption MotionCardMovingOption { get; set; } = new MovingOption();
/// <summary>
/// 褰撳墠鏉垮崱瀹炰緥
@@ -40,40 +40,53 @@
foreach (var axisConfig in MotionCard.IConfig.AxisSettings.FindAll(u => u.IsAxisEnabled))
{
CtrlMotionCardAxisOperation axisOperation = new CtrlMotionCardAxisOperation(Device, axisConfig.AxisIndex, axisConfig.AxisName);
- axisOperation.Dock = DockStyle.Fill;
+ //axisOperation.Dock = DockStyle.Fill;
flowLayoutPanel1.Controls.Add(axisOperation);
}
+
+ MotionCardMovingOption.SetAxisSetting(MotionCard.IConfig.AxisSettings);
+ propGrid.SelectedObject = MotionCardMovingOption;
}
private void buttonClearStatus_Click(object sender, EventArgs e)
{
-
+ MotionCard.ClearStatus(1, MotionCard.IConfig.AxisSettings.FindAll(u => u.IsAxisEnabled).Count);
}
private void buttonServoEnable_Click(object sender, EventArgs e)
{
-
+ int sts = MotionCard.GetAxisStatus(MotionCardMovingOption.AxisIndex);
+ if ((sts & 0x200) == 0)//鍏抽棴鐘舵��
+ {
+ MotionCard.AxisOnAsync(MotionCardMovingOption.AxisIndex);
+ buttonServoEnable.Text = "浼烘湇宸插紑鍚�";
+ }
+ else
+ {
+ MotionCard.AxisOffAsync(MotionCardMovingOption.AxisIndex);
+ buttonServoEnable.Text = "浼烘湇宸插叧闂�";
+ }
}
private void buttonPositionReset_Click(object sender, EventArgs e)
{
-
+ var res = MotionCard.PositionReset(MotionCardMovingOption.AxisIndex, 1);
}
private void btnStart_Click(object sender, EventArgs e)
{
-
+ MotionCard.SingleAxisMoving(MotionCardMovingOption);
}
private void buttonSmoothStop_Click(object sender, EventArgs e)
{
-
+ MotionCard.MoveStop(MotionCardMovingOption.AxisIndex, 0);
}
private void buttonEmergencyStop_Click(object sender, EventArgs e)
{
-
+ MotionCard.MoveStop(MotionCardMovingOption.AxisIndex, 1);
}
}
--
Gitblit v1.8.0