From b32329cdf758ef830bca69fc6e5cfb12b83f0e14 Mon Sep 17 00:00:00 2001
From: Milan Hanajik <milan.hanajik@xyleminc.com>
Date: Mon, 7 Dec 2020 11:42:37 +0100
Subject: [PATCH] DiverterTest changes reverted back (Luxemburg: root cause of
 the isssue was in CB firmware), ver. 2.26.1554

---
 .../DiverterTest/DiverterTestSeq.cs           | 28 ++-----------------
 TBF/Properties/AssemblyInfo.cs                |  4 +--
 2 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/TBF/BenchControl/TestMethods/DiverterTest/DiverterTestSeq.cs b/TBF/BenchControl/TestMethods/DiverterTest/DiverterTestSeq.cs
index bebf13351..b3bbcf8f1 100644
--- a/TBF/BenchControl/TestMethods/DiverterTest/DiverterTestSeq.cs
+++ b/TBF/BenchControl/TestMethods/DiverterTest/DiverterTestSeq.cs
@@ -518,32 +518,10 @@ namespace TBF.BenchControl.TestMethods.DiverterTest
 
                     Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
                     Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+
+                    if (e.Contains(Event.MeasurementCompleted)) break;
                 }
-                while (!e.Contains(Event.MeasurementCompleted) && !e.Contains(Event.Next));	    /// 'Next' button can be used in Debug version
-
-                State.Create(string.Format("{0}({1}) : Stopping the diverter", test.Method, test.Name))
-                     .AddOperation(checkUiOp)
-                     .AddOperations(readTempPressOps)
-                     .AddOperations(measureOperations)
-                     .AddOperation(readRegistersOp)
-                     .AddOperation(scale.ReadMassOp(ref Mass))
-                     .AddOperation(cBrd.StopPreviousOp())
-                     .AddOperation(processDataLoggingOp)
-                     .EnterState();
-                do {
-                    e = StateMachine.WaitRunDevsRunOps();
-                    if (e.Contains(Event.Error))      { retVal = Event.Error; goto stopTest; }
-                    if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
-
-                    RefFreq.Val = cBrd.ReferenceFreq;
-                    RefFlow.Val = cBrd.ReferenceFlow;
-
-                    UpdateAllStatistics(StateMachine.Time);
-
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
-                }
-                while (!e.Contains(Event.PreviousStopped) && !e.Contains(Event.Next));	    /// 'Next' button can be used in Debug version
+                while (!e.Contains(Event.Next));	    /// 'Next' button can be used in Debug version
 
                 LogProcessDataHeader(processDataLogger, string.Format("Delay {0}", divRepetNr));
 
diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index e88b65539..f417accf5 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.26.1553.0")]
-[assembly: AssemblyFileVersion("2.26.1553.0")]
+[assembly: AssemblyVersion("2.26.1554.0")]
+[assembly: AssemblyFileVersion("2.26.1554.0")]