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

Results from pressure and leak tests fixed for compound meters, version 1.5.124.

Browse Source
This commit is contained in:
Milan Hanajik 2015-09-25 10:15:46 +02:00
parent 786485f566
commit f2676993b1
3 changed files with 95 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs
View File

@ -303,6 +303,8 @@ namespace TBF.BenchControl.TestMethods.LeakTest
tstRslt.TimeDivEnd4 = 0;
tstRslt.TimeDivEnd5 = 0;
if (StateMachine.Procedure.MetersKind == Entities.MetersKind.Single)
{
for (int i = 0; i < Program.WMsCount; i++)
{
if (sensPath.RegisterReaders[i] != null)
@ -319,6 +321,45 @@ namespace TBF.BenchControl.TestMethods.LeakTest
tstRslt.Meters[i].Passed = true;
}
}
}
else
{
for (int iCmbnd = 0; iCmbnd < Program.CompoundWMsCount; iCmbnd++)
{
tstRslt.CombinedMeters[iCmbnd].VolumeRef = 0;
for (int i = 2 * iCmbnd; i < 2 * iCmbnd + 2; i++)
{
if (sensPath.RegisterReaders[i] == null || sensPath.RegisterReaders[i].PulsesPerLtr <= float.Epsilon)
{
tstRslt.Meters[i].PulsesPerLiter = 1.0f;
}
else
{
tstRslt.Meters[i].PulsesPerLiter = sensPath.RegisterReaders[i].PulsesPerLtr;
}
tstRslt.Meters[i].SerialNr = (WaterMeters.Count > i) ? WaterMeters[i].SerialNr : string.Empty;
tstRslt.Meters[i].VolumeStart = 0;
tstRslt.Meters[i].VolumeEnd = 0;
tstRslt.Meters[i].VolumeRef = 0;
tstRslt.Meters[i].VolumeMeter = 0;
tstRslt.Meters[i].Time = test.TstTime;
tstRslt.Meters[i].TimeStart = 0;
tstRslt.Meters[i].TimeEnd = testParams.DurationPMax;
tstRslt.Meters[i].PulsesMeter = 0;
tstRslt.Meters[i].PulsesMaster = 0;
tstRslt.Meters[i].VolumeErrorPct = 0;
tstRslt.Meters[i].Passed = true;
}
tstRslt.CombinedMeters[iCmbnd].VolumeMeter = 0;
tstRslt.CombinedMeters[iCmbnd].PulsesMaster = 0;
tstRslt.CombinedMeters[iCmbnd].Time = testParams.DurationPMax;
tstRslt.CombinedMeters[iCmbnd].VolumeErrorPct = 0;
tstRslt.CombinedMeters[iCmbnd].Passed = true;
}
}
/// Add data - end
AddOrOverwriteResult(tstRslt);
@ -358,5 +399,10 @@ namespace TBF.BenchControl.TestMethods.LeakTest
retList.Add(retVal);
return retList;
}
bool IsMainMtr(int i)
{
return (i % 2) == 0;
}
}
}

48
TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs
View File

@ -215,6 +215,8 @@ namespace TBF.BenchControl.TestMethods.PMaxTest
tstRslt.TimeDivEnd4 = 0;
tstRslt.TimeDivEnd5 = 0;
if (StateMachine.Procedure.MetersKind == Entities.MetersKind.Single)
{
for (int i = 0; i < Program.WMsCount; i++)
{
if (sensPath.RegisterReaders[i] != null)
@ -227,9 +229,48 @@ namespace TBF.BenchControl.TestMethods.PMaxTest
tstRslt.Meters[i].PulsesMeter = 0;
tstRslt.Meters[i].PulsesMaster = 0;
tstRslt.Meters[i].Time = testParams.DurationPMax;
tstRslt.Meters[i].VolumeErrorPct= 0;
tstRslt.Meters[i].VolumeErrorPct = 0;
tstRslt.Meters[i].Passed = true;
}
}
}
else
{
for (int iCmbnd = 0; iCmbnd < Program.CompoundWMsCount; iCmbnd++)
{
tstRslt.CombinedMeters[iCmbnd].VolumeRef = 0;
for (int i = 2 * iCmbnd; i < 2 * iCmbnd + 2; i++)
{
if (sensPath.RegisterReaders[i] == null || sensPath.RegisterReaders[i].PulsesPerLtr <= float.Epsilon)
{
tstRslt.Meters[i].PulsesPerLiter = 1.0f;
}
else
{
tstRslt.Meters[i].PulsesPerLiter = sensPath.RegisterReaders[i].PulsesPerLtr;
}
tstRslt.Meters[i].SerialNr = (WaterMeters.Count > i) ? WaterMeters[i].SerialNr : string.Empty;
tstRslt.Meters[i].VolumeStart = 0;
tstRslt.Meters[i].VolumeEnd = 0;
tstRslt.Meters[i].VolumeRef = 0;
tstRslt.Meters[i].VolumeMeter = 0;
tstRslt.Meters[i].Time = test.TstTime;
tstRslt.Meters[i].TimeStart = 0;
tstRslt.Meters[i].TimeEnd = testParams.DurationPMax;
tstRslt.Meters[i].PulsesMeter = 0;
tstRslt.Meters[i].PulsesMaster = 0;
tstRslt.Meters[i].VolumeErrorPct = 0;
tstRslt.Meters[i].Passed = true;
}
tstRslt.CombinedMeters[iCmbnd].VolumeMeter = 0;
tstRslt.CombinedMeters[iCmbnd].PulsesMaster = 0;
tstRslt.CombinedMeters[iCmbnd].Time = testParams.DurationPMax;
tstRslt.CombinedMeters[iCmbnd].VolumeErrorPct = 0;
tstRslt.CombinedMeters[iCmbnd].Passed = true;
}
}
/// Add data - end
@ -270,5 +311,10 @@ namespace TBF.BenchControl.TestMethods.PMaxTest
retList.Add(retVal);
return retList;
}
bool IsMainMtr(int i)
{
return (i % 2) == 0;
}
}
}

4
TestBenchFramework/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("1.5.123.1")]
[assembly: AssemblyFileVersion("1.5.123.1")]
[assembly: AssemblyVersion("1.5.124.1")]
[assembly: AssemblyFileVersion("1.5.124.1")]