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

iPerlCommunication activity 'WriteDefaultQ2Corrections' modified.

Browse Source
This commit is contained in:
Milan Hanajik 2021-07-29 12:02:49 +02:00
parent 96a17b2d16
commit c4ca299ce2
3 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs
View File

@ -1865,7 +1865,41 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
}
else
{
return WriteQ2Corrections(threadId, ihead, wm, ref resultStr, 0, 0);
int q2corrRL;
int q2corrLR;
switch (ihead.MeterType)
{
case MeterType.DN15:
q2corrRL = cfg.DfltQ2c_15_rl;
q2corrLR = cfg.DfltQ2c_15_lr;
break;
case MeterType.DN20:
q2corrRL = cfg.DfltQ2c_20_rl;
q2corrLR = cfg.DfltQ2c_20_lr;
break;
case MeterType.DN25:
q2corrRL = cfg.DfltQ2c_25_63_rl;
q2corrLR = cfg.DfltQ2c_25_63_lr;
break;
case MeterType.DN25_Q3_10:
q2corrRL = cfg.DfltQ2c_25_10_rl;
q2corrLR = cfg.DfltQ2c_25_10_lr;
break;
case MeterType.DN32:
q2corrRL = cfg.DfltQ2c_32_rl;
q2corrLR = cfg.DfltQ2c_32_lr;
break;
case MeterType.DN40:
q2corrRL = cfg.DfltQ2c_40_rl;
q2corrLR = cfg.DfltQ2c_40_lr;
break;
default:
q2corrRL = 0;
q2corrLR = 0;
break;
}
return WriteQ2Corrections(threadId, ihead, wm, ref resultStr, q2corrLR, q2corrRL);
}
}

6
TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs
View File

@ -82,10 +82,6 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
{
IsQ2PreCorrectionCalculated = GetQ2PreCorrectionsOrBackups(cfg, wmType, out CalculatedQ2PreCorrectionLR, out CalculatedQ2PreCorrectionRL);
}
else
{
}
/// Generate test results
Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(test.Name, 0);
@ -101,7 +97,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
{
if (mtr.TestRslt == tstRslt)
{
mtr.Passed = IsQ2PreCorrectionCalculated;
mtr.Passed = !cfg.UseWebService || IsQ2PreCorrectionCalculated;
mtr.TestDone = true;
break;
}

1
TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs
View File

@ -38,6 +38,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication.iPerlHead
public int RfidComPortNr { get { return iperlHeadCfg.RfidComPortNr; } }
public int MuxBoardNrOrGroup14 { get { return iperlHeadCfg.MuxBoardNr; } }
public int Group { get { return iperlHeadCfg.Group; } }
public iPerlHead.MeterType MeterType { get { return iperlHeadCfg.MeterType; } }
public int Position
{