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

ReadMassOp removed, ProcessData.Mass removed, TestMethods.FixedStartMassCollection, ver. 3.1.1620

Browse Source
This commit is contained in:
Milan Hanajik
2021-04-15 13:15:18 +02:00
parent eeaf1e1682
commit 1f05cc420c
23 changed files with 303 additions and 580 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/Rig/TestMethods/DiverterTest/DiverterTestSeq.cs
+1 -17
View File
@@ -180,22 +180,7 @@ namespace TBF.Rig.TestMethods.DiverterTest
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)
.AddOperation(scale.ReadMassOp(ref Mass))
.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 = Mass.Val + test.Volume;
double estimatedEndMass = scale.Mass + test.Volume;
if (estimatedEndMass >= scale.Capacity * Constants.TankFullFactor)
{
drainTheTank = true;
@@ -456,7 +441,6 @@ namespace TBF.Rig.TestMethods.DiverterTest
}
while (!e.Contains(Event.ScaleDone));
Mass.Val = StartMass.Val;
tMass1 = StateMachine.Time;
log.WarnFormat("Start mass = {0}kg", StartMass);