From b5e7fa2db4ac36fdb7bf9fd330d12a72ade9d483 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期日, 24 一月 2021 15:07:26 +0800
Subject: [PATCH] 0124
---
src/Bro.M071.Process/M071Process_MotionCard.cs | 222 +++++++++++++++++++++++++++----------------------------
1 files changed, 108 insertions(+), 114 deletions(-)
diff --git a/src/Bro.M071.Process/M071Process_MotionCard.cs b/src/Bro.M071.Process/M071Process_MotionCard.cs
index fbc4314..8806106 100644
--- a/src/Bro.M071.Process/M071Process_MotionCard.cs
+++ b/src/Bro.M071.Process/M071Process_MotionCard.cs
@@ -17,7 +17,6 @@
public partial class M071Process
{
public Timer ResetTimer = null;
- const int FULLRESETTIME = 5;
object machineStateLock = new object();
//MachineState _machineStatePre = MachineState.Unknown;
@@ -30,112 +29,103 @@
if (machineState == value)
return;
- //_machineStatePre = machineState;
-
+ LogAsync(DateTime.Now, $"璁惧鐘舵�佸垏鎹�:{machineState.ToString()}->{value.ToString()}", "");
machineState = value;
- switch (machineState)
+ Task.Run(() =>
{
- case MachineState.Ready:
- lock (machineStateLock)
- {
- SwitchBeep(false);
- SwitchLightRed(false);
- SwitchLightYellow(false);
- }
-
- Task.Run(() =>
- {
-
- while (MachineState == MachineState.Ready)
+ switch (machineState)
+ {
+ case MachineState.Ready:
+ lock (machineStateLock)
{
- lock (machineStateLock)
- {
- SwitchLightGreen(true);
- Thread.Sleep(1000);
- SwitchLightGreen(false);
- Thread.Sleep(1000);
- }
+ SwitchBeep(false);
+ SwitchLightRed(false);
+ SwitchLightYellow(false);
}
- });
- break;
- case MachineState.Running:
- lock (machineStateLock)
- {
- SwitchBeep(false);
- SwitchLightRed(false);
- SwitchLightYellow(false);
- SwitchLightGreen(true);
- }
- break;
- case MachineState.Alarm:
- lock (machineStateLock)
- {
- SwitchBeep(true);
- SwitchLightRed(true);
- SwitchLightYellow(false);
- SwitchLightGreen(false);
- }
- break;
- case MachineState.Pause:
- lock (machineStateLock)
- {
- SwitchBeep(false);
- SwitchLightRed(false);
- }
- Task.Run(() =>
- {
- while (MachineState == MachineState.Pause)
+ Task.Run(() =>
{
- lock (machineStateLock)
+ while (MachineState == MachineState.Ready)
{
- SwitchLightYellow(true);
- SwitchLightGreen(true);
- Thread.Sleep(1000);
- SwitchLightYellow(false);
- SwitchLightGreen(false);
- Thread.Sleep(1000);
+ lock (machineStateLock)
+ {
+ SwitchLightGreen(true);
+ Thread.Sleep(1000);
+ SwitchLightGreen(false);
+ Thread.Sleep(1000);
+ }
}
- }
- });
- break;
- case MachineState.Resetting:
- lock (machineStateLock)
- {
- SwitchBeep(false);
- SwitchLightRed(false);
- SwitchLightGreen(false);
- }
- Task.Run(() =>
- {
- while (MachineState == MachineState.Resetting)
- {
- lock (machineStateLock)
- {
+ });
- SwitchLightYellow(true);
- Thread.Sleep(1000);
- SwitchLightYellow(false);
- Thread.Sleep(1000);
- }
+ break;
+ case MachineState.Running:
+ lock (machineStateLock)
+ {
+ SwitchBeep(false);
+ SwitchLightRed(false);
+ SwitchLightYellow(false);
+ SwitchLightGreen(true);
}
- });
- break;
- default:
- break;
- }
+ break;
+ case MachineState.Alarm:
+ lock (machineStateLock)
+ {
+ SwitchBeep(true);
+ SwitchLightRed(true);
+ SwitchLightYellow(false);
+ SwitchLightGreen(false);
+ }
+ break;
+ case MachineState.Pause:
+ lock (machineStateLock)
+ {
+ SwitchBeep(false);
+ SwitchLightRed(false);
+ }
+ Task.Run(() =>
+ {
+ while (MachineState == MachineState.Pause)
+ {
+ lock (machineStateLock)
+ {
+ SwitchLightYellow(true);
+ SwitchLightGreen(true);
+ Thread.Sleep(1000);
+ SwitchLightYellow(false);
+ SwitchLightGreen(false);
+ Thread.Sleep(1000);
+ }
+ }
+ });
+ break;
+ case MachineState.Resetting:
+ lock (machineStateLock)
+ {
+ SwitchBeep(false);
+ SwitchLightRed(false);
+ SwitchLightGreen(false);
+ }
+ Task.Run(() =>
+ {
+ while (MachineState == MachineState.Resetting)
+ {
+ lock (machineStateLock)
+ {
+ SwitchLightYellow(true);
+ Thread.Sleep(1000);
+ SwitchLightYellow(false);
+ Thread.Sleep(1000);
+ }
+ }
+ });
+ break;
+ default:
+ break;
+ }
+ });
OnMachineStateChanged?.Invoke(machineState);
-
- //if (_machineStatePre == MachineState.Running && machineState == MachineState.Pause)
- //{
- // Pause();
- //}
- //else if (_machineStatePre == MachineState.Pause && (machineState == MachineState.Running || machineState == MachineState.Ready))
- //{
- // Resume();
- //}
}
}
@@ -243,7 +233,7 @@
if (opConfig?.InputPara != null && opConfig.InputPara.Count > 0)
{
//澶у浣嶄俊鍙�
- ResetTimer.Change(opConfig.InputPara[0] == 1 ? FULLRESETTIME * 1000 : -1, -1);
+ ResetTimer.Change(opConfig.InputPara[0] == 1 ? Config.FullResetRequiredDuration * 1000 : -1, -1);
if (opConfig.InputPara[0] == 0)
return new ProcessResponse(true);
@@ -260,15 +250,15 @@
RaisedAlarm("");
- 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)
{
@@ -312,8 +302,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();
@@ -653,13 +646,16 @@
ManualResetEventSlim _pausedHandle = new ManualResetEventSlim(true);
MachineState _machineStateBeforePause = MachineState.Unknown;
- private async void CheckMachinePauseState()
+ private void CheckMachinePauseState()
{
- await Task.Run(() =>
+ //await Task.Run(() =>
{
if (IsMachinePaused)
{
- _machineStateBeforePause = MachineState;
+ if (MachineState == MachineState.Ready || MachineState == MachineState.Running)
+ {
+ _machineStateBeforePause = MachineState;
+ }
MachineState = MachineState.Pause;
_pausedHandle.Reset();
@@ -681,7 +677,8 @@
MachineState = _machineStateBeforePause;
}
}
- });
+ }
+ //);
}
public bool IsMachinePaused
@@ -711,9 +708,6 @@
[ProcessMethod("", "SafetyBeamSignal", "瀹夊叏鍏夊箷淇″彿鐩戞帶锛屾甯窸N锛孫FF鏃舵姤璀�", InvokeType.TestInvoke)]
public ProcessResponse SafetyBeamSignal(IOperationConfig opConfig, IDevice invokeDevice, IDevice sourceDevice)
{
- //if (MachineState != MachineState.Running && MachineState != MachineState.Pause)
- // return new ProcessResponse(true);
-
if (opConfig.InputPara == null || opConfig.InputPara.Count == 0)
throw new ProcessException("瀹夊叏鍏夊箷鐩戞帶鏈厤缃緭鍏ヤ俊鍙�");
@@ -756,7 +750,7 @@
IsEmergencyStopped = opConfig.InputPara[0] == 0;
- if (IsEmergencyStopped)
+ if (isEmergencyStopped)
{
RaisedAlarm("鎬ュ仠鎸夐挳琚媿涓�");
MachineState = MachineState.Alarm;
--
Gitblit v1.8.0