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

Uni.FlowMetersInParallel added, ver. 3.1.1617

Browse Source
This commit is contained in:
Milan Hanajik
2021-03-29 16:23:21 +02:00
parent 79e1fff45e
commit 68ca5c4901
11 changed files with 473 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/Rig/Uni/FlowMeter/ReadFlowOp.cs
+5 -4
View File
@@ -4,6 +4,7 @@
using System;
using log4net;
using TBF.Boxes;
using TBF.Rig.GenericDevices;
namespace TBF.Rig.Uni.FlowMeter
{
@@ -13,7 +14,7 @@ namespace TBF.Rig.Uni.FlowMeter
public override string ToString() { return string.Format("ReadFlowOp({0},.,.,{1})", flowMeter.Idx1, eventDone); }
/// Set by the constructor
readonly FlowMeter flowMeter;
readonly IFlowMeter flowMeter;
readonly DoubleBox flowBox;
readonly Event eventDone;
@@ -23,7 +24,7 @@ namespace TBF.Rig.Uni.FlowMeter
/// <param name="flowMeter">Flow meter reference</param>
/// <param name="flowBox">Reference to the measured flow variable, value is in bar</param>
/// <param name="eventDone">Event to be returned by Run() when completed OK</param>
public ReadFlowOp(FlowMeter flowMeter, ref DoubleBox flowBox, Event eventDone)
public ReadFlowOp(IFlowMeter flowMeter, ref DoubleBox flowBox, Event eventDone)
{
if (flowMeter == null) throw new ArgumentNullException();
@@ -34,7 +35,7 @@ namespace TBF.Rig.Uni.FlowMeter
log.Debug(this.ToString());
}
public ReadFlowOp(FlowMeter flowMeter, ref DoubleBox flowBox)
public ReadFlowOp(IFlowMeter flowMeter, ref DoubleBox flowBox)
: this(flowMeter, ref flowBox, Event.FlowMeasurementDone)
{
}
@@ -50,7 +51,7 @@ namespace TBF.Rig.Uni.FlowMeter
{
if (flowMeter.MsrmntAvailable)
{
flowBox.Val = flowMeter.ReadFlow();
if (flowBox != null) flowBox.Val = flowMeter.ReadFlow();
return eventDone;
}