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

FixedStartMassCollection : Flow adjustment during measurement, ver. 2.30.1987

Browse Source
This commit is contained in:
Milan Hanajik 2022-11-18 12:32:15 +01:00
parent 6a374c5af0
commit d29d8be81a
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TBF/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.30.1986.0")]
[assembly: AssemblyFileVersion("2.30.1986.0")]
[assembly: AssemblyVersion("2.30.1987.0")]
[assembly: AssemblyFileVersion("2.30.1987.0")]

5
TBF/Rig/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
View File

@ -635,11 +635,12 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollection
Bridge.OnActivity(this, Strings.Test_in_progress);
//------------------------------------------------
StartTime = (double)StateMachine.Time;
var setFlowOp = outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, int.MaxValue); /// Flow adjustment during measurement
State.Create(string.Format("{0}({1}) : Starting the test", test.Method, test.Name))
.AddOperation(checkUiOp)
.AddOperations(readTempPressOps)
.AddOperation(new TBF.Rig.Elde.SetValvesOp(cBrd, false, outPath)) /// This line should precede StartMeasureentOp (sending commands)
.AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, int.MaxValue))
.AddOperation(setFlowOp)
.EnterState();
do {
e = StateMachine.WaitRunDevsRunOps();
@ -662,7 +663,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollection
/// Measurement loop - begin
do {
//--------------------------------
switch (ReadRegistersTempPressAmbient(null, true))
switch (ReadRegistersTempPressAmbient(new List<IOperation>() { setFlowOp }, true))
{
case Event.Error: retVal = Event.Error; goto stopTest;
case Event.UiCmdStop: retVal = Event.UiCmdStop; goto stopTest;