From 7f3d1bb199a34dde47fd63bfa1b52a15a0f5f042 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Fri, 22 Apr 2016 11:13:52 +0200 Subject: [PATCH] iPerlSpecial: MettlerToledo.Standard.BalanceDev bug fix, ver.2.5.272 --- .../MettlerToledo/Standard/BalanceDev.cs | 2 +- .../MettlerToledo/Standard/BalanceNewDev.cs | 13 +------------ TestBenchFramework/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceDev.cs b/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceDev.cs index f6f012501..da1591d25 100644 --- a/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceDev.cs +++ b/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceDev.cs @@ -325,7 +325,7 @@ namespace TBF.BenchControl.MettlerToledo.Standard msrmntState = MsrmntState.Valid; log.InfoFormat("{0} - Balance response = \"{1}\", Mass = {2}", Name, received, mass); } - else if (fields.Length == 4 && fields[1].Equals("S") && + else if (fields.Length == 4 && (fields[1].Equals("S") || fields[1].Equals("D")) && float.TryParse(fields[2], NumberStyles.AllowDecimalPoint | NumberStyles.AllowLeadingSign, CultureInfo.InvariantCulture, diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceNewDev.cs b/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceNewDev.cs index 7ff8558e1..073e7023f 100644 --- a/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceNewDev.cs +++ b/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceNewDev.cs @@ -144,18 +144,7 @@ namespace TBF.BenchControl.MettlerToledo.Standard } else if (fields[0].Equals("S")) /// Stable (field[1] == "S") or dynamic (field[1] == "D") mass measurement { - if (fields.Length == 4 && fields[1].Equals("S") && - float.TryParse(fields[2], NumberStyles.AllowDecimalPoint | NumberStyles.AllowLeadingSign | NumberStyles.AllowLeadingWhite, - CultureInfo.InvariantCulture, out mass)) - { - if (fields[3].Equals("g")) mass /= 1000.0f; - if (fields[3].Equals("t")) mass *= 1000.0f; - Masses[balanceNr] = mass; - msrmntState = MsrmntState.Valid; - log.InfoFormat("{0} - Balance response = {1}, Mass = {2}", Name, - received.Replace("\r", "").Replace("\n", ""), mass); - } - else if (fields.Length == 4 && fields[1].Equals("D") && + if (fields.Length == 4 && (fields[1].Equals("S") || fields[1].Equals("D")) && float.TryParse(fields[2], NumberStyles.AllowDecimalPoint | NumberStyles.AllowLeadingSign | NumberStyles.AllowLeadingWhite, CultureInfo.InvariantCulture, out mass)) { diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 33b2a1b38..7abc4c3b7 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.5.271.1")] -[assembly: AssemblyFileVersion("2.5.271.1")] +[assembly: AssemblyVersion("2.5.272.1")] +[assembly: AssemblyFileVersion("2.5.272.1")]