- Fixed bugs in (simultaneous) tank emptying

2014-08-11 21:19:47 +02:00
parent 7cdfad0738
commit d177a4f892
3 changed files with 66 additions and 40 deletions
@@ -46,19 +46,21 @@ namespace TBF.BenchControl.MettlerToledo
 		/// </returns>
 		public Event Run()
 		{
-			if (done) return Event.BalanceDone;			/// Mass has already been read
-																					
-			if (balanceDev.MsrmntState == MsrmntState.Busy) return Event.None;
-
-			if (balanceDev.MsrmntState == MsrmntState.Valid)
-			{
-				result.Val = balanceDev.Mass;
-				done = true;
-				return Event.BalanceDone;				/// Mass read OK
-			}
-
-			balanceDev.GetImmediateMassMeasurement();	/// Failed -> repeat the measurement
-			return Event.None;
+            if (balanceDev.MsrmntState == MsrmntState.Valid)
+            {
+                result.Val = balanceDev.Mass;
+                done = true;
+                balanceDev.GetImmediateMassMeasurement();	/// Start another measurement
+                return Event.BalanceDone;				    /// Mass read OK
+            }
+            else if (done)
+            {
+                return Event.BalanceDone;			        /// Mass has already been read (at least once)
+            }
+            else
+            {
+                return Event.None;
+            }
 		}

 		/// <summary>Stop this operation</summary>