From 2edc3c54ba7a42d5e9bb9120b9881d418e6bd408 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期五, 13 八月 2021 09:38:29 +0800
Subject: [PATCH] 1. GTS回原点修改，避免来回 2. 添加单键测量结果补偿 3. 部分条件限制，日志修改 4. 来料检debug，添加退出条件判断
---
src/Bro.M071.Process/M071Process_MotionCard.cs | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/Bro.M071.Process/M071Process_MotionCard.cs b/src/Bro.M071.Process/M071Process_MotionCard.cs
index c49221c..7d5994c 100644
--- a/src/Bro.M071.Process/M071Process_MotionCard.cs
+++ b/src/Bro.M071.Process/M071Process_MotionCard.cs
@@ -19,6 +19,8 @@
{
public Timer ResetTimer = null;
+ MachineState MeasureState = MachineState.Unknown;
+
object machineStateLock = new object();
//MachineState _machineStatePre = MachineState.Unknown;
MachineState machineState = MachineState.Unknown;
@@ -250,6 +252,8 @@
(invokeDevice as MotionCardBase).ResetAlarm();
_isdoing = false;
+ _pausedHandle.Set();
+
RaisedAlarm("");
OnCheckHintUpload?.Invoke("", false);
@@ -681,7 +685,15 @@
}
_pausedHandle.Set();
RaisedAlarm("");
- MachineState = _machineStateBeforePause;
+
+ if (_machineStateBeforePause == MachineState.Running && MeasureState == MachineState.Ready)
+ {
+ MachineState = MachineState.Ready;
+ }
+ else
+ {
+ MachineState = _machineStateBeforePause;
+ }
}
}
}
--
Gitblit v1.8.0