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

iPerl : Default calibration factors modified, ver. 2.18.875

Browse Source
This commit is contained in:
Milan Hanajik 2018-04-12 15:27:29 +02:00
parent d1f5bd8300
commit 441601bd42
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Results/Properties/AssemblyInfo.cs
View File

@ -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")]

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

@ -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:

4
TBF/Properties/AssemblyInfo.cs
View File

@ -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")]