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

Event.BalanceDone --> Event.ScaleDone, EmergencyStop is route bit #81, ver. 3.1.1608

Browse Source
This commit is contained in:
Milan Hanajik
2021-03-24 09:32:42 +01:00
parent 9bfa70d5c1
commit ebf7c97bc6
29 changed files with 85 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/Rig/TestMethods/DiverterTest/DiverterTestSeq.cs
+3 -3
View File
@@ -193,7 +193,7 @@ namespace TBF.Rig.TestMethods.DiverterTest
if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
}
while (!e.Contains(Event.BalanceDone));
while (!e.Contains(Event.ScaleDone));
double estimatedEndMass = Mass.Val + test.Volume;
if (estimatedEndMass >= scale.Capacity * Constants.TankFullFactor)
@@ -457,7 +457,7 @@ namespace TBF.Rig.TestMethods.DiverterTest
goto stopTest;
}
}
while (!e.Contains(Event.BalanceDone));
while (!e.Contains(Event.ScaleDone));
Mass.Val = StartMass.Val;
tMass1 = StateMachine.Time;
@@ -613,7 +613,7 @@ namespace TBF.Rig.TestMethods.DiverterTest
goto stopTest;
}
}
while (!e.Contains(Event.BalanceDone));
while (!e.Contains(Event.ScaleDone));
///
tMass2 = StateMachine.Time;
log.WarnFormat("End mass = {0}kg", EndMass);