From f9d2c43d57d56545e7497fcdb5b031b565775817 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Sat, 6 Sep 2014 18:30:13 +0200 Subject: [PATCH] - Tank empty threshold changed (increased) - Fixed a bug in SequenceBase.LtrPerRefPulse[] initialization --- .../BenchControl/Sequences/SequenceBase.cs | 2 +- TestBenchFramework/BenchControl/StateMachine.cs | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs index c377bf737..eafe05b5b 100644 --- a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs +++ b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs @@ -277,7 +277,7 @@ namespace TBF.BenchControl.Sequences } while (!e.Contains(Event.BalanceDone)); } - while (mass.Val > (Balance.Capacity / 100.0f + 20.0f)); + while (mass.Val > (Balance.Capacity / 40.0f + 20.0f)); quit_emptying: //-------------------------------- diff --git a/TestBenchFramework/BenchControl/StateMachine.cs b/TestBenchFramework/BenchControl/StateMachine.cs index ea5cdd1dd..42ef6cd27 100644 --- a/TestBenchFramework/BenchControl/StateMachine.cs +++ b/TestBenchFramework/BenchControl/StateMachine.cs @@ -475,12 +475,15 @@ namespace TBF.BenchControl try { - Sequences.SequenceBase.ReferenceFlowmetersCount = SequenceBase.FlowMeters.Count; - Sequences.SequenceBase.LtrPerRefPulse = new float[Sequences.SequenceBase.ReferenceFlowmetersCount]; + SequenceBase.ReferenceFlowmetersCount = SequenceBase.FlowMeters.Count; + SequenceBase.LtrPerRefPulse = new float[SequenceBase.ReferenceFlowmetersCount]; foreach (var flowmtr in SequenceBase.FlowMeters) { int ix = flowmtr.Position; - SequenceBase.LtrPerRefPulse[ix - 1] = flowmtr.NominalFlow / 7200.0f; + if (ix > 0 && ix <= SequenceBase.ReferenceFlowmetersCount) + { + SequenceBase.LtrPerRefPulse[ix - 1] = flowmtr.NominalFlow / 7200.0f; + } } (new Sequences.MainSeq()).Execute(null);