michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Three tanks, balances, empty valves supported

Browse Source 
- Code cleanup
This commit is contained in:
Milan Hanajik
2014-08-12 14:52:42 +02:00
parent d177a4f892
commit 38a88e841b
6 changed files with 186 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
+15 -15
View File
@@ -31,7 +31,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
do
{
e = StateMachine.WaitRunDevsRunOps();
if (e.Contains(Event.UiCmdStop)) goto stop;
if (e.Contains(Event.UiCmdStop)) goto stopTest;
}
while (!e.Contains(Event.PreviousStopped));
@@ -58,7 +58,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
switch (Transition(transitionStart, "FlyingStartCollectionMethod : " + Strings.Test_start_sequence_i_n))
{
case Event.Error: goto error;
case Event.UiCmdStop: goto stop;
case Event.UiCmdStop: goto stopTest;
}
}
else
@@ -72,7 +72,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
do
{
e = StateMachine.WaitRunDevsRunOps();
if (e.Contains(Event.UiCmdStop)) goto stop;
if (e.Contains(Event.UiCmdStop)) goto stopTest;
}
while (!e.Contains(Event.ValvesSet));
}
@@ -95,7 +95,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
{
e = StateMachine.WaitRunDevsRunOps();
if (e.Contains(Event.Error)) goto error;
if (e.Contains(Event.UiCmdStop)) goto stop;
if (e.Contains(Event.UiCmdStop)) goto stopTest;
}
while (!e.Contains(Event.BalanceDone));
@@ -110,7 +110,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
switch (EmptyTheTank(outPath.EmptyTankValve, outPath.Balance))
{
case Event.Error: goto error;
case Event.UiCmdStop: goto stop;
case Event.UiCmdStop: goto stopTest;
}
set_flow:
@@ -134,7 +134,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
float progress = Formulas.TestProgress(flowSetTime, estFlowSetTime, test.TstTime);
Bridge.OnTestProgress(this, GetTestProgressData(test, tstRslt, cBrd, flowSetTime, progress));
if (e.Contains(Event.UiCmdStop)) goto stop;
if (e.Contains(Event.UiCmdStop)) goto stopTest;
}
while (!e.Contains(Event.ValvesSet));
@@ -151,7 +151,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
float progress = Formulas.TestProgress(flowSetTime, estFlowSetTime, test.TstTime);
Bridge.OnTestProgress(this, GetTestProgressData(test, tstRslt, cBrd, flowSetTime, progress));
if (e.Contains(Event.UiCmdStop)) goto stop;
if (e.Contains(Event.UiCmdStop)) goto stopTest;
if (e.Contains(Event.OpArgumentError))
if (e.Contains(Event.RegulValveTimeOut)) goto error;
if (e.Contains(Event.Next)) goto flow_set;
@@ -182,7 +182,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
{
e = StateMachine.WaitRunDevsRunOps();
if (e.Contains(Event.Error)) goto error;
if (e.Contains(Event.UiCmdStop)) goto stop;
if (e.Contains(Event.UiCmdStop)) goto stopTest;
}
while (!e.Contains(Event.BalanceDone));
@@ -202,7 +202,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
{
e = StateMachine.WaitRunDevsRunOps();
if (e.Contains(Event.Error)) goto error;
if (e.Contains(Event.UiCmdStop)) goto stop;
if (e.Contains(Event.UiCmdStop)) goto stopTest;
}
while (!e.Contains(Event.MeasurementStarted));
@@ -222,7 +222,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
switch (ReadRegistersTempPressAmbient(measureOperations, true))
{
case Event.Error: goto error;
case Event.UiCmdStop: goto stop;
case Event.UiCmdStop: goto stopTest;
case Event.MeasurementCompleted: goto measurement_completed;
}
@@ -278,7 +278,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
{
e = StateMachine.WaitRunDevsRunOps();
if (e.Contains(Event.Error)) goto error;
if (e.Contains(Event.UiCmdStop)) goto stop;
if (e.Contains(Event.UiCmdStop)) goto stopTest;
}
while (!e.Contains(Event.BalanceDone));
///
@@ -298,7 +298,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
do
{
e = StateMachine.WaitRunDevsRunOps();
if (e.Contains(Event.UiCmdStop)) goto stop;
if (e.Contains(Event.UiCmdStop)) goto stopTest;
}
while (!e.Contains(Event.ValvesSet));
@@ -311,7 +311,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
do
{
e = StateMachine.WaitRunDevsRunOps();
if (e.Contains(Event.UiCmdStop)) goto stop;
if (e.Contains(Event.UiCmdStop)) goto stopTest;
}
while (!e.Contains(Event.PreviousStopped));
@@ -418,7 +418,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
switch (Transition(transitionStop, "FlyingStartCollectionMethod : " + Strings.Test_stop_sequence_i_n))
{
case Event.Error: goto error;
case Event.UiCmdStop: goto stop;
case Event.UiCmdStop: goto stopTest;
}
}
else
@@ -440,7 +440,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
return retval;
//====================================
stop:
stopTest:
State.Create("FlyingStartCollectionMethod : User selected STOP -> Closing the valves")
.AddOperation(checkUiOp)
.AddOperation((inPath != null && inPath.Pump is GenericDevices.IPumpFM) ? (inPath.Pump as GenericDevices.IPumpFM).TurnOff() : null)