diff --git a/Results/Output/SensusTestInfo.cs b/Results/Output/SensusTestInfo.cs index a80bd6e58..205f115b7 100644 --- a/Results/Output/SensusTestInfo.cs +++ b/Results/Output/SensusTestInfo.cs @@ -9,10 +9,11 @@ namespace Results.Output { public enum LogType { - Just_Q3Q2Q1, /// pNrs = 3,2,1 - Just_Q3Q2Q1_Alt, /// pNrs = 5,2,1 - Just_Q3Q2adjQ1, /// pNrs = 3,2,1 - Just_Q3Q2adjQ1_Alt, /// pNrs = 5,2,1 + Just_Q3Q2Q1, /// pNrs = -1,3,2,1 + Just_Q3Q2Q1_Alt, /// pNrs = -1,5,2,1 + Just_Q3Q2adjQ1, /// pNrs = -1,3,2,1 + Just_Q3Q2adjQ1_Alt, /// pNrs = -1,5,2,1 + JustA0A4_Q3Q2adjQ1, /// pNrs = -2,-1,3,2,1 (Australia 169 MHz) DEWA, /// Q4, Q3, Q2adj, Q2, Q1 DEWA_wo_Q2, /// Q4, Q3, Q2adj, Q1 Suez, /// Two directions, with Q2 and Q2ac @@ -264,6 +265,18 @@ namespace Results.Output new SensusTestInfo("Q1", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110), }; + case LogType.JustA0A4_Q3Q2adjQ1: + return new SensusTestInfo[] + { + /// TBF Oracle DB Opto RAW LU logfiles + new SensusTestInfo("Q2adj", 0, "", 2, "02", 0, "", Range.R100_110), + new SensusTestInfo("Qjust_A0", -1, "Just", -1, "-1", -1, "Q-1", Range.R95_105), + new SensusTestInfo("Qjust_A4", -2, "Just", -2, "-2", -2, "Q-2", Range.R95_105), + new SensusTestInfo("Q3", 3, "Q3", 3, "03", 3, "Q3", Range.R90_100), + new SensusTestInfo("Q2", 2, "Q2", 0, "", 2, "Q2", Range.R100_110), + new SensusTestInfo("Q1", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110), + }; + case LogType.DEWA: /// DEWA (with Q4 and Q2 after correction) return new SensusTestInfo[] { diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs index 2a638478b..7fee447e8 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs @@ -70,13 +70,18 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication public const string ResetQ2CorrectionStr = "Reset Q2 correction"; public const string WriteDefaultQ2CorrectionsStr = "Write default Q2 corrections"; public const string InitOrReadQ2CorrectionsStr = "Init or read Q2 corrections"; - public const string WriteQ2CorrectionStr = "Write Q2 correction"; /// No arguments - public const string WriteQ2CorrectionAltStr = "Write Q2 correction Alt"; /// No arguments - public const string WriteQ2CorrectionGreeceStr = "Write Q2 correction Greece"; /// Arguments: test_name - public const string WriteQ2CorrectionRLStr = "Write Q2 correction R-L"; /// Arguments: test_name - public const string WriteQ2CorrectionLRStr = "Write Q2 correction L-R"; /// Arguments: test_name - public const string UpdateQ2CorrectionsStr = "Update Q2 corrections"; /// Arguments: R-L_test_name L-R_test_name - public const string ConditnlUpdateQ2CorrectionsStr = "Conditional update of Q2 corrections"; /// Arguments: R-L_test_name L-R_test_name + public const string WriteQ2CorrectionStr = "Write Q2 correction"; /// No arguments + public const string WriteQ2CorrectionAltStr = "Write Q2 correction Alt"; /// No arguments + public const string WriteQ2CorrectionGreeceStr = "Write Q2 correction Greece"; /// Arguments: test_name + public const string WriteQ2CorrectionRLStr = "Write Q2 correction R-L"; /// Arguments: test_name + public const string WriteQ2CorrectionLRStr = "Write Q2 correction L-R"; /// Arguments: test_name + public const string WriteQ2CorrectionIncl05Str = "Write_Q2_correction_incl.-0,5..0,5%"; /// No arguments + public const string WriteQ2CorrectionAltIncl05Str = "Write_Q2_correction_Alt_incl.-0,5..0,5%"; /// No arguments + public const string WriteQ2CorrectionGreeceIncl05Str = "Write_Q2_correction_Greece_incl.-0,5..0,5%"; /// Arguments: test_name + public const string WriteQ2CorrectionRLIncl05Str = "Write_Q2_correction_R-L_incl.-0,5..0,5%"; /// Arguments: test_name + public const string WriteQ2CorrectionLRIncl05Str = "Write_Q2_correction_L-R_incl.-0,5..0,5%"; /// Arguments: test_name + public const string UpdateQ2CorrectionsStr = "Update Q2 corrections"; /// Arguments: R-L_test_name L-R_test_name + public const string ConditnlUpdateQ2CorrectionsStr = "Conditional update of Q2 corrections"; /// Arguments: R-L_test_name L-R_test_name public const string Reset2HzCorrectionStr = "Reset 2Hz correction"; public const string Write2HzCorrectionStr = "Write 2Hz correction"; @@ -860,6 +865,11 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication else if (currentActivity.ToLower().Contains(WriteQ2CorrectionGreeceStr.ToLower())) error = WriteQ2Correction(threadID, ihead, wm, currentTest, ref resultStr, Q2CorrType.Greece, currentActivity.Substring(WriteQ2CorrectionGreeceStr.Length).Trim()); else if (currentActivity.ToLower().Contains(WriteQ2CorrectionRLStr.ToLower())) error = WriteQ2Correction(threadID, ihead, wm, currentTest, ref resultStr, Q2CorrType.RL, currentActivity.Substring(WriteQ2CorrectionRLStr.Length).Trim()); else if (currentActivity.ToLower().Contains(WriteQ2CorrectionLRStr.ToLower())) error = WriteQ2Correction(threadID, ihead, wm, currentTest, ref resultStr, Q2CorrType.LR, currentActivity.Substring(WriteQ2CorrectionLRStr.Length).Trim()); + else if (currentActivity.ToLower() == WriteQ2CorrectionIncl05Str.ToLower()) error = WriteQ2Correction(threadID, ihead, wm, currentTest, ref resultStr, Q2CorrType.Standard_incl_05, null); + else if (currentActivity.ToLower() == WriteQ2CorrectionAltIncl05Str.ToLower()) error = WriteQ2Correction(threadID, ihead, wm, currentTest, ref resultStr, Q2CorrType.Dewa_incl_05, null); + else if (currentActivity.ToLower().Contains(WriteQ2CorrectionGreeceIncl05Str.ToLower()))error = WriteQ2Correction(threadID, ihead, wm, currentTest, ref resultStr, Q2CorrType.Greece_incl_05, currentActivity.Substring(WriteQ2CorrectionGreeceIncl05Str.Length).Trim()); + else if (currentActivity.ToLower().Contains(WriteQ2CorrectionRLIncl05Str.ToLower())) error = WriteQ2Correction(threadID, ihead, wm, currentTest, ref resultStr, Q2CorrType.RL_incl_05, currentActivity.Substring(WriteQ2CorrectionRLIncl05Str.Length).Trim()); + else if (currentActivity.ToLower().Contains(WriteQ2CorrectionLRIncl05Str.ToLower())) error = WriteQ2Correction(threadID, ihead, wm, currentTest, ref resultStr, Q2CorrType.LR_incl_05, currentActivity.Substring(WriteQ2CorrectionLRIncl05Str.Length).Trim()); else if (currentActivity.ToLower().Contains(UpdateQ2CorrectionsStr.ToLower())) error = WriteQ2Correction(threadID, ihead, wm, currentTest, ref resultStr, Q2CorrType.Update, currentActivity.Substring(UpdateQ2CorrectionsStr.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); @@ -2223,12 +2233,12 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication Byte q2CorrRL = 0; Byte q2CorrLR = 0; /// - if (q2CorrType == Q2CorrType.Standard) + if (q2CorrType == Q2CorrType.Standard || q2CorrType == Q2CorrType.Standard_incl_05) { /// /// Standard process /// - if (Math.Abs(q2adjResult.Error - ihead.CalibTargetQ2) <= 0.5) + if (q2CorrType == Q2CorrType.Standard && Math.Abs(q2adjResult.Error - ihead.CalibTargetQ2) <= 0.5) { resultStr = string.Format("Q2 correction = 0 (writing bypassed)"); return CommErr.None; @@ -2237,12 +2247,12 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication q2CorrRL = (byte)((int)Math.Round(1.1 * q2Correction) & 0x000000FF); q2CorrLR = (byte)((int)Math.Round(0.5 * q2Correction) & 0x000000FF); } - else if (q2CorrType == Q2CorrType.Dewa) + else if (q2CorrType == Q2CorrType.Dewa || q2CorrType == Q2CorrType.Dewa_incl_05) { /// /// Process for DEWA /// - if (Math.Abs(q2adjResult.Error - ihead.CalibTargetQ2) <= 0.5) + if (q2CorrType == Q2CorrType.Dewa && Math.Abs(q2adjResult.Error - ihead.CalibTargetQ2) <= 0.5) { resultStr = string.Format("Q2 correction = 0 (writing bypassed)"); return CommErr.None; @@ -2252,23 +2262,23 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication q2CorrRL = (byte)((int)Math.Round(1.1 * q2Correction) & 0x000000FF); q2CorrLR = (byte)((int)Math.Round(1.1 * q2Correction) & 0x000000FF); } - else if (q2CorrType == Q2CorrType.Greece) + else if (q2CorrType == Q2CorrType.Greece || q2CorrType == Q2CorrType.Greece_incl_05) { /// /// Process for Greece /// - if (Math.Abs(q2adjResult.Error - ihead.CalibTargetQ2) <= 0.5) + if (q2CorrType == Q2CorrType.Greece && Math.Abs(q2adjResult.Error - ihead.CalibTargetQ2) <= 0.5) { resultStr = string.Format("Q2 correction = 0 (writing bypassed)"); return CommErr.None; } - q2CorrRL = (byte)((int)Math.Round(2.2 * q2Correction) & 0x000000FF); + q2CorrRL = (byte)((int)Math.Round(2.0 * q2Correction) & 0x000000FF); q2CorrLR = (byte)((int)Math.Round(1.1 * q2Correction) & 0x000000FF); } - else if (q2CorrType == Q2CorrType.RL) /// SUEZ + else if (q2CorrType == Q2CorrType.RL || q2CorrType == Q2CorrType.RL_incl_05) /// SUEZ RL only { - if (Math.Abs(q2adjResult.Error - ihead.CalibTargetQ2) <= 0.5) + if (q2CorrType == Q2CorrType.RL && Math.Abs(q2adjResult.Error - ihead.CalibTargetQ2) <= 0.5) { resultStr = string.Format("Q2 correction = 0 (writing bypassed)"); return CommErr.None; @@ -2276,9 +2286,9 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication q2CorrRL = (byte)((int)Math.Round(q2Correction) & 0x000000FF); } - else if (q2CorrType == Q2CorrType.LR) /// SUEZ + else if (q2CorrType == Q2CorrType.LR || q2CorrType == Q2CorrType.LR_incl_05) /// SUEZ LR only { - if (Math.Abs(q2adjResult.Error - ihead.CalibTargetQ2) <= 0.5) + if (q2CorrType == Q2CorrType.LR && Math.Abs(q2adjResult.Error - ihead.CalibTargetQ2) <= 0.5) { resultStr = string.Format("Q2 correction = 0 (writing bypassed)"); return CommErr.None; diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationParams.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationParams.cs index 5374ef622..d07713e6c 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationParams.cs +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationParams.cs @@ -63,6 +63,11 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication retVal.Add(iPerlCommunicationForm.WriteQ2CorrectionGreeceStr); retVal.Add(iPerlCommunicationForm.WriteQ2CorrectionRLStr); retVal.Add(iPerlCommunicationForm.WriteQ2CorrectionLRStr); + retVal.Add(iPerlCommunicationForm.WriteQ2CorrectionIncl05Str); + retVal.Add(iPerlCommunicationForm.WriteQ2CorrectionAltIncl05Str); + retVal.Add(iPerlCommunicationForm.WriteQ2CorrectionGreeceIncl05Str); + retVal.Add(iPerlCommunicationForm.WriteQ2CorrectionRLIncl05Str); + retVal.Add(iPerlCommunicationForm.WriteQ2CorrectionLRIncl05Str); retVal.Add(iPerlCommunicationForm.UpdateQ2CorrectionsStr); retVal.Add(iPerlCommunicationForm.ConditnlUpdateQ2CorrectionsStr); retVal.Add("Q2 corrected from Q2adj"); diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlEnums.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlEnums.cs index eb18dbcad..0c499e251 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlEnums.cs +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlEnums.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2017-2019 Sensus Slovensko a.s. +/// Copyright (c) 2017-2020 Sensus Slovensko a.s. /// using System; using System.Collections.Generic; @@ -16,6 +16,11 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication Greece, RL, LR, + Standard_incl_05, + Dewa_incl_05, + Greece_incl_05, + RL_incl_05, + LR_incl_05, Update, ConditionalUpdate, Count, diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index d9e2b4d2a..1c649e12a 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.26.1545.0")] -[assembly: AssemblyFileVersion("2.26.1545.0")] +[assembly: AssemblyVersion("2.26.1549.0")] +[assembly: AssemblyFileVersion("2.26.1549.0")]