diff --git a/TBF/BenchControl/Output/SensusTestInfo.cs b/TBF/BenchControl/Output/SensusTestInfo.cs index a0bf00882..950e6256e 100644 --- a/TBF/BenchControl/Output/SensusTestInfo.cs +++ b/TBF/BenchControl/Output/SensusTestInfo.cs @@ -21,6 +21,7 @@ namespace TBF.BenchControl.Output Suez_EMP_DN20, /// EMP: 12 flow rates Suez_EMP_DN32, /// EMP: 12 flow rates Suez_EMP_DN40, /// EMP: 12 flow rates + Greece, /// Q3, Q2adj, Q2, Q1 Count, None, } @@ -368,6 +369,17 @@ namespace TBF.BenchControl.Output new SensusTestInfo("Q2ac_lr", 2, "Q2ac", 2, "02", 2, "Q2", Range.R100_110), new SensusTestInfo("Q1_lr", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110), }; + + case LogType.Greece: /// Q2adj (before correction) and Q2 (after correction) measured + return new SensusTestInfo[] + { + /// TBF Oracle DB Opto RAW LU logfiles + new SensusTestInfo("Adjustment", -1, "Just", -1, "-1", -1, "Just", Range.R95_105), + new SensusTestInfo("Q3", 4, "Q3", 4, "04", 4, "Q3", Range.R90_100), + new SensusTestInfo("Q2adj", 3, "Q2adj", 3, "03", 3,"Q2adj", Range.R100_110), + new SensusTestInfo("Q2", 2, "Q2", 2, "02", 2, "Q2", Range.R100_110), + new SensusTestInfo("Q1", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110), + }; } } diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs index 0f826ada2..900ae004b 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs @@ -48,20 +48,43 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication public partial class iPerlCommunicationForm : Form, GenericDevices.IHasCompleted { + private static readonly ILog log = LogManager.GetLogger(typeof(iPerlCommunicationForm)); + protected static readonly ILog rfidDataLogger = LogManager.GetLogger("RfidData"); + const int Hz2CorrFactorsAddr = 0x1875; /// Used by Reset2HzCorrection(...) and Write2HzCorrection(...) const int Q2CorrFactorsAddr = 0x1878; /// Used by ResetQ2Correction(...) and WriteQ2Correction(...) const int Q2CorrFactorsAddrLR = 0x1878; const int Q2CorrFactorsAddrRL = 0x1879; + public const string ReadConfigurationStr = "Read configuration"; /// Example: "Read configuration" or "Read configuration if enabled" + public const string SetTestModeStr = "Set Test mode"; /// Example: "Set Test mode" or "Set Test mode A0" (hexadecimal number is the required 'testModeConfig' + public const string SetActiveModeStr = "Set Active mode"; + public const string ReadCalibrationStr = "Read calibration"; + public const string ReadCalibrationV4Str = "Read calibration_V4"; + public const string WriteCalibrationFactorStr = "Write calibration factor"; + public const string WriteCalibrationV4FactorsStr = "Write calibration_V4"; + public const string NormalizeCalibrationFactorStr = "Normalize calibration factor"; + public const string NormalizeCalibrationV4FactorsStr = "Normalize calibration_V4"; + public const string ReadQ2CorrectionStr = "Read Q2 corrections"; + public const string ResetQ2CorrectionStr = "Reset Q2 correction"; + public const string InitOrReadQ2CorrectionStr = "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 Reset2HzCorrectionStr = "Reset 2Hz correction"; + public const string Write2HzCorrectionStr = "Write 2Hz correction"; + public static Color DisabledColor = Color.DarkGray; public static Color OptoAndDirOKColor = Color.Green; public static Color OptoNokColor = Color.Orange; public static Color DirNokColor = Color.Red; - private static readonly ILog log = LogManager.GetLogger(typeof(iPerlCommunicationForm)); - protected static readonly ILog rfidDataLogger = LogManager.GetLogger("RfidData"); -#region DLL_Interface + #region DLL_Interface [DllImport("libRfid1.dll", EntryPoint = "getDllVersion")] static extern unsafe int getDllVersion1(); [DllImport("libRfid1.dll", EntryPoint = "openPort")] static extern unsafe int openPort1(int comPort); @@ -254,29 +277,6 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication #endregion DLL_Interface - public const string ReadConfigurationStr = "Read configuration"; /// Example: "Read configuration" or "Read configuration if enabled" - public const string SetTestModeStr = "Set Test mode"; /// Example: "Set Test mode" or "Set Test mode A0" (hexadecimal number is the required 'testModeConfig' - public const string SetActiveModeStr = "Set Active mode"; - public const string ReadCalibrationStr = "Read calibration"; - public const string ReadCalibrationV4Str = "Read calibration_V4"; - public const string WriteCalibrationFactorStr = "Write calibration factor"; - public const string WriteCalibrationV4FactorsStr = "Write calibration_V4"; - public const string NormalizeCalibrationFactorStr = "Normalize calibration factor"; - public const string NormalizeCalibrationV4FactorsStr = "Normalize calibration_V4"; - public const string ReadQ2CorrectionStr = "Read Q2 corrections"; - public const string ResetQ2CorrectionStr = "Reset Q2 correction"; - public const string InitOrReadQ2CorrectionStr = "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 Reset2HzCorrectionStr = "Reset 2Hz correction"; - public const string Write2HzCorrectionStr = "Write 2Hz correction"; - - readonly bool checkBoxesEditMode; DateTime startTime; @@ -2047,7 +2047,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication return CommErr.None; } - q2CorrRL = (byte)((int)Math.Round(1.0 * q2Correction) & 0x000000FF); + q2CorrRL = (byte)((int)Math.Round(1.1 * q2Correction) & 0x000000FF); q2CorrLR = (byte)((int)Math.Round(0.5 * q2Correction) & 0x000000FF); } else if (q2CorrType == Q2CorrType.Dewa) @@ -2067,8 +2067,17 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication } else if (q2CorrType == Q2CorrType.Greece) { - q2CorrRL = (byte)((int)Math.Round(q2Correction) & 0x000000FF); - q2CorrLR = (byte)((int)Math.Round(q2Correction) & 0x000000FF); + /// + /// Process for Greece + /// + if (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); + q2CorrLR = (byte)((int)Math.Round(1.1 * q2Correction) & 0x000000FF); } else if (q2CorrType == Q2CorrType.RL) /// SUEZ { diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index b7d4a0cdc..10cde29de 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.18.1241.0")] -[assembly: AssemblyFileVersion("2.18.1241.0")] +[assembly: AssemblyVersion("2.18.1244.0")] +[assembly: AssemblyFileVersion("2.18.1244.0")]