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

Standing start/stop fixed, ver. 3.1.1653

Browse Source
This commit is contained in:
Milan Hanajik
2021-05-21 17:13:45 +02:00
parent 81151935bc
commit 62d725d879
34 changed files with 161 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/Rig/TestMethods/StandingStartMassCollection/StandingStartMassCollectionSeq.cs
+13 -17
View File
@@ -444,7 +444,7 @@ namespace TBF.Rig.TestMethods.StandingStartMassCollection
/// Temperature is withing required range at this point
///
IOperation testInProgress = cBrd.StandingStartStopTestOp(test, test.Qfrom, test.Qto, totalPulses, true);
IOperation testInProgress = cBrd.StandingStartStopTestOp(test, test.Qfrom, test.Qto, 2 * totalPulses, true);
//-----------------------------------------------------------------
Bridge.OnActivity(this, Strings.Stopping_flow_for_the_fixed_start);
@@ -650,6 +650,8 @@ namespace TBF.Rig.TestMethods.StandingStartMassCollection
int remainingTime;
StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, Math.Max((int)(test.TestTime / 10), 5));
int initialPulsesCount = RefPulses;
State.Create(string.Format("{0}({1}) : Start the test, open the start/stop valve", test.Method, test.Name))
.AddOperation(checkUiOp)
.AddOperations(readTempPressOps)
@@ -701,7 +703,7 @@ namespace TBF.Rig.TestMethods.StandingStartMassCollection
Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
}
while (!e.Contains(Event.TestCompleted) && !e.Contains(Event.Next));
while (cBrd.RefPulses < initialPulsesCount + totalPulses && !e.Contains(Event.TestCompleted) && !e.Contains(Event.Next));
/// Measurement loop end
switchTimeStart = 0.001f * cBrd.ValveOpenCloseTime;
@@ -1162,21 +1164,15 @@ namespace TBF.Rig.TestMethods.StandingStartMassCollection
StopRecordingStatistics();
///
/// Quit this sequence
///
if (isLastRepetition || retVal == Event.UiCmdStop || retVal == Event.OpArgumentError
|| retVal == Event.Error || retVal == Event.ConfigurationError)
{
State.Create(string.Format("{0}({1}) : Stopping diverter, gate, etc.", test.Method, test.Name))
.AddOperation(checkUiOp)
.AddOperation(cBrd.StopPreviousOp())
.EnterState();
do {
e = StateMachine.WaitRunDevsRunOps();
if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
}
while (!e.Contains(Event.PreviousStopped));
///
/// Quit this sequence
///
if (isLastRepetition || retVal == Event.UiCmdStop
|| retVal == Event.OpArgumentError
|| retVal == Event.Error
|| retVal == Event.ConfigurationError)
{
cBrd.StopAll(false);
}
return new List<Event> { retVal };