Zmeny urobene v ST pri testovani kamery

This commit is contained in:
Milan Hanajik
2014-09-24 19:58:05 +02:00
parent 09affdb1dd
commit 9868c41640
6 changed files with 65 additions and 109 deletions
@@ -40,7 +40,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
/// float timeSec = 3600.0f * timeHr;
/// int refPulses = (int)(timeSec * (2000.0f * targetFlow / pOut.FlowMeter.NominalFlow));
int totalPulses = (int)(test.Volume / ltrPerRefPulse);
processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this);
int repetitionNr = 1; /// First test: repetitionNr=1
@@ -134,13 +134,12 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
if (e.Contains(Event.OpArgumentError)) { retVal = Event.OpArgumentError; goto stopTest; }
if (e.Contains(Event.UiCmdStop)) { retVal = Event.UiCmdStop; goto stopTest; }
if (e.Contains(Event.RegulValveTimeOut)) { retVal = Event.Error; goto stopTest; }
if (e.Contains(Event.RegulValveTimeOut)) { log.Warn("FlowSetTimeout"); retVal = Event.Error; goto stopTest; }
if (e.Contains(Event.Next)) goto flow_set;
}
while (!e.Contains(Event.FlowReached));
flow_set:
int time = StateMachine.Time;
float currentFlow = refFlow.Val;