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

More ReadMassOp / Mass / etc.

Browse Source
This commit is contained in:
Milan Hanajik
2021-04-15 16:49:28 +02:00
parent 1f05cc420c
commit b36a76f413
10 changed files with 33 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/Rig/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs
+3 -17
View File
@@ -221,20 +221,6 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollComparative
if (!drainTheTank) /// If condition met => skip measuring and force emptying
{
///
/// Measure the weight and skip emptying if there is enough room in the tank
///
State.Create(string.Format("{0}({1}) : Checking available tank capacity", test.Method, test.Name))
.AddOperation(checkUiOp)
.AddOperations(readTempPressOps)
.EnterState();
do {
e = StateMachine.WaitRunDevsRunOps();
if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
}
while (!e.Contains(Event.ScaleDone));
double estimatedEndMass = scale.Mass + test.Volume;
if (estimatedEndMass >= scale.Capacity * Constants.TankFullFactor)
{
@@ -574,7 +560,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollComparative
goto stopTest;
}
}
while (!e.Contains(Event.ScaleDone));
while (!e.Contains(Event.ScaleDone) && !e.Contains(Event.Next));
log.WarnFormat("Reference mass = {0}kg", measuredRefMass);
@@ -624,7 +610,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollComparative
goto stopTest;
}
}
while (!e.Contains(Event.ScaleDone));
while (!e.Contains(Event.ScaleDone) && !e.Contains(Event.Next));
tMass1 = StateMachine.Time;
log.WarnFormat("Start mass = {0}kg", StartMass);
@@ -756,7 +742,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollComparative
goto stopTest;
}
}
while (!e.Contains(Event.ScaleDone));
while (!e.Contains(Event.ScaleDone) && !e.Contains(Event.Next));
///
tMass2 = StateMachine.Time;
log.WarnFormat("End mass = {0}kg", EndMass);