From b86ca9fac8e3905d56ea94b8e6ea8829d764c35a Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Tue, 15 Mar 2016 19:29:47 +0800 Subject: [PATCH] Active FM pump is switched off in 'default action' after test (not when transition sequences are used), ver.2.3.242. --- .../BenchControl/Sequences/SequenceBase.cs | 2 ++ .../FlyingStartMassCollectionSeq.cs | 29 +++++++++---------- TestBenchFramework/Properties/AssemblyInfo.cs | 4 +-- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs index e79842cb7..473031e73 100644 --- a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs +++ b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs @@ -225,6 +225,8 @@ namespace TBF.BenchControl.Sequences /// if (context == TransitionContext.AfterTest) { + if (inPath.Pump is GenericDevices.IPumpFM) (inPath.Pump as GenericDevices.IPumpFM).TurnOff(); + State.Create("SequenceBase : Transition : TestEnd - Default action") .AddOperation(checkUiOp) .AddOperation(new MettlerToledo.KeepReadingMassesOp()) diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs index 131ee5409..a2f369e38 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs @@ -73,21 +73,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection //------------------------------------------------ if (inPath.Pump is GenericDevices.IPumpFM) (inPath.Pump as GenericDevices.IPumpFM).TurnOn(test.PumpPower); - State.Create("FlyingStartMassCollection : Starting the pump") - .AddOperation(checkUiOp) - .AddOperation(new Operations.TimerOp(5)) - .EnterState(); - do - { - e = StateMachine.WaitRunDevsRunOps(); - Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting)); - Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting)); - - if (e.Contains(Event.UiCmdStop)) { retVal = Event.UiCmdStop; goto stopTest; } - } - while (!e.Contains(Event.TimerExpired)); - - State.Create("FlyingStartMassCollection : Starting the pump") .AddOperation(checkUiOp) .AddOperation(cBrd.SetValvesOp(inPath.Pump, null)) @@ -102,6 +87,20 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection } while (!e.Contains(Event.ValvesSet)); + State.Create("FlyingStartMassCollection : Starting the pump") + .AddOperation(checkUiOp) + .AddOperation(new Operations.TimerOp(5)) + .EnterState(); + do + { + e = StateMachine.WaitRunDevsRunOps(); + Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting)); + Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting)); + + if (e.Contains(Event.UiCmdStop)) { retVal = Event.UiCmdStop; goto stopTest; } + } + while (!e.Contains(Event.TimerExpired)); + if (!test.Emptying) /// If condition met => skip measuring and force emptying { diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index ce6fbb80e..14f249997 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.3.241.1")] -[assembly: AssemblyFileVersion("2.3.241.1")] +[assembly: AssemblyVersion("2.3.242.1")] +[assembly: AssemblyFileVersion("2.3.242.1")]