Reconfigured fro SLM-50

Changes to sequences to update process data immediately after starting a new test, ver.2.18.1170
(1) ProcessTabPageEx : TRefHi and TRefLo added, (2) Ambient values written to ProcessData, bypass sequences, ver. 2.18.1169
2019-03-18 11:38:59 +01:00 · 2019-03-18 11:38:45 +01:00 · 2019-03-18 11:22:10 +01:00
32 changed files with 635 additions and 201 deletions
@@ -18,7 +18,7 @@
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;SLM_50;HEAT_METERS;LANG_SK</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -28,7 +28,7 @@
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;SLM_50;HEAT_METERS;LANG_SK</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
@@ -18,7 +18,7 @@
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;SLM_50;HEAT_METERS;LANG_SK</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <PlatformTarget>x86</PlatformTarget>
@@ -27,7 +27,7 @@
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;SLM_50;HEAT_METERS;LANG_SK</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
@@ -21,7 +21,7 @@
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;SLM_50;HEAT_METERS;LANG_SK</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -31,7 +31,7 @@
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;SLM_50;HEAT_METERS;LANG_SK</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
@@ -107,6 +107,7 @@ namespace TBF.BenchControl.Ambient.Comet
                            value = (int)byteArr[9] * 256 + (int)byteArr[10];
                            pressure = (float)value / 10000.0f;

+                            UpdateProcessData(temperature, pressure, humidity);
                            msrmntTimeStamp = StateMachine.Time;
                            msrmntState = MsrmntState.Valid;
                            log.InfoFormat("Ambient: temperature = {0:F1} C, humidity = {1:F1} %, pressure = {2:F0} mbar", temperature, humidity, 1000 * pressure);
@@ -185,6 +186,14 @@ namespace TBF.BenchControl.Ambient.Comet

 		public void StopDevice2() { }

+        void UpdateProcessData(float temperature, float pressure, float humidity)
+        {
+            TBF.BenchControl.Sequences.ProcessData.AmbTemp.Val = temperature;
+            TBF.BenchControl.Sequences.ProcessData.AmbPress.Val = pressure;
+            TBF.BenchControl.Sequences.ProcessData.AmbHumi.Val = humidity;
+        }
+
+
 		///
 		/// Boxes for the operation result
 		///
@@ -133,9 +133,10 @@ namespace TBF.BenchControl.Ambient.Greco
 						temperature = t;
 						humidity = h;
 						pressure = p / 1000.0F;
-						msrmntTimeStamp = StateMachine.Time;
-						msrmntState = MsrmntState.Valid;

+                        UpdateProcessData(temperature, pressure, humidity);
+                        msrmntTimeStamp = StateMachine.Time;
+						msrmntState = MsrmntState.Valid;
                        log.InfoFormat("Ambient: temperature = {0:F1} C, humidity = {1:F1} %, pressure = {2:F0} mbar", temperature, humidity, 1000 * pressure);
                    }
 					else
@@ -170,6 +171,13 @@ namespace TBF.BenchControl.Ambient.Greco

 		public void StopDevice2() { }

+        void UpdateProcessData(float temperature, float pressure, float humidity)
+        {
+            TBF.BenchControl.Sequences.ProcessData.AmbTemp.Val = temperature;
+            TBF.BenchControl.Sequences.ProcessData.AmbPress.Val = pressure;
+            TBF.BenchControl.Sequences.ProcessData.AmbHumi.Val = humidity;
+        }
+
 		///
 		/// Boxes for the operation result
 		///
@@ -95,9 +95,31 @@ namespace TBF.BenchControl.TestMethods.Adjustment

            processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this, false);
            
-			/// Start the test, initialize test results
-			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses));
-			string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
+            /// Read pressure and temperature once before calling Bridge.OnTestSelected(...)
+            State.Create(string.Format("{0}({1}) : Measuring process data", test.Method, test.Name))
+                .AddOperation(checkUiOp)
+                .AddOperation(benchPath.TempMtrUp == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp))
+                .AddOperation(benchPath.TempMtrDown == null ? null : benchPath.TempMtrDown.ReadTempOp(ref TempDown))
+                .AddOperation(outPath.TempDiv == null ? null : outPath.TempDiv.ReadTempOp(ref TempDiv))
+                .AddOperation(benchPath.PressMtrUp == null ? null : benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
+                .AddOperation(benchPath.PressMtrDown == null ? null : benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
+                .AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm1.ReadTempOp(ref TempRefHi1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
+                .EnterState();
+            do
+            {
+                e = StateMachine.WaitRunDevsRunOps();
+                if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
+                if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
+            }
+            while (e.Contains(Event.Busy));
+
+            /// Start the test, initialize test results
+            Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
+            string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
 			TestStartTime = DateTime.Now;

 			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
@@ -40,7 +40,7 @@ namespace TBF.BenchControl.TestMethods.ChangeFlowDirection
            checkUiOp = new Operations.CheckUIOp(true);     /// Runs in more then one state

 			/// Start the test, initialize test results
-			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, 0));
+			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, 0));
 			string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
 			TestStartTime = DateTime.Now;

@@ -105,8 +105,30 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection

        //====================================
        loop:
-			/// Start the test, initialize test results
-			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, (int)totalPulses));
+            /// Read pressure and temperature once before calling Bridge.OnTestSelected(...)
+            State.Create(string.Format("{0}({1}) : Measuring process data", test.Method, test.Name))
+                .AddOperation(checkUiOp)
+                .AddOperation(benchPath.TempMtrUp == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp))
+                .AddOperation(benchPath.TempMtrDown == null ? null : benchPath.TempMtrDown.ReadTempOp(ref TempDown))
+                .AddOperation(outPath.TempDiv == null ? null : outPath.TempDiv.ReadTempOp(ref TempDiv))
+                .AddOperation(benchPath.PressMtrUp == null ? null : benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
+                .AddOperation(benchPath.PressMtrDown == null ? null : benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
+                .AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm1.ReadTempOp(ref TempRefHi1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
+                .EnterState();
+            do
+            {
+                e = StateMachine.WaitRunDevsRunOps();
+                if (e.Contains(Event.Error)) { goto stopTest; }
+                if (TestAndLogUiCmdStop(test, e)) { goto stopTest; }
+            }
+            while (e.Contains(Event.Busy));
+
+            /// Start the test, initialize test results
+            Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
 			string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
 			TestStartTime = DateTime.Now;
 			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
@@ -87,8 +87,30 @@ namespace TBF.BenchControl.TestMethods.Endurance

        //====================================
        loop:
+            /// Read pressure and temperature once before calling Bridge.OnTestSelected(...)
+            State.Create(string.Format("{0}({1}) : Measuring process data", test.Method, test.Name))
+                .AddOperation(checkUiOp)
+                .AddOperation(benchPath.TempMtrUp == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp))
+                .AddOperation(benchPath.TempMtrDown == null ? null : benchPath.TempMtrDown.ReadTempOp(ref TempDown))
+                .AddOperation(outPath.TempDiv == null ? null : outPath.TempDiv.ReadTempOp(ref TempDiv))
+                .AddOperation(benchPath.PressMtrUp == null ? null : benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
+                .AddOperation(benchPath.PressMtrDown == null ? null : benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
+                .AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm1.ReadTempOp(ref TempRefHi1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
+                .EnterState();
+            do
+            {
+                e = StateMachine.WaitRunDevsRunOps();
+                if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
+                if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
+            }
+            while (e.Contains(Event.Busy));
+
            /// Start the test, initialize test results
-            Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses));
+            Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
            string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
            TestStartTime = DateTime.Now;

@@ -243,8 +265,6 @@ namespace TBF.BenchControl.TestMethods.Endurance
                    .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
                    .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
                    .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
-                    .AddOperation((StateMachine.Ambient != null)
-                                    ? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
                    .AddOperation(processDataLoggingOp)
 					.AddOperation(enduranceDataLoggingOp)
 					.AddOperation(cBrd.StartMeasurementOp(outPath, Elde.TestMethods.Synchro,
@@ -293,9 +313,6 @@ namespace TBF.BenchControl.TestMethods.Endurance
                    .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
                    .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
                    .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
-                    .AddOperation((StateMachine.Ambient != null)
-                                    ? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi)
-                                    : null)
                    .AddOperation(queryEnd1)
                    .AddOperation(processDataLoggingOp)
 					.AddOperation(enduranceDataLoggingOp)
@@ -542,7 +559,6 @@ namespace TBF.BenchControl.TestMethods.Endurance
 					.AddOperation(benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
 					.AddOperation(benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
 					.AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
-					.AddOperation((StateMachine.Ambient != null) ? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
 					.AddOperation(processDataLoggingOp)
 					.AddOperation(enduranceDataLoggingOp)
 					.AddOperation(cBrd.ExecuteCommandOp(Elde.Command.EnduranceCycleParamsUpload, Elde.Command.None, 0))
@@ -572,7 +588,6 @@ namespace TBF.BenchControl.TestMethods.Endurance
 					.AddOperation(benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
 					.AddOperation(benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
 					.AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
-					.AddOperation((StateMachine.Ambient != null) ? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
 					.AddOperation(processDataLoggingOp)
 					.AddOperation(enduranceDataLoggingOp)
 					.AddOperation(cBrd.ExecuteCommandOp(Elde.Command.EnduranceCycleStart, Elde.Command.EnduranceCycleStop, 0))
@@ -622,7 +637,6 @@ namespace TBF.BenchControl.TestMethods.Endurance
                    .AddOperation(benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
                    .AddOperation(benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
                    .AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
-                    .AddOperation((StateMachine.Ambient != null) ? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
                    .AddOperation(processDataLoggingOp)
 					.AddOperation(enduranceDataLoggingOp)
 					.EnterState();
@@ -83,8 +83,30 @@ namespace TBF.BenchControl.TestMethods.FixedStart

        //====================================
        loop:
+            /// Read pressure and temperature once before calling Bridge.OnTestSelected(...)
+            State.Create(string.Format("{0}({1}) : Measuring process data", test.Method, test.Name))
+                .AddOperation(checkUiOp)
+                .AddOperation(benchPath.TempMtrUp == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp))
+                .AddOperation(benchPath.TempMtrDown == null ? null : benchPath.TempMtrDown.ReadTempOp(ref TempDown))
+                .AddOperation(outPath.TempDiv == null ? null : outPath.TempDiv.ReadTempOp(ref TempDiv))
+                .AddOperation(benchPath.PressMtrUp == null ? null : benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
+                .AddOperation(benchPath.PressMtrDown == null ? null : benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
+                .AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm1.ReadTempOp(ref TempRefHi1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
+                .EnterState();
+            do
+            {
+                e = StateMachine.WaitRunDevsRunOps();
+                if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
+                if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
+            }
+            while (e.Contains(Event.Busy));
+
            /// Start the test, initialize test results
-            Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses));
+            Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
            string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);

            ///
@@ -721,8 +743,6 @@ namespace TBF.BenchControl.TestMethods.FixedStart
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
-				.AddOperation((StateMachine.Ambient != null)
-                                ? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
                .AddOperation(scale.ReadMassOp(ref Mass))
                .AddOperation(processDataLoggingOp)
                .AddOperation(new Operations.TimerOp(test.TimeStop2Mass))
@@ -81,8 +81,30 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced

 		//====================================
 		loop:
-			/// Start the test, initialize test results
-			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses));
+            /// Read pressure and temperature once before calling Bridge.OnTestSelected(...)
+            State.Create(string.Format("{0}({1}) : Measuring process data", test.Method, test.Name))
+                .AddOperation(checkUiOp)
+                .AddOperation(benchPath.TempMtrUp == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp))
+                .AddOperation(benchPath.TempMtrDown == null ? null : benchPath.TempMtrDown.ReadTempOp(ref TempDown))
+                .AddOperation(outPath.TempDiv == null ? null : outPath.TempDiv.ReadTempOp(ref TempDiv))
+                .AddOperation(benchPath.PressMtrUp == null ? null : benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
+                .AddOperation(benchPath.PressMtrDown == null ? null : benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
+                .AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm1.ReadTempOp(ref TempRefHi1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
+                .EnterState();
+            do
+            {
+                e = StateMachine.WaitRunDevsRunOps();
+                if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
+                if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
+            }
+            while (e.Contains(Event.Busy));
+
+            /// Start the test, initialize test results
+			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
 			string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
 			TestStartTime = DateTime.Now;

@@ -310,8 +332,6 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
 				.AddOperation(benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
 				.AddOperation(benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
 				.AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
-				.AddOperation((StateMachine.Ambient != null)
-								? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
 				.AddOperation(scale.ReadStableMassOp(ref StartMass, test.MassRepeats, test.MassSpread, test.MassMethod))
                .AddOperation(new Operations.TimerOp(StableMassMsrmntTimeoutSec))
                .AddOperation(processDataLoggingOp)
@@ -433,8 +453,6 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
 				.AddOperation(benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
 				.AddOperation(benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
 				.AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
-				.AddOperation((StateMachine.Ambient != null)
-								? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
 				.AddOperation(scale.ReadMassOp(ref Mass))
 				.AddOperation(processDataLoggingOp)
 				.AddOperation(new Operations.TimerOp(test.TimeStop2Mass))
@@ -459,8 +477,6 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
 				.AddOperation(benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
 				.AddOperation(benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
 				.AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
-				.AddOperation((StateMachine.Ambient != null)
-								? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
 				.AddOperation(scale.ReadStableMassOp(ref EndMass, test.MassRepeats, test.MassSpread, test.MassMethod))
                .AddOperation(new Operations.TimerOp(StableMassMsrmntTimeoutSec))
                .AddOperation(processDataLoggingOp)
@@ -110,8 +110,30 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEvaluation

        //====================================
        loop:
+            /// Read pressure and temperature once before calling Bridge.OnTestSelected(...)
+            State.Create(string.Format("{0}({1}) : Measuring process data", test.Method, test.Name))
+                .AddOperation(checkUiOp)
+                .AddOperation(benchPath.TempMtrUp == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp))
+                .AddOperation(benchPath.TempMtrDown == null ? null : benchPath.TempMtrDown.ReadTempOp(ref TempDown))
+                .AddOperation(outPath.TempDiv == null ? null : outPath.TempDiv.ReadTempOp(ref TempDiv))
+                .AddOperation(benchPath.PressMtrUp == null ? null : benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
+                .AddOperation(benchPath.PressMtrDown == null ? null : benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
+                .AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm1.ReadTempOp(ref TempRefHi1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
+                .EnterState();
+            do
+            {
+                e = StateMachine.WaitRunDevsRunOps();
+                if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
+                if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
+            }
+            while (e.Contains(Event.Busy));
+
            /// Start the test, initialize test results
-            Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses));
+            Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
            string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);

            ///
@@ -476,8 +498,6 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEvaluation
                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
-                .AddOperation((StateMachine.Ambient != null)
-                                ? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
                .AddOperation(scale.ReadStableMassOp(ref StartMass, test.MassRepeats, test.MassSpread, test.MassMethod))
                .AddOperation(new Operations.TimerOp(StableMassMsrmntTimeoutSec))
                .AddOperation(processDataLoggingOp)
@@ -785,8 +805,6 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEvaluation
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
-				.AddOperation((StateMachine.Ambient != null)
-                                ? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
                .AddOperation(scale.ReadMassOp(ref Mass))
                .AddOperation(processDataLoggingOp)
                .AddOperation(new Operations.TimerOp(test.TimeStop2Mass))
@@ -818,8 +836,6 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEvaluation
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
-				.AddOperation((StateMachine.Ambient != null)
-                                ? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
                .AddOperation(scale.ReadStableMassOp(ref EndMass, test.MassRepeats, test.MassSpread, test.MassMethod))
                .AddOperation(new Operations.TimerOp(StableMassMsrmntTimeoutSec))
                .AddOperation(processDataLoggingOp)
@@ -90,8 +90,30 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection

        //====================================
        loop:
+            /// Read pressure and temperature once before calling Bridge.OnTestSelected(...)
+            State.Create(string.Format("{0}({1}) : Measuring process data", test.Method, test.Name))
+                .AddOperation(checkUiOp)
+                .AddOperation(benchPath.TempMtrUp == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp))
+                .AddOperation(benchPath.TempMtrDown == null ? null : benchPath.TempMtrDown.ReadTempOp(ref TempDown))
+                .AddOperation(outPath.TempDiv == null ? null : outPath.TempDiv.ReadTempOp(ref TempDiv))
+                .AddOperation(benchPath.PressMtrUp == null ? null : benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
+                .AddOperation(benchPath.PressMtrDown == null ? null : benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
+                .AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm1.ReadTempOp(ref TempRefHi1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
+                .EnterState();
+            do
+            {
+                e = StateMachine.WaitRunDevsRunOps();
+                if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
+                if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
+            }
+            while (e.Contains(Event.Busy));
+
            /// Start the test, initialize test results
-            Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses));
+            Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
            string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);

            ///
@@ -456,8 +478,6 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
-                .AddOperation((StateMachine.Ambient != null)
-                                ? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
                .AddOperation(scale.ReadStableMassOp(ref StartMass, test.MassRepeats, test.MassSpread, test.MassMethod))
                .AddOperation(new Operations.TimerOp(StableMassMsrmntTimeoutSec))
                .AddOperation(processDataLoggingOp)
@@ -773,8 +793,6 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
-				.AddOperation((StateMachine.Ambient != null)
-                                ? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
                .AddOperation(scale.ReadMassOp(ref Mass))
                .AddOperation(processDataLoggingOp)
                .AddOperation(new Operations.TimerOp(test.TimeStop2Mass))
@@ -806,8 +824,6 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
-				.AddOperation((StateMachine.Ambient != null)
-                                ? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
                .AddOperation(scale.ReadStableMassOp(ref EndMass, test.MassRepeats, test.MassSpread, test.MassMethod))
                .AddOperation(new Operations.TimerOp(StableMassMsrmntTimeoutSec))
                .AddOperation(processDataLoggingOp)
@@ -94,8 +94,30 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection

        //====================================
        loop:
+            /// Read pressure and temperature once before calling Bridge.OnTestSelected(...)
+            State.Create(string.Format("{0}({1}) : Measuring process data", test.Method, test.Name))
+                .AddOperation(checkUiOp)
+                .AddOperation(benchPath.TempMtrUp == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp))
+                .AddOperation(benchPath.TempMtrDown == null ? null : benchPath.TempMtrDown.ReadTempOp(ref TempDown))
+                .AddOperation(outPath.TempDiv == null ? null : outPath.TempDiv.ReadTempOp(ref TempDiv))
+                .AddOperation(benchPath.PressMtrUp == null ? null : benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
+                .AddOperation(benchPath.PressMtrDown == null ? null : benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
+                .AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm1.ReadTempOp(ref TempRefHi1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
+                .EnterState();
+            do
+            {
+                e = StateMachine.WaitRunDevsRunOps();
+                if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
+                if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
+            }
+            while (e.Contains(Event.Busy));
+
            /// Start the test, initialize test results
-            Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses));
+            Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
            string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);


@@ -540,8 +562,6 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
 				.AddOperation(benchPath.PressMtrUp    == null ? null : benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
 				.AddOperation(benchPath.PressMtrDown  == null ? null : benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
 				.AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
-				.AddOperation((StateMachine.Ambient != null)
-                                ? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
                .AddOperation(processDataLoggingOp)
                .AddOperation(new Operations.TimerOp(test.TimeStop2Mass))
                .EnterState();
@@ -567,9 +587,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
 				.AddOperation(benchPath.PressMtrUp    == null ? null : benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
 				.AddOperation(benchPath.PressMtrDown  == null ? null : benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
 				.AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
-				.AddOperation((StateMachine.Ambient != null)
-                                ? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
-                                .AddOperation(manualLevelMsrmnt ? tank.ManualReadVolumeOp(ref volumeBox) : tank.ReadStableVolumeOp(ref volumeBox, test.MassSpread))
+                .AddOperation(manualLevelMsrmnt ? tank.ManualReadVolumeOp(ref volumeBox) : tank.ReadStableVolumeOp(ref volumeBox, test.MassSpread))
                .AddOperation(processDataLoggingOp)
                .EnterState();
            do
@@ -113,8 +113,30 @@ namespace TBF.BenchControl.TestMethods.FlyingStart

 		//====================================
        loop:
-			/// Start the test, initialize test results
-			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses));
+            /// Read pressure and temperature once before calling Bridge.OnTestSelected(...)
+            State.Create(string.Format("{0}({1}) : Measuring process data", test.Method, test.Name))
+                .AddOperation(checkUiOp)
+                .AddOperation(benchPath.TempMtrUp == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp))
+                .AddOperation(benchPath.TempMtrDown == null ? null : benchPath.TempMtrDown.ReadTempOp(ref TempDown))
+                .AddOperation(outPath.TempDiv == null ? null : outPath.TempDiv.ReadTempOp(ref TempDiv))
+                .AddOperation(benchPath.PressMtrUp == null ? null : benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
+                .AddOperation(benchPath.PressMtrDown == null ? null : benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
+                .AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm1.ReadTempOp(ref TempRefHi1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
+                .EnterState();
+            do
+            {
+                e = StateMachine.WaitRunDevsRunOps();
+                if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
+                if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
+            }
+            while (e.Contains(Event.Busy));
+
+            /// Start the test, initialize test results
+			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
 			string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
 			TestStartTime = DateTime.Now;

@@ -377,8 +399,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
-				.AddOperation((StateMachine.Ambient != null)
-								? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
 				.AddOperation(processDataLoggingOp)
 				.AddOperation(cBrd.StartMeasurementOp(outPath, Elde.TestMethods.Synchro,
                                                      test.Qfrom, test.Qto, totalPulses, filters))
@@ -426,9 +446,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
-				.AddOperation((StateMachine.Ambient != null)
-								? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi)
-								: null)
 				.AddOperation(queryEnd1)
 				.AddOperation(processDataLoggingOp)
 				.EnterState();
@@ -97,8 +97,30 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
            LtrPerRefPulse = outPath.FlowMeter.LtrPerPulse;
            int totalPulses = (int)((repetitionNr == 1 ? test.Volume : nextTestVolume) / LtrPerRefPulse + 0.5f);

+            /// Read pressure and temperature once before calling Bridge.OnTestSelected(...)
+            State.Create(string.Format("{0}({1}) : Measuring process data", test.Method, test.Name))
+                .AddOperation(checkUiOp)
+                .AddOperation(benchPath.TempMtrUp == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp))
+                .AddOperation(benchPath.TempMtrDown == null ? null : benchPath.TempMtrDown.ReadTempOp(ref TempDown))
+                .AddOperation(outPath.TempDiv == null ? null : outPath.TempDiv.ReadTempOp(ref TempDiv))
+                .AddOperation(benchPath.PressMtrUp == null ? null : benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
+                .AddOperation(benchPath.PressMtrDown == null ? null : benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
+                .AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm1.ReadTempOp(ref TempRefHi1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
+                .EnterState();
+            do
+            {
+                e = StateMachine.WaitRunDevsRunOps();
+                if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
+                if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
+            }
+            while (e.Contains(Event.Busy));
+
            /// Start the test, initialize test results
-			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses));
+			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
 			string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
 			TestStartTime = DateTime.Now;

@@ -489,8 +511,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
 					.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
 					.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
 					.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
-					.AddOperation((StateMachine.Ambient != null)
-	                                ? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
 	                .AddOperation(scale.ReadStableMassOp(ref StartMass, test.MassRepeats, test.MassSpread, test.MassMethod))
                    .AddOperation(new Operations.TimerOp(StableMassMsrmntTimeoutSec))
                    .AddOperation(processDataLoggingOp)
@@ -533,8 +553,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
-				.AddOperation((StateMachine.Ambient != null)
-								? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
 				.AddOperation(processDataLoggingOp)
 				.AddOperation(cBrd.StartMeasurementOp(outPath, (repetitionNr == 1) ? Elde.TestMethods.Diverter | Elde.TestMethods.Synchro : Elde.TestMethods.Synchro,
                                                      test.Qfrom, test.Qto, totalPulses, filters))
@@ -584,9 +602,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
 				.AddOperation((repetitionNr == 1) ? scale.ReadMassOp(ref Mass) : null)
                .AddOperation((repetitionNr == 1) ? cBrd.ReadDiverterTransitionOp(outPath.Diverter, 2, 4, switchTimeStart, DiverterStart, BatchRslts.Batch.BatchNr, test.Name, repetitionNr) : null)
-				.AddOperation((StateMachine.Ambient != null)
-								? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi)
-								: null)
 				.AddOperation(queryEnd1)
 				.AddOperation(processDataLoggingOp)
 				.EnterState();
@@ -685,8 +700,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
 					.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
 					.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
 					.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
-	                .AddOperation((StateMachine.Ambient != null)
-	                                ? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
 	                .AddOperation(scale.ReadMassOp(ref Mass))
 	                .AddOperation((repetitionNr == 1) ? cBrd.ReadDiverterTransitionOp(outPath.Diverter, 2, 4, switchTimeEnd, DiverterEnd, BatchRslts.Batch.BatchNr, test.Name, repetitionNr) : null)
 	                .AddOperation(processDataLoggingOp)
@@ -716,8 +729,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
 					.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
 					.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
 					.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
-	                .AddOperation((StateMachine.Ambient != null)
-	                                ? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
 	                .AddOperation(scale.ReadStableMassOp(ref EndMass, test.MassRepeats, test.MassSpread, test.MassMethod))
                    .AddOperation(new Operations.TimerOp(StableMassMsrmntTimeoutSec))
                    .AddOperation(processDataLoggingOp)
@@ -106,8 +106,30 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative

 		//====================================
        loop:
-			/// Start the test, initialize test results
-			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses));
+            /// Read pressure and temperature once before calling Bridge.OnTestSelected(...)
+            State.Create(string.Format("{0}({1}) : Measuring process data", test.Method, test.Name))
+                .AddOperation(checkUiOp)
+                .AddOperation(benchPath.TempMtrUp == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp))
+                .AddOperation(benchPath.TempMtrDown == null ? null : benchPath.TempMtrDown.ReadTempOp(ref TempDown))
+                .AddOperation(outPath.TempDiv == null ? null : outPath.TempDiv.ReadTempOp(ref TempDiv))
+                .AddOperation(benchPath.PressMtrUp == null ? null : benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
+                .AddOperation(benchPath.PressMtrDown == null ? null : benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
+                .AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm1.ReadTempOp(ref TempRefHi1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
+                .EnterState();
+            do
+            {
+                e = StateMachine.WaitRunDevsRunOps();
+                if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
+                if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
+            }
+            while (e.Contains(Event.Busy));
+
+            /// Start the test, initialize test results
+			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
 			string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
 			TestStartTime = DateTime.Now;

@@ -514,8 +536,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
-                .AddOperation((StateMachine.Ambient != null)
-                                ? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
                .AddOperation(scale.ReadStableMassOp(ref measuredRefMass, test.MassRepeats, test.MassSpread, test.MassMethod))
                .AddOperation(new Operations.TimerOp(StableMassMsrmntTimeoutSec))
                .AddOperation(processDataLoggingOp)
@@ -598,8 +618,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
-				.AddOperation((StateMachine.Ambient != null)
-                                ? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
                .AddOperation(scale.ReadStableMassOp(ref StartMass, test.MassRepeats, test.MassSpread, test.MassMethod))
                .AddOperation(new Operations.TimerOp(StableMassMsrmntTimeoutSec))
                .AddOperation(processDataLoggingOp)
@@ -652,8 +670,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
-				.AddOperation((StateMachine.Ambient != null)
-								? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
 				.AddOperation(processDataLoggingOp)
 				.AddOperation(cBrd.StartMeasurementOp(outPath, Elde.TestMethods.Diverter | Elde.TestMethods.Synchro,
                                                      test.Qfrom, test.Qto, totalPulses, filters))
@@ -701,9 +717,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
 				.AddOperation(scale.ReadMassOp(ref Mass))
-                .AddOperation((StateMachine.Ambient != null)
-								? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi)
-								: null)
                .AddOperation(cBrd.ReadDiverterTransitionOp(outPath.Diverter, 2, 4, switchTimeStart, DiverterStart, BatchRslts.Batch.BatchNr, test.Name, repetitionNr))
                .AddOperation(cBrd.QueryMeasurementEndOp())
                .AddOperation(processDataLoggingOp)
@@ -801,8 +814,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
-                .AddOperation((StateMachine.Ambient != null)
-                                ? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
                .AddOperation(scale.ReadMassOp(ref Mass))
                .AddOperation(cBrd.ReadDiverterTransitionOp(outPath.Diverter, 2, 4, switchTimeEnd, DiverterEnd, BatchRslts.Batch.BatchNr, test.Name, repetitionNr))
                .AddOperation(processDataLoggingOp)
@@ -832,8 +843,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
-                .AddOperation((StateMachine.Ambient != null)
-                                ? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
                .AddOperation(scale.ReadStableMassOp(ref EndMass, test.MassRepeats, test.MassSpread, test.MassMethod))
                .AddOperation(new Operations.TimerOp(StableMassMsrmntTimeoutSec))
                .AddOperation(processDataLoggingOp)
@@ -103,8 +103,30 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged

 		//====================================
        loop:
-			/// Start the test, initialize test results
-			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, targetTotalPulses));
+            /// Read pressure and temperature once before calling Bridge.OnTestSelected(...)
+            State.Create(string.Format("{0}({1}) : Measuring process data", test.Method, test.Name))
+                .AddOperation(checkUiOp)
+                .AddOperation(benchPath.TempMtrUp == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp))
+                .AddOperation(benchPath.TempMtrDown == null ? null : benchPath.TempMtrDown.ReadTempOp(ref TempDown))
+                .AddOperation(outPath.TempDiv == null ? null : outPath.TempDiv.ReadTempOp(ref TempDiv))
+                .AddOperation(benchPath.PressMtrUp == null ? null : benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
+                .AddOperation(benchPath.PressMtrDown == null ? null : benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
+                .AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm1.ReadTempOp(ref TempRefHi1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
+                .EnterState();
+            do
+            {
+                e = StateMachine.WaitRunDevsRunOps();
+                if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
+                if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
+            }
+            while (e.Contains(Event.Busy));
+
+            /// Start the test, initialize test results
+			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, targetTotalPulses));
 			string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
 			TestStartTime = DateTime.Now;

@@ -493,8 +515,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
-				.AddOperation((StateMachine.Ambient != null)
-                                ? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
                .AddOperation(scale.ReadStableMassOp(ref StartMass, test.MassRepeats, test.MassSpread, test.MassMethod))
                .AddOperation(new Operations.TimerOp(StableMassMsrmntTimeoutSec))
                .AddOperation(processDataLoggingOp)
@@ -536,8 +556,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
-				.AddOperation((StateMachine.Ambient != null)
-								? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
 				.AddOperation(processDataLoggingOp)
 				.AddOperation(cBrd.StartProlongedMeasurementOp(outPath, Elde.TestMethods.Diverter | Elde.TestMethods.Synchro | Elde.TestMethods.MassAndContinue,
                                                      test.Qfrom, test.Qto, targetTotalPulses, targetMassPulses, filters))
@@ -585,9 +603,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
 				.AddOperation(scale.ReadMassOp(ref Mass))
-                .AddOperation((StateMachine.Ambient != null)
-								? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi)
-								: null)
                .AddOperation(cBrd.ReadDiverterTransitionOp(outPath.Diverter, 2, 4, switchTimeStart, DiverterStart, BatchRslts.Batch.BatchNr, test.Name, repetitionNr))
                .AddOperation(cBrd.QueryMeasurementEndOp())
                .AddOperation(processDataLoggingOp)
@@ -685,8 +700,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
-                .AddOperation((StateMachine.Ambient != null)
-                                ? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
                .AddOperation(scale.ReadMassOp(ref Mass))
                .AddOperation(cBrd.ReadDiverterTransitionOp(outPath.Diverter, 2, 4, switchTimeEnd, DiverterEnd, BatchRslts.Batch.BatchNr, test.Name, repetitionNr))
                .AddOperation(processDataLoggingOp)
@@ -716,8 +729,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
-                .AddOperation((StateMachine.Ambient != null)
-                                ? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
                .AddOperation(scale.ReadStableMassOp(ref EndMass, test.MassRepeats, test.MassSpread, test.MassMethod))
                .AddOperation(new Operations.TimerOp(StableMassMsrmntTimeoutSec))
                .AddOperation(processDataLoggingOp)
@@ -95,8 +95,30 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection

 		//====================================
        loop:
-			/// Start the test, initialize test results
-			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses));
+            /// Read pressure and temperature once before calling Bridge.OnTestSelected(...)
+            State.Create(string.Format("{0}({1}) : Measuring process data", test.Method, test.Name))
+                .AddOperation(checkUiOp)
+                .AddOperation(benchPath.TempMtrUp == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp))
+                .AddOperation(benchPath.TempMtrDown == null ? null : benchPath.TempMtrDown.ReadTempOp(ref TempDown))
+                .AddOperation(outPath.TempDiv == null ? null : outPath.TempDiv.ReadTempOp(ref TempDiv))
+                .AddOperation(benchPath.PressMtrUp == null ? null : benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
+                .AddOperation(benchPath.PressMtrDown == null ? null : benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
+                .AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm1.ReadTempOp(ref TempRefHi1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
+                .EnterState();
+            do
+            {
+                e = StateMachine.WaitRunDevsRunOps();
+                if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
+                if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
+            }
+            while (e.Contains(Event.Busy));
+
+            /// Start the test, initialize test results
+			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
 			string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
 			TestStartTime = DateTime.Now;

@@ -485,7 +507,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
-				.AddOperation((StateMachine.Ambient == null) ? null : StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi))
                .AddOperation(scale.ReadStableMassOp(ref StartMass, test.MassRepeats, test.MassSpread, test.MassMethod))
                .AddOperation(new Operations.TimerOp(StableMassMsrmntTimeoutSec))
                .AddOperation(processDataLoggingOp)
@@ -527,8 +548,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
-				.AddOperation((StateMachine.Ambient != null)
-								? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
 				.AddOperation(processDataLoggingOp)
 				.AddOperation(cBrd.StartMeasurementOp(outPath, Elde.TestMethods.Diverter | Elde.TestMethods.Synchro,
                                                      test.Qfrom, test.Qto, totalPulses, filters))
@@ -576,9 +595,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
 				.AddOperation(scale.ReadMassOp(ref Mass))
-                .AddOperation((StateMachine.Ambient != null)
-								? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi)
-								: null)
                .AddOperation(cBrd.ReadDiverterTransitionOp(outPath.Diverter, 2, 4, switchTimeStart, DiverterStart, BatchRslts.Batch.BatchNr, test.Name, repetitionNr))
                .AddOperation(cBrd.QueryMeasurementEndOp())
                .AddOperation(processDataLoggingOp)
@@ -678,8 +694,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
-                .AddOperation((StateMachine.Ambient != null)
-                                ? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
                .AddOperation(scale.ReadMassOp(ref Mass))
                .AddOperation(cBrd.ReadDiverterTransitionOp(outPath.Diverter, 2, 4, switchTimeEnd, DiverterEnd, BatchRslts.Batch.BatchNr, test.Name, repetitionNr))
                .AddOperation(processDataLoggingOp)
@@ -709,8 +723,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
 				.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
-                .AddOperation((StateMachine.Ambient != null)
-                                ? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
                .AddOperation(scale.ReadStableMassOp(ref EndMass, test.MassRepeats, test.MassSpread, test.MassMethod))
                .AddOperation(new Operations.TimerOp(StableMassMsrmntTimeoutSec))
                .AddOperation(processDataLoggingOp)
@@ -92,8 +92,30 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection

 		//====================================
        loop:
-			/// Start the test, initialize test results
-			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses));
+            /// Read pressure and temperature once before calling Bridge.OnTestSelected(...)
+            State.Create(string.Format("{0}({1}) : Measuring process data", test.Method, test.Name))
+                .AddOperation(checkUiOp)
+                .AddOperation(benchPath.TempMtrUp == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp))
+                .AddOperation(benchPath.TempMtrDown == null ? null : benchPath.TempMtrDown.ReadTempOp(ref TempDown))
+                .AddOperation(outPath.TempDiv == null ? null : outPath.TempDiv.ReadTempOp(ref TempDiv))
+                .AddOperation(benchPath.PressMtrUp == null ? null : benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
+                .AddOperation(benchPath.PressMtrDown == null ? null : benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
+                .AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm1.ReadTempOp(ref TempRefHi1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
+                .EnterState();
+            do
+            {
+                e = StateMachine.WaitRunDevsRunOps();
+                if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
+                if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
+            }
+            while (e.Contains(Event.Busy));
+
+            /// Start the test, initialize test results
+            Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
 			string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
 			TestStartTime = DateTime.Now;

@@ -305,8 +327,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection
 				.AddOperation(benchPath.PressMtrUp    == null ? null : benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
 				.AddOperation(benchPath.PressMtrDown  == null ? null : benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
 				.AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
-				.AddOperation((StateMachine.Ambient != null)
-								? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
 				.AddOperation(processDataLoggingOp)
 				.AddOperation(cBrd.StartMeasurementOp(outPath, Elde.TestMethods.Diverter | Elde.TestMethods.Synchro,
                                                      test.Qfrom, test.Qto, totalPulses, filters))
@@ -349,9 +369,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection
 				.AddOperation(benchPath.PressMtrUp    == null ? null : benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
 				.AddOperation(benchPath.PressMtrDown  == null ? null : benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
 				.AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
-				.AddOperation((StateMachine.Ambient != null)
-								? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi)
-								: null)
                .AddOperation(cBrd.ReadDiverterTransitionOp(outPath.Diverter, 2, 4, switchTimeStart, DiverterStart, BatchRslts.Batch.BatchNr, test.Name, repetitionNr))
                .AddOperation(cBrd.QueryMeasurementEndOp())
                .AddOperation(processDataLoggingOp)
@@ -427,8 +444,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection
 				.AddOperation(benchPath.PressMtrUp    == null ? null : benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
 				.AddOperation(benchPath.PressMtrDown  == null ? null : benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
 				.AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
-                .AddOperation((StateMachine.Ambient != null)
-                                ? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
                .AddOperation(cBrd.ReadDiverterTransitionOp(outPath.Diverter, 2, 4, switchTimeEnd, DiverterEnd, BatchRslts.Batch.BatchNr, test.Name, repetitionNr))
                .AddOperation(processDataLoggingOp)
                .AddOperation(new Operations.TimerOp(test.TimeStop2Mass))
@@ -453,8 +468,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection
 				.AddOperation(benchPath.PressMtrUp    == null ? null : benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
 				.AddOperation(benchPath.PressMtrDown  == null ? null : benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
 				.AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
-                .AddOperation((StateMachine.Ambient != null)
-                                ? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
                .AddOperation(manualLevelMsrmnt ? tank.ManualReadVolumeOp(ref volumeBox) : tank.ReadStableVolumeOp(ref volumeBox, test.MassSpread))
                .AddOperation(processDataLoggingOp)
                .EnterState();
@@ -37,8 +37,30 @@ namespace TBF.BenchControl.TestMethods.LeakTest

 			processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this, false);

+            /// Read pressure and temperature once before calling Bridge.OnTestSelected(...)
+            State.Create(string.Format("{0}({1}) : Measuring process data", test.Method, test.Name))
+                .AddOperation(checkUiOp)
+                .AddOperation(benchPath.TempMtrUp == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp))
+                .AddOperation(benchPath.TempMtrDown == null ? null : benchPath.TempMtrDown.ReadTempOp(ref TempDown))
+                .AddOperation(outPath.TempDiv == null ? null : outPath.TempDiv.ReadTempOp(ref TempDiv))
+                .AddOperation(benchPath.PressMtrUp == null ? null : benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
+                .AddOperation(benchPath.PressMtrDown == null ? null : benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
+                .AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm1.ReadTempOp(ref TempRefHi1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
+                .EnterState();
+            do
+            {
+                e = StateMachine.WaitRunDevsRunOps();
+                if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
+                if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
+            }
+            while (e.Contains(Event.Busy));
+
            /// Start the test, initialize test results
-			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, 1, inPath, benchPath, outPath, sensPath, 0));
+            Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, 1, inPath, benchPath, outPath, sensPath, heatMetersPath, 0));
 			string testName = Results.Utils.GetTestName(test.Name, test.Repeats, 1);

 			//------------------------------------------------
@@ -37,8 +37,30 @@ namespace TBF.BenchControl.TestMethods.PMaxTest

            processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this, false);

-			/// Start the test, initialize test results
-			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, 1, inPath, benchPath, outPath, sensPath, 0));
+            /// Read pressure and temperature once before calling Bridge.OnTestSelected(...)
+            State.Create(string.Format("{0}({1}) : Measuring process data", test.Method, test.Name))
+                .AddOperation(checkUiOp)
+                .AddOperation(benchPath.TempMtrUp == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp))
+                .AddOperation(benchPath.TempMtrDown == null ? null : benchPath.TempMtrDown.ReadTempOp(ref TempDown))
+                .AddOperation(outPath.TempDiv == null ? null : outPath.TempDiv.ReadTempOp(ref TempDiv))
+                .AddOperation(benchPath.PressMtrUp == null ? null : benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
+                .AddOperation(benchPath.PressMtrDown == null ? null : benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
+                .AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm1.ReadTempOp(ref TempRefHi1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
+                .EnterState();
+            do
+            {
+                e = StateMachine.WaitRunDevsRunOps();
+                if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
+                if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
+            }
+            while (e.Contains(Event.Busy));
+
+            /// Start the test, initialize test results
+            Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, 1, inPath, benchPath, outPath, sensPath, heatMetersPath, 0));
 			string testName = Results.Utils.GetTestName(test.Name, test.Repeats, 1);
 			TestStartTime = DateTime.Now;

@@ -94,9 +94,31 @@ namespace TBF.BenchControl.TestMethods.PulsesTest
            }

            processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this, false);
-            
-			/// Start the test, initialize test results
-			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses));
+
+            /// Read pressure and temperature once before calling Bridge.OnTestSelected(...)
+            State.Create(string.Format("{0}({1}) : Measuring process data", test.Method, test.Name))
+                .AddOperation(checkUiOp)
+                .AddOperation(benchPath.TempMtrUp == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp))
+                .AddOperation(benchPath.TempMtrDown == null ? null : benchPath.TempMtrDown.ReadTempOp(ref TempDown))
+                .AddOperation(outPath.TempDiv == null ? null : outPath.TempDiv.ReadTempOp(ref TempDiv))
+                .AddOperation(benchPath.PressMtrUp == null ? null : benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
+                .AddOperation(benchPath.PressMtrDown == null ? null : benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
+                .AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm1.ReadTempOp(ref TempRefHi1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
+                .EnterState();
+            do
+            {
+                e = StateMachine.WaitRunDevsRunOps();
+                if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
+                if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
+            }
+            while (e.Contains(Event.Busy));
+
+            /// Start the test, initialize test results
+			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
 			string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
 			TestStartTime = DateTime.Now;

@@ -94,9 +94,31 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
            }

            processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this, false);
-            
-			/// Start the test, initialize test results
-			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses));
+
+            /// Read pressure and temperature once before calling Bridge.OnTestSelected(...)
+            State.Create(string.Format("{0}({1}) : Measuring process data", test.Method, test.Name))
+                .AddOperation(checkUiOp)
+                .AddOperation(benchPath.TempMtrUp == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp))
+                .AddOperation(benchPath.TempMtrDown == null ? null : benchPath.TempMtrDown.ReadTempOp(ref TempDown))
+                .AddOperation(outPath.TempDiv == null ? null : outPath.TempDiv.ReadTempOp(ref TempDiv))
+                .AddOperation(benchPath.PressMtrUp == null ? null : benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
+                .AddOperation(benchPath.PressMtrDown == null ? null : benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
+                .AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm1.ReadTempOp(ref TempRefHi1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
+                .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
+                .EnterState();
+            do
+            {
+                e = StateMachine.WaitRunDevsRunOps();
+                if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
+                if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
+            }
+            while (e.Contains(Event.Busy));
+
+            /// Start the test, initialize test results
+			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
 			string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
 			TestStartTime = DateTime.Now;

@@ -40,7 +40,7 @@ namespace TBF.BenchControl.TestMethods.RoiDetection
 			//====================
 			// Start the test
 			//====================
-			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses));
+			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
 			string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
 			TestStartTime = DateTime.Now;

@@ -80,7 +80,7 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest
        //====================================
        loop:
 			/// Start the test, initialize test results
-			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, (int)totalPulses));
+            Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
 			string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
 			TestStartTime = DateTime.Now;

@@ -54,9 +54,9 @@ namespace TBF
            this.horizontalSplitContainer = new System.Windows.Forms.SplitContainer();
            this.mainTabControl = new System.Windows.Forms.TabControl();
            this.homeTabPage = new System.Windows.Forms.TabPage();
-			this.ctrlBrdComponent = new ControlComponent3Munich.UserControl1();
+			this.ctrlBrdComponent = new ControlComponent_Torino2015.UserControl1();
            this.processTabPage = new System.Windows.Forms.TabPage();
-            this.processTabPageCtrl = new TBF.Screens.ProcessTabPageCtrl6();
+            this.processTabPageCtrl = new TBF.Screens.ProcessTabPageExCtrl();
            this.insertTabPage = new System.Windows.Forms.TabPage();
            this.resultsTabPage = new System.Windows.Forms.TabPage();
            this.resultsTabPageCtrl = new TBF.Screens.ResultsTabPageCtrl();
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.18.1168.0")]
-[assembly: AssemblyFileVersion("2.18.1168.0")]
+[assembly: AssemblyVersion("2.18.1170.0")]
+[assembly: AssemblyFileVersion("2.18.1170.0")]
@@ -33,6 +33,12 @@ namespace TBF.Screens
        {
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProcessTabPageExCtrl));
            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+            this.tLoCmpntLabel = new System.Windows.Forms.Label();
+            this.tLoDataLabel = new System.Windows.Forms.Label();
+            this.tLoLabel = new System.Windows.Forms.Label();
+            this.tHiCmpntLabel = new System.Windows.Forms.Label();
+            this.tHiDataLabel = new System.Windows.Forms.Label();
+            this.tHiLabel = new System.Windows.Forms.Label();
            this.pumpPctTextBox = new System.Windows.Forms.TextBox();
            this.pictureBox1 = new System.Windows.Forms.PictureBox();
            this.flowMeterPictureBox = new System.Windows.Forms.PictureBox();
@@ -118,6 +124,12 @@ namespace TBF.Screens
            // 
            // splitContainer1.Panel1
            // 
+            this.splitContainer1.Panel1.Controls.Add(this.tLoCmpntLabel);
+            this.splitContainer1.Panel1.Controls.Add(this.tLoDataLabel);
+            this.splitContainer1.Panel1.Controls.Add(this.tLoLabel);
+            this.splitContainer1.Panel1.Controls.Add(this.tHiCmpntLabel);
+            this.splitContainer1.Panel1.Controls.Add(this.tHiDataLabel);
+            this.splitContainer1.Panel1.Controls.Add(this.tHiLabel);
            this.splitContainer1.Panel1.Controls.Add(this.pumpPctTextBox);
            this.splitContainer1.Panel1.Controls.Add(this.pictureBox1);
            this.splitContainer1.Panel1.Controls.Add(this.flowMeterPictureBox);
@@ -187,6 +199,66 @@ namespace TBF.Screens
            this.splitContainer1.SplitterWidth = 1;
            this.splitContainer1.TabIndex = 182;
            // 
+            // tLoCmpntLabel
+            // 
+            this.tLoCmpntLabel.AutoSize = true;
+            this.tLoCmpntLabel.Location = new System.Drawing.Point(367, 218);
+            this.tLoCmpntLabel.Name = "tLoCmpntLabel";
+            this.tLoCmpntLabel.Size = new System.Drawing.Size(52, 13);
+            this.tLoCmpntLabel.TabIndex = 250;
+            this.tLoCmpntLabel.Text = "tLoCmpnt";
+            this.tLoCmpntLabel.Visible = false;
+            // 
+            // tLoDataLabel
+            // 
+            this.tLoDataLabel.AutoSize = true;
+            this.tLoDataLabel.Location = new System.Drawing.Point(367, 234);
+            this.tLoDataLabel.Name = "tLoDataLabel";
+            this.tLoDataLabel.Size = new System.Drawing.Size(45, 13);
+            this.tLoDataLabel.TabIndex = 249;
+            this.tLoDataLabel.Text = "tLoData";
+            this.tLoDataLabel.Visible = false;
+            // 
+            // tLoLabel
+            // 
+            this.tLoLabel.AutoSize = true;
+            this.tLoLabel.Location = new System.Drawing.Point(306, 234);
+            this.tLoLabel.Name = "tLoLabel";
+            this.tLoLabel.Size = new System.Drawing.Size(48, 13);
+            this.tLoLabel.TabIndex = 248;
+            this.tLoLabel.Text = "T lo [°C]:";
+            this.tLoLabel.Visible = false;
+            // 
+            // tHiCmpntLabel
+            // 
+            this.tHiCmpntLabel.AutoSize = true;
+            this.tHiCmpntLabel.Location = new System.Drawing.Point(367, 178);
+            this.tHiCmpntLabel.Name = "tHiCmpntLabel";
+            this.tHiCmpntLabel.Size = new System.Drawing.Size(50, 13);
+            this.tHiCmpntLabel.TabIndex = 247;
+            this.tHiCmpntLabel.Text = "tHiCmpnt";
+            this.tHiCmpntLabel.Visible = false;
+            // 
+            // tHiDataLabel
+            // 
+            this.tHiDataLabel.AutoSize = true;
+            this.tHiDataLabel.Location = new System.Drawing.Point(367, 194);
+            this.tHiDataLabel.Name = "tHiDataLabel";
+            this.tHiDataLabel.Size = new System.Drawing.Size(43, 13);
+            this.tHiDataLabel.TabIndex = 246;
+            this.tHiDataLabel.Text = "tHiData";
+            this.tHiDataLabel.Visible = false;
+            // 
+            // tHiLabel
+            // 
+            this.tHiLabel.AutoSize = true;
+            this.tHiLabel.Location = new System.Drawing.Point(306, 194);
+            this.tHiLabel.Name = "tHiLabel";
+            this.tHiLabel.Size = new System.Drawing.Size(48, 13);
+            this.tHiLabel.TabIndex = 245;
+            this.tHiLabel.Text = "T hi [°C]:";
+            this.tHiLabel.Visible = false;
+            // 
            // pumpPctTextBox
            // 
            this.pumpPctTextBox.Location = new System.Drawing.Point(797, 372);
@@ -613,7 +685,7 @@ namespace TBF.Screens
            // prInCmpntLabel
            // 
            this.prInCmpntLabel.AutoSize = true;
-            this.prInCmpntLabel.Location = new System.Drawing.Point(141, 124);
+            this.prInCmpntLabel.Location = new System.Drawing.Point(141, 178);
            this.prInCmpntLabel.Name = "prInCmpntLabel";
            this.prInCmpntLabel.Size = new System.Drawing.Size(55, 13);
            this.prInCmpntLabel.TabIndex = 194;
@@ -622,7 +694,7 @@ namespace TBF.Screens
            // prOutCmpntLabel
            // 
            this.prOutCmpntLabel.AutoSize = true;
-            this.prOutCmpntLabel.Location = new System.Drawing.Point(598, 124);
+            this.prOutCmpntLabel.Location = new System.Drawing.Point(598, 178);
            this.prOutCmpntLabel.Name = "prOutCmpntLabel";
            this.prOutCmpntLabel.Size = new System.Drawing.Size(63, 13);
            this.prOutCmpntLabel.TabIndex = 193;
@@ -631,7 +703,7 @@ namespace TBF.Screens
            // tOutCmpntLabel
            // 
            this.tOutCmpntLabel.AutoSize = true;
-            this.tOutCmpntLabel.Location = new System.Drawing.Point(598, 162);
+            this.tOutCmpntLabel.Location = new System.Drawing.Point(598, 218);
            this.tOutCmpntLabel.Name = "tOutCmpntLabel";
            this.tOutCmpntLabel.Size = new System.Drawing.Size(57, 13);
            this.tOutCmpntLabel.TabIndex = 192;
@@ -640,7 +712,7 @@ namespace TBF.Screens
            // tInCmpntLabel
            // 
            this.tInCmpntLabel.AutoSize = true;
-            this.tInCmpntLabel.Location = new System.Drawing.Point(141, 162);
+            this.tInCmpntLabel.Location = new System.Drawing.Point(141, 218);
            this.tInCmpntLabel.Name = "tInCmpntLabel";
            this.tInCmpntLabel.Size = new System.Drawing.Size(49, 13);
            this.tInCmpntLabel.TabIndex = 191;
@@ -658,7 +730,7 @@ namespace TBF.Screens
            // prOutLabel
            // 
            this.prOutLabel.AutoSize = true;
-            this.prOutLabel.Location = new System.Drawing.Point(598, 140);
+            this.prOutLabel.Location = new System.Drawing.Point(598, 194);
            this.prOutLabel.Name = "prOutLabel";
            this.prOutLabel.Size = new System.Drawing.Size(33, 13);
            this.prOutLabel.TabIndex = 189;
@@ -667,7 +739,7 @@ namespace TBF.Screens
            // tOutLabel
            // 
            this.tOutLabel.AutoSize = true;
-            this.tOutLabel.Location = new System.Drawing.Point(598, 178);
+            this.tOutLabel.Location = new System.Drawing.Point(598, 234);
            this.tOutLabel.Name = "tOutLabel";
            this.tOutLabel.Size = new System.Drawing.Size(27, 13);
            this.tOutLabel.TabIndex = 188;
@@ -676,7 +748,7 @@ namespace TBF.Screens
            // label17
            // 
            this.label17.AutoSize = true;
-            this.label17.Location = new System.Drawing.Point(517, 140);
+            this.label17.Location = new System.Drawing.Point(517, 194);
            this.label17.Name = "label17";
            this.label17.Size = new System.Drawing.Size(73, 13);
            this.label17.TabIndex = 187;
@@ -685,7 +757,7 @@ namespace TBF.Screens
            // label18
            // 
            this.label18.AutoSize = true;
-            this.label18.Location = new System.Drawing.Point(524, 178);
+            this.label18.Location = new System.Drawing.Point(524, 234);
            this.label18.Name = "label18";
            this.label18.Size = new System.Drawing.Size(66, 13);
            this.label18.TabIndex = 186;
@@ -694,7 +766,7 @@ namespace TBF.Screens
            // prInLabel
            // 
            this.prInLabel.AutoSize = true;
-            this.prInLabel.Location = new System.Drawing.Point(141, 140);
+            this.prInLabel.Location = new System.Drawing.Point(141, 194);
            this.prInLabel.Name = "prInLabel";
            this.prInLabel.Size = new System.Drawing.Size(25, 13);
            this.prInLabel.TabIndex = 185;
@@ -703,7 +775,7 @@ namespace TBF.Screens
            // tInLabel
            // 
            this.tInLabel.AutoSize = true;
-            this.tInLabel.Location = new System.Drawing.Point(141, 178);
+            this.tInLabel.Location = new System.Drawing.Point(141, 234);
            this.tInLabel.Name = "tInLabel";
            this.tInLabel.Size = new System.Drawing.Size(19, 13);
            this.tInLabel.TabIndex = 184;
@@ -712,7 +784,7 @@ namespace TBF.Screens
            // label14
            // 
            this.label14.AutoSize = true;
-            this.label14.Location = new System.Drawing.Point(73, 140);
+            this.label14.Location = new System.Drawing.Point(73, 194);
            this.label14.Name = "label14";
            this.label14.Size = new System.Drawing.Size(59, 13);
            this.label14.TabIndex = 183;
@@ -721,7 +793,7 @@ namespace TBF.Screens
            // label13
            // 
            this.label13.AutoSize = true;
-            this.label13.Location = new System.Drawing.Point(80, 178);
+            this.label13.Location = new System.Drawing.Point(80, 234);
            this.label13.Name = "label13";
            this.label13.Size = new System.Drawing.Size(52, 13);
            this.label13.TabIndex = 182;
@@ -737,14 +809,14 @@ namespace TBF.Screens
            this.metersListView.UseCompatibleStateImageBehavior = false;
            this.metersListView.View = System.Windows.Forms.View.Details;
            // 
-            // ProcessTabPageHeatMetersCtrl
+            // ProcessTabPageExCtrl
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.BackColor = System.Drawing.SystemColors.Control;
            this.Controls.Add(this.splitContainer1);
            this.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.Name = "ProcessTabPageHeatMetersCtrl";
+            this.Name = "ProcessTabPageExCtrl";
            this.Size = new System.Drawing.Size(1100, 800);
            this.Load += new System.EventHandler(this.ProcessTabPageCtrl_Load);
            this.Paint += new System.Windows.Forms.PaintEventHandler(this.ProcessTabPageCtrl_Paint);
@@ -828,6 +900,12 @@ namespace TBF.Screens
        private System.Windows.Forms.Label label14;
        private System.Windows.Forms.Label label13;
        private System.Windows.Forms.ListView metersListView;
+        private System.Windows.Forms.Label tLoCmpntLabel;
+        private System.Windows.Forms.Label tLoDataLabel;
+        private System.Windows.Forms.Label tLoLabel;
+        private System.Windows.Forms.Label tHiCmpntLabel;
+        private System.Windows.Forms.Label tHiDataLabel;
+        private System.Windows.Forms.Label tHiLabel;



@@ -46,6 +46,15 @@ namespace TBF.Screens

            InitializeComponent();

+#if HEAT_METERS
+            tLoLabel.Visible = true;
+            tLoCmpntLabel.Visible = true;
+            tLoDataLabel.Visible = true;
+            tHiLabel.Visible = true;
+            tHiCmpntLabel.Visible = true;
+            tHiDataLabel.Visible = true;
+#endif
+
 			Bridge.ProcedureSelectedHandler += delegate(object sndr, ProcedureSelectedEventArgs args)
 			{
 				try
@@ -95,14 +104,20 @@ namespace TBF.Screens
 				}
 				catch (Exception e) { log.ErrorFormat("ProcessTabPage24.OnProcedureCompleted() failed: {0}", e.Message); }
 			};
+
+            Timer timer = new Timer();
+            timer.Tick += (s, e) => { OnTimerTick(); };
+            timer.Interval = 5000;
+            timer.Start();
 		}

 		private void ProcessTabPageCtrl_Load(object sender, EventArgs e)
 		{
 			Once();
 			ResetLabelsAndTargetVals();
-			ResetReadings();
-
+			ResetReadings();        /// Erase all results
+            OnTimerTick();          /// Redraw measurements that are always available
+            ProcessTabPageCtrl_Paint(this, null);
 		}

 		void Once()
@@ -124,19 +139,19 @@ namespace TBF.Screens
                metersListView.Items.Clear();
                metersListView.Columns.Clear();

-                metersListView.Columns.Add(Strings.Meter, 100);
-                metersListView.Columns.Add(Strings.Sensor, 100);
-                metersListView.Columns.Add(Strings.Pulses_count, 120);
+                metersListView.Columns.Add(Strings.Meter, 60);
+                metersListView.Columns.Add(Strings.Sensor, 80);
+                metersListView.Columns.Add(Strings.Pulses_count, 100);
                metersListView.Columns.Add(Strings.Ref_pulses_count, 120);
-                metersListView.Columns.Add(Strings.Volume, 100);
-                metersListView.Columns.Add(Strings.Error, 100);
-                metersListView.Columns.Add(Strings.Result, 100);
+                metersListView.Columns.Add(Strings.Volume, 80);
+                metersListView.Columns.Add(Strings.Error, 80);
+                metersListView.Columns.Add(Strings.Result, 80);
                ///
                if (metersKind == MetersKind.HeatMeter)
                {
-                    metersListView.Columns.Add(Strings.Energy, 100);
-                    metersListView.Columns.Add(Strings.Error, 100);
-                    metersListView.Columns.Add(Strings.Result, 100);
+                    metersListView.Columns.Add(Strings.Energy, 80);
+                    metersListView.Columns.Add(Strings.Error, 80);
+                    metersListView.Columns.Add(Strings.Result, 80);
                }

                if ((metersKind == MetersKind.Single) || (metersKind == MetersKind.HeatMeter))
@@ -213,6 +228,8 @@ namespace TBF.Screens
            tInCmpntLabel.Text = "---";
            tOutCmpntLabel.Text = "---";
            tDivCmpntLabel.Text = "---";
+            tHiCmpntLabel.Text = "---";
+            tLoCmpntLabel.Text = "---";

            scaleCmpntLabel.Text = "---";

@@ -240,10 +257,6 @@ namespace TBF.Screens
 		void ResetReadings()
 		{
 			/// Top part
-			airTempLabel.Text = "---";
-			airPressLabel.Text = "---";
-			airHumiLabel.Text = "---";
-
 			refPulsesLabel.Text = "---";
 			refFreqLabel.Text = "---";
 			refFlowLabel.Text = "---";
@@ -253,8 +266,12 @@ namespace TBF.Screens
 			tDivLabel.Text = "---";

            tInLabel.Text = "---";
-            tOutLabel.Text = "---";
            prInLabel.Text = "---";
+
+            tHiDataLabel.Text = "---";
+            tLoDataLabel.Text = "---";
+
+            tOutLabel.Text = "---";
            prOutLabel.Text = "---";

            massLabel.Text = "---";
@@ -309,11 +326,36 @@ namespace TBF.Screens
            }
        }

+        void OnTimerTick()
+        {
+            ///
+            /// Always available
+            ///
+            airTempLabel.Text = ProcessData.AmbTemp.ToString();
+            airPressLabel.Text = Config.Units.ConvertTo(Config.Unit.mbar, ProcessData.AmbPress.Val).ToString("F0");
+            airHumiLabel.Text = ProcessData.AmbHumi.ToString();
+
+            tInLabel.Text = ProcessData.TempUp.ToString();
+            tOutLabel.Text = ProcessData.TempDown.ToString();
+            tDivLabel.Text = ProcessData.TempDiv.ToString();
+
+            prInLabel.Text = ProcessData.PressUp.ToString();
+            prOutLabel.Text = ProcessData.PressDown.ToString();
+
+            massLabel.Text = ProcessData.Mass.ToString();
+
+#if HEAT_METERS
+            tHiDataLabel.Text = (ProcessData.TempRefHi1.Valid && ProcessData.TempRefHi2.Valid) ? ((ProcessData.TempRefHi1.Val + ProcessData.TempRefHi2.Val) / 2).ToString("F2") : "---";
+            tLoDataLabel.Text = (ProcessData.TempRefLo1.Valid && ProcessData.TempRefLo2.Valid) ? ((ProcessData.TempRefLo1.Val + ProcessData.TempRefLo2.Val) / 2).ToString("F2") : "---";
+#endif
+        }
+
 		void OnProcedureSelected(object sender, ProcedureSelectedEventArgs args)
 		{
 			UpdateCurrentMetersKind(args.Procedure.MetersKind);
 			ResetLabelsAndTargetVals();
 			ResetReadings();
+            OnTimerTick();          /// Redraw measurements that are always available
            Invalidate();
 		}

@@ -330,15 +372,21 @@ namespace TBF.Screens
 			estmtdTimeLabel.Text     = args.Test.TstTime.ToString("F1");

 			/// Names of virtual bench components
-            if (args.BenchPath.PressMtrUp != null)   prInCmpntLabel.Text     = args.BenchPath.PressMtrUp.Name;
+            if (args.OutputPath.FlowMeter != null) refFlowCmpntLabel.Text = args.OutputPath.FlowMeter.Name;
+            if (args.OutputPath.RegulValve != null) regValveCmpntLabel.Text = args.OutputPath.RegulValve.Name;
+            if (args.OutputPath.Scale != null) scaleCmpntLabel.Text = args.OutputPath.Scale.Name;
+            if (args.BenchPath.PressMtrUp != null) prInCmpntLabel.Text = args.BenchPath.PressMtrUp.Name;
            if (args.BenchPath.PressMtrDown != null) prOutCmpntLabel.Text    = args.BenchPath.PressMtrDown.Name;
            if (args.BenchPath.TempMtrUp != null)    tInCmpntLabel.Text      = args.BenchPath.TempMtrUp.Name;
            if (args.BenchPath.TempMtrDown != null)  tOutCmpntLabel.Text     = args.BenchPath.TempMtrDown.Name;
            if (args.OutputPath.TempDiv != null)     tDivCmpntLabel.Text     = args.OutputPath.TempDiv.Name;
-            if (args.OutputPath.FlowMeter != null)   refFlowCmpntLabel.Text  = args.OutputPath.FlowMeter.Name;
-            if (args.OutputPath.RegulValve != null)  regValveCmpntLabel.Text = args.OutputPath.RegulValve.Name;
-            if (args.OutputPath.Scale != null)       scaleCmpntLabel.Text    = args.OutputPath.Scale.Name;
+#if HEAT_METERS
+            if (args.HeatMetersPath != null && args.HeatMetersPath.TMeterRefWarm1 != null) tHiCmpntLabel.Text = args.HeatMetersPath.TMeterRefWarm1.Name;
+            if (args.HeatMetersPath != null && args.HeatMetersPath.TMeterRefCold1 != null) tLoCmpntLabel.Text = args.HeatMetersPath.TMeterRefCold1.Name;
+#endif

+            OnTimerTick();          /// Redraw measurements that are always available
+            
            if ((currentMetersKind == MetersKind.Single) || (currentMetersKind == MetersKind.HeatMeter))
            {
                for (int i = 0; i < metersListView.Items.Count; i++)
@@ -377,17 +425,7 @@ namespace TBF.Screens

 		void OnProcessDataChanged(object sender, ProcessDataEventArgs args)
 		{
-			///
-			/// Always available
-			///
-			airTempLabel.Text = ProcessData.AmbTemp.ToString();
-            airPressLabel.Text = Config.Units.ConvertTo(Config.Unit.mbar, ProcessData.AmbPress.Val).ToString("F0");
-            airHumiLabel.Text = ProcessData.AmbHumi.ToString();
-
-			tInLabel.Text = ProcessData.TempUp.ToString();
-			tOutLabel.Text = ProcessData.TempDown.ToString();
-			tDivLabel.Text = ProcessData.TempDiv.ToString();
-
+            /// Pressure may change faster then temperature, therefore it is updated also here
 			prInLabel.Text = ProcessData.PressUp.ToString();
 			prOutLabel.Text = ProcessData.PressDown.ToString();

@@ -490,16 +528,9 @@ namespace TBF.Screens
 			Results.Entities.TestRslt tRes = args.TestRslt;
            if (tRes == null) return;

-			airTempLabel.Text = tRes.AmbTempMean.ToString("F1");
-            airPressLabel.Text = Config.Units.ConvertTo(Config.Unit.mbar, tRes.AmbPressMean).ToString("F0");
-            airHumiLabel.Text = tRes.AmbHumiMean.ToString("F1");
-
-			tInLabel.Text = tRes.TempUpMean.ToString("F2");
-			tOutLabel.Text = tRes.TempDownMean.ToString("F2");
-			tDivLabel.Text = tRes.TempDivMean.ToString("F2");
-
-			prInLabel.Text = tRes.PressUpMean.ToString("F2");
-			prOutLabel.Text = tRes.PressDownMean.ToString("F2");
+            /// Pressure may change faster then temperature, therefore it is updated also here
+            prInLabel.Text = ProcessData.PressUp.ToString();
+            prOutLabel.Text = ProcessData.PressDown.ToString();

 			massLabel.Text = ProcessData.Mass.ToString();
 			massDiffLabel.Text = (tRes.MassEnd - tRes.MassStart).ToString("F3");
@@ -39,7 +39,7 @@
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH;CAMERA</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;SLM_50;HEAT_METERS;LANG_SK;STABLE_MASS_EXTRAS</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -49,7 +49,7 @@
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH;CAMERA</DefineConstants>
+    <DefineConstants>TRACE;SLM_50;HEAT_METERS;LANG_SK;STABLE_MASS_EXTRAS</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <PlatformTarget>x86</PlatformTarget>
@@ -58,7 +58,7 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    <DebugSymbols>true</DebugSymbols>
    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH;CAMERA</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;SLM_50;HEAT_METERS;LANG_SK;STABLE_MASS_EXTRAS</DefineConstants>
    <DebugType>full</DebugType>
    <PlatformTarget>x86</PlatformTarget>
    <ErrorReport>prompt</ErrorReport>
@@ -67,7 +67,7 @@
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH;CAMERA</DefineConstants>
+    <DefineConstants>TRACE;SLM_50;HEAT_METERS;LANG_SK;STABLE_MASS_EXTRAS</DefineConstants>
    <Optimize>true</Optimize>
    <DebugType>pdbonly</DebugType>
    <PlatformTarget>x86</PlatformTarget>
@@ -97,8 +97,9 @@
    <SignManifests>false</SignManifests>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="ControlComponent3Munich">
-      <HintPath>..\packages\ControlBoard\Munich\ControlComponent3Munich.dll</HintPath>
+    <Reference Include="ControlComponent3U, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ControlBoard\SLM-PT50\ControlComponent3U.dll</HintPath>
    </Reference>
    <Reference Include="FluentNHibernate">
      <HintPath>..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll</HintPath>
@@ -14,9 +14,10 @@ namespace TBF.UiBridge
 		public BenchPath BenchPath;
 		public OutputPath OutputPath;
 		public MetersPath MetersPath;
+        public HeatMetersPath HeatMetersPath;
 		public int TotalPulses;

-		public TestSelectedEventArgs(Config.Entities.Test test, int repetitionNr, FeedingPath f, BenchPath b, OutputPath o, MetersPath m, int tp)
+		public TestSelectedEventArgs(Config.Entities.Test test, int repetitionNr, FeedingPath f, BenchPath b, OutputPath o, MetersPath m, HeatMetersPath h, int tp)
 		{
 			Test = test;
 			RepetitionNr = repetitionNr;
@@ -24,6 +25,7 @@ namespace TBF.UiBridge
 			BenchPath = b;
 			OutputPath = o;
 			MetersPath = m;
+            HeatMetersPath = h;
 			TotalPulses = tp;
 		}
 	}
Author	SHA1	Message	Date
Milan Hanajik	a043b09ced	Reconfigured fro SLM-50	2019-03-18 11:38:59 +01:00
Milan Hanajik	ca36fc0004	Changes to sequences to update process data immediately after starting a new test, ver.2.18.1170	2019-03-18 11:38:45 +01:00
Milan Hanajik	6ea9f7ee97	(1) ProcessTabPageEx : TRefHi and TRefLo added, (2) Ambient values written to ProcessData, bypass sequences, ver. 2.18.1169	2019-03-18 11:22:10 +01:00