From c7f0a6964a652f17d7cc77fcfb6afd68cecffe0b Mon Sep 17 00:00:00 2001 From: Han Qiang Qiang <1364346467@qq.com> Date: Tue, 18 Jul 2023 15:51:57 +0800 Subject: [PATCH] =?UTF-8?q?TM,Load,Unload=E8=85=94=E6=BC=8F=E6=A3=80Routin?= =?UTF-8?q?e=E6=B7=BB=E5=8A=A0=E5=BB=B6=E6=97=B6=EF=BC=8C=E5=8F=82?= =?UTF-8?q?=E8=80=83PM=E8=85=94=E6=BC=8F=E6=A3=80=E7=9A=84=E5=BB=B6?= =?UTF-8?q?=E6=97=B6=E8=B0=83=E7=94=A8=E6=97=B6=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Mainframe/LLs/Routines/LoadLockLeakCheckRoutine.cs | 3 +++ Modules/Mainframe/TMs/Routines/TMLeakcheckRoutine.cs | 2 ++ .../Mainframe/UnLoads/Routines/UnLoadLeakCheckRoutine.cs | 8 ++++++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Modules/Mainframe/LLs/Routines/LoadLockLeakCheckRoutine.cs b/Modules/Mainframe/LLs/Routines/LoadLockLeakCheckRoutine.cs index e005d60f..f4b55082 100644 --- a/Modules/Mainframe/LLs/Routines/LoadLockLeakCheckRoutine.cs +++ b/Modules/Mainframe/LLs/Routines/LoadLockLeakCheckRoutine.cs @@ -25,6 +25,7 @@ namespace SicModules.LLs.Routines ContinuePump, ClosePumpValve, DoLeakCheck, + DoLeakCheckDelay, CalcLeakCheck, StartLoop, LoopVent, @@ -180,8 +181,10 @@ namespace SicModules.LLs.Routines TimeDelay((int)RoutineStep.PumpDelay, _paramContinuePumpTime); CloseFastPumpValve((int)RoutineStep.CloseFastValve); CloseSlowPumpValve((int)RoutineStep.CloseSlowValve); + DoLeakCheck((int)RoutineStep.DoLeakCheck, _paramLeakCheckTime); //CalcLeackCheckPerMinute(_paramLeakCheckTime); + TimeDelay((int)RoutineStep.DoLeakCheckDelay, _paramLeakCheckTime); CalcLeakCheck((int)RoutineStep.CalcLeakCheck, _paramLeakCheckTime); } diff --git a/Modules/Mainframe/TMs/Routines/TMLeakcheckRoutine.cs b/Modules/Mainframe/TMs/Routines/TMLeakcheckRoutine.cs index 58819eee..02d7925d 100644 --- a/Modules/Mainframe/TMs/Routines/TMLeakcheckRoutine.cs +++ b/Modules/Mainframe/TMs/Routines/TMLeakcheckRoutine.cs @@ -30,6 +30,7 @@ namespace SicModules.TMs.Routines ContinuePump, ClosePumpValve, DoLeakCheck, + DoLeakCheckDelay, CalcLeakCheck, StartLoop, LoopVent, @@ -189,6 +190,7 @@ namespace SicModules.TMs.Routines DoLeakCheck((int)RoutineStep.DoLeakCheck, _paramLeakCheckTime); //CalcLeackCheckPerMinute(_paramLeakCheckTime); + TimeDelay((int)RoutineStep.DoLeakCheckDelay, _paramLeakCheckTime); CalcLeakCheck((int)RoutineStep.CalcLeakCheck, _paramLeakCheckTime); } diff --git a/Modules/Mainframe/UnLoads/Routines/UnLoadLeakCheckRoutine.cs b/Modules/Mainframe/UnLoads/Routines/UnLoadLeakCheckRoutine.cs index 17468047..feab78fb 100644 --- a/Modules/Mainframe/UnLoads/Routines/UnLoadLeakCheckRoutine.cs +++ b/Modules/Mainframe/UnLoads/Routines/UnLoadLeakCheckRoutine.cs @@ -23,6 +23,7 @@ namespace SicModules.UnLoads.Routines ContinuePump, ClosePumpValve, DoLeakCheck, + DoLeakCheckDelay, CalcLeakCheck, StartLoop, LoopVent, @@ -165,9 +166,12 @@ namespace SicModules.UnLoads.Routines TimeDelay((int)RoutineStep.PumpDelay, _paramContinuePumpTime); CloseFastPumpValve((int)RoutineStep.CloseFastValve); CloseSlowPumpValve((int)RoutineStep.CloseSlowValve); - DoLeakCheck((int)RoutineStep.DoLeakCheck, _paramLeakCheckTime); - CalcLeackCheckPerMinute(_paramLeakCheckTime); + + DoLeakCheck((int)RoutineStep.DoLeakCheck, _paramLeakCheckTime); + //CalcLeackCheckPerMinute(_paramLeakCheckTime); + TimeDelay((int)RoutineStep.DoLeakCheckDelay, _paramLeakCheckTime); + CalcLeakCheck((int)RoutineStep.CalcLeakCheck, _paramLeakCheckTime); } catch (RoutineBreakException) {