From 357a216b6b7cd5f0ce83eab64b74babfe3118bd0 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Wed, 15 May 2019 16:04:50 +0200 Subject: [PATCH] Stopping flow regulation after test in all remaining FlyingStart.... sequences. --- .../FlyingStartFirstRepetWithMassCollSeq.cs | 12 ++++++++++++ .../FlyingStartMassCollComparativeSeq.cs | 12 ++++++++++++ .../FlyingStartTankCollectionSeq.cs | 12 ++++++++++++ 3 files changed, 36 insertions(+) diff --git a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs index ba1845007..7912f46ff 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs @@ -623,6 +623,18 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl StopRecordingStatistics(); + State.Create(string.Format("{0}({1}) : Stopping flow regulation", test.Method, test.Name)) + .AddOperation(checkUiOp) + .AddOperations(readTempPressOps) + .AddOperation(cBrd.StopFlowRegulationOp(outPath)) + .EnterState(); + do { + e = StateMachine.WaitRunDevsRunOps(); + if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; } + if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; } + } + while (!e.Contains(Event.FlowRegulationStopped)); + if (repetitionNr == 1) { /// diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs index 59a42133f..57af65046 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs @@ -721,6 +721,18 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative StopRecordingStatistics(); + State.Create(string.Format("{0}({1}) : Stopping flow regulation", test.Method, test.Name)) + .AddOperation(checkUiOp) + .AddOperations(readTempPressOps) + .AddOperation(cBrd.StopFlowRegulationOp(outPath)) + .EnterState(); + do { + e = StateMachine.WaitRunDevsRunOps(); + if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; } + if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; } + } + while (!e.Contains(Event.FlowRegulationStopped)); + /// /// (Berlin:) Water is stopped immediately after the test and before the 2nd mass measurement in case: /// - no 'transition sequence after test' is used diff --git a/TBF/BenchControl/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs index 2931628c9..f8cc80c5d 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs @@ -402,6 +402,18 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection StopRecordingStatistics(); + State.Create(string.Format("{0}({1}) : Stopping flow regulation", test.Method, test.Name)) + .AddOperation(checkUiOp) + .AddOperations(readTempPressOps) + .AddOperation(cBrd.StopFlowRegulationOp(outPath)) + .EnterState(); + do { + e = StateMachine.WaitRunDevsRunOps(); + if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; } + if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; } + } + while (!e.Contains(Event.FlowRegulationStopped)); + /// /// (Berlin:) Water is stopped immediately after the test and before the 2nd mass measurement in case: /// - no 'transition sequence after test' is used