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

TBF : (1) Elde.RegisterReader has a new proc. parameter int Filter, (2) Filters 'int[]' are passed everywhere in the TBF application istead of test.TolerRed.

Browse Source
This commit is contained in:
Milan Hanajik
2018-08-23 12:45:13 +02:00
parent 58df07300e
commit bf69524fd8
25 changed files with 162 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/Elde/StartMeasurementOp.cs
+7 -7
View File
@@ -25,7 +25,7 @@ namespace TBF.BenchControl.Elde
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 float filterConstant;
readonly int[] filters;
readonly int diverterNr;
bool started = false;
@@ -55,8 +55,8 @@ namespace TBF.BenchControl.Elde
/// <param name="filterConstant">Specifies filter for watermeter pulses</param>
public StartMeasurementOp(ControlBoardDev controlBoard, OutputPath outputPath, TestMethods method,
float requiredFlowLo, float requiredFlowHi,
int refPulses, float filterConstant)
: this(controlBoard, outputPath, method, requiredFlowLo, requiredFlowHi, refPulses, refPulses, filterConstant)
int refPulses, int[] filters)
: this(controlBoard, outputPath, method, requiredFlowLo, requiredFlowHi, refPulses, refPulses, filters)
{
}
@@ -71,7 +71,7 @@ namespace TBF.BenchControl.Elde
/// <param name="filterConstant">Specifies filter for watermeter pulses</param>
public StartMeasurementOp(ControlBoardDev controlBoard, OutputPath outputPath, TestMethods method,
float requiredFlowLo, float requiredFlowHi,
int totalRefPulses, int massRefPulses, float filterConstant)
int totalRefPulses, int massRefPulses, int[] filters)
{
if (controlBoard == null) throw new ArgumentNullException("controlBoardDev");
this.controlBoard = controlBoard;
@@ -111,7 +111,7 @@ namespace TBF.BenchControl.Elde
this.totalRefPulses = totalRefPulses;
this.massRefPulses = massRefPulses;
this.testMethod = method;
this.filterConstant = filterConstant;
this.filters = filters;
log.Debug(this.ToString());
}
@@ -127,11 +127,11 @@ namespace TBF.BenchControl.Elde
int flowMeterIdxAndDiv = flowMeterNr;
#endif
log.InfoFormat("Start() : SendCommand(Cmd.Start, {0}, route, {1}, {1}, {2}, {3}, {4}, 0, Stop.None)",
flowMeterIdxAndDiv, totalRefPulses, testMethod, filterConstant, (int)pidCoef);
flowMeterIdxAndDiv, totalRefPulses, testMethod, filters[0], (int)pidCoef);
controlBoard.SendCommand(Command.Start, flowMeterIdxAndDiv, controlBoard.Route,
totalRefPulses, massRefPulses, testMethod,
filterConstant, (int)pidCoef, 0, StopDevs.None);
filters, (int)pidCoef, 0, StopDevs.None);
}
/// <summary>Start this operation</summary>