diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Multi/BalanceDev.cs b/TestBenchFramework/BenchControl/MettlerToledo/Multi/BalanceDev.cs index b681e4334..c119f1f12 100644 --- a/TestBenchFramework/BenchControl/MettlerToledo/Multi/BalanceDev.cs +++ b/TestBenchFramework/BenchControl/MettlerToledo/Multi/BalanceDev.cs @@ -69,7 +69,6 @@ namespace TBF.BenchControl.MettlerToledo.Multi /// Constructor /// /// Balance properties - /// A list of components loaded so far public BalanceDev(BalanceCfg cfg) : base(cfg) { @@ -112,23 +111,6 @@ namespace TBF.BenchControl.MettlerToledo.Multi return (mass <= balanceCfg.Empty); } - public void ZeroWhenStable() - { - if (balanceCfg.DebugLevel == Entities.DebugMode.Simulate) return; - - if (msrmntState == MsrmntState.Busy) - { - log.Warn("ZeroWhenStable() returns without starting zeroing the scale because measurementState == MeasurementState.Busy"); - return; - } - - log.Info("ZeroWhenStable()"); - - msrmntState = MsrmntState.Busy; - stringBuilder.Clear(); - serialPort.Write("Z\r\n"); - } - /// /// Parse characters received from the serial port /// @@ -193,17 +175,17 @@ namespace TBF.BenchControl.MettlerToledo.Multi out tmpMass)) { Masses[balanceIdNr - 1] = tmpMass * Balances[balanceIdNr - 1].Resolution; - msrmntState = MsrmntState.Valid; + Balances[balanceIdNr - 1].msrmntState = MsrmntState.Valid; log.InfoFormat("Balance({2}) response = \"{0}\", Mass = {1}kg", received, Masses[balanceIdNr - 1], balanceIdNr); } else { - msrmntState = MsrmntState.Busy; + Balances[balanceIdNr - 1].msrmntState = MsrmntState.Busy; } } else { - msrmntState = MsrmntState.Failed; + Balances[balanceIdNr - 1].msrmntState = MsrmntState.Failed; log.WarnFormat("Balance({2}) response = \"{0}\", Unexpected error !!!", received, balanceIdNr); } @@ -232,17 +214,17 @@ namespace TBF.BenchControl.MettlerToledo.Multi out tmpMass)) { Masses[balanceIdNr - 1] = tmpMass * Balances[balanceIdNr - 1].Resolution; - msrmntState = MsrmntState.Valid; + Balances[balanceIdNr - 1].msrmntState = MsrmntState.Valid; log.InfoFormat("Balance({2}) response = \"{0}\", Mass = {1}kg", received, Masses[balanceIdNr - 1], balanceIdNr); } else { - msrmntState = MsrmntState.Busy; + Balances[balanceIdNr - 1].msrmntState = MsrmntState.Busy; } } else { - msrmntState = MsrmntState.Failed; + Balances[balanceIdNr - 1].msrmntState = MsrmntState.Failed; log.WarnFormat("Balance({2}) response = \"{0}\", Unexpected error !!!", received, balanceIdNr); } } diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index c7f2fe7ce..00df78b99 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("1.3.31.1")] -[assembly: AssemblyFileVersion("1.3.31.1")] +[assembly: AssemblyVersion("1.3.32.1")] +[assembly: AssemblyFileVersion("1.3.32.1")]