diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs index 0a1f33ff0..dfa62ffb0 100644 --- a/Results/Properties/AssemblyInfo.cs +++ b/Results/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.18.870.0")] -[assembly: AssemblyFileVersion("2.18.870.0")] +[assembly: AssemblyVersion("2.18.874.0")] +[assembly: AssemblyFileVersion("2.18.874.0")] diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs index a2bd78bbf..13c948b88 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs @@ -1197,7 +1197,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication { if (ihead.CommFailed) return CommErr.CommFailed; - if (ihead.CalibFactor <= 5000) + if (ihead.FactorLimitLo <= ihead.CalibFactor && ihead.CalibFactor <= ihead.FactorLimitHi) { resultStr = "Calibratin factor is OK"; return CommErr.None; /// No need to update the calibration factor @@ -1208,14 +1208,14 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication CommErr error = CommErr.Write; /// Determine the new calibration factor - UInt16 newCalibFactor = 0; + UInt16 newCalibFactor; switch (ihead.CalibrationStruct.MeterType) { - case MeterType.DN15: newCalibFactor = 2650; break; + case MeterType.DN15: newCalibFactor = 2710; break; case MeterType.DN20: newCalibFactor = 3746; break; case MeterType.DN25: newCalibFactor = 3300; break; case MeterType.DN32: newCalibFactor = 2500; break; - case MeterType.DN40: newCalibFactor = 3000; break; + case MeterType.DN40: newCalibFactor = 3080; break; case MeterType.DN26: case MeterType.CoaxManifold: diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 32de9f5ba..0d185e5bd 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.872.0")] -[assembly: AssemblyFileVersion("2.18.872.0")] +[assembly: AssemblyVersion("2.18.875.0")] +[assembly: AssemblyFileVersion("2.18.875.0")]