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

FixedStartMassCollection cleanup.

Browse Source
This commit is contained in:
Milan Hanajik
2021-04-26 06:42:59 +02:00
parent e74c8692ce
commit 03197dc8f3
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
+12 -16
View File
@@ -641,38 +641,28 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
int estimtdEndTime = StateMachine.Time + (int)test.TstTime;
/// Measurement loop - begin
do
{
do {
//--------------------------------
switch (ReadRegistersTempPressAmbient(null, true))
{
case Event.Error:
retVal = Event.Error;
goto stopTest;
case Event.UiCmdStop:
retVal = Event.UiCmdStop;
goto stopTest;
case Event.MeasurementCompleted:
goto test_completed;
case Event.Error: retVal = Event.Error; goto stopTest;
case Event.UiCmdStop: retVal = Event.UiCmdStop; goto stopTest;
case Event.MeasurementCompleted: goto test_completed;
}
int remainingTime = Math.Max(estimtdEndTime - StateMachine.Time, 0);
if (remainingTime > 60)
{
Bridge.OnActivity(this, string.Format("{0} ... {1} {2} {3} {4}", Strings.Test_in_progress, remainingTime / 60, "min", remainingTime % 60, Strings.sec));
}
else
{
Bridge.OnActivity(this, string.Format("{0} ... {1} s", Strings.Test_in_progress, remainingTime));
}
RefFreq.Val = cBrd.ReferenceFreq;
RefFlow.Val = cBrd.ReferenceFlow;
UpdateAllStatistics(StateMachine.Time);
#region Heat meters
if (heatMetersTestParams != null)
{
if (lastEnergyUpdateTime == 0)
@@ -692,6 +682,10 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
}
}
#endregion
#region Compound
if (compound)
{
/// TODO: Reimplement for combined meters
@@ -707,6 +701,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
//}
}
#endregion
Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
}