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/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.1.1607.0")]
[assembly: AssemblyFileVersion("3.1.1607.0")]
[assembly: AssemblyVersion("3.1.1608.0")]
[assembly: AssemblyFileVersion("3.1.1608.0")]
TBF/Rig/ControlBoard/Uni/UniCB.cs
+6 -1
View File
@@ -138,7 +138,7 @@ namespace TBF.Rig.ControlBoard.Uni
public bool IsUIBlocked { get; set; }
/// Measured values valid during a test
public double RefFrequency { get { return Data.ReferenceFreq[0]; } }
public double RefFrequency { get { return Data.ReferenceFreq[0]; } }
public double RefFrequency1 { get { return Data.ReferenceFreq[1]; } }
public double RefFrequency2 { get { return Data.ReferenceFreq[2]; } }
public double RefFrequency3 { get { return Data.ReferenceFreq[3]; } }
@@ -355,6 +355,11 @@ namespace TBF.Rig.ControlBoard.Uni
/// No connection to control board ... set indicator bit
route += ((UInt128)1) << cbCfg.BitNr;
}
if ((State & (ulong)StatusP.EmgcyStopActive) != 0)
{
/// No connection to control board ... set indicator bit
route += ((UInt128)1) << (cbCfg.BitNr + 1);
}
}
log.DebugFormat("Route synced with RRoute and UI changes, new route = {0}", Utils.RouteToStr(route));
}
TBF/Rig/ControlBoard/Uni/UniCBCfg.cs
+1 -1
View File
@@ -51,7 +51,7 @@ namespace TBF.Rig.ControlBoard.Uni
public double MsrdValLimLo { get; set; }
public double MsrdValLimHi { get; set; }
public int BitNr { get { return 64; } } /// Bit-position
public int BitNr { get { return 80; } } /// Bit-position
public bool Inverted { get { return false; } } /// When true the valve function is inverted: 0 = open, 1 = closed
[XmlIgnore]
TBF/Rig/Dummy/Balance/Component.cs
+1 -1
View File
@@ -70,7 +70,7 @@ namespace TBF.Rig.Dummy.Balance
/// <summary>Run this operation</summary>
public Event Run()
{
return Event.BalanceDone;
return Event.ScaleDone;
}
/// <summary>Stop this operation</summary>
TBF/Rig/Events.cs
+2 -2
View File
@@ -84,8 +84,8 @@ namespace TBF.Rig
ValvesSet,
AmbientDone,
BalanceDone,
BalanceOverload,
ScaleDone,
ScaleOverload,
ScaleTimeout,
PressureDone,
PressureInDone,
TBF/Rig/MettlerToledo/Multi/ReadMassOp.cs
+2 -2
View File
@@ -56,7 +56,7 @@ namespace TBF.Rig.MettlerToledo.Multi
if (!done)
return Event.Busy;
else
return Event.BalanceDone;
return Event.ScaleDone;
}
else if (started && scale.MsrmntState != MsrmntState.Busy)
{
@@ -65,7 +65,7 @@ namespace TBF.Rig.MettlerToledo.Multi
scale.MsrmntState, scale.Mass);
done = true;
started = false;
return Event.BalanceDone; /// Mass read OK
return Event.ScaleDone; /// Mass read OK
}
else
{
TBF/Rig/MettlerToledo/Multi/ReadStableMassOp.cs
+2 -2
View File
@@ -88,7 +88,7 @@ namespace TBF.Rig.MettlerToledo.Multi
return Event.None;
}
if (currentReadingsCount >= totalReadingsCount) return Event.BalanceDone; /// Mass has already been calculated
if (currentReadingsCount >= totalReadingsCount) return Event.ScaleDone; /// Mass has already been calculated
if (scale.MsrmntState == MsrmntState.Busy) return Event.None;
@@ -109,7 +109,7 @@ namespace TBF.Rig.MettlerToledo.Multi
calcMass = (calcMass / (totalReadingsCount - 2));
log.InfoFormat("ReadStableMassOp.Run() ... valid mass={0} ... returning Event.BalanceDone", calcMass);
result.Val = calcMass;
return Event.BalanceDone; /// Mass has just been calculated
return Event.ScaleDone; /// Mass has just been calculated
#else
double minimum = double.MaxValue;
double maximum = double.MinValue;
TBF/Rig/MettlerToledo/Multi/TaringOp.cs
+3 -3
View File
@@ -48,7 +48,7 @@ namespace TBF.Rig.MettlerToledo.Multi
/// </returns>
public Event Run()
{
if (done) return Event.BalanceDone; /// Taring has been done already
if (done) return Event.ScaleDone; /// Taring has been done already
if (balanceDev.MsrmntState == MsrmntState.Busy) return Event.Busy;
@@ -56,14 +56,14 @@ namespace TBF.Rig.MettlerToledo.Multi
{
tara.Val = balanceDev.Capacity;
done = true;
return Event.BalanceOverload;
return Event.ScaleOverload;
}
if (balanceDev.MsrmntState == MsrmntState.Valid)
{
tara.Val = balanceDev.Mass;
done = true;
return Event.BalanceDone; /// Taring completed
return Event.ScaleDone; /// Taring completed
}
return Event.Busy;
TBF/Rig/MettlerToledo/Multi/ZeroOp.cs
+3 -3
View File
@@ -41,20 +41,20 @@ namespace TBF.Rig.MettlerToledo.Multi
/// </returns>
public Event Run()
{
if (done) return Event.BalanceDone; /// Zero has been done already
if (done) return Event.ScaleDone; /// Zero has been done already
if (balanceDev.MsrmntState == MsrmntState.Busy) return Event.Busy;
if (balanceDev.MsrmntState == MsrmntState.Overload)
{
done = true;
return Event.BalanceOverload;
return Event.ScaleOverload;
}
if (balanceDev.MsrmntState == MsrmntState.Valid)
{
done = true;
return Event.BalanceDone; /// Zero completed
return Event.ScaleDone; /// Zero completed
}
return Event.Busy;
TBF/Rig/MettlerToledo/ReadMassesOp.cs
+2 -2
View File
@@ -43,7 +43,7 @@ namespace TBF.Rig.MettlerToledo
/// </returns>
public Event Run()
{
if (done) return Event.BalanceDone; /// Mass has already been read
if (done) return Event.ScaleDone; /// Mass has already been read
for (int i = 0; i < Standard.BalanceDev.BalancesCount; i++)
{
@@ -60,7 +60,7 @@ namespace TBF.Rig.MettlerToledo
}
}
done = true;
return Event.BalanceDone;
return Event.ScaleDone;
}
/// <summary>Stop this operation</summary>
TBF/Rig/MettlerToledo/Standard/GetSerNumOp.cs
+1 -1
View File
@@ -63,7 +63,7 @@ namespace TBF.Rig.MettlerToledo.Standard
if (scale.MsrmntState == MsrmntState.Valid)
{
serialNumber = scale.SerialNumber;
return Event.BalanceDone; /// S/N read successful
return Event.ScaleDone; /// S/N read successful
}
if (scale.MsrmntState == MsrmntState.Failed)
TBF/Rig/MettlerToledo/Standard/ReadMassOp.cs
+1 -1
View File
@@ -42,7 +42,7 @@ namespace TBF.Rig.MettlerToledo.Standard
public Event Run()
{
result.Val = scale.Mass;
return Event.BalanceDone;
return Event.ScaleDone;
}
/// <summary>Stop this operation</summary>
TBF/Rig/MettlerToledo/Standard/ReadStableMassOp.cs
+5 -5
View File
@@ -130,7 +130,7 @@ namespace TBF.Rig.MettlerToledo.Standard
if (measurementCompleted)
{
return Event.BalanceDone;
return Event.ScaleDone;
}
if (scale.MsrmntState == MsrmntState.Busy)
@@ -176,7 +176,7 @@ namespace TBF.Rig.MettlerToledo.Standard
log.InfoFormat("ReadStableMassOp.Run() ... valid mass={0} ... returning Event.BalanceDone", result.Val);
measurementCompleted = true;
return Event.BalanceDone; /// Mass has just been calculated
return Event.ScaleDone; /// Mass has just been calculated
}
}
else if (method == Config.Entities.MassMethod.StdDev)
@@ -195,7 +195,7 @@ namespace TBF.Rig.MettlerToledo.Standard
log.InfoFormat("ReadStableMassOp.Run() ... valid mass={0} ... returning Event.BalanceDone", result.Val);
measurementCompleted = true;
return Event.BalanceDone; /// Mass has just been calculated
return Event.ScaleDone; /// Mass has just been calculated
}
}
else
@@ -210,14 +210,14 @@ namespace TBF.Rig.MettlerToledo.Standard
log.InfoFormat("ReadStableMassOp.Run() ... valid mass={0} ... returning Event.BalanceDone", result.Val);
measurementCompleted = true;
return Event.BalanceDone; /// Mass has just been calculated
return Event.ScaleDone; /// Mass has just been calculated
}
}
if (measurementCompleted)
{
return Event.BalanceDone;
return Event.ScaleDone;
}
else
{
TBF/Rig/MettlerToledo/Standard/SetUnitsOp.cs
+1 -1
View File
@@ -65,7 +65,7 @@ namespace TBF.Rig.MettlerToledo.Standard
return Event.None;
}
if (scale.MsrmntState == MsrmntState.Valid) return Event.BalanceDone; /// Units set
if (scale.MsrmntState == MsrmntState.Valid) return Event.ScaleDone; /// Units set
if (scale.MsrmntState == MsrmntState.Failed) return Event.Error; /// Failed
return Event.None; /// No result yet
}
TBF/Rig/MettlerToledo/Standard/TaringOp.cs
+3 -3
View File
@@ -67,7 +67,7 @@ namespace TBF.Rig.MettlerToledo.Standard
return Event.Busy;
}
if (done) return Event.BalanceDone; /// Taring has been done already
if (done) return Event.ScaleDone; /// Taring has been done already
if (scale.MsrmntState == MsrmntState.Busy) return Event.Busy;
@@ -75,14 +75,14 @@ namespace TBF.Rig.MettlerToledo.Standard
{
tara.Val = scale.Capacity;
done = true;
return Event.BalanceOverload;
return Event.ScaleOverload;
}
if (scale.MsrmntState == MsrmntState.Valid)
{
tara.Val = scale.Mass;
done = true;
return Event.BalanceDone; /// Taring completed
return Event.ScaleDone; /// Taring completed
}
scale.SendTaraCmd(); /// Failed -> repeat taring
TBF/Rig/MettlerToledo/Standard/ZeroOp.cs
+3 -3
View File
@@ -64,20 +64,20 @@ namespace TBF.Rig.MettlerToledo.Standard
return Event.Busy;
}
if (done) return Event.BalanceDone; /// Zeroing has been done already
if (done) return Event.ScaleDone; /// Zeroing has been done already
if (scale.MsrmntState == MsrmntState.Busy) return Event.Busy;
if (scale.MsrmntState == MsrmntState.Overload)
{
done = true;
return Event.BalanceOverload;
return Event.ScaleOverload;
}
if (scale.MsrmntState == MsrmntState.Valid)
{
done = true;
return Event.BalanceDone; /// Zeroing completed
return Event.ScaleDone; /// Zeroing completed
}
scale.SendZeroWhenStableCmd(); /// Failed -> repeat zeroing
TBF/Rig/Sequences/MainSeq.cs
+1 -1
View File
@@ -157,7 +157,7 @@ namespace TBF.Rig.Sequences
if (e.Contains(Event.Error)) goto error;
if (e.Contains(Event.UiCmdStop)) goto stop;
}
while (!e.Contains(Event.BalanceDone));
while (!e.Contains(Event.ScaleDone));
select_procedure:
TBF/Rig/Sequences/SequenceBase.cs
+10 -10
View File
@@ -279,7 +279,7 @@ namespace TBF.Rig.Sequences
stopped = true;
break;
}
if (e.Contains(Event.BalanceOverload)) { }; /// Tank should be emptying now
if (e.Contains(Event.ScaleOverload)) { }; /// Tank should be emptying now
///
if (!(tank is IScale))
{
@@ -289,7 +289,7 @@ namespace TBF.Rig.Sequences
remainingTimeSec.Val % 60, Strings.sec));
}
}
while ((tank is IScale) && !e.Contains(Event.BalanceDone));
while ((tank is IScale) && !e.Contains(Event.ScaleDone));
if (stopped) break;
}
@@ -332,7 +332,7 @@ namespace TBF.Rig.Sequences
stopped = true;
break;
}
if (e.Contains(Event.BalanceOverload)) { }; /// Tank should be emptying now
if (e.Contains(Event.ScaleOverload)) { }; /// Tank should be emptying now
///
if (!(tank is IScale))
{
@@ -342,7 +342,7 @@ namespace TBF.Rig.Sequences
(remainingTimeSec.Val + tank.EmptyTimeSec / 2) % 60, Strings.sec));
}
}
while ((tank is IScale) && !e.Contains(Event.BalanceDone));
while ((tank is IScale) && !e.Contains(Event.ScaleDone));
if (stopped) break;
}
@@ -382,7 +382,7 @@ namespace TBF.Rig.Sequences
stopped = true;
break;
}
if (e.Contains(Event.BalanceOverload)) { }; /// Tank should be emptying now
if (e.Contains(Event.ScaleOverload)) { }; /// Tank should be emptying now
///
if (!(tank is IScale))
{
@@ -393,7 +393,7 @@ namespace TBF.Rig.Sequences
}
}
while ((tank is IScale) && !e.Contains(Event.BalanceDone));
while ((tank is IScale) && !e.Contains(Event.ScaleDone));
if (stopped) break;
}
@@ -416,7 +416,7 @@ namespace TBF.Rig.Sequences
if (e.Contains(Event.Error)) return Event.Error;
if (TestAndLogUiCmdStop(e)) return Event.UiCmdStop;
}
while (!e.Contains(Event.ValvesSet) || ((tank is IScale) && !e.Contains(Event.BalanceDone)));
while (!e.Contains(Event.ValvesSet) || ((tank is IScale) && !e.Contains(Event.ScaleDone)));
if (tank.DrainValve2 != null)
{
@@ -432,7 +432,7 @@ namespace TBF.Rig.Sequences
if (e.Contains(Event.Error)) return Event.Error;
if (TestAndLogUiCmdStop(e)) return Event.UiCmdStop;
}
while (!e.Contains(Event.ValvesSet) || ((tank is IScale) && !e.Contains(Event.BalanceDone)));
while (!e.Contains(Event.ValvesSet) || ((tank is IScale) && !e.Contains(Event.ScaleDone)));
}
if (tank is IScale)
@@ -449,7 +449,7 @@ namespace TBF.Rig.Sequences
if (e.Contains(Event.Error)) return Event.Error;
if (TestAndLogUiCmdStop(e)) return Event.UiCmdStop;
}
while (!e.Contains(Event.BalanceDone) || !e.Contains(Event.TimerExpired));
while (!e.Contains(Event.ScaleDone) || !e.Contains(Event.TimerExpired));
}
if (stopped)
@@ -1090,7 +1090,7 @@ namespace TBF.Rig.Sequences
if (TestAndLogUiCmdStop(e)) return Event.UiCmdStop;
if (e.Contains(Event.TestCompleted) || e.Contains(Event.Next)) return Event.TestCompleted;
}
while ( (realTest && (outPath.Scale is IScale) && !e.Contains(Event.BalanceDone)) ||
while ( (realTest && (outPath.Scale is IScale) && !e.Contains(Event.ScaleDone)) ||
!e.Contains(Event.ReadAllRegistersDone));
return Event.Done;
TBF/Rig/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
+3 -3
View File
@@ -209,7 +209,7 @@ namespace TBF.Rig.TestMethods.CombinedWithDetection
if (e.Contains(Event.Error)) goto error;
if (TestAndLogUiCmdStop(test,e)) goto stopTest;
}
while (!e.Contains(Event.BalanceDone));
while (!e.Contains(Event.ScaleDone));
double estimatedEndMass = Mass.Val + test.Volume;
if (estimatedEndMass < scale.Capacity * Constants.TankFullFactor)
@@ -552,7 +552,7 @@ namespace TBF.Rig.TestMethods.CombinedWithDetection
goto stopTest;
}
}
while (!e.Contains(Event.BalanceDone));
while (!e.Contains(Event.ScaleDone));
///
Mass.Val = StartMass.Val;
tMass1 = StateMachine.Time;
@@ -649,7 +649,7 @@ namespace TBF.Rig.TestMethods.CombinedWithDetection
goto stopTest;
}
}
while (!e.Contains(Event.BalanceDone));
while (!e.Contains(Event.ScaleDone));
///
tMass2 = StateMachine.Time;
TestEndTime = DateTime.Now;
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);
TBF/Rig/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs
+3 -3
View File
@@ -179,7 +179,7 @@ namespace TBF.Rig.TestMethods.FixedStartAdvanced
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));
}
///
/// Skip draining in case there is enough room in the tank
@@ -386,7 +386,7 @@ namespace TBF.Rig.TestMethods.FixedStartAdvanced
goto stopTest;
}
}
while (!e.Contains(Event.BalanceDone));
while (!e.Contains(Event.ScaleDone));
///
TestStartTime = DateTime.Now;
Mass.Val = StartMass.Val;
@@ -501,7 +501,7 @@ namespace TBF.Rig.TestMethods.FixedStartAdvanced
goto stopTest;
}
}
while (!e.Contains(Event.BalanceDone));
while (!e.Contains(Event.ScaleDone));
///
tMass2 = StateMachine.Time;
TestEndTime = DateTime.Now;
TBF/Rig/TestMethods/FixedStartMassCollAdvanced/FixedStartMassCollAdvancedSeq.cs
+4 -4
View File
@@ -203,7 +203,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.BalanceDone));
while (!e.Contains(Event.ScaleDone));
}
///
/// Skip draining in case there is enough room in the tank
@@ -238,7 +238,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.BalanceDone));
while (!e.Contains(Event.ValvesSet) || !e.Contains(Event.ScaleDone));
#endregion
@@ -287,7 +287,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollAdvanced
goto stopTest;
}
}
while (!e.Contains(Event.BalanceDone));
while (!e.Contains(Event.ScaleDone));
///
Mass.Val = StartMass.Val;
tMass1 = StateMachine.Time;
@@ -648,7 +648,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollAdvanced
goto stopTest;
}
}
while (!e.Contains(Event.BalanceDone));
while (!e.Contains(Event.ScaleDone));
///
tMass2 = StateMachine.Time;
TBF/Rig/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs
+4 -4
View File
@@ -225,7 +225,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.BalanceDone));
while (!e.Contains(Event.ScaleDone));
}
///
/// Skip draining in case there is enough room in the tank
@@ -260,7 +260,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.BalanceDone));
while (!e.Contains(Event.ValvesSet) || !e.Contains(Event.ScaleDone));
@@ -532,7 +532,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollDeferredEval
goto stopTest;
}
}
while (!e.Contains(Event.BalanceDone));
while (!e.Contains(Event.ScaleDone));
///
Mass.Val = StartMass.Val;
tMass1 = StateMachine.Time;
@@ -799,7 +799,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollDeferredEval
goto stopTest;
}
}
while (!e.Contains(Event.BalanceDone));
while (!e.Contains(Event.ScaleDone));
///
tMass2 = StateMachine.Time;
TestEndTime = DateTime.Now;
TBF/Rig/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
+4 -4
View File
@@ -202,7 +202,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.BalanceDone));
while (!e.Contains(Event.ScaleDone));
}
///
/// Skip draining in case there is enough room in the tank
@@ -237,7 +237,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.BalanceDone));
while (!e.Contains(Event.ValvesSet) || !e.Contains(Event.ScaleDone));
@@ -508,7 +508,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollection
goto stopTest;
}
}
while (!e.Contains(Event.BalanceDone));
while (!e.Contains(Event.ScaleDone));
///
Mass.Val = StartMass.Val;
tMass1 = StateMachine.Time;
@@ -794,7 +794,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollection
goto stopTest;
}
}
while (!e.Contains(Event.BalanceDone));
while (!e.Contains(Event.ScaleDone));
///
tMass2 = StateMachine.Time;
TBF/Rig/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs
+3 -3
View File
@@ -220,7 +220,7 @@ namespace TBF.Rig.TestMethods.FlyingStartFirstRepetWithMassColl
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)
@@ -549,7 +549,7 @@ namespace TBF.Rig.TestMethods.FlyingStartFirstRepetWithMassColl
goto stopTest;
}
}
while (!e.Contains(Event.BalanceDone));
while (!e.Contains(Event.ScaleDone));
Mass.Val = StartMass.Val;
tMass1 = StateMachine.Time;
@@ -673,7 +673,7 @@ namespace TBF.Rig.TestMethods.FlyingStartFirstRepetWithMassColl
goto stopTest;
}
}
while (!e.Contains(Event.BalanceDone));
while (!e.Contains(Event.ScaleDone));
///
tMass2 = StateMachine.Time;
log.WarnFormat("End mass = {0}kg", EndMass);
TBF/Rig/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs
+4 -4
View File
@@ -234,7 +234,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollComparative
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)
@@ -579,7 +579,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollComparative
goto stopTest;
}
}
while (!e.Contains(Event.BalanceDone));
while (!e.Contains(Event.ScaleDone));
log.WarnFormat("Reference mass = {0}kg", measuredRefMass);
@@ -630,7 +630,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollComparative
goto stopTest;
}
}
while (!e.Contains(Event.BalanceDone));
while (!e.Contains(Event.ScaleDone));
Mass.Val = StartMass.Val;
tMass1 = StateMachine.Time;
@@ -761,7 +761,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollComparative
goto stopTest;
}
}
while (!e.Contains(Event.BalanceDone));
while (!e.Contains(Event.ScaleDone));
///
tMass2 = StateMachine.Time;
log.WarnFormat("End mass = {0}kg", EndMass);
TBF/Rig/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs
+3 -3
View File
@@ -212,7 +212,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollProlonged
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 + volumeToTank;
if (estimatedEndMass >= scale.Capacity * Constants.TankFullFactor)
@@ -541,7 +541,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollProlonged
goto stopTest;
}
}
while (!e.Contains(Event.BalanceDone));
while (!e.Contains(Event.ScaleDone));
Mass.Val = StartMass.Val;
tMass1 = StateMachine.Time;
@@ -608,7 +608,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollProlonged
DoInsideMeasurementLoop(cBrd, heatMetersTestParams, test, repetitionNr, estimtdEndTime);
/// Continue in 2nd part of the test when mass measurement is completed, 'Next' button can be used in Debug version
}
while (!e.Contains(Event.BalanceDone) && !e.Contains(Event.ScaleTimeout) && !e.Contains(Event.Next));
while (!e.Contains(Event.ScaleDone) && !e.Contains(Event.ScaleTimeout) && !e.Contains(Event.Next));
///
/// 2nd part of the test and optional opening of the drain valve
TBF/Rig/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
+3 -3
View File
@@ -209,7 +209,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollection
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)
@@ -538,7 +538,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollection
goto stopTest;
}
}
while (!e.Contains(Event.BalanceDone));
while (!e.Contains(Event.ScaleDone));
Mass.Val = StartMass.Val;
tMass1 = StateMachine.Time;
@@ -665,7 +665,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollection
goto stopTest;
}
}
while (!e.Contains(Event.BalanceDone));
while (!e.Contains(Event.ScaleDone));
///
tMass2 = StateMachine.Time;
log.WarnFormat("End mass = {0}kg", EndMass);
TBF/Rig/TestMethods/LeakTest/LeakTestSeq.cs
+2 -2
View File
@@ -272,7 +272,7 @@ namespace TBF.Rig.TestMethods.LeakTest
UpdateAllStatistics(StateMachine.Time);
}
while (!e.Contains(Event.BalanceDone));
while (!e.Contains(Event.ScaleDone));
}
///------------------------------------------------
@@ -329,7 +329,7 @@ namespace TBF.Rig.TestMethods.LeakTest
UpdateAllStatistics(StateMachine.Time);
}
while (!e.Contains(Event.BalanceDone));
while (!e.Contains(Event.ScaleDone));
}
///