CalibFactor included in 'summaryResults', version 1.5.97.

This commit is contained in:
Milan Hanajik
2015-08-24 15:16:14 +02:00
parent d4399c23ca
commit da01b1fe61
5 changed files with 17 additions and 10 deletions
@@ -460,6 +460,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
tstRslt.Meters[i].Time = (float)(iPerl.TimestampSecEnd - iPerl.TimestampSecStart);
tstRslt.Meters[i].TimeStart = (float)iPerl.TimestampSecStart;
tstRslt.Meters[i].TimeEnd = (float)iPerl.TimestampSecEnd;
tstRslt.Meters[i].CalibFactor = (iPerl.CalibrationStruct != null) ? iPerl.CalibrationStruct.Calibration : 0;
}
else
{
@@ -816,7 +816,12 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
byte[] data = new byte[2] { (byte)(newCalibFactor & 0x00FF), (byte)((newCalibFactor >> 8) & 0x00FF) };
for (int j = 0; j < MaxCommRetries; j++)
{
if (0 == WriteRequestPort(wm.MuxBoardNr, MessageID.Calibration, 2, 2, data, CommTimeout)) { error = CommErr.None; break; }
if (0 == WriteRequestPort(wm.MuxBoardNr, MessageID.Calibration, 2, 2, data, CommTimeout))
{
error = CommErr.None;
wm.CalibrationStruct.Update(data, 2);
break;
}
}
if (error == CommErr.None)