From 05982cc2ff629ebb1fac9de178367962a8e826e2 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Mon, 24 Apr 2017 09:44:11 +0200 Subject: [PATCH] Endurance test method sequence modified. --- .../CombinedWithDetectionSeq.cs | 2 +- .../TestMethods/Endurance/EnduranceSeq.cs | 28 ++++++++++----- .../FixedStartAdvancedSeq.cs | 2 +- .../FixedStartMassCollectionSeq.cs | 34 +++++++++---------- .../TestMethods/FlyingStart/FlyingStartSeq.cs | 18 +++++----- .../FlyingStartMassCollectionSeq.cs | 34 +++++++++---------- .../TestMethods/LeakTest/LeakTestSeq.cs | 14 ++++---- .../TestMethods/PMaxTest/PMaxTestSeq.cs | 8 ++--- .../ReferenceFlowmeterCalibrationSeq.cs | 2 +- 9 files changed, 77 insertions(+), 65 deletions(-) diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs index 63618ae4d..9f351b90c 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs @@ -144,7 +144,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection if (!test.Draining) /// Do not skip emptying if test.Emptying==true { //-------------------------------- - State.Create("CombinedWithDetection : Get the mass of water in the tank") + State.Create("CombinedWithDetection : Mesuring mass of water in the tank") .AddOperation(checkUiOp) .AddOperation(outPath.Scale.ReadMassOp(ref Mass)) .EnterState(); diff --git a/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs b/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs index 0a20fb970..63a96676e 100644 --- a/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs @@ -90,7 +90,7 @@ namespace TBF.BenchControl.TestMethods.Endurance //------------------------------------------------ if (inPath.Pump is GenericDevices.IPumpFM) (inPath.Pump as GenericDevices.IPumpFM).TurnOn(test.PumpPower); /// - State.Create("Endurance : Starting the pump") + 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)) @@ -112,7 +112,7 @@ namespace TBF.BenchControl.TestMethods.Endurance Bridge.OnActivity(this, Strings.Setting_the_flow); //------------------------------------------------ int flowSetTime0 = StateMachine.Time; - State.Create("Endurance : Setting the flow") + State.Create(string.Format("{0}({1}) : Setting the flow", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, outPath.PidCoef, RefFlow, 990)) /// timeout = 16.5 min. .EnterState(); @@ -188,7 +188,7 @@ namespace TBF.BenchControl.TestMethods.Endurance //------------------------------------------------ Bridge.OnActivity(this, Strings.Test_in_progress); //------------------------------------------------ - State.Create("Endurance : Starting the test") + State.Create(string.Format("{0}({1}) : Starting the test", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperations(measureOperations) .AddOperation(benchPath.TempMtrUp == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp)) @@ -231,7 +231,7 @@ namespace TBF.BenchControl.TestMethods.Endurance ClearAllStatistics(); /// Measurement loop - begin - State.Create("Read water meters") + State.Create(string.Format("{0}({1}) : Reading watermeters", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperations(measureOperations) .AddOperation(readRegistersOp) @@ -452,9 +452,21 @@ namespace TBF.BenchControl.TestMethods.Endurance Bridge.OnActivity(this, Strings.Endurance_cycle_execution); //------------------------------------------------ + State.Create(string.Format("{0}({1}) : Stopping diverter, gate, etc.", test.Method, test.Name)) + .AddOperation(checkUiOp) + .AddOperation(cBrd.StopPreviousOp()) + .EnterState(); + do + { + e = StateMachine.WaitRunDevsRunOps(); + if (TestAndLogUiCmdStop(test, e)) { if (retVal == Event.Done) retVal = Event.UiCmdStop; break; } + } + while (!e.Contains(Event.PreviousStopped)); + int estimtdEndTime = StateMachine.Time + (int)test.TstTime; ClearAllStatistics(); + /// /// Update CyclePar[] array /// @@ -480,7 +492,7 @@ namespace TBF.BenchControl.TestMethods.Endurance /// cBrd.CyclePar = cyclePar; /// - State.Create("Endurance : Cycle parameters upload") + State.Create(string.Format("{0}({1}) : Uploading cycle parameters", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(benchPath.TempMtrUp.ReadTempOp(ref TempUp)) .AddOperation(benchPath.TempMtrDown.ReadTempOp(ref TempDown)) @@ -509,7 +521,7 @@ namespace TBF.BenchControl.TestMethods.Endurance bool stopInProgress = false; /// - State.Create("Endurance : Cycle execution") + State.Create(string.Format("{0}({1}) : Executing the cycle", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(new Operations.TimerOp((int)test.TstTime, Event.TimerExpired)) .AddOperation(benchPath.TempMtrUp.ReadTempOp(ref TempUp)) @@ -559,7 +571,7 @@ namespace TBF.BenchControl.TestMethods.Endurance //------------------------------------------------ Bridge.OnActivity(this, Strings.Last_cycle_wait_please); //------------------------------------------------ - State.Create("Endurance : Extra delay to be sure the last endurance cycle completed") + State.Create(string.Format("{0}({1}) : Delay to make sure the last endu.cycle completed", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(new Operations.TimerOp((int)(duration / 1000) + 1, Event.TimerExpired)) .AddOperation(benchPath.TempMtrUp.ReadTempOp(ref TempUp)) @@ -612,7 +624,7 @@ namespace TBF.BenchControl.TestMethods.Endurance /// Quit this sequence /// ///----------------------/// - State.Create("Endurance : Stopping diverter, gate, etc.") + State.Create(string.Format("{0}({1}) : Stopping diverter, gate, etc.", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(cBrd.StopPreviousOp()) .EnterState(); diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs index 1c8813fcf..c2a4fbecb 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs @@ -70,7 +70,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced /// /// Measure the weight in case there is no unconditional draining /// - State.Create("FixedStartAdvanced : Measuring the mass of water in the tank") + State.Create("FixedStartAdvanced : Measuring mass of water in the tank") .AddOperation(checkUiOp) .AddOperation(outPath.Scale.ReadMassOp(ref Mass)) .EnterState(); diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs index 5301e253d..1e9f9fd49 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs @@ -96,7 +96,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection /// /// Measure the weight in case there is no unconditional draining /// - State.Create("FixedStartMassCollection : Measuring the mass of water in the tank") + State.Create(string.Format("{0}({1}) : Measuring mass of water in the tank", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(outPath.Scale.ReadMassOp(ref Mass)) .AddOperation(heatMetersPromptOp) @@ -128,7 +128,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection /// /// Make sure the drain valve is closed /// - State.Create("FixedStartMassCollection : Make sure the drain valve is closed") + State.Create(string.Format("{0}({1}) : Make sure the drain valve is closed", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(outPath.Scale.ReadMassOp(ref Mass)) .AddOperation(heatMetersPromptOp) @@ -156,7 +156,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection if (inPath.Pump is GenericDevices.IPumpFM) (inPath.Pump as GenericDevices.IPumpFM).TurnOn(test.PumpPower); /// - State.Create("FixedStartMassCollection : Starting the pump") + 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)) @@ -191,7 +191,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection valvesOpen.Add(inPath.Pump); valvesOpen.Add(outPath.StartValve); /// - State.Create("FixedStartMassCollection : Starting the pump") + State.Create(string.Format("{0}({1}) : Turning pump on", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(StateMachine.ControlBoard.SetValvesOp(valvesOpen, null)) .AddOperation(heatMetersPromptOp) @@ -208,7 +208,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection //-------------------------------- - State.Create("FixedStartMassCollection : Setting the flow") + State.Create(string.Format("{0}({1}) : Setting the flow", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, outPath.PidCoef, RefFlow, 600)) /// timeout = 10 min. .AddOperation(heatMetersPromptOp) @@ -245,7 +245,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection double Tw_last = 0; double Tc_last = 0; - State.Create("FixedStartMassCollection : Check temperature stabilized.") + State.Create(string.Format("{0}({1}) : Checking if the temperature is stable", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(heatMetersPath.TMeterRefWarm1.ReadTempOp(ref TempRefHi1)) .AddOperation(heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2)) @@ -289,7 +289,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection //------------------------------------------------ Bridge.OnActivity(this, Strings.Stopping_flow_for_the_fixed_start); //------------------------------------------------ - State.Create("FixedStartMassCollection : Closing the start/stop valve before the fixed start test") + State.Create(string.Format("{0}({1}) : Closing the start/stop valve before the fixed start test", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(StateMachine.ControlBoard.SetValvesOp(null, outPath.StartValve)) .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm1.ReadTempOp(ref TempRefHi1)) @@ -353,7 +353,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection if (dataEntryCmpnt != null) { Bridge.OnActivity(this, Strings.Enter_water_meter_data); - State.Create("FixedStartMassCollection : Enter begin-state") + State.Create(string.Format("{0}({1}) : Entering begin-state", test.Method, test.Name)) .AddOperation((dataEntryCmpnt as GenericDevices.IHasWMStatesForm).ShowTestStartFormOp()) .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm1.ReadTempOp(ref TempRefHi1)) .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2)) @@ -401,7 +401,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection //------------------------------------------------ Bridge.OnActivity(this, Strings.Measuring_the_weight); //------------------------------------------------ - State.Create("FixedStartMassCollection : Measuring the start mass") + State.Create(string.Format("{0}({1}) : Measuring the start mass", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperations(measureOperations) .AddOperation(benchPath.TempMtrUp == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp)) @@ -433,7 +433,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection //------------------------------------------------ Bridge.OnActivity(this, Strings.Test_in_progress); //------------------------------------------------ - State.Create("FixedStartMassCollection : Starting the test") + State.Create(string.Format("{0}({1}) : Starting the test", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperations(measureOperations) .AddOperation(benchPath.TempMtrUp == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp)) @@ -458,7 +458,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection while (!e.Contains(Event.MeasurementStarted)); - State.Create("FixedStartMassCollection : Opening the start/stop valve at the beginning of the fixed start test") + State.Create(string.Format("{0}({1}) : Opening the start/stop valve at the beginning of the fixed start test", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(benchPath.TempMtrUp == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp)) .AddOperation(benchPath.TempMtrDown == null ? null : benchPath.TempMtrDown.ReadTempOp(ref TempDown)) @@ -564,7 +564,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection test_completed: - State.Create("FixedStartMassCollection : Closing the start/stop valve at the end of the fixed start test") + State.Create(string.Format("{0}({1}) : Closing the start/stop valve at the end of the fixed start test", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(benchPath.TempMtrUp == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp)) .AddOperation(benchPath.TempMtrDown == null ? null : benchPath.TempMtrDown.ReadTempOp(ref TempDown)) @@ -587,7 +587,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection while (e.Contains(Event.ValvesBusy)); - State.Create("FixedStartMassCollection : Waiting before 2nd mass measurement") + State.Create(string.Format("{0}({1}) : Waiting before 2nd mass measurement", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(benchPath.TempMtrUp == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp)) .AddOperation(benchPath.TempMtrDown == null ? null : benchPath.TempMtrDown.ReadTempOp(ref TempDown)) @@ -618,7 +618,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection //------------------------------------------------ Bridge.OnActivity(this, Strings.Measuring_the_weight); //------------------------------------------------ - State.Create("FixedStartMassCollection : Measuring the end mass") + State.Create(string.Format("{0}({1}) : Measuring the end mass", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(benchPath.TempMtrUp == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp)) .AddOperation(benchPath.TempMtrDown == null ? null : benchPath.TempMtrDown.ReadTempOp(ref TempDown)) @@ -647,7 +647,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection TestEndTime = DateTime.Now; - State.Create("FixedStartMassCollection : Stopping diverter, gate, etc.") + State.Create(string.Format("{0}({1}) : Stopping diverter, gate, etc.", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(cBrd.StopPreviousOp()) .EnterState(); @@ -671,7 +671,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection if (dataEntryCmpnt != null) { Bridge.OnActivity(this, Strings.Enter_water_meter_data); - State state = State.Create("FixedStartMassCollection : Enter end-state"); + State state = State.Create(string.Format("{0}({1}) : Entering the end-state", test.Method, test.Name)); if (heatMetersTestParams != null && dataEntryCmpnt is GenericDevices.IHasHeatMtrStatesForm) { state.AddOperation((dataEntryCmpnt as GenericDevices.IHasHeatMtrStatesForm). @@ -981,7 +981,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection /// Quit this sequence /// ///----------------------/// - State.Create("FixedStartMassCollection : Stopping diverter, gate, etc.") + State.Create(string.Format("{0}({1}) : Stopping diverter, gate, etc.", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(cBrd.StopPreviousOp()) .EnterState(); diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs index 42a60670b..4754b734e 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs @@ -75,11 +75,11 @@ namespace TBF.BenchControl.TestMethods.FlyingStart } } - //------------------------------------------------ - Bridge.OnActivity(this, string.Format("Simulating {0}", test.Name)); - //------------------------------------------------ + //------------------------------------------------------------------ + Bridge.OnActivity(this, string.Format("{0} simulation", test.Name)); + //------------------------------------------------------------------ - State.Create(string.Format("FlyingStart : Simulating {0}", test.Name)) + State.Create(string.Format("{0}({1}) : Simulating {0}", test.Method, test.Name)) .AddOperation(checkUiOp) .EnterState(); e = StateMachine.WaitRunDevsRunOps(); @@ -142,7 +142,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart //------------------------------------------------ if (inPath.Pump is GenericDevices.IPumpFM) (inPath.Pump as GenericDevices.IPumpFM).TurnOn(test.PumpPower); /// - State.Create("FlyingStart : Starting the pump") + 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)) @@ -164,7 +164,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart Bridge.OnActivity(this, Strings.Setting_the_flow); //------------------------------------------------ int flowSetTime0 = StateMachine.Time; - State.Create("FlyingStart : Setting the flow") + State.Create(string.Format("{0}({1}) : Setting the flow", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, outPath.PidCoef, RefFlow, 990)) /// timeout = 16.5 min. .AddOperation(heatMetersPromptOp) @@ -202,7 +202,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart double Tw_last = 0; double Tc_last = 0; - State.Create("FlyingStart : Check temperature stabilized.") + State.Create(string.Format("{0}({1}) : Checking if the temperature is stable", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(heatMetersPath.TMeterRefWarm1.ReadTempOp(ref TempRefHi1)) .AddOperation(heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2)) @@ -282,7 +282,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart //------------------------------------------------ Bridge.OnActivity(this, Strings.Test_in_progress); //------------------------------------------------ - State.Create("FlyingStart : Starting the test") + State.Create(string.Format("{0}({1}) : Starting the test", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperations(measureOperations) .AddOperation(benchPath.TempMtrUp == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp)) @@ -658,7 +658,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart /// Quit this sequence /// ///----------------------/// - State.Create("FlyingStart : Stopping diverter, gate, etc.") + State.Create(string.Format("{0}({1}) : Stopping diverter, gate, etc.", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(cBrd.StopPreviousOp()) .EnterState(); diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs index 6ead41b68..d035d1de8 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs @@ -76,10 +76,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection } //------------------------------------------------ - Bridge.OnActivity(this, string.Format("Simulating {0}", test.Name)); + Bridge.OnActivity(this, string.Format("{0} Simulation", test.Name)); //------------------------------------------------ - State.Create(string.Format("FlyingStartMassCollection : Simulating {0}", test.Name)) + State.Create(string.Format("{0}({1}) : Simulation", test.Method, test.Name)) .AddOperation(checkUiOp) .EnterState(); e = StateMachine.WaitRunDevsRunOps(); @@ -139,7 +139,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection /// /// Measure the weight and skip emptying if there is enough room in the tank /// - State.Create("FlyingStartMassCollection : Checking available tank capacity") + State.Create(string.Format("{0}({1}) : Checking available tank capacity", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(outPath.Scale.ReadMassOp(ref Mass)) .EnterState(); @@ -169,7 +169,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection drainTheTank = false; #else - State.Create("FlyingStartMassCollection : Opening the emptying valve") + State.Create(string.Format("{0}({1}) : Opening the emptying valve", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(StateMachine.ControlBoard.SetValvesOp(outPath.Scale.DrainValve, null)) .EnterState(); @@ -206,7 +206,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection if (inPath.Pump is GenericDevices.IPumpFM) (inPath.Pump as GenericDevices.IPumpFM).TurnOn(test.PumpPower); /// - State.Create("FlyingStartMassCollection : Starting the pump") + 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)) @@ -227,7 +227,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection if (test.TimePump2StartV > 0) { - State.Create("FlyingStartMassCollection : Waiting after the pump started") + State.Create(string.Format("{0}({1}) : Waiting after the pump started", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(new Operations.TimerOp(test.TimePump2StartV)) .AddOperation(StateMachine.ControlBoard.UpdateTankWeightOp()) @@ -247,7 +247,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection if (benchPath.StopBFValve != null) { - State.Create("FlyingStartMassCollection : Opening the stop backflow valve") + State.Create(string.Format("{0}({1}) : Opening the stop backflow valve", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(StateMachine.ControlBoard.SetValvesOp(benchPath.StopBFValve, null)) .AddOperation(StateMachine.ControlBoard.UpdateTankWeightOp()) @@ -265,7 +265,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection if (test.TimeBeforeFlow > 0) { - State.Create("FlyingStartMassCollection : Waiting before flow setting process starts") + State.Create(string.Format("{0}({1}) : Waiting before flow setting process starts", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(new Operations.TimerOp(test.TimeBeforeFlow)) .AddOperation(StateMachine.ControlBoard.UpdateTankWeightOp()) @@ -288,7 +288,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection //------------------------------------------------ Bridge.OnActivity(this, Strings.Setting_the_flow); //------------------------------------------------ - State.Create("FlyingStartMassCollection : Setting the flow") + State.Create(string.Format("{0}({1}) : Setting the flow", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(StateMachine.ControlBoard.UpdateTankWeightOp()) .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, outPath.PidCoef, RefFlow, 990)) /// timeout = 16.5 min. @@ -327,7 +327,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection double Tw_last = 0; double Tc_last = 0; - State.Create("FlyingStartMassCollection : Check temperature stabilized.") + State.Create(string.Format("{0}({1}) : Check temperature stabilized.", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(heatMetersPath.TMeterRefWarm1.ReadTempOp(ref TempRefHi1)) .AddOperation(heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2)) @@ -432,7 +432,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection if (test.TimeFlow2Mass > 0) { - State.Create("FlyingStartMassCollection : Waiting before 1st mass measurement") + State.Create(string.Format("{0}({1}) : Waiting before 1st mass measurement", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm1.ReadTempOp(ref TempRefHi1)) .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2)) @@ -460,7 +460,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection else LogProcessHeaderHeatMeters(processDataLogger, "Start mass"); - State.Create("FlyingStartMassCollection : Measuring the start mass") + State.Create(string.Format("{0}({1}) : Measuring the start mass", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperations(measureOperations) .AddOperation(benchPath.TempMtrUp == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp)) @@ -498,7 +498,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection //------------------------------------------------ Bridge.OnActivity(this, Strings.Test_in_progress); //------------------------------------------------ - State.Create("FlyingStartMassCollection : Starting the test") + State.Create(string.Format("{0}({1}) : Starting the test", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperations(measureOperations) .AddOperation(benchPath.TempMtrUp == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp)) @@ -540,7 +540,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection ClearAllStatistics(); /// Measurement loop - begin - State.Create("Read water meters") + State.Create(string.Format("{0}({1}) : Reading watermeters", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperations(measureOperations) .AddOperation(readRegistersOp) @@ -631,7 +631,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection //------------------------------------------------ Bridge.OnActivity(this, Strings.Measuring_the_weight); //------------------------------------------------ - State.Create("FlyingStartMassCollection : Waiting before the 2nd mass measurement") + State.Create(string.Format("{0}({1}) : Waiting before the 2nd mass measurement", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(benchPath.TempMtrUp == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp)) .AddOperation(benchPath.TempMtrDown == null ? null : benchPath.TempMtrDown.ReadTempOp(ref TempDown)) @@ -663,7 +663,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection else LogProcessHeaderHeatMeters(processDataLogger, "End mass"); - State.Create("FlyingStartMassCollection : Measuring the end mass") + State.Create(string.Format("{0}({1}) : Measuring the end mass", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(benchPath.TempMtrUp == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp)) .AddOperation(benchPath.TempMtrDown == null ? null : benchPath.TempMtrDown.ReadTempOp(ref TempDown)) @@ -1001,7 +1001,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection /// Quit this sequence /// ///----------------------/// - State.Create("FlyingStartMassCollection : Stopping diverter, gate, etc.") + State.Create(string.Format("{0}({1}) : Stopping diverter, gate, etc.", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(cBrd.StopPreviousOp()) .EnterState(); diff --git a/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs b/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs index 609fff6f6..b0efa0d7c 100644 --- a/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs @@ -58,7 +58,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest //------------------------------------------------ if (inPath.Pump is GenericDevices.IPumpFM) (inPath.Pump as GenericDevices.IPumpFM).TurnOn(test.PumpPower); - State.Create("LeakTest : Starting the pump") + State.Create(string.Format("{0}({1}) : Starting the pump", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(benchPath.TempMtrUp.ReadTempOp(ref TempUp)) .AddOperation(benchPath.TempMtrDown.ReadTempOp(ref TempDown)) @@ -89,7 +89,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest { if (inPath.Pump is GenericDevices.IPumpFM) (inPath.Pump as GenericDevices.IPumpFM).TurnOn(pumpPower); - State.Create("LeakTest : Setting the water pressure") + State.Create(string.Format("{0}({1}) : Setting the water pressure", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(benchPath.TempMtrUp.ReadTempOp(ref TempUp)) .AddOperation(benchPath.TempMtrDown.ReadTempOp(ref TempDown)) @@ -143,7 +143,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest Bridge.OnActivity(this, Strings.Test_in_progress); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Config.Entities.Progress.Test)); //------------------------------------------------ - State.Create("LeakTest : Maximum water pressure set") + State.Create(string.Format("{0}({1}) : Maximum water pressure set", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(benchPath.TempMtrUp.ReadTempOp(ref TempUp)) .AddOperation(benchPath.TempMtrDown.ReadTempOp(ref TempDown)) @@ -178,7 +178,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest //------------------------------------------------ Bridge.OnActivity(this, Strings.Closing_valve_Pump_off); //------------------------------------------------ - State.Create("LeakTest : Closing the valve") + State.Create(string.Format("{0}({1}) : Closing the valve", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(cBrd.SetValvesOp(null, outPath.StartValve)) .AddOperation(benchPath.TempMtrUp.ReadTempOp(ref TempUp)) @@ -202,7 +202,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest if (inPath.Pump is GenericDevices.IPumpFM) (inPath.Pump as GenericDevices.IPumpFM).TurnOff(); - State.Create("LeakTest : Closing the valve") + State.Create(string.Format("{0}({1}) : Closing the valve", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(cBrd.SetValvesOp(null, inPath.Pump)) .AddOperation(benchPath.TempMtrUp.ReadTempOp(ref TempUp)) @@ -233,7 +233,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest //------------------------------------------------ Bridge.OnActivity(this, Strings.Test_in_progress); //------------------------------------------------ - State.Create("LeakTest : Starting the test") + State.Create(string.Format("{0}({1}) : Starting the test", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(benchPath.TempMtrUp.ReadTempOp(ref TempUp)) .AddOperation(benchPath.TempMtrDown.ReadTempOp(ref TempDown)) @@ -422,7 +422,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest /// /// Quit this sequence /// - State.Create("LeakTest : Stopping diverter, gate, etc.") + State.Create(string.Format("{0}({1}) : Stopping diverter, gate, etc.", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(cBrd.StopPreviousOp()) .EnterState(); diff --git a/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs b/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs index 49bed63a9..c82e6ea71 100644 --- a/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs @@ -59,7 +59,7 @@ namespace TBF.BenchControl.TestMethods.PMaxTest //------------------------------------------------ if (inPath.Pump is GenericDevices.IPumpFM) (inPath.Pump as GenericDevices.IPumpFM).TurnOn(test.PumpPower); - State.Create("PMaxTest : Starting the pump") + State.Create(string.Format("{0}({1}) : Starting the pump", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(benchPath.TempMtrUp.ReadTempOp(ref TempUp)) .AddOperation(benchPath.TempMtrDown.ReadTempOp(ref TempDown)) @@ -90,7 +90,7 @@ namespace TBF.BenchControl.TestMethods.PMaxTest { if (inPath.Pump is GenericDevices.IPumpFM) (inPath.Pump as GenericDevices.IPumpFM).TurnOn(pumpPower); - State.Create("PMaxTest : Setting the water pressure") + State.Create(string.Format("{0}({1}) : Setting the water pressure", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(benchPath.TempMtrUp.ReadTempOp(ref TempUp)) .AddOperation(benchPath.TempMtrDown.ReadTempOp(ref TempDown)) @@ -144,7 +144,7 @@ namespace TBF.BenchControl.TestMethods.PMaxTest Bridge.OnActivity(this, Strings.Test_in_progress); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Config.Entities.Progress.Test)); //------------------------------------------------ - State.Create("PMaxTest : Starting the test") + State.Create(string.Format("{0}({1}) : Starting the test", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(benchPath.TempMtrUp.ReadTempOp(ref TempUp)) .AddOperation(benchPath.TempMtrDown.ReadTempOp(ref TempDown)) @@ -333,7 +333,7 @@ namespace TBF.BenchControl.TestMethods.PMaxTest /// /// Quit this sequence /// - State.Create("PMaxTest : Stopping diverter, gate, etc.") + State.Create(string.Format("{0}({1}) : Stopping diverter, gate, etc.", test.Method, test.Name)) .AddOperation(checkUiOp) .AddOperation(cBrd.StopPreviousOp()) .EnterState(); diff --git a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs index f9904ad75..bd26300d8 100644 --- a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs @@ -108,7 +108,7 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration /// /// Measure the weight and skip emptying if there is enough room in the tank /// - State.Create("ReferenceFlowmeterCalibration : Measuring the mass of water in the tank") + State.Create("ReferenceFlowmeterCalibration : Measuring mass of water in the tank") .AddOperation(checkUiOp) .AddOperation(outPath.Scale.ReadMassOp(ref Mass)) .EnterState();