From 3f6e94d7de9694378114773ab48d8a61bcc3a01e Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期一, 01 二月 2021 09:22:20 +0800
Subject: [PATCH] 1. 报警生成前后端异步调用 2. 安全光栅方法单线程调用 3. 复位完成时修改界面显示 4. 机台状态拆分执行状态
---
src/Bro.M071.Process/M071Process_MotionCard.cs | 86 +++++++++++++++++++++++++------------------
1 files changed, 50 insertions(+), 36 deletions(-)
diff --git a/src/Bro.M071.Process/M071Process_MotionCard.cs b/src/Bro.M071.Process/M071Process_MotionCard.cs
index 5423b8f..c49221c 100644
--- a/src/Bro.M071.Process/M071Process_MotionCard.cs
+++ b/src/Bro.M071.Process/M071Process_MotionCard.cs
@@ -7,6 +7,7 @@
using System.ComponentModel;
using System.Drawing.Design;
using System.Linq;
+using System.Runtime.CompilerServices;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
@@ -29,10 +30,13 @@
if (machineState == value)
return;
+ LogAsync(DateTime.Now, $"璁惧鐘舵�佸垏鎹�:{machineState.ToString()}->{value.ToString()}", "");
machineState = value;
Task.Run(() =>
{
+ OnMachineStateChanged?.Invoke(machineState);
+
switch (machineState)
{
case MachineState.Ready:
@@ -122,9 +126,7 @@
default:
break;
}
- });
-
- OnMachineStateChanged?.Invoke(machineState);
+ });
}
}
@@ -247,17 +249,19 @@
MotionCardDefaultRun("Reset", ref opConfig, ref invokeDevice);
(invokeDevice as MotionCardBase).ResetAlarm();
+ _isdoing = false;
RaisedAlarm("");
+ OnCheckHintUpload?.Invoke("", false);
- if (MachineState != MachineState.Pause)
- {
- MachineState = MachineState.Ready;
- }
- else
- {
- LogAsync(DateTime.Now, "璁惧鏆傚仠涓紝鏃犳硶澶嶄綅", "");
- return new ProcessResponse(true);
- }
+ //if (MachineState != MachineState.Pause)
+ //{
+ MachineState = MachineState.Ready;
+ //}
+ //else
+ //{
+ // LogAsync(DateTime.Now, "璁惧鏆傚仠涓紝鏃犳硶澶嶄綅", "");
+ // return new ProcessResponse(true);
+ //}
if (IsEmergencyStopped)
{
@@ -267,6 +271,7 @@
}
LogAsync(DateTime.Now, "鏅�氬浣嶅姩浣滃畬鎴�", "");
+ OnResetDone?.Invoke();
return new ProcessResponse(true);
}
@@ -301,8 +306,11 @@
MachineState = MachineState.Resetting;
MotionCardDefaultRun("FullReset", ref opConfig, ref invokeDevice);
- productionList.ForEach(u => u.Dispose());
- productionList.Clear();
+ lock (productionLock)
+ {
+ productionList.ForEach(u => u.Dispose());
+ productionList.Clear();
+ }
OnFullResetDone?.Invoke();
@@ -642,39 +650,43 @@
ManualResetEventSlim _pausedHandle = new ManualResetEventSlim(true);
MachineState _machineStateBeforePause = MachineState.Unknown;
- private void CheckMachinePauseState()
+ object _pauseLock = new object();
+ private async void CheckMachinePauseState()
{
- //await Task.Run(() =>
+ await Task.Run(() =>
{
- if (IsMachinePaused)
+ lock (_pauseLock)
{
- if (MachineState == MachineState.Ready || MachineState == MachineState.Running)
+ if (IsMachinePaused)
{
- _machineStateBeforePause = MachineState;
- }
- MachineState = MachineState.Pause;
- _pausedHandle.Reset();
+ if (MachineState == MachineState.Ready || MachineState == MachineState.Running)
+ {
+ _machineStateBeforePause = MachineState;
+ }
+ MachineState = MachineState.Pause;
+ _pausedHandle.Reset();
- if (_machineStateBeforePause == MachineState.Running)
- {
- Pause();
- }
- }
- else
- {
- if (MachineState == MachineState.Pause)
- {
if (_machineStateBeforePause == MachineState.Running)
{
- Resume(true);
+ Pause();
}
- _pausedHandle.Set();
- RaisedAlarm("");
- MachineState = _machineStateBeforePause;
+ }
+ else
+ {
+ if (MachineState == MachineState.Pause)
+ {
+ if (_machineStateBeforePause == MachineState.Running || _machineStateBeforePause == MachineState.Ready)
+ {
+ Resume(true);
+ }
+ _pausedHandle.Set();
+ RaisedAlarm("");
+ MachineState = _machineStateBeforePause;
+ }
}
}
}
- //);
+ );
}
public bool IsMachinePaused
@@ -683,6 +695,7 @@
}
[ProcessMethod("", "SafetyDoorSignal", "瀹夊叏闂ㄤ俊鍙风洃鎺э紝姝ｅ父ON锛孫FF鏃舵姤璀�", InvokeType.TestInvoke)]
+ [MethodImpl(MethodImplOptions.Synchronized)]
public ProcessResponse SafetyDoorSignal(IOperationConfig opConfig, IDevice invokeDevice, IDevice sourceDevice)
{
//if (MachineState != MachineState.Running && MachineState != MachineState.Pause)
@@ -702,6 +715,7 @@
}
[ProcessMethod("", "SafetyBeamSignal", "瀹夊叏鍏夊箷淇″彿鐩戞帶锛屾甯窸N锛孫FF鏃舵姤璀�", InvokeType.TestInvoke)]
+ [MethodImpl(MethodImplOptions.Synchronized)]
public ProcessResponse SafetyBeamSignal(IOperationConfig opConfig, IDevice invokeDevice, IDevice sourceDevice)
{
if (opConfig.InputPara == null || opConfig.InputPara.Count == 0)
--
Gitblit v1.8.0