Database cleanup, columns correctly renamed, DataContainer namespace, etc.
This commit is contained in:
+5
-5
@@ -142,7 +142,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
|
||||
}
|
||||
}
|
||||
|
||||
(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>();
|
||||
@@ -588,7 +588,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
|
||||
/// Measurement loop - preparation
|
||||
readRegistersOp = new Operations.ReadMoreRegistersOp(sensPath.RegisterReaders);
|
||||
|
||||
int estimtdEndTime = StateMachine.Time + (int)test.TstTime;
|
||||
int estimtdEndTime = StateMachine.Time + (int)test.TestTime;
|
||||
StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0);
|
||||
|
||||
/// Measurement loop - begin
|
||||
@@ -1200,10 +1200,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
|
||||
/// Simulate flow
|
||||
StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0);
|
||||
|
||||
IntBox remainingTime = new IntBox((int)test.TstTime);
|
||||
IntBox remainingTime = new IntBox((int)test.TestTime);
|
||||
State.Create(string.Format("{0}({1}) : Simulation", test.Method, test.Name))
|
||||
.AddOperation(checkUiOp)
|
||||
.AddOperation(new Operations.TimerOp((int)test.TstTime, remainingTime))
|
||||
.AddOperation(new Operations.TimerOp((int)test.TestTime, remainingTime))
|
||||
.EnterState();
|
||||
do
|
||||
{
|
||||
@@ -1222,7 +1222,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
|
||||
}
|
||||
//------------------------------------------------
|
||||
|
||||
RefFlow.Val = (1.0 + 0.2 * Math.Sin(2 * Math.PI * (float)remainingTime.Val / test.TstTime)) * (test.Qfrom + test.Qto) / 2.0;
|
||||
RefFlow.Val = (1.0 + 0.2 * Math.Sin(2 * Math.PI * (float)remainingTime.Val / test.TestTime)) * (test.Qfrom + test.Qto) / 2.0;
|
||||
PressUp.Val = 2.7f;
|
||||
PressDown.Val = 2.2f;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user