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/CombinedWithDetection/CombinedWithDetectionSeq.cs
+2 -2
View File
@@ -536,7 +536,7 @@ namespace TBF.Rig.TestMethods.CombinedWithDetection
goto stopTest;
}
}
while (!e.Contains(Event.ScaleDone));
while (!e.Contains(Event.ScaleDone) && !e.Contains(Event.Next));
///
tMass1 = StateMachine.Time;
@@ -632,7 +632,7 @@ namespace TBF.Rig.TestMethods.CombinedWithDetection
goto stopTest;
}
}
while (!e.Contains(Event.ScaleDone));
while (!e.Contains(Event.ScaleDone) && !e.Contains(Event.Next));
///
tMass2 = StateMachine.Time;
TestEndTime = DateTime.Now;
TBF/Rig/TestMethods/DiverterTest/DiverterTestSeq.cs
+2 -2
View File
@@ -439,7 +439,7 @@ namespace TBF.Rig.TestMethods.DiverterTest
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);
@@ -599,7 +599,7 @@ namespace TBF.Rig.TestMethods.DiverterTest
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);
TBF/Rig/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs
+3 -3
View File
@@ -360,7 +360,7 @@ namespace TBF.Rig.TestMethods.FixedStartAdvanced
goto stopTest;
}
}
while (!e.Contains(Event.ScaleDone));
while (!e.Contains(Event.ScaleDone) && !e.Contains(Event.Next));
///
TestStartTime = DateTime.Now;
tMass1 = StateMachine.Time;
@@ -474,8 +474,8 @@ namespace TBF.Rig.TestMethods.FixedStartAdvanced
goto stopTest;
}
}
while (!e.Contains(Event.ScaleDone));
///
while (!e.Contains(Event.ScaleDone) && !e.Contains(Event.Next));
///
tMass2 = StateMachine.Time;
TestEndTime = DateTime.Now;
TBF/Rig/TestMethods/FixedStartMassCollAdvanced/FixedStartMassCollAdvancedSeq.cs
+3 -3
View File
@@ -213,7 +213,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollAdvanced
if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
}
while (!e.Contains(Event.ValvesSet) || !e.Contains(Event.ScaleDone));
while (!e.Contains(Event.ValvesSet));
#endregion
@@ -262,7 +262,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollAdvanced
goto stopTest;
}
}
while (!e.Contains(Event.ScaleDone));
while (!e.Contains(Event.ScaleDone) && !e.Contains(Event.Next));
///
tMass1 = StateMachine.Time;
@@ -618,7 +618,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollAdvanced
goto stopTest;
}
}
while (!e.Contains(Event.ScaleDone));
while (!e.Contains(Event.ScaleDone) && !e.Contains(Event.Next));
///
tMass2 = StateMachine.Time;
TBF/Rig/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs
+3 -3
View File
@@ -239,7 +239,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollDeferredEval
if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
}
while (!e.Contains(Event.ValvesSet) || !e.Contains(Event.ScaleDone));
while (!e.Contains(Event.ValvesSet));
@@ -508,7 +508,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollDeferredEval
goto stopTest;
}
}
while (!e.Contains(Event.ScaleDone));
while (!e.Contains(Event.ScaleDone) && !e.Contains(Event.Next));
///
tMass1 = StateMachine.Time;
@@ -774,7 +774,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollDeferredEval
goto stopTest;
}
}
while (!e.Contains(Event.ScaleDone));
while (!e.Contains(Event.ScaleDone) && !e.Contains(Event.Next));
///
tMass2 = StateMachine.Time;
TestEndTime = DateTime.Now;
TBF/Rig/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
+6 -5
View File
@@ -210,7 +210,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollection
if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
}
while (!e.Contains(Event.ValvesSet) || !e.Contains(Event.ScaleDone));
while (!e.Contains(Event.ValvesSet));
@@ -467,9 +467,10 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollection
.AddOperation(scale.ReadStableMassOp(ref StartMass, test.TimeFlow2Mass, test.MassMethod, test.MassRepeats, test.MassSpread))
.AddOperation(processDataLoggingOp)
.EnterState();
do {
do
{
e = StateMachine.WaitRunDevsRunOps();
if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
if (e.Contains(Event.ScaleTimeout))
{
@@ -478,7 +479,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollection
goto stopTest;
}
}
while (!e.Contains(Event.ScaleDone));
while (!e.Contains(Event.ScaleDone) && !e.Contains(Event.Next));
///
tMass1 = StateMachine.Time;
@@ -713,7 +714,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollection
goto stopTest;
}
}
while (!e.Contains(Event.ScaleDone));
while (!e.Contains(Event.ScaleDone) && !e.Contains(Event.Next));
///
tMass2 = StateMachine.Time;
TBF/Rig/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs
+8 -29
View File
@@ -196,38 +196,17 @@ namespace TBF.Rig.TestMethods.FlyingStartFirstRepetWithMassColl
}
}
bool drainTheTank = (repetitionNr == 1) ? test.DoDraining : false;
bool drainTheTank = false;
if (repetitionNr == 1)
{
//------------------------------------------------
Bridge.OnActivity(this, Strings.Checking_tank_capacity);
//------------------------------------------------
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)
{
drainTheTank = true;
}
}
///
if (drainTheTank)
drainTheTank = test.DoDraining || (scale.Mass + test.Volume >= scale.Capacity * Constants.TankFullFactor);
if (drainTheTank)
{
#if BERLIN
switch (DrainTheTank(outPath.Scale))
@@ -544,7 +523,7 @@ namespace TBF.Rig.TestMethods.FlyingStartFirstRepetWithMassColl
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);
@@ -675,8 +654,8 @@ namespace TBF.Rig.TestMethods.FlyingStartFirstRepetWithMassColl
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);
}
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);
TBF/Rig/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs
+1 -1
View File
@@ -523,7 +523,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollProlonged
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);
TBF/Rig/TestMethods/LeakTest/LeakTestSeq.cs
+2 -2
View File
@@ -267,7 +267,7 @@ namespace TBF.Rig.TestMethods.LeakTest
UpdateAllStatistics(StateMachine.Time);
}
while (!e.Contains(Event.ScaleDone));
while (!e.Contains(Event.ScaleDone) && !e.Contains(Event.Next));
}
///------------------------------------------------
@@ -324,7 +324,7 @@ namespace TBF.Rig.TestMethods.LeakTest
UpdateAllStatistics(StateMachine.Time);
}
while (!e.Contains(Event.ScaleDone));
while (!e.Contains(Event.ScaleDone) && !e.Contains(Event.Next));
}
///