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

iPerlCommunicationForm bug fix, ver. 2.26.1542

Browse Source
This commit is contained in:
Milan Hanajik
2020-11-13 08:40:41 +01:00
parent 75f0cb2930
commit 5f5063663c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs
+3 -3
View File
@@ -864,7 +864,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
else if (currentActivity.ToLower().Contains(ConditnlUpdateQ2CorrectionsStr.ToLower())) error = WriteQ2Correction(threadID, ihead, wm, currentTest, ref resultStr, Q2CorrType.ConditionalUpdate, currentActivity.Substring(ConditnlUpdateQ2CorrectionsStr.Length).Trim()); else if (currentActivity.ToLower().Contains(ConditnlUpdateQ2CorrectionsStr.ToLower())) error = WriteQ2Correction(threadID, ihead, wm, currentTest, ref resultStr, Q2CorrType.ConditionalUpdate, currentActivity.Substring(ConditnlUpdateQ2CorrectionsStr.Length).Trim());
else if (currentActivity.ToLower() == Reset2HzCorrectionStr.ToLower()) error = Reset2HzCorrection(threadID, ihead, wm, ref resultStr); else if (currentActivity.ToLower() == Reset2HzCorrectionStr.ToLower()) error = Reset2HzCorrection(threadID, ihead, wm, ref resultStr);
else if (currentActivity.ToLower() == Write2HzCorrectionStr.ToLower()) error = Write2HzCorrection(threadID, ihead, wm, ref resultStr); else if (currentActivity.ToLower() == Write2HzCorrectionStr.ToLower()) error = Write2HzCorrection(threadID, ihead, wm, ref resultStr);
else if (currentActivity.ToLower() == GetDefaultQ2CorrectionsStr.ToLower()) error = GetQ2PreCorrectionsFormRest(threadID, ihead, wm, ref resultStr); else if (currentActivity.ToLower() == GetDefaultQ2CorrectionsStr.ToLower()) error = GetQ2PreCorrectionsFormRest(threadID, ihead, wm, ref resultStr);
#endif #endif
else else
@@ -892,7 +892,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
{ {
ihead.CommFailed = true; ihead.CommFailed = true;
if ((wm.ResultCode & (int)Results.Entities.ResultCode.RfidErrorCodeMask) == 0) if (wm != null && (wm.ResultCode & (int)Results.Entities.ResultCode.RfidErrorCodeMask) == 0)
{ {
wm.ResultCode |= (((int)error << 16) | ((int)tests[i].ItemNr << 20)); wm.ResultCode |= (((int)error << 16) | ((int)tests[i].ItemNr << 20));
} }
@@ -903,7 +903,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
{ {
ihead.CommFailed = true; ihead.CommFailed = true;
if ((wm.ResultCode & (int)Results.Entities.ResultCode.RfidErrorCodeMask) == 0) if (wm != null && (wm.ResultCode & (int)Results.Entities.ResultCode.RfidErrorCodeMask) == 0)
{ {
wm.ResultCode |= (((int)error << 16) | ((int)tests[i].ItemNr << 20)); wm.ResultCode |= (((int)error << 16) | ((int)tests[i].ItemNr << 20));
} }
TBF/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.26.1528.0")] [assembly: AssemblyVersion("2.26.1542.0")]
[assembly: AssemblyFileVersion("2.26.1528.0")] [assembly: AssemblyFileVersion("2.26.1542.0")]