ReadMassOp removed, ProcessData.Mass removed, TestMethods.FixedStartMassCollection, ver. 3.1.1620
This commit is contained in:
@@ -69,7 +69,7 @@ namespace TBF.Rig.ControlBoard.Uni
|
||||
log.InfoFormat("Op.Start() RV#={0} Et#={1} Qfrom={2} Qto={3}", regV.Idx1, flowMeter.Idx1, qFrom, qTo);
|
||||
|
||||
/// Start the test (and the flow measurement)
|
||||
uniCB.StartTest(false, flowMeter.Idx1, 0, 0, false, false, true, false, pulsesCount, 0);
|
||||
uniCB.StartTest(false, flowMeter.Idx1, 0, 0, false, false, true, false, pulsesCount);
|
||||
|
||||
opState = OpState.StartingTest;
|
||||
}
|
||||
@@ -117,7 +117,7 @@ namespace TBF.Rig.ControlBoard.Uni
|
||||
|
||||
case OpState.TestInProgress:
|
||||
|
||||
if ((uniCB.State & (ulong)StatusP.TestCompleted) == 0)
|
||||
if ((uniCB.State & (ulong)StatusP.TestCompleted) == 0 && uniCB.RefPulses < pulsesCount)
|
||||
{
|
||||
return Event.TestInProgress; /// Test was not completed yet
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user