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

Elde interface : filters, pidCoef and shortPulses are set by SetFilterPidShortPulses( ) only.

Browse Source
This commit is contained in:
Milan Hanajik
2019-05-10 16:28:18 +02:00
parent 6b42dd091f
commit 7724c004a0
33 changed files with 288 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/Elde/StartMeasurementOp.cs
+7 -16
View File
@@ -1,5 +1,5 @@
///
/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
///
using System;
using log4net;
@@ -22,12 +22,9 @@ namespace TBF.BenchControl.Elde
readonly double maximalFlow;
readonly double reqFlowLo;
readonly double reqFlowHi;
readonly float pidCoef;
readonly int totalRefPulses; /// Number of reference pulses for a complete test
readonly int massRefPulses; /// Number of reference pulses for mass collection
readonly TestMethods testMethod;
readonly int[] filters;
readonly int shortPulses;
readonly int diverterNr;
///
@@ -54,9 +51,8 @@ namespace TBF.BenchControl.Elde
/// <param name="totalRefPulses">Test duration in number of reference flowmeter pulses</param>
/// <param name="filterConstant">Specifies filter for watermeter pulses</param>
public StartMeasurementOp(ControlBoardDev controlBoard, OutputPath outputPath, TestMethods method,
double requiredFlowLo, double requiredFlowHi,
int refPulses, int[] filters, int shortPulses)
: this(controlBoard, outputPath, method, requiredFlowLo, requiredFlowHi, refPulses, refPulses, filters, shortPulses)
double requiredFlowLo, double requiredFlowHi, int refPulses)
: this(controlBoard, outputPath, method, requiredFlowLo, requiredFlowHi, refPulses, refPulses)
{
}
@@ -70,8 +66,7 @@ namespace TBF.BenchControl.Elde
/// <param name="refPulses">Test duration in number of reference flowmeter pulses</param>
/// <param name="filterConstant">Specifies filter for watermeter pulses</param>
public StartMeasurementOp(ControlBoardDev controlBoard, OutputPath outputPath, TestMethods method,
double requiredFlowLo, double requiredFlowHi,
int totalRefPulses, int massRefPulses, int[] filters, int shortPulses)
double requiredFlowLo, double requiredFlowHi, int totalRefPulses, int massRefPulses)
{
if (controlBoard == null) throw new ArgumentNullException("controlBoardDev");
this.controlBoard = controlBoard;
@@ -107,13 +102,10 @@ namespace TBF.BenchControl.Elde
this.reqFlowLo = requiredFlowLo;
this.reqFlowHi = requiredFlowHi;
this.pidCoef = outputPath.PidCoef;
this.totalRefPulses = totalRefPulses;
this.massRefPulses = massRefPulses;
this.testMethod = method;
this.filters = filters;
this.shortPulses = shortPulses;
log.Debug(this.ToString());
}
@@ -128,12 +120,11 @@ namespace TBF.BenchControl.Elde
#else
int flowMeterIdxAndDiv = flowMeterNr;
#endif
log.InfoFormat("Start() : SendCommand(Cmd.Start, {0}, route, {1}, {1}, {2}, {3}, {4}, {5}, Stop.None)",
flowMeterIdxAndDiv, totalRefPulses, testMethod, filters[0], (int)pidCoef, shortPulses);
log.InfoFormat("Start() : SendCommand(Cmd.Start, {0}, route, {1}, {1}, {2}, Stop.None)",
flowMeterIdxAndDiv, totalRefPulses, testMethod);
controlBoard.SendCommand(Command.Start, flowMeterIdxAndDiv, controlBoard.Route,
totalRefPulses, massRefPulses, testMethod,
filters, (int)pidCoef, shortPulses, StopDevs.None);
totalRefPulses, massRefPulses, testMethod, StopDevs.None);
}
/// <summary>Start this operation</summary>