Pressure up and Pressure down stored in mbar, not in kPa. Display in process data screens fixed.

2016-08-02 10:47:51 +02:00
parent b9ea2087de
commit c88ac1fcab
15 changed files with 3323 additions and 3319 deletions
@@ -103,11 +103,11 @@ namespace TBF.BenchControl.TestMethods.PMaxTest
 				}
 				while (e.Contains(Event.TimerBusy));

-				UiBridge.Bridge.OnLog(this, string.Format("time = {0}, pump_power = {1}%, pressure_up = {2}kPa, pressure_down = {3}kPa\r\n",
+				UiBridge.Bridge.OnLog(this, string.Format("time = {0}, pump_power = {1}%, pressure_up = {2}bar, pressure_down = {3}bar\r\n",
 										StateMachine.Time - startTime,
 										pumpPower.ToString("F0"),
-										PressureUp.Val.ToString("F1"),
-										PressureUp.Val.ToString("F1")));
+										PressureUp.ToString(),
+										PressureDown.ToString()));

 				float step = (pumpPower < 40.0f) ? 5.0f : ((pumpPower < 60.0f) ? 3.0f : ((pumpPower < 80.0f) ? 2.0f : 1.0f));