From 0ec7f2e32c8c7ef62ab71c0a2f5bd015aef7d7fe Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期五, 10 七月 2020 17:39:56 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.M071.Process/M071Process_MotionCard.cs | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/Bro.M071.Process/M071Process_MotionCard.cs b/src/Bro.M071.Process/M071Process_MotionCard.cs
index 62fd994..441e2c3 100644
--- a/src/Bro.M071.Process/M071Process_MotionCard.cs
+++ b/src/Bro.M071.Process/M071Process_MotionCard.cs
@@ -213,7 +213,7 @@
}
MotionCardDefaultRun("Reset", ref opConfig, ref invokeDevice);
- //(invokeDevice as IMotionCard).Reset();
+ (invokeDevice as MotionCardBase).ResetAlarm();
RaisedAlarm("");
MachineState = MachineState.Ready;
@@ -251,7 +251,8 @@
}
}
- [ProcessMethod("MotionCardOperationConfigCollection", "FullReset", "澶у浣嶆搷浣�", InvokeType.TestInvoke)]
+ //[ProcessMethod("MotionCardOperationConfigCollection", "FullReset", "澶у浣嶆搷浣�", InvokeType.TestInvoke)]
+ [ProcessMethod("MotionCardBase", "FullReset", "澶у浣嶆搷浣�", InvokeType.TestInvoke)]
public ProcessResponse FullReset(IOperationConfig opConfig, IDevice invokeDevice, IDevice sourceDevice)
{
//if (opConfig == null)
@@ -302,7 +303,7 @@
};
MachineState _machineStateBeforePause = MachineState.Unknown;
List<MachineState> _statesAllowPause = new List<MachineState>() { MachineState.Running, MachineState.Ready, MachineState.Pause };
- [ProcessMethod("", "PauseJob", "鏆傚仠娴佺▼", InvokeType.TestInvoke)]
+ [ProcessMethod("", "SwitchJobStatus", "娴佺▼鐘舵�佸垏鎹�", InvokeType.TestInvoke)]
public ProcessResponse SwitchJobStatus(IOperationConfig opConfig, IDevice invokeDevice, IDevice sourceDevice)
{
if (!_statesAllowPause.Contains(MachineState))
@@ -328,7 +329,7 @@
if (!_pauseHandle.WaitResult)
{
#region 鏉垮崱鏆傚仠鍔ㄤ綔
- motionDevice.StateChange(DeviceState.DSPause);
+ motionDevice.SetImmediatePause();
#endregion
_pauseHandle.WaitHandle.Reset();
@@ -339,7 +340,7 @@
else if (!_pauseHandle.WaitResult)
{
#region 鏉垮崱鎭㈠鍔ㄤ綔
- motionDevice.StateChange(DeviceState.DSOpen);
+ motionDevice.ResetImmediatePause();
#endregion
_pauseHandle.WaitHandle.Set();
@@ -354,7 +355,7 @@
if (!_pauseHandle.WaitResult)
{
#region 鏉垮崱鏆傚仠鍔ㄤ綔
- motionDevice.StateChange(DeviceState.DSPause);
+ motionDevice.SetImmediatePause();
#endregion
_pauseHandle.WaitHandle.Reset();
@@ -367,7 +368,7 @@
if (!_pauseHandle.WaitResult)
{
#region 鏉垮崱鎭㈠鍔ㄤ綔
- motionDevice.StateChange(DeviceState.DSOpen);
+ motionDevice.ResetImmediatePause();
#endregion
_pauseHandle.WaitHandle.Set();
--
Gitblit v1.8.0