From d2493b033123b6635a6084c15260289f27471ac3 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Tue, 1 Mar 2016 16:22:49 +0100 Subject: [PATCH] Bug fix: padlo v Active mode na konci cyklu, ver.2.3.230. --- .../iPerlCommunicationForm.cs | 20 ++++++++++++------- TestBenchFramework/Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs b/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs index 80c8613aa..b78d41e73 100644 --- a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs +++ b/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs @@ -877,14 +877,17 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication byte[] cfg_0_3 = null; for (int j = 0; j < cfg.MaxCommRetries; j++) { - if (0 == ReadRequestPort(wm, MessageID.Configuration, 0, 4, out cfg_0_3, cfg.CommTimeout)) + if (wm.ConfigStruct == null) { - wm.ConfigStruct.Update(0, cfg_0_3); - if (wm.ConfigStruct.MeterState == MeterState.Active) + if (0 == ReadRequestPort(wm, MessageID.Configuration, 0, 4, out cfg_0_3, cfg.CommTimeout)) { - error = CommErr.None; - resultStr = wm.ConfigStruct.ToString(1); - break; + wm.ConfigStruct.Update(0, cfg_0_3); + if (wm.ConfigStruct.MeterState == MeterState.Active) + { + error = CommErr.None; + resultStr = wm.ConfigStruct.ToString(1); + break; + } } } } @@ -892,7 +895,10 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication #else if (error == CommErr.None) { - resultStr = wm.ConfigStruct.ToString(1); + if (wm.ConfigStruct == null) + resultStr = "OK (Config not available)"; + else + resultStr = wm.ConfigStruct.ToString(1); } #endif diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 3ce286f9b..639978a77 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.3.229.1")] -[assembly: AssemblyFileVersion("2.3.229.1")] +[assembly: AssemblyVersion("2.3.230.1")] +[assembly: AssemblyFileVersion("2.3.230.1")]