From d29d8be81a08e3ee9670a705ad18e21018bb02c0 Mon Sep 17 00:00:00 2001
From: Milan Hanajik <milan.hanajik@xyleminc.com>
Date: Fri, 18 Nov 2022 12:32:15 +0100
Subject: [PATCH] FixedStartMassCollection : Flow adjustment during
 measurement, ver. 2.30.1987

---
 TBF/Properties/AssemblyInfo.cs                               | 4 ++--
 .../FixedStartMassCollection/FixedStartMassCollectionSeq.cs  | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index 4128f7be8..9d4768c9a 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.30.1986.0")]
-[assembly: AssemblyFileVersion("2.30.1986.0")]
+[assembly: AssemblyVersion("2.30.1987.0")]
+[assembly: AssemblyFileVersion("2.30.1987.0")]
diff --git a/TBF/Rig/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TBF/Rig/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
index 4f436c05d..93390d014 100644
--- a/TBF/Rig/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
+++ b/TBF/Rig/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
@@ -635,11 +635,12 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollection
             Bridge.OnActivity(this, Strings.Test_in_progress);
             //------------------------------------------------
             StartTime = (double)StateMachine.Time;
+            var setFlowOp = outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, int.MaxValue);   /// Flow adjustment during measurement
             State.Create(string.Format("{0}({1}) : Starting the test", test.Method, test.Name))
                  .AddOperation(checkUiOp)
                  .AddOperations(readTempPressOps)
                  .AddOperation(new TBF.Rig.Elde.SetValvesOp(cBrd, false, outPath))     /// This line should precede StartMeasureentOp (sending commands)
-                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, int.MaxValue))
+                 .AddOperation(setFlowOp)
                  .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
@@ -662,7 +663,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollection
             /// Measurement loop - begin
             do {
                 //--------------------------------
-                switch (ReadRegistersTempPressAmbient(null, true))
+                switch (ReadRegistersTempPressAmbient(new List<IOperation>() { setFlowOp }, true))
                 {
                     case Event.Error: retVal = Event.Error; goto stopTest;
                     case Event.UiCmdStop: retVal = Event.UiCmdStop; goto stopTest;