From 66d995d55f9c122328b4eceb99bc20aca3a42c10 Mon Sep 17 00:00:00 2001
From: wells <123>
Date: 星期日, 12 七月 2020 21:04:16 +0800
Subject: [PATCH] debug
---
src/Bro.M071.Process/M071Process_MotionCard.cs | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/Bro.M071.Process/M071Process_MotionCard.cs b/src/Bro.M071.Process/M071Process_MotionCard.cs
index 7a91ce4..2821708 100644
--- a/src/Bro.M071.Process/M071Process_MotionCard.cs
+++ b/src/Bro.M071.Process/M071Process_MotionCard.cs
@@ -358,9 +358,17 @@
throw new ProcessException("鏈幏鍙栨澘鍗¤澶�");
bool? isToPause = null; //true 鏆傚仠 false 缁х画
- if (opConfig.InputPara != null && opConfig.InputPara.Count > 0)
+ //if (opConfig.InputPara != null && opConfig.InputPara.Count > 0)
+ //{
+ // isToPause = opConfig.InputPara[0] == 1;
+ //}
+ if (opConfig.InputPara[0] == 10)
{
- isToPause = opConfig.InputPara[0] == 1;
+ isToPause = false;
+ }
+ else if (opConfig.InputPara[0] == 11)
+ {
+ isToPause = true;
}
if (isToPause == null)
@@ -665,7 +673,7 @@
[ProcessMethod("", "SafetyBeamSignal", "瀹夊叏鍏夊箷淇″彿鐩戞帶锛屾甯窸N锛孫FF鏃舵姤璀�", InvokeType.TestInvoke)]
public ProcessResponse SafetyBeamSignal(IOperationConfig opConfig, IDevice invokeDevice, IDevice sourceDevice)
{
- if (MachineState != MachineState.Running || MachineState != MachineState.Alarm)
+ if (MachineState != MachineState.Running && MachineState != MachineState.Alarm)
return new ProcessResponse(true);
if (opConfig.InputPara == null || opConfig.InputPara.Count == 0)
--
Gitblit v1.8.0