michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fixes: (1) in MainSeq when starting iPearlCommForm, (2) in SetActiveMode (config struct was null), version 2.2.217.

Browse Source
This commit is contained in:
Milan Hanajik
2016-02-16 17:25:01 +01:00
parent 4b1a684d69
commit 4d39805ef4
6 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Config/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.1.200.0")] [assembly: AssemblyVersion("2.2.217.0")]
[assembly: AssemblyFileVersion("2.1.200.0")] [assembly: AssemblyFileVersion("2.2.217.0")]
Results/Mappings/WaterMeterMap.cs
+3
View File
@@ -29,6 +29,9 @@ namespace Results.Mappings
Map(x => x.Q2CorrectionDone); Map(x => x.Q2CorrectionDone);
Map(x => x.Q2Correction); Map(x => x.Q2Correction);
Map(x => x.Q2CorrFlowRight); Map(x => x.Q2CorrFlowRight);
Map(x => x.Diff2Hz8Hz);
Map(x => x.Hz2CorrectionDone);
Map(x => x.Hz2Correction);
#endif #endif
References(x => x.WaterMeterData); References(x => x.WaterMeterData);
References(x => x.Batch); References(x => x.Batch);
Results/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.1.213.0")] [assembly: AssemblyVersion("2.2.217.0")]
[assembly: AssemblyFileVersion("2.1.213.0")] [assembly: AssemblyFileVersion("2.2.217.0")]
TestBenchFramework/BenchControl/Sequences/MainSeq.cs
+2 -1
View File
@@ -382,7 +382,7 @@ namespace TBF.BenchControl.Sequences
if (UIFlowControl.Stop == WaitBeginFormClosed()) goto stop; if (UIFlowControl.Stop == WaitBeginFormClosed()) goto stop;
/// Open iPerlCommunicationForm /// 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 }); Program.MainWnd.Invoke(new iPerlCommFormDlgt(OpenIPerlCommForm), new object[] { this, simultWithPurgingCfg, simultWithPurgingTests, simultWithPurgingParams });
} }
@@ -708,6 +708,7 @@ namespace TBF.BenchControl.Sequences
if (simultWithEvacuationCount > 0) if (simultWithEvacuationCount > 0)
{ {
/// Open iPerlCommunicationForm /// Open iPerlCommunicationForm
ProcessData.RegisterReaders = StateMachine.GetMetersPath(simultWithEvacuationTests[0]).RegisterReaders;
Program.MainWnd.Invoke(new iPerlCommFormDlgt(OpenIPerlCommForm), new object[] { this, simultWithEvacuationCfg, simultWithEvacuationTests, simultWithEvacuationParams }); Program.MainWnd.Invoke(new iPerlCommFormDlgt(OpenIPerlCommForm), new object[] { this, simultWithEvacuationCfg, simultWithEvacuationTests, simultWithEvacuationParams });
} }
TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs
+18 -1
View File
@@ -782,6 +782,8 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
{ {
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; }
} }
Thread.Sleep(250);
} }
if (error == CommErr.None && (wm.ConfigStruct.TestModeConfig != testModeConfig)) if (error == CommErr.None && (wm.ConfigStruct.TestModeConfig != testModeConfig))
@@ -798,6 +800,8 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
break; break;
} }
} }
Thread.Sleep(250);
} }
if (error == CommErr.None) 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; } 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 /// 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 }; byte[] cmd = new byte[1] { (byte)6 };
for (int j = 0; j < cfg.MaxCommRetries; j++) 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) if (error == CommErr.None)
{ {
error = CommErr.Verify; 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 ClosePort(wm); /// Close RFID port
TestBenchFramework/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.1.215.1")] [assembly: AssemblyVersion("2.2.217.1")]
[assembly: AssemblyFileVersion("2.1.215.1")] [assembly: AssemblyFileVersion("2.2.217.1")]