From 7bdb7f99d4b783adee7b8eebb2f1bc27ec85857e Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Tue, 20 Nov 2018 17:49:58 +0100 Subject: [PATCH] FlyingStarMassCollComparative : Mass updated when comparative measurement done, ver. 2.18.1072 --- .../FlyingStartMassCollComparativeSeq.cs | 4 ++++ TBF/Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs index abb0e02ab..1a91717dc 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs @@ -465,6 +465,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative State.Create(string.Format("{0}({1}) : Activate ref. mass valve", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(StateMachine.ControlBoard.SetValvesOp(compareValve, null)) + .AddOperation(scale.ReadMassOp(ref Mass)) .EnterState(); do { @@ -483,6 +484,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2)) .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1)) .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2)) + .AddOperation(scale.ReadMassOp(ref Mass)) .AddOperation(new Operations.TimerOp(stabTime)) .EnterState(); do @@ -538,6 +540,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative State.Create(string.Format("{0}({1}) : Deactivate ref. mass valve", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(StateMachine.ControlBoard.SetValvesOp(null, compareValve)) + .AddOperation(scale.ReadMassOp(ref Mass)) .EnterState(); do { @@ -556,6 +559,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2)) .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1)) .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2)) + .AddOperation(scale.ReadMassOp(ref Mass)) .AddOperation(new Operations.TimerOp(stabTime)) .EnterState(); do diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 8d541f4eb..5df229a6c 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.18.1071.0")] -[assembly: AssemblyFileVersion("2.18.1071.0")] +[assembly: AssemblyVersion("2.18.1072.0")] +[assembly: AssemblyFileVersion("2.18.1072.0")]