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

Stable level and volume measurement ... in progress.

Browse Source
This commit is contained in:
Milan Hanajik
2018-11-13 16:31:20 +01:00
parent f81c30f072
commit a8e0a8087d
14 changed files with 229 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/Modbus/UltrasoundLevelMeter/ReadVolumeOp.cs
+3 -9
View File
@@ -10,11 +10,10 @@ namespace TBF.BenchControl.Modbus.UltrasoundLevelMeter
public class ReadVolumeOp : IOperation
{
private static readonly ILog log = LogManager.GetLogger(typeof(ReadVolumeOp));
public override string ToString() { return string.Format("ReadVolumeOp(.,{0},.)", eventDone); }
public override string ToString() { return string.Format("ReadVolumeOp(.,.)"); }
/// Set by the constructor
readonly LevelMeter levelMeter;
readonly Event eventDone;
/// Measured value
DoubleBox volume;
@@ -25,19 +24,14 @@ namespace TBF.BenchControl.Modbus.UltrasoundLevelMeter
/// <param name="levelMeter">Water volume meter reference</param>
/// <param name="volume">Reference to the measured volume variable, value is in l</param>
/// <param name="eventDone">Event to be returned by Run() when completed OK</param>
public ReadVolumeOp(LevelMeter levelMeter, ref DoubleBox volume, Event eventDone)
public ReadVolumeOp(LevelMeter levelMeter, ref DoubleBox volume)
{
if (levelMeter == null) throw new ArgumentNullException("levelMeter");
this.levelMeter = levelMeter;
this.volume = volume;
this.eventDone = eventDone;
log.Debug(this.ToString());
}
public ReadVolumeOp(LevelMeter levelMeter, ref DoubleBox volume)
: this(levelMeter, ref volume, Event.VolumeDone)
{
}
/// <summary>Start this operation</summary>
@@ -53,7 +47,7 @@ namespace TBF.BenchControl.Modbus.UltrasoundLevelMeter
public Event Run()
{
volume.Val = levelMeter.ReadVolume();
return eventDone;
return Event.VolumeDone;
}
/// <summary>Stop this operation</summary>