From eafcf016f3c40b03e76e3603f461925027bfba73 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Mon, 24 Apr 2017 11:58:57 +0200 Subject: [PATCH] Setting regulation valves before flow setting disabled, caused porbles all the time, ver. 2.12 549 --- .../BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs | 4 ++-- .../BenchControl/TestMethods/Endurance/EnduranceSeq.cs | 4 ++-- .../FixedStartMassCollection/FixedStartMassCollectionSeq.cs | 4 ++-- .../BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs | 4 ++-- .../FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs | 4 ++-- .../BenchControl/TestMethods/LeakTest/LeakTestSeq.cs | 4 ++-- .../BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs | 4 ++-- TestBenchFramework/Properties/AssemblyInfo.cs | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs b/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs index a16f2ac95..92421885d 100644 --- a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs @@ -102,7 +102,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment State.Create("Adjustment : Starting the pump") .AddOperation(checkUiOp) .AddOperation(StateMachine.ControlBoard.UpdateTankWeightOp()) - .AddOperation(new Operations.SetAllRegulValvesOp(inPath.RegulValves, inPath.RegulValvesPct, 60)) +// .AddOperation(new Operations.SetAllRegulValvesOp(inPath.RegulValves, inPath.RegulValvesPct, 60)) .AddOperation(inPath.Pump != null ? cBrd.SetValvesOp(inPath.Pump, null) : null) .EnterState(); do @@ -115,7 +115,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; } } - while (e.Contains(Event.ValvesBusy) || !e.Contains(Event.AllPositionsReached)); + while (e.Contains(Event.ValvesBusy) /* || !e.Contains(Event.AllPositionsReached)*/); if (test.TimeBeforeFlow > 0) diff --git a/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs b/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs index 63a96676e..887b7b935 100644 --- a/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs @@ -93,7 +93,7 @@ namespace TBF.BenchControl.TestMethods.Endurance State.Create(string.Format("{0}({1}) : Starting the pump", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(StateMachine.ControlBoard.UpdateTankWeightOp()) - .AddOperation(new Operations.SetAllRegulValvesOp(inPath.RegulValves, inPath.RegulValvesPct, 60)) +// .AddOperation(new Operations.SetAllRegulValvesOp(inPath.RegulValves, inPath.RegulValvesPct, 60)) .AddOperation(inPath.Pump != null ? cBrd.SetValvesOp(inPath.Pump, null) : null) .EnterState(); do @@ -106,7 +106,7 @@ namespace TBF.BenchControl.TestMethods.Endurance if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; } } - while (e.Contains(Event.ValvesBusy) || !e.Contains(Event.AllPositionsReached)); + while (e.Contains(Event.ValvesBusy) /* || !e.Contains(Event.AllPositionsReached)*/); //------------------------------------------------ Bridge.OnActivity(this, Strings.Setting_the_flow); diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs index 1e9f9fd49..79a46fc65 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs @@ -159,7 +159,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection State.Create(string.Format("{0}({1}) : Starting the pump", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(StateMachine.ControlBoard.UpdateTankWeightOp()) - .AddOperation(new Operations.SetAllRegulValvesOp(inPath.RegulValves, inPath.RegulValvesPct, 60)) +// .AddOperation(new Operations.SetAllRegulValvesOp(inPath.RegulValves, inPath.RegulValvesPct, 60)) .AddOperation(heatMetersPromptOp) .AddOperation(inPath.Pump != null ? cBrd.SetValvesOp(inPath.Pump, null) : null) .EnterState(); @@ -173,7 +173,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; } } - while (e.Contains(Event.ValvesBusy) || !e.Contains(Event.AllPositionsReached)); + while (e.Contains(Event.ValvesBusy) /* || !e.Contains(Event.AllPositionsReached)*/); diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs index 4754b734e..9abab7e29 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs @@ -145,7 +145,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart State.Create(string.Format("{0}({1}) : Starting the pump", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(StateMachine.ControlBoard.UpdateTankWeightOp()) - .AddOperation(new Operations.SetAllRegulValvesOp(inPath.RegulValves, inPath.RegulValvesPct, 60)) +// .AddOperation(new Operations.SetAllRegulValvesOp(inPath.RegulValves, inPath.RegulValvesPct, 60)) .AddOperation(heatMetersPromptOp) .AddOperation(inPath.Pump != null ? cBrd.SetValvesOp(inPath.Pump, null) : null) .EnterState(); @@ -158,7 +158,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; } if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; } } - while (e.Contains(Event.ValvesBusy) || !e.Contains(Event.AllPositionsReached)); + while (e.Contains(Event.ValvesBusy) /* || !e.Contains(Event.AllPositionsReached)*/); //------------------------------------------------ Bridge.OnActivity(this, Strings.Setting_the_flow); diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs index d035d1de8..2d0d52498 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs @@ -209,7 +209,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection State.Create(string.Format("{0}({1}) : Starting the pump", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(StateMachine.ControlBoard.UpdateTankWeightOp()) - .AddOperation(new Operations.SetAllRegulValvesOp(inPath.RegulValves, inPath.RegulValvesPct, 60)) +// .AddOperation(new Operations.SetAllRegulValvesOp(inPath.RegulValves, inPath.RegulValvesPct, 60)) .AddOperation(heatMetersPromptOp) .AddOperation(inPath.Pump != null ? cBrd.SetValvesOp(inPath.Pump, null) : null) .EnterState(); @@ -222,7 +222,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; } if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; } } - while (e.Contains(Event.ValvesBusy) || !e.Contains(Event.AllPositionsReached)); + while (e.Contains(Event.ValvesBusy) /* || !e.Contains(Event.AllPositionsReached)*/); if (test.TimePump2StartV > 0) diff --git a/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs b/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs index b0efa0d7c..43dffbb55 100644 --- a/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs @@ -65,7 +65,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest .AddOperation(benchPath.PressMtrUp.ReadPressureOp(ref PressUp)) .AddOperation(benchPath.PressMtrDown.ReadPressureOp(ref PressDown)) .AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta)) - .AddOperation(new Operations.SetAllRegulValvesOp(inPath.RegulValves, inPath.RegulValvesPct, 60)) +// .AddOperation(new Operations.SetAllRegulValvesOp(inPath.RegulValves, inPath.RegulValvesPct, 60)) .AddOperation(inPath.Pump != null ? cBrd.SetValvesOp(inPath.Pump, null) : null) .EnterState(); do @@ -74,7 +74,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest if (TestAndLogUiCmdStop(test,e)) { retVal = Event.UiCmdStop; goto stopTest; } if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; } } - while (e.Contains(Event.ValvesBusy) || !e.Contains(Event.AllPositionsReached)); + while (e.Contains(Event.ValvesBusy) /* || !e.Contains(Event.AllPositionsReached)*/); //------------------------------------------------ diff --git a/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs b/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs index c82e6ea71..7de58510d 100644 --- a/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs @@ -66,7 +66,7 @@ namespace TBF.BenchControl.TestMethods.PMaxTest .AddOperation(benchPath.PressMtrUp.ReadPressureOp(ref PressUp)) .AddOperation(benchPath.PressMtrDown.ReadPressureOp(ref PressDown)) .AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta)) - .AddOperation(new Operations.SetAllRegulValvesOp(inPath.RegulValves, inPath.RegulValvesPct, 60)) +// .AddOperation(new Operations.SetAllRegulValvesOp(inPath.RegulValves, inPath.RegulValvesPct, 60)) .AddOperation(inPath.Pump != null ? cBrd.SetValvesOp(inPath.Pump, null) : null) .EnterState(); do @@ -75,7 +75,7 @@ namespace TBF.BenchControl.TestMethods.PMaxTest if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; } if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; } } - while (e.Contains(Event.ValvesBusy) || !e.Contains(Event.AllPositionsReached)); + while (e.Contains(Event.ValvesBusy) /* || !e.Contains(Event.AllPositionsReached)*/); //------------------------------------------------ diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 8876b01f1..adfcafaf7 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.548.1")] -[assembly: AssemblyFileVersion("2.12.548.1")] +[assembly: AssemblyVersion("2.12.549.1")] +[assembly: AssemblyFileVersion("2.12.549.1")]