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

Short pulses test parameter used in SendCommand(..., shortPulses), ver. 2.18.1204

Browse Source
This commit is contained in:
Milan Hanajik
2019-04-29 10:36:08 +02:00
parent 6cc10d221d
commit e9bda4f1b2
23 changed files with 105 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/Elde/StartMeasurementOp.cs
+8 -6
View File
@@ -27,6 +27,7 @@ namespace TBF.BenchControl.Elde
readonly int massRefPulses; /// Number of reference pulses for mass collection
readonly TestMethods testMethod;
readonly int[] filters;
readonly int shortPulses;
readonly int diverterNr;
///
@@ -54,8 +55,8 @@ namespace TBF.BenchControl.Elde
/// <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)
: this(controlBoard, outputPath, method, requiredFlowLo, requiredFlowHi, refPulses, refPulses, filters)
int refPulses, int[] filters, int shortPulses)
: this(controlBoard, outputPath, method, requiredFlowLo, requiredFlowHi, refPulses, refPulses, filters, shortPulses)
{
}
@@ -70,7 +71,7 @@ namespace TBF.BenchControl.Elde
/// <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 totalRefPulses, int massRefPulses, int[] filters, int shortPulses)
{
if (controlBoard == null) throw new ArgumentNullException("controlBoardDev");
this.controlBoard = controlBoard;
@@ -112,6 +113,7 @@ namespace TBF.BenchControl.Elde
this.massRefPulses = massRefPulses;
this.testMethod = method;
this.filters = filters;
this.shortPulses = shortPulses;
log.Debug(this.ToString());
}
@@ -126,12 +128,12 @@ namespace TBF.BenchControl.Elde
#else
int flowMeterIdxAndDiv = flowMeterNr;
#endif
log.InfoFormat("Start() : SendCommand(Cmd.Start, {0}, route, {1}, {1}, {2}, {3}, {4}, 0, Stop.None)",
flowMeterIdxAndDiv, totalRefPulses, testMethod, filters[0], (int)pidCoef);
log.InfoFormat("Start() : SendCommand(Cmd.Start, {0}, route, {1}, {1}, {2}, {3}, {4}, {5}, Stop.None)",
flowMeterIdxAndDiv, totalRefPulses, testMethod, filters[0], (int)pidCoef, shortPulses);
controlBoard.SendCommand(Command.Start, flowMeterIdxAndDiv, controlBoard.Route,
totalRefPulses, massRefPulses, testMethod,
filters, (int)pidCoef, 0, StopDevs.None);
filters, (int)pidCoef, shortPulses, StopDevs.None);
}
/// <summary>Start this operation</summary>