From 421474b990fc687c7a4a023affcafb1a747bc063 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Sat, 22 Aug 2015 16:25:35 +0200 Subject: [PATCH] Bugfixes: Q2 correction, both BenchID-s, ver.1.5.92 --- .../BenchInfo/Munich/Component.cs | 2 +- .../BenchInfo/Polska/Component.cs | 2 +- .../iPerlCommunicationForm.cs | 2 +- .../WaterMeters/iPerl/WaterMeter.cs | 19 +++++++++++-------- TestBenchFramework/Properties/AssemblyInfo.cs | 4 ++-- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/TestBenchFramework/BenchControl/BenchInfo/Munich/Component.cs b/TestBenchFramework/BenchControl/BenchInfo/Munich/Component.cs index 781abc148..d40f15606 100644 --- a/TestBenchFramework/BenchControl/BenchInfo/Munich/Component.cs +++ b/TestBenchFramework/BenchControl/BenchInfo/Munich/Component.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.BenchInfo.Munich /// /// Holds information identifying the test bench. /// - public class Component : ComponentBase + public class Component : ComponentBase, GenericDevices.IBenchInfo { private static readonly ILog log = LogManager.GetLogger(typeof(Component)); public override string ToString() { return string.Format("BenchInfo({0})", Cfg.ToString(1)); } diff --git a/TestBenchFramework/BenchControl/BenchInfo/Polska/Component.cs b/TestBenchFramework/BenchControl/BenchInfo/Polska/Component.cs index 0e63c1be6..ae7bbe9a5 100644 --- a/TestBenchFramework/BenchControl/BenchInfo/Polska/Component.cs +++ b/TestBenchFramework/BenchControl/BenchInfo/Polska/Component.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.BenchInfo.Polska /// /// Holds information identifying the test bench. /// - public class Component : ComponentBase + public class Component : ComponentBase, GenericDevices.IBenchInfo { private static readonly ILog log = LogManager.GetLogger(typeof(Component)); public override string ToString() { return string.Format("BenchInfoPL({0})", Cfg.ToString(1)); } diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs b/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs index 57cb72be4..edc248dff 100644 --- a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs +++ b/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs @@ -929,7 +929,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication for (int j = 0; j < MaxCommRetries; j++) { if ((0 == ReadRequestPort(wm.MuxBoardNr, MessageID.MetrologyMemory, Q2CorrFactorsAddr, 2, out rdData, CommTimeout)) && - (rdData != null) && (rdData.Length == 2) && (rdData[0] == q2CorrRFlow) && (rdData[1] == q2CorrRFlow)) + (rdData != null) && (rdData.Length == 2) && (rdData[0] == q2CorrRFlow) && (rdData[1] == q2CorrLFlow)) { error = CommErr.None; resultStr = string.Format("Group={0}, Board={1}, Q2 correction factors set: RightFlow = {2}, LeftFlow = {3}", diff --git a/TestBenchFramework/BenchControl/WaterMeters/iPerl/WaterMeter.cs b/TestBenchFramework/BenchControl/WaterMeters/iPerl/WaterMeter.cs index 996a44b31..0e5548cc8 100644 --- a/TestBenchFramework/BenchControl/WaterMeters/iPerl/WaterMeter.cs +++ b/TestBenchFramework/BenchControl/WaterMeters/iPerl/WaterMeter.cs @@ -243,14 +243,17 @@ namespace TBF.BenchControl.WaterMeters.iPerl public void RunDeviceBefore() { - if (optoSerialPortParsingEnabled) - { - ReadOptoSerialPort(); - } - else - { - FlushOptoSerialPort(); - } + if (DebugLevel == Entities.DebugMode.Normal) + { + if (optoSerialPortParsingEnabled) + { + ReadOptoSerialPort(); + } + else + { + FlushOptoSerialPort(); + } + } } public void RunDeviceAfter() diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index b72772e4b..031c2f4bc 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.5.91.1")] -[assembly: AssemblyFileVersion("1.5.91.1")] +[assembly: AssemblyVersion("1.5.92.1")] +[assembly: AssemblyFileVersion("1.5.92.1")]