From 4d39805ef4da213d7ce9821abf76b17f64c1331e Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Tue, 16 Feb 2016 15:57:30 +0100 Subject: [PATCH] Bug fixes: (1) in MainSeq when starting iPearlCommForm, (2) in SetActiveMode (config struct was null), version 2.2.217. --- Config/Properties/AssemblyInfo.cs | 4 ++-- Results/Mappings/WaterMeterMap.cs | 3 +++ Results/Properties/AssemblyInfo.cs | 4 ++-- .../BenchControl/Sequences/MainSeq.cs | 3 ++- .../iPerlCommunicationForm.cs | 19 ++++++++++++++++++- TestBenchFramework/Properties/AssemblyInfo.cs | 4 ++-- 6 files changed, 29 insertions(+), 8 deletions(-) diff --git a/Config/Properties/AssemblyInfo.cs b/Config/Properties/AssemblyInfo.cs index 5cd41b6ad..b4453d700 100644 --- a/Config/Properties/AssemblyInfo.cs +++ b/Config/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.1.200.0")] -[assembly: AssemblyFileVersion("2.1.200.0")] +[assembly: AssemblyVersion("2.2.217.0")] +[assembly: AssemblyFileVersion("2.2.217.0")] diff --git a/Results/Mappings/WaterMeterMap.cs b/Results/Mappings/WaterMeterMap.cs index 2f0537271..455ce72cb 100644 --- a/Results/Mappings/WaterMeterMap.cs +++ b/Results/Mappings/WaterMeterMap.cs @@ -29,6 +29,9 @@ namespace Results.Mappings Map(x => x.Q2CorrectionDone); Map(x => x.Q2Correction); Map(x => x.Q2CorrFlowRight); + Map(x => x.Diff2Hz8Hz); + Map(x => x.Hz2CorrectionDone); + Map(x => x.Hz2Correction); #endif References(x => x.WaterMeterData); References(x => x.Batch); diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs index d549b9f3b..aea684ba9 100644 --- a/Results/Properties/AssemblyInfo.cs +++ b/Results/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.1.213.0")] -[assembly: AssemblyFileVersion("2.1.213.0")] +[assembly: AssemblyVersion("2.2.217.0")] +[assembly: AssemblyFileVersion("2.2.217.0")] diff --git a/TestBenchFramework/BenchControl/Sequences/MainSeq.cs b/TestBenchFramework/BenchControl/Sequences/MainSeq.cs index b33a2f936..6bb8542e1 100644 --- a/TestBenchFramework/BenchControl/Sequences/MainSeq.cs +++ b/TestBenchFramework/BenchControl/Sequences/MainSeq.cs @@ -382,7 +382,7 @@ namespace TBF.BenchControl.Sequences if (UIFlowControl.Stop == WaitBeginFormClosed()) goto stop; /// Open iPerlCommunicationForm - ProcessData.RegisterReaders = sensPath.RegisterReaders; + ProcessData.RegisterReaders = StateMachine.GetMetersPath(simultWithPurgingTests[0]).RegisterReaders; Program.MainWnd.Invoke(new iPerlCommFormDlgt(OpenIPerlCommForm), new object[] { this, simultWithPurgingCfg, simultWithPurgingTests, simultWithPurgingParams }); } @@ -708,6 +708,7 @@ namespace TBF.BenchControl.Sequences if (simultWithEvacuationCount > 0) { /// Open iPerlCommunicationForm + ProcessData.RegisterReaders = StateMachine.GetMetersPath(simultWithEvacuationTests[0]).RegisterReaders; Program.MainWnd.Invoke(new iPerlCommFormDlgt(OpenIPerlCommForm), new object[] { this, simultWithEvacuationCfg, simultWithEvacuationTests, simultWithEvacuationParams }); } diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs b/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs index 154f1a66f..80c8613aa 100644 --- a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs +++ b/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs @@ -782,6 +782,8 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication { if (0 == WriteRequestPort(wm, MessageID.Command, 0, 1, cmd, cfg.CommTimeout)) { error = CommErr.None; break; } } + + Thread.Sleep(250); } if (error == CommErr.None && (wm.ConfigStruct.TestModeConfig != testModeConfig)) @@ -798,6 +800,8 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication break; } } + + Thread.Sleep(250); } if (error == CommErr.None) @@ -809,6 +813,8 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication { if (0 == WriteRequestPort(wm, MessageID.Command, 0, 1, cmd, cfg.CommTimeout)) { error = CommErr.None; break; } } + + Thread.Sleep(250); } /// Now the meter should be in the Test mode ... verify @@ -855,9 +861,14 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication byte[] cmd = new byte[1] { (byte)6 }; for (int j = 0; j < cfg.MaxCommRetries; j++) { - if (0 == WriteRequestPort(wm, MessageID.Command, 0, 1, cmd, cfg.CommTimeout)) { error = CommErr.None; break; } + if (0 == WriteRequestPort(wm, MessageID.Command, 0, 1, cmd, cfg.CommTimeout)) + { + error = CommErr.None; + break; + } } +#if false if (error == CommErr.None) { error = CommErr.Verify; @@ -878,6 +889,12 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication } } } +#else + if (error == CommErr.None) + { + resultStr = wm.ConfigStruct.ToString(1); + } +#endif ClosePort(wm); /// Close RFID port diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 56dc06284..3b6650a51 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.1.215.1")] -[assembly: AssemblyFileVersion("2.1.215.1")] +[assembly: AssemblyVersion("2.2.217.1")] +[assembly: AssemblyFileVersion("2.2.217.1")]