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

Critical bug fix in many sequences - STOP not functioning !!!

Browse Source
This commit is contained in:
Milan Hanajik
2020-05-21 16:43:35 +02:00
parent 7b321abb30
commit 767796662e
12 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
+1 -1
View File
@@ -559,7 +559,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment
.EnterState(); .EnterState();
do { do {
e = StateMachine.WaitRunDevsRunOps(); e = StateMachine.WaitRunDevsRunOps();
if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; } if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
} }
while (!e.Contains(Event.PreviousStopped)); while (!e.Contains(Event.PreviousStopped));
} }
TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs
+1 -1
View File
@@ -1079,7 +1079,7 @@ namespace TBF.BenchControl.TestMethods.FixedStart
do do
{ {
e = StateMachine.WaitRunDevsRunOps(); e = StateMachine.WaitRunDevsRunOps();
if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; } if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
} }
while (!e.Contains(Event.PreviousStopped)); while (!e.Contains(Event.PreviousStopped));
} }
TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs
+1 -1
View File
@@ -723,7 +723,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
.EnterState(); .EnterState();
do { do {
e = StateMachine.WaitRunDevsRunOps(); e = StateMachine.WaitRunDevsRunOps();
if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; } if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
} }
while (!e.Contains(Event.PreviousStopped)); while (!e.Contains(Event.PreviousStopped));
} }
TBF/BenchControl/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs
+1 -1
View File
@@ -891,7 +891,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
.EnterState(); .EnterState();
do { do {
e = StateMachine.WaitRunDevsRunOps(); e = StateMachine.WaitRunDevsRunOps();
if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; } /// TODO: this is an endless loop !!! if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; } /// TODO: this is an endless loop !!!
} }
while (!e.Contains(Event.PreviousStopped)); while (!e.Contains(Event.PreviousStopped));
} }
TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs
+1 -1
View File
@@ -1043,7 +1043,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
.EnterState(); .EnterState();
do { do {
e = StateMachine.WaitRunDevsRunOps(); e = StateMachine.WaitRunDevsRunOps();
if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; } /// TODO: this is an endless loop !!! if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; } /// TODO: this is an endless loop !!!
} }
while (!e.Contains(Event.PreviousStopped)); while (!e.Contains(Event.PreviousStopped));
} }
TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
+1 -1
View File
@@ -1257,7 +1257,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
.EnterState(); .EnterState();
do { do {
e = StateMachine.WaitRunDevsRunOps(); e = StateMachine.WaitRunDevsRunOps();
if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; } if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
} }
while (!e.Contains(Event.PreviousStopped)); while (!e.Contains(Event.PreviousStopped));
} }
TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs
+1 -1
View File
@@ -926,7 +926,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
do do
{ {
e = StateMachine.WaitRunDevsRunOps(); e = StateMachine.WaitRunDevsRunOps();
if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; } if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
} }
while (!e.Contains(Event.PreviousStopped)); while (!e.Contains(Event.PreviousStopped));
} }
TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
+2 -2
View File
@@ -760,8 +760,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
.EnterState(); .EnterState();
do { do {
e = StateMachine.WaitRunDevsRunOps(); e = StateMachine.WaitRunDevsRunOps();
if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; } if (e.Contains(Event.Error)) { retVal = Event.Error; break; }
if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; } if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
} }
while (!e.Contains(Event.FlowRegulationStopped)); while (!e.Contains(Event.FlowRegulationStopped));
TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs
+1 -1
View File
@@ -474,7 +474,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest
.EnterState(); .EnterState();
do { do {
e = StateMachine.WaitRunDevsRunOps(); e = StateMachine.WaitRunDevsRunOps();
if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; } if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
} }
while (!e.Contains(Event.PreviousStopped)); while (!e.Contains(Event.PreviousStopped));
} }
TBF/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs
+1 -1
View File
@@ -302,7 +302,7 @@ namespace TBF.BenchControl.TestMethods.PMaxTest
.EnterState(); .EnterState();
do { do {
e = StateMachine.WaitRunDevsRunOps(); e = StateMachine.WaitRunDevsRunOps();
if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; } if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
} }
while (!e.Contains(Event.PreviousStopped)); while (!e.Contains(Event.PreviousStopped));
} }
TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs
+1 -1
View File
@@ -520,7 +520,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTest
.EnterState(); .EnterState();
do { do {
e = StateMachine.WaitRunDevsRunOps(); e = StateMachine.WaitRunDevsRunOps();
if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; } if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
} }
while (!e.Contains(Event.PreviousStopped)); while (!e.Contains(Event.PreviousStopped));
} }
TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs
+1 -1
View File
@@ -511,7 +511,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
.EnterState(); .EnterState();
do { do {
e = StateMachine.WaitRunDevsRunOps(); e = StateMachine.WaitRunDevsRunOps();
if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; } if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
} }
while (!e.Contains(Event.PreviousStopped)); while (!e.Contains(Event.PreviousStopped));
} }