diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs b/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs index 5a1418d1c..69e27c207 100644 --- a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs @@ -53,7 +53,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment /// Event.OpArgumentError . Target flow is out of range /// Event.Error . . . . . . Unspecified error /// - public IList Execute(Test test, DebugMode mode) + public IList Execute(Test test, bool outerLoopMode, int outerLoopCounter, DebugMode mode) { float simulatedError = 4.5f; /// % @@ -73,7 +73,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this, false); - int repetitionNr = 1; /// First test: repetitionNr=1 + int repetitionNr = outerLoopMode ? outerLoopCounter : 1; /// First test: repetitionNr=1 //==================================== // Transition or SetRoute - Start diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/TestMethod.cs b/TestBenchFramework/BenchControl/TestMethods/Adjustment/TestMethod.cs index 8615215fa..9e08be206 100644 --- a/TestBenchFramework/BenchControl/TestMethods/Adjustment/TestMethod.cs +++ b/TestBenchFramework/BenchControl/TestMethods/Adjustment/TestMethod.cs @@ -30,7 +30,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment public IList Execute(Test test, bool outerLoopMode, int outerLoopCounter) { - return (new AdjustmentSeq()).Execute(test, DebugLevel); + return (new AdjustmentSeq()).Execute(test, outerLoopMode, outerLoopCounter, DebugLevel); } } } diff --git a/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetection.cs b/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetection.cs index 8a79a75d1..0a45a7643 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetection.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetection.cs @@ -30,7 +30,7 @@ namespace TBF.BenchControl.TestMethods.CameraRoiDetection public IList Execute(Test test, bool outerLoopMode, int outerLoopCounter) { - return (new RoiDetectionSeq()).Execute(test); + return (new RoiDetectionSeq()).Execute(test, outerLoopMode, outerLoopCounter); } } } diff --git a/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionSeq.cs index e4ce5f577..921780c3e 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionSeq.cs @@ -16,7 +16,7 @@ namespace TBF.BenchControl.TestMethods.CameraRoiDetection private static readonly ILog log = LogManager.GetLogger(typeof(RoiDetectionSeq)); - public IList Execute(Test test) + public IList Execute(Test test, bool outerLoopMode, int outerLoopCounter) { Elde.ControlBoardDev cBrd = StateMachine.ControlBoard; diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs index b035b970c..89b742ba7 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs @@ -18,7 +18,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection const int DetectionBufferSize = 9; const int DetectionKernelSize = 5; - public IList Execute(Config.Entities.Test test, + public IList Execute(Config.Entities.Test test, bool outerLoopMode, int outerLoopCounter, CombinedWithDetTestParams testParams, Config.Entities.DebugMode debugLevel) { @@ -118,7 +118,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection /// Meters path is required for the following: readRegistersOp = new Operations.ReadMoreRegistersOp(sensPath.RegisterReaders); - int repetitionNr = 1; /// First test: repetitionNr=1 + int repetitionNr = outerLoopMode ? outerLoopCounter : 1; /// First test: repetitionNr=1 //==================================== // Transition or SetRoute - Start @@ -718,7 +718,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection /// Append the results to the CSV-file allResults.Info(TestResult2CsvLine(testName, test.Part)); - if (++repetitionNr <= test.Repeats) + if (!outerLoopMode && (++repetitionNr <= test.Repeats)) { goto loop; } diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/TestMethod.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/TestMethod.cs index ce08faac8..0df2c00a7 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/TestMethod.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/TestMethod.cs @@ -33,7 +33,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection public IList Execute(Test test, bool outerLoopMode, int outerLoopCounter) { - return (new CombinedWithDetectionSeq()).Execute(test, testMethodCfg.TestParams, DebugLevel); + return (new CombinedWithDetectionSeq()).Execute(test, outerLoopMode, outerLoopCounter, testMethodCfg.TestParams, DebugLevel); } } } diff --git a/TestBenchFramework/BenchControl/TestMethods/Endurance/Component.cs b/TestBenchFramework/BenchControl/TestMethods/Endurance/Component.cs index d990803f5..8cd4fe3fd 100644 --- a/TestBenchFramework/BenchControl/TestMethods/Endurance/Component.cs +++ b/TestBenchFramework/BenchControl/TestMethods/Endurance/Component.cs @@ -35,7 +35,7 @@ namespace TBF.BenchControl.TestMethods.Endurance public IList Execute(Test test, bool outerLoopMode, int outerLoopCounter) { - return (new EnduranceSeq()).Execute(test, testMethodCfg.Cycle, DebugLevel); + return (new EnduranceSeq()).Execute(test, outerLoopMode, outerLoopCounter, testMethodCfg.Cycle, DebugLevel); } } } diff --git a/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs b/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs index f16d246d4..07d8fc28f 100644 --- a/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs @@ -26,7 +26,7 @@ namespace TBF.BenchControl.TestMethods.Endurance /// Event.OpArgumentError . Target flow is out of range /// Event.Error . . . . . . Unspecified error /// - public IList Execute(Config.Entities.Test test, + public IList Execute(Config.Entities.Test test, bool outerLoopMode, int outerLoopCounter, string enduranceCycleStr, Config.Entities.DebugMode debugLevel) { @@ -46,7 +46,7 @@ namespace TBF.BenchControl.TestMethods.Endurance /// int refPulses = (int)(timeSec * (2000.0f * targetFlow / pOut.FlowMeter.NominalFlow)); int totalPulses = (int)(test.Volume / LtrPerRefPulse + 0.5f); - int repetitionNr = 1; /// First test: repetitionNr=1 + int repetitionNr = outerLoopMode ? outerLoopCounter : 1; /// Initialize repetitionNr (First test =1 ) //==================================== // Transition or SetRoute - Start @@ -549,7 +549,7 @@ namespace TBF.BenchControl.TestMethods.Endurance } - if (++repetitionNr <= test.Repeats) + if (!outerLoopMode && (++repetitionNr <= test.Repeats)) { goto loop; } diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs index e39cca747..b00db182f 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs @@ -26,7 +26,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced /// Event.OpArgumentError . Target flow is out of range /// Event.Error . . . . . . Unspecified error /// - public IList Execute(Config.Entities.Test test) + public IList Execute(Config.Entities.Test test, bool outerLoopMode, int outerLoopCounter) { Elde.ControlBoardDev cBrd = StateMachine.ControlBoard; @@ -47,7 +47,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced float[] wmBeginStates = new float[Config.Data.WMsCount]; float[] wmEndStates = new float[Config.Data.WMsCount]; - int repetitionNr = 1; /// First test: repetitionNr=1 + int repetitionNr = outerLoopMode ? outerLoopCounter : 1; /// First test: repetitionNr=1 //==================================== // Transition or SetRoute - Start @@ -594,7 +594,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced allResults.Info(TestResult2CsvLine(testName, test.Part)); - if (++repetitionNr <= test.Repeats) + if (!outerLoopMode && (++repetitionNr <= test.Repeats)) { goto loop; } diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/Single/Component.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/Single/Component.cs index 27a0dd964..9efd115c4 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/Single/Component.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/Single/Component.cs @@ -30,7 +30,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced.Single public IList Execute(Test test, bool outerLoopMode, int outerLoopCounter) { - return (new FixedStartAdvancedSeq()).Execute(test); + return (new FixedStartAdvancedSeq()).Execute(test, outerLoopMode, outerLoopCounter); } } } diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/Compound/Component.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/Compound/Component.cs index 5c86428cf..7f68538c8 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/Compound/Component.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/Compound/Component.cs @@ -32,7 +32,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection.Compound public IList Execute(Test test, bool outerLoopMode, int outerLoopCounter) { - return (new FixedStartMassCollectionSeq()).Execute(test, true, null); + return (new FixedStartMassCollectionSeq()).Execute(test, outerLoopMode, outerLoopCounter, true, null); } } } diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs index e9b45226a..cba70b998 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs @@ -26,7 +26,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection /// Event.OpArgumentError . Target flow is out of range /// Event.Error . . . . . . Unspecified error /// - public IList Execute(Config.Entities.Test test, + public IList Execute(Config.Entities.Test test, bool outerLoopMode, int outerLoopCounter, bool compound, HeatMeters.TestParams heatMetersTestParams) { @@ -49,7 +49,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection float[] wmBeginStates = new float[Config.Data.WMsCount]; float[] wmEndStates = new float[Config.Data.WMsCount]; - int repetitionNr = 1; /// First test: repetitionNr=1 + int repetitionNr = outerLoopMode ? outerLoopCounter : 1; /// First test: repetitionNr=1 //==================================== // Transition or SetRoute - Start @@ -900,7 +900,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection /// Append the results to the CSV-file allResults.Info(TestResult2CsvLine(testName, test.Part)); - if (++repetitionNr <= test.Repeats) + if (!outerLoopMode && (++repetitionNr <= test.Repeats)) { goto loop; } diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/Component.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/Component.cs index edad9aeaa..bfd4a02a2 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/Component.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/Component.cs @@ -35,7 +35,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection.HeatMeters public IList Execute(Test test, bool outerLoopMode, int outerLoopCounter) { - return (new FixedStartMassCollectionSeq()).Execute(test, false, testMethodCfg.TestParams); + return (new FixedStartMassCollectionSeq()).Execute(test, outerLoopMode, outerLoopCounter, false, testMethodCfg.TestParams); } } } diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/Single/Component.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/Single/Component.cs index fae34617f..7fff3d977 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/Single/Component.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/Single/Component.cs @@ -32,7 +32,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection.Single public IList Execute(Test test, bool outerLoopMode, int outerLoopCounter) { - return (new FixedStartMassCollectionSeq()).Execute(test, false, null); + return (new FixedStartMassCollectionSeq()).Execute(test, outerLoopMode, outerLoopCounter, false, null); } } } diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/Compound/Component.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/Compound/Component.cs index a481edc37..c4d0b9d3a 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/Compound/Component.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/Compound/Component.cs @@ -35,7 +35,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart.Compound public IList Execute(Test test, bool outerLoopMode, int outerLoopCounter) { - return (new FlyingStartSeq()).Execute(test, testMethodCfg.TestParams, null, DebugLevel); + return (new FlyingStartSeq()).Execute(test, outerLoopMode, outerLoopCounter, testMethodCfg.TestParams, null, DebugLevel); } } } diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs index 17dc77556..a6635c944 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs @@ -26,7 +26,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart /// Event.OpArgumentError . Target flow is out of range /// Event.Error . . . . . . Unspecified error /// - public IList Execute(Config.Entities.Test test, + public IList Execute(Config.Entities.Test test, bool outerLoopMode, int outerLoopCounter, Compound.TestParams compoundTestParams, HeatMeters.TestParams heatMetersTestParams, Config.Entities.DebugMode debugLevel) @@ -104,7 +104,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart /// int refPulses = (int)(timeSec * (2000.0f * targetFlow / pOut.FlowMeter.NominalFlow)); int totalPulses = (int)(test.Volume / LtrPerRefPulse + 0.5f); - int repetitionNr = 1; /// First test: repetitionNr=1 + int repetitionNr = outerLoopMode ? outerLoopCounter : 1; /// First test: repetitionNr=1 //==================================== // Transition or SetRoute - Start @@ -604,7 +604,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart /// Append the results to the CSV-file allResults.Info(TestResult2CsvLine(testName, test.Part)); - if (++repetitionNr <= test.Repeats) + if (!outerLoopMode && (++repetitionNr <= test.Repeats)) { goto loop; } diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/HeatMeters/Component.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/HeatMeters/Component.cs index 4433020a1..1a112b0f2 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/HeatMeters/Component.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/HeatMeters/Component.cs @@ -35,7 +35,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart.HeatMeters public IList Execute(Test test, bool outerLoopMode, int outerLoopCounter) { - return (new FlyingStartSeq()).Execute(test, null, testMethodCfg.TestParams, DebugLevel); + return (new FlyingStartSeq()).Execute(test, outerLoopMode, outerLoopCounter, null, testMethodCfg.TestParams, DebugLevel); } } } diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/Single/Component.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/Single/Component.cs index 4b9766eb0..9f67462c9 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/Single/Component.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/Single/Component.cs @@ -32,7 +32,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart.Single public IList Execute(Test test, bool outerLoopMode, int outerLoopCounter) { - return (new FlyingStartSeq()).Execute(test, null, null, DebugLevel); + return (new FlyingStartSeq()).Execute(test, outerLoopMode, outerLoopCounter, null, null, DebugLevel); } } } diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/Compound/Component.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/Compound/Component.cs index f4a5cbf5c..366d45246 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/Compound/Component.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/Compound/Component.cs @@ -36,7 +36,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection.Compound public IList Execute(Test test, bool outerLoopMode, int outerLoopCounter) { - return (new FlyingStartMassCollectionSeq()).Execute(test, testMethodCfg.TestParams, null, DebugLevel); + return (new FlyingStartMassCollectionSeq()).Execute(test, outerLoopMode, outerLoopCounter, testMethodCfg.TestParams, null, DebugLevel); } } } diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs index 83df5f335..c0aac3513 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs @@ -26,7 +26,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection /// Event.OpArgumentError . Target flow is out of range /// Event.Error . . . . . . Unspecified error /// - public IList Execute(Config.Entities.Test test, + public IList Execute(Config.Entities.Test test, bool outerLoopMode, int outerLoopCounter, Compound.CombinedTestParams compoundTestParams, HeatMeters.TestParams heatMetersTestParams, Config.Entities.DebugMode debugLevel) @@ -99,7 +99,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection LtrPerRefPulse = outPath.FlowMeter.LtrPerPulse; int totalPulses = (int)(test.Volume / LtrPerRefPulse + 0.5f); - int repetitionNr = 1; /// First test: repetitionNr = 1 + int repetitionNr = outerLoopMode ? outerLoopCounter : 1; /// First test: repetitionNr = 1 //==================================== // Transition or SetRoute - Start @@ -910,7 +910,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection /// Append the results to the CSV-file allResults.Info(TestResult2CsvLine(testName, test.Part)); - if (++repetitionNr <= test.Repeats) + if (!outerLoopMode && (++repetitionNr <= test.Repeats)) { goto loop; } diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/Component.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/Component.cs index 3771ab0ea..d941ed227 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/Component.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/Component.cs @@ -35,7 +35,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection.HeatMeters public IList Execute(Test test, bool outerLoopMode, int outerLoopCounter) { - return (new FlyingStartMassCollectionSeq()).Execute(test, null, testMethodCfg.TestParams, DebugLevel); + return (new FlyingStartMassCollectionSeq()).Execute(test, outerLoopMode, outerLoopCounter, null, testMethodCfg.TestParams, DebugLevel); } } } diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/Single/Component.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/Single/Component.cs index 23be9afe3..36c1736f4 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/Single/Component.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/Single/Component.cs @@ -32,7 +32,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection.Single public IList Execute(Test test, bool outerLoopMode, int outerLoopCounter) { - return (new FlyingStartMassCollectionSeq()).Execute(test, null, null, DebugLevel); + return (new FlyingStartMassCollectionSeq()).Execute(test, outerLoopMode, outerLoopCounter, null, null, DebugLevel); } } } diff --git a/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs b/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs index 1902230f5..715ac8f5b 100644 --- a/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs @@ -27,7 +27,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest /// Event.OpArgumentError . Target flow is out of range /// Event.Error . . . . . . Unspecified error /// - public IList Execute(Config.Entities.Test test, LeakTestParams testParams) + public IList Execute(Config.Entities.Test test, bool outerLoopMode, int outerLoopCounter, LeakTestParams testParams) { Elde.ControlBoardDev cBrd = StateMachine.ControlBoard; diff --git a/TestBenchFramework/BenchControl/TestMethods/LeakTest/TestMethod.cs b/TestBenchFramework/BenchControl/TestMethods/LeakTest/TestMethod.cs index 387416caa..85a1d0a7d 100644 --- a/TestBenchFramework/BenchControl/TestMethods/LeakTest/TestMethod.cs +++ b/TestBenchFramework/BenchControl/TestMethods/LeakTest/TestMethod.cs @@ -33,7 +33,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest public IList Execute(Test test, bool outerLoopMode, int outerLoopCounter) { - return (new LeakTestSeq()).Execute(test, testMethodCfg.TestParams); + return (new LeakTestSeq()).Execute(test, outerLoopMode, outerLoopCounter, testMethodCfg.TestParams); } } } diff --git a/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs b/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs index d07ee4b07..56cf9995d 100644 --- a/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs @@ -27,7 +27,7 @@ namespace TBF.BenchControl.TestMethods.PMaxTest /// Event.OpArgumentError . Target flow is out of range /// Event.Error . . . . . . Unspecified error /// - public IList Execute(Config.Entities.Test test, PMaxTestParams testParams) + public IList Execute(Config.Entities.Test test, bool outerLoopMode, int outerLoopCounter, PMaxTestParams testParams) { Elde.ControlBoardDev cBrd = StateMachine.ControlBoard; diff --git a/TestBenchFramework/BenchControl/TestMethods/PMaxTest/TestMethod.cs b/TestBenchFramework/BenchControl/TestMethods/PMaxTest/TestMethod.cs index 05bd0aef6..d80a3bcd8 100644 --- a/TestBenchFramework/BenchControl/TestMethods/PMaxTest/TestMethod.cs +++ b/TestBenchFramework/BenchControl/TestMethods/PMaxTest/TestMethod.cs @@ -33,7 +33,7 @@ namespace TBF.BenchControl.TestMethods.PMaxTest public IList Execute(Test test, bool outerLoopMode, int outerLoopCounter) { - return (new PMaxTestSeq()).Execute(test, testMethodCfg.TestParams); + return (new PMaxTestSeq()).Execute(test, outerLoopMode, outerLoopCounter, testMethodCfg.TestParams); } } } diff --git a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs index dd2d7ebd9..3de99344c 100644 --- a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs @@ -26,7 +26,7 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration /// Event.OpArgumentError . Target flow is out of range /// Event.Error . . . . . . Unspecified error /// - public IList Execute(Config.Entities.Test test) + public IList Execute(Config.Entities.Test test, bool outerLoopMode, int outerLoopCounter) { Elde.ControlBoardDev cBrd = StateMachine.ControlBoard; @@ -34,7 +34,7 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration Event retVal = Event.Done; checkUiOp = new Operations.CheckUIOp(true); /// Runs in more then one state - LtrPerRefPulse = outPath.FlowMeter.LtrPerPulse; /// [ltr/pulse], nominal flow in [m3/h] + LtrPerRefPulse = outPath.FlowMeter.LtrPerPulse; /// [ltr/pulse], nominal flow in [m3/h] /// Notes: /// float timeHr = volumeLtr / (1000.0f * targetFlow); @@ -44,7 +44,7 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this, false); - int repetitionNr = 1; /// First test: repetitionNr=1 + int repetitionNr = outerLoopMode ? outerLoopCounter : 1; /// First test: repetitionNr=1 //==================================== // Transition or SetRoute - Start @@ -403,7 +403,7 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Completed)); - if (++repetitionNr <= test.Repeats) + if (!outerLoopMode && (++repetitionNr <= test.Repeats)) { goto loop; } diff --git a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/TestMethod.cs b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/TestMethod.cs index 6372dcbee..4bf0be424 100644 --- a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/TestMethod.cs +++ b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/TestMethod.cs @@ -30,7 +30,7 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration public IList Execute(Test test, bool outerLoopMode, int outerLoopCounter) { - return (new ReferenceFlowmeterCalibrationSeq()).Execute(test); + return (new ReferenceFlowmeterCalibrationSeq()).Execute(test, outerLoopMode, outerLoopCounter); } } } diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/TestMethod.cs b/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/TestMethod.cs index abfc86c04..f52ab0d82 100644 --- a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/TestMethod.cs +++ b/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/TestMethod.cs @@ -101,7 +101,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication public IList Execute(Test test, bool outerLoopMode, int outerLoopCounter) { - return (new iPerlCommunicationSeq()).Execute(test, testMethodCfg, testMethodCfg.TestParams); + return (new iPerlCommunicationSeq()).Execute(test, outerLoopMode, outerLoopCounter, testMethodCfg, testMethodCfg.TestParams); } } } diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs b/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs index a668176c4..966d7ff0c 100644 --- a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs @@ -47,7 +47,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication /// Event.OpArgumentError . Target flow is out of range /// Event.Error . . . . . . Unspecified error /// - public IList Execute(Config.Entities.Test test, TestMethodCfg cfg, iPerlCommunicationParams testParams) + public IList Execute(Config.Entities.Test test, bool outerLoopMode, int outerLoopCounter, TestMethodCfg cfg, iPerlCommunicationParams testParams) { IList e = new List(); /// Events from currently running operations Event retVal = Event.Done; diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 161b96cbe..b2a9f850a 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.411.1")] -[assembly: AssemblyFileVersion("2.12.411.1")] +[assembly: AssemblyVersion("2.12.412.1")] +[assembly: AssemblyFileVersion("2.12.412.1")]