From 970fc886c6e2eb39093eebbf5d90101efc60b3a7 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Fri, 17 Feb 2017 10:51:30 +0100 Subject: [PATCH] FlyingStartMassCollectionSeq : If transitionAfter is not used, the valves/pumps are closed immediately after the test before the 2nd mass measurement, ver. 2.12.472 --- .../FlyingStartMassCollectionSeq.cs | 10 ++++++++++ TestBenchFramework/Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs index 15be276ba..a052625b6 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs @@ -588,6 +588,16 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection /// Measurement loop - end test_completed: + + if (transitionAfter == null) + { + switch (Transition(transitionAfter, TransitionContext.AfterTest)) + { + case Event.Error: { retVal = Event.Error; goto stopTest; } + case Event.UiCmdStop: { retVal = Event.UiCmdStop; goto stopTest; } + } + } + //------------------------------------------------ Bridge.OnActivity(this, Strings.Measuring_the_weight); //------------------------------------------------ diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 8d4a34436..9fbdb97ba 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.12.471.1")] -[assembly: AssemblyFileVersion("2.12.471.1")] +[assembly: AssemblyVersion("2.12.472.1")] +[assembly: AssemblyFileVersion("2.12.472.1")]