DiverterTest : Delay TimeFlow2Mass (min. 5 s) between tests, UpgradeSlectionDlg changes, ver. 2.33.2061

TBF/Rig/TestMethods/DiverterTest/DiverterTestSeq.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
+/// Copyright (c) 2019-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -524,15 +524,14 @@ namespace TBF.Rig.TestMethods.DiverterTest
                 {
                     /// This is not the last diverter repetition
 
-                    /// Delay 5s
+                    /// Delay 'TimeFlow2Mass', min. 5 seconds
                     State.Create(string.Format("{0}({1}) : Delay {2}", test.Method, test.Name, divRepetNr))
-                         .AddOperation(checkUiOp)
-                         .AddOperations(readTempPressOps)
-                         .AddOperation(processDataLoggingOp)
-                         .AddOperation(new Operations.TimerOp(5))
-                         .EnterState();
-                    do
-                    {
+                            .AddOperation(checkUiOp)
+                            .AddOperations(readTempPressOps)
+                            .AddOperation(processDataLoggingOp)
+                            .AddOperation(new Operations.TimerOp(Math.Max(5, test.TimeFlow2Mass)))
+                            .EnterState();
+                    do {
                         e = StateMachine.WaitRunDevsRunOps();
                         if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
                         if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }