(1) ProcedureDlg: Draining before/after in Process tab, (2) DoDrainingAfter implemented in test method sequences.

2019-10-28 17:05:41 +01:00
parent 28123c3a31
commit 870d57fb67
15 changed files with 240 additions and 48 deletions
@@ -645,6 +645,21 @@ namespace TBF.BenchControl.TestMethods.DiverterTest
            log.WarnFormat("End mass = {0}kg", EndMass);
 			TestEndTime = DateTime.Now;

+            if (test.DoDrainingAfter)
+            {
+                State.Create(string.Format("{0}({1}) : Open the drain valve", test.Method, test.Name))
+                     .AddOperation(checkUiOp)
+                     .AddOperation(StateMachine.ControlBoard.SetValvesOp(scale.DrainValve, null))
+                     .AddOperations(readTempPressOps)
+                     .EnterState();
+                do
+                {
+                    e = StateMachine.WaitRunDevsRunOps();
+                    if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
+                }
+                while (e.Contains(Event.ValvesBusy));
+            }
+
 			//------------------------------------------------
 			Bridge.OnActivity(this, Strings.Test_completed);
 			//------------------------------------------------