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

Stopping flow regulation modifications : cmd=Stop, real flowMeterNr used.

Browse Source
This commit is contained in:
Milan Hanajik
2019-05-10 10:53:48 +02:00
parent a4debe7ac0
commit 4221de3b22
5 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/Elde/ControlBoardDev.cs
+2 -2
View File
@@ -673,9 +673,9 @@ namespace TBF.BenchControl.Elde
/// Events: FlowRegulationStopped
/// </summary>
/// <returns>Created operation</returns>
public IOperation StopFlowRegulationOp()
public IOperation StopFlowRegulationOp(OutputPath outputPath)
{
return new StopFlowRegulationOp(this);
return new StopFlowRegulationOp(this, outputPath);
}
/// <summary>
TBF/BenchControl/Elde/StopFlowRegulationOp.cs
+7 -3
View File
@@ -13,17 +13,21 @@ namespace TBF.BenchControl.Elde
/// Set by the constructor
readonly ControlBoardDev controlBoard;
readonly int flowMeterNr;
/// <summary>
/// Stop the previous control board operation (diverter, gate, etc.)
/// Events: None or PreviousStopped
/// </summary>
/// <param name="controlBoardDev">Control board component reference</param>
public StopFlowRegulationOp(ControlBoardDev controlBoardDev)
public StopFlowRegulationOp(ControlBoardDev controlBoardDev, OutputPath outputPath)
{
if (controlBoardDev == null) throw new ArgumentNullException("controlBoardDev");
this.controlBoard = controlBoardDev;
if (outputPath.FlowMeter == null) throw new ArgumentNullException("Flow meter is missing");
flowMeterNr = outputPath.FlowMeter.Idx1;
log.Debug(this.ToString());
}
@@ -31,8 +35,8 @@ namespace TBF.BenchControl.Elde
void SendStopFlowRegulationCommand()
{
controlBoard.SyncRoute();
controlBoard.SendCommand(Command.None,
0, /// ref. flowmeter number
controlBoard.SendCommand(Command.Stop,
flowMeterNr, /// ref. flowmeter number
controlBoard.Route, /// route
0, 0, /// ref. pulses
0,
TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
+1 -1
View File
@@ -737,7 +737,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
State.Create(string.Format("{0}({1}) : Stopping flow regulation", test.Method, test.Name))
.AddOperation(checkUiOp)
.AddOperations(readTempPressOps)
.AddOperation(cBrd.StopFlowRegulationOp())
.AddOperation(cBrd.StopFlowRegulationOp(outPath))
.EnterState();
do {
e = StateMachine.WaitRunDevsRunOps();
TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs
+1 -1
View File
@@ -622,7 +622,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
State.Create(string.Format("{0}({1}) : Stopping flow regulation", test.Method, test.Name))
.AddOperation(checkUiOp)
.AddOperations(readTempPressOps)
.AddOperation(cBrd.StopFlowRegulationOp())
.AddOperation(cBrd.StopFlowRegulationOp(outPath))
.EnterState();
do {
e = StateMachine.WaitRunDevsRunOps();
TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
+1 -1
View File
@@ -610,7 +610,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
State.Create(string.Format("{0}({1}) : Stopping flow regulation", test.Method, test.Name))
.AddOperation(checkUiOp)
.AddOperations(readTempPressOps)
.AddOperation(cBrd.StopFlowRegulationOp())
.AddOperation(cBrd.StopFlowRegulationOp(outPath))
.EnterState();
do {
e = StateMachine.WaitRunDevsRunOps();