From ed53c7797e2a60c45e0ba655ce3cf5643302b755 Mon Sep 17 00:00:00 2001 From: Liang Su Date: Wed, 28 Jun 2023 11:39:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96PM=E5=8F=91=E7=94=9FAlarm?= =?UTF-8?q?=E6=97=B6=E8=B0=83=E7=94=A8AbortRoutine()=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E7=9A=84=E4=BD=8D=E7=BD=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Modules/Mainframe/PMs/PMModule.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/Mainframe/PMs/PMModule.cs b/Modules/Mainframe/PMs/PMModule.cs index dd6bb336..1a121e39 100644 --- a/Modules/Mainframe/PMs/PMModule.cs +++ b/Modules/Mainframe/PMs/PMModule.cs @@ -836,6 +836,7 @@ namespace SicModules.PMs private bool FsmEnterError(object[] param) { + AbortRoutine(); InvokeOnEnterError(Module); if (IsOnline) { @@ -1363,8 +1364,7 @@ namespace SicModules.PMs { return false; } - - AbortRoutine(); + StopRamp(); _pmInterLock.SetPMProcessRunning(false, out string reason); _pmInterLock.SetPMPreProcessRunning(false, out reason);