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

Range of q2CorrRL and q2CorrLR limitted to -128 .. +127.

Browse Source
This commit is contained in:
Milan Hanajik 2023-10-18 17:13:54 +02:00
parent f0afcd57a2
commit 1c638b3f87
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs
View File

@ -2081,7 +2081,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
/// Do not forget to modify iPerlCommunicationSeq.MakeQ2CorrectedFrom(...) /// Do not forget to modify iPerlCommunicationSeq.MakeQ2CorrectedFrom(...)
/// ///
double errorTarget = (q3error * q2adjResult.Error < 0) ? (0.1 * q2adjResult.Error) : (-0.1 * q2adjResult.Error); double errorTarget = (q3error * q2adjResult.Error < 0) ? (0.1 * q2adjResult.Error) : (-0.1 * q2adjResult.Error);
q2CorrRL = Convert.ToInt32(ihead.CalculateQ2CorrectionFactor(q2adjResult, q2adjResult.Q2CorrRL, q2adjTestData.Qfrom, errorTarget)); q2CorrRL = Math.Max(-128, Math.Min(127, Convert.ToInt32(ihead.CalculateQ2CorrectionFactor(q2adjResult, q2adjResult.Q2CorrRL, q2adjTestData.Qfrom, errorTarget))));
} }
else if (q2CorrType == Q2CorrType.Dewa || else if (q2CorrType == Q2CorrType.Dewa ||
q2CorrType == Q2CorrType.Dewa_incl_05 || q2CorrType == Q2CorrType.Dewa_incl_05 ||
@ -2093,7 +2093,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
/// Do not forget to modify iPerlCommunicationSeq.MakeQ2CorrectedFrom(...) /// Do not forget to modify iPerlCommunicationSeq.MakeQ2CorrectedFrom(...)
/// ///
double errorTarget = (q3error * q2adjResult.Error < 0) ? (0.1 * q2adjResult.Error) : (-0.1 * q2adjResult.Error); double errorTarget = (q3error * q2adjResult.Error < 0) ? (0.1 * q2adjResult.Error) : (-0.1 * q2adjResult.Error);
q2CorrLR = Convert.ToInt32(ihead.CalculateQ2CorrectionFactor(q2adjResult, q2adjResult.Q2CorrLR, q2adjTestData.Qfrom, errorTarget)); q2CorrLR = Math.Max(-128, Math.Min(127, Convert.ToInt32(ihead.CalculateQ2CorrectionFactor(q2adjResult, q2adjResult.Q2CorrLR, q2adjTestData.Qfrom, errorTarget))));
} }
else if (q2CorrType == Q2CorrType.RL || else if (q2CorrType == Q2CorrType.RL ||
q2CorrType == Q2CorrType.RL_incl_05 || q2CorrType == Q2CorrType.RL_incl_05 ||
@ -2110,7 +2110,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
return CommErr.None; return CommErr.None;
} }
q2CorrRL = Convert.ToInt32(ihead.CalculateQ2CorrectionFactor(q2adjResult, q2adjResult.Q2CorrRL, q2adjTestData.Qfrom)); q2CorrRL = Math.Max(-128, Math.Min(127, Convert.ToInt32(ihead.CalculateQ2CorrectionFactor(q2adjResult, q2adjResult.Q2CorrRL, q2adjTestData.Qfrom))));
} }
else if (q2CorrType == Q2CorrType.LR || else if (q2CorrType == Q2CorrType.LR ||
q2CorrType == Q2CorrType.LR_incl_05 || q2CorrType == Q2CorrType.LR_incl_05 ||
@ -2127,7 +2127,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
return CommErr.None; return CommErr.None;
} }
q2CorrLR = Convert.ToInt32(ihead.CalculateQ2CorrectionFactor(q2adjResult, q2adjResult.Q2CorrLR, q2adjTestData.Qfrom)); q2CorrLR = Math.Max(-128, Math.Min(127, Convert.ToInt32(ihead.CalculateQ2CorrectionFactor(q2adjResult, q2adjResult.Q2CorrLR, q2adjTestData.Qfrom))));
} }
else if (q2CorrType == Q2CorrType.Update || q2CorrType == Q2CorrType.ConditionalUpdate) else if (q2CorrType == Q2CorrType.Update || q2CorrType == Q2CorrType.ConditionalUpdate)
{ {
@ -2136,8 +2136,8 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
/// Assuming the 2nd Q2 tests are done afterwards /// Assuming the 2nd Q2 tests are done afterwards
/// MakeQ2CorrectedFrom(...) is not used /// MakeQ2CorrectedFrom(...) is not used
/// ///
q2CorrRL = Convert.ToInt32(ihead.CalculateQ2CorrectionFactor(q2adjResult, q2adjResult.Q2CorrRL, q2adjTestData.Qfrom)); q2CorrRL = Math.Max(-128, Math.Min(127, Convert.ToInt32(ihead.CalculateQ2CorrectionFactor(q2adjResult, q2adjResult.Q2CorrRL, q2adjTestData.Qfrom))));
q2CorrLR = Convert.ToInt32(ihead.CalculateQ2CorrectionFactor(q2adjResult2, q2adjResult2.Q2CorrLR, q2adjTestData2.Qfrom)); q2CorrLR = Math.Max(-128, Math.Min(127, Convert.ToInt32(ihead.CalculateQ2CorrectionFactor(q2adjResult2, q2adjResult2.Q2CorrLR, q2adjTestData2.Qfrom))));
} }
else if (q2CorrType == Q2CorrType.Greece || q2CorrType == Q2CorrType.Greece_incl_05 || q2CorrType == Q2CorrType.UpdateBothQ2FactorsTestLRDir) else if (q2CorrType == Q2CorrType.Greece || q2CorrType == Q2CorrType.Greece_incl_05 || q2CorrType == Q2CorrType.UpdateBothQ2FactorsTestLRDir)
{ {
@ -2150,7 +2150,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
return CommErr.None; return CommErr.None;
} }
q2CorrLR = Convert.ToInt32(ihead.CalculateQ2CorrectionFactor(q2adjResult, q2adjResult.Q2CorrLR, q2adjTestData.Qfrom)); q2CorrLR = Math.Max(-128, Math.Min(127, Convert.ToInt32(ihead.CalculateQ2CorrectionFactor(q2adjResult, q2adjResult.Q2CorrLR, q2adjTestData.Qfrom))));
q2CorrRL = q2CorrLR; q2CorrRL = q2CorrLR;
} }
else if (q2CorrType == Q2CorrType.UpdateBothQ2FactorsTestRLDir) else if (q2CorrType == Q2CorrType.UpdateBothQ2FactorsTestRLDir)
@ -2159,7 +2159,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
/// Another strange process /// Another strange process
/// ///
double errorTarget = (q3error * q2adjResult.Error < 0) ? (0.1 * q2adjResult.Error) : (-0.1 * q2adjResult.Error); double errorTarget = (q3error * q2adjResult.Error < 0) ? (0.1 * q2adjResult.Error) : (-0.1 * q2adjResult.Error);
q2CorrRL = Convert.ToInt32(ihead.CalculateQ2CorrectionFactor(q2adjResult, q2adjResult.Q2CorrRL, q2adjTestData.Qfrom, errorTarget)); q2CorrRL = Math.Max(-128, Math.Min(127, Convert.ToInt32(ihead.CalculateQ2CorrectionFactor(q2adjResult, q2adjResult.Q2CorrRL, q2adjTestData.Qfrom, errorTarget))));
q2CorrLR = q2CorrRL; q2CorrLR = q2CorrRL;
} }