diff --git a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs index c83e40ab0..0e74056ac 100644 --- a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs +++ b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs @@ -698,7 +698,8 @@ namespace TBF.BenchControl.Sequences float refPulsesPerLtr = 1.0f / outPath.FlowMeter.LtrPerPulseCorrected(refFlow.Val); /// [pulse/ltr] data.Volume = new FloatBox() { Name = "Volume", Format = "F1", Val = Formulas.VolumeFromPulses(data.RefPulses, refPulsesPerLtr) }; - for (int i = 0; i < Program.WMsCount; i++) + int count = Math.Min(Program.WMsCount, data.TestResult.Meters.Count); + for (int i = 0; i < count; i++) { if (sensPath.RegisterReaders[i] != null) { diff --git a/TestBenchFramework/BenchControl/StateMachine.cs b/TestBenchFramework/BenchControl/StateMachine.cs index 1fe39034c..0c51a5de0 100644 --- a/TestBenchFramework/BenchControl/StateMachine.cs +++ b/TestBenchFramework/BenchControl/StateMachine.cs @@ -408,7 +408,8 @@ namespace TBF.BenchControl } if (pmtrs != null) { - for (int i = 0; i < Program.WMsCount; i++) + int count = Math.Min(Program.WMsCount, pmtrs.RegisterReaders.Length); + for (int i = 0; i < count; i++) { if ((pmtrs.RegisterReaders[i] != null) && (pmtrs.RegisterReaders[i].Cfg.DebugLevel == Entities.DebugMode.DetectedOff)) diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs index bd7ddf6c4..4af0e89ca 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs @@ -261,7 +261,7 @@ namespace TBF.BenchControl.TestMethods.CombinedMeters string logstr = string.Format("E={0} f={1} q={2}", cBrd.EtPulses(0), cBrd.ReferenceFreq, cBrd.ReferenceFlow * outPath.FlowMeter.NominalFlow); - for (int i = 0; i < Program.WMsCount; i++) + for (int i = 0; i < (Program.WMsCount / 2) * 2; i++) { logstr += string.Format(" M{0}=({1},{2})", i + 1, WMRefPulses[i], WMPulses[i]); } diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs index fd48cb8b8..bb44f457e 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs @@ -459,7 +459,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection string logstr = string.Format("E={0} f={1} q={2}", cBrd.EtPulses(0), cBrd.ReferenceFreq, cBrd.ReferenceFlow * outPath.FlowMeter.NominalFlow); - for (int i = 0; i < Program.WMsCount; i++) + for (int i = 0; i < (Program.WMsCount / 2) * 2; i++) { logstr += string.Format(" M{0}=({1},{2})", i + 1, WMRefPulses[i], WMPulses[i]); } diff --git a/TestBenchFramework/Screens/MeasurementTabPageCtrl.cs b/TestBenchFramework/Screens/MeasurementTabPageCtrl.cs index d2894ba40..d73e19efe 100644 --- a/TestBenchFramework/Screens/MeasurementTabPageCtrl.cs +++ b/TestBenchFramework/Screens/MeasurementTabPageCtrl.cs @@ -148,7 +148,8 @@ namespace TBF.Screens { if (data.TestResult != null) { - for (int i = 0; i < Program.WMsCount; i++) + int count = Math.Min(Program.WMsCount, data.TestResult.Meters.Count); + for (int i = 0; i < count; i++) { measurementTbl1Col2.SetData(i, data.TestResult.Meters[i].VolumeMeter.ToString("F1")); measurementTbl1Col3.SetData(i, data.TestResult.Meters[i].VolumeErrorPct.ToString("F1"));