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

Bug fix: padlo v Active mode na konci cyklu, ver.2.3.230.

Browse Source
This commit is contained in:
Milan Hanajik 2016-03-01 16:22:49 +01:00
parent 82cede65ef
commit d2493b0331
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs
View File

@ -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

4
TestBenchFramework/Properties/AssemblyInfo.cs
View File

@ -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")]