Time2MassMsrmt implemented, database tables Test and TestResult changed

2014-12-11 08:49:07 +01:00
parent ea6c9818cf
commit 1afd6870c3
11 changed files with 105 additions and 12 deletions
@@ -258,7 +258,29 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
            /// Measurement loop - end

        test_completed:
-
+            State.Create("FlyingStartCollectionMethod : Waiting before mass measurement")
+                .AddOperation(checkUiOp)
+                .AddOperation(benchPath.TempIn.ReadTempOp(ref tempIn))
+                .AddOperation(benchPath.TempOut.ReadTempOp(ref tempOut))
+                .AddOperation(outPath.TempDiv.ReadTempOp(ref tempDiv))
+                .AddOperation(benchPath.PressIn.ReadPressureOp(ref pressIn))
+                .AddOperation(benchPath.PressOut.ReadPressureOp(ref pressOut))
+                .AddOperation(readRegisters1)
+                .AddOperation((StateMachine.Ambient != null)
+                                ? StateMachine.Ambient.ReadAmbientOp(airTemperature, airPressure, airHumidity) : null)
+                .AddOperation(outPath.Balance.ReadMassOp(ref mass))
+                .AddOperation(cBrd.UpdateTankWeightOp())
+                .AddOperation(processDataLoggingOp)
+                .AddOperation(new Operations.TimerOp(test.Time2MassMsrmt))
+                .EnterState();
+            do
+            {
+                e = StateMachine.WaitRunDevsRunOps();
+                if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
+                if (e.Contains(Event.UiCmdStop)) { retVal = Event.UiCmdStop; goto stopTest; }
+            }
+            while (!e.Contains(Event.TimerExpired));
+                
            LogProcessHeader(processDataLogger, "End mass");

            //------------------------------------------------