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

Database cleanup, columns correctly renamed, DataContainer namespace, etc.

Browse Source
This commit is contained in:
Milan Hanajik
2021-02-24 17:42:50 +01:00
parent a9d6fa631c
commit b5f8d06e5b
91 changed files with 390 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
+3 -3
View File
@@ -133,7 +133,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
}
}
(cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1);
(cBrd as ControlBoard.Legacy.CBoard).SetFiltersPidShortPulses(filters, outPath.PidCoef, test.ShortPulses);
}
IList<IOperation> readTempPressOps = new List<IOperation>();
@@ -294,7 +294,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
.AddOperation(checkUiOp)
.AddOperations(readTempPressOps)
.AddOperations(measureOperations)
.AddOperation(outPath.RegulValve.SetFlowAndMeasureOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowSettingTimeoutSec, (float)test.TolerRed))
.AddOperation(outPath.RegulValve.SetFlowAndMeasureOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowSettingTimeoutSec, (float)test.ShortPulses))
.EnterState();
do {
e = StateMachine.WaitRunDevsRunOps();
@@ -585,7 +585,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
queryEnd1 = cBrd.QueryMeasurementEndOp();
StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0);
int estimtdEndTime = StateMachine.Time + (int)test.TstTime;
int estimtdEndTime = StateMachine.Time + (int)test.TestTime;
/// Read the diverter switch time
if (StateMachine.ControlBoard is ControlBoard.Legacy.CBoard)