diff --git a/TestBenchFramework/BenchControl/Elde/RegulValve/SetFlowOp.cs b/TestBenchFramework/BenchControl/Elde/RegulValve/SetFlowOp.cs index 7ba7cb185..837e4b041 100644 --- a/TestBenchFramework/BenchControl/Elde/RegulValve/SetFlowOp.cs +++ b/TestBenchFramework/BenchControl/Elde/RegulValve/SetFlowOp.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2017 Sensus Metering Systems /// using System; using System.Collections.Generic; @@ -103,8 +103,8 @@ namespace TBF.BenchControl.Elde.RegulValve nominalFlow = flowMeter.NominalFlow; - this.reqFlowLo = requiredFlowLo; - this.reqFlowHi = requiredFlowHi; + this.reqFlowLo = (3.0f * requiredFlowLo + requiredFlowHi) / 4.0f; + this.reqFlowHi = (3.0f * requiredFlowHi + requiredFlowLo) / 4.0f; this.reqFlowAve = (reqFlowLo + reqFlowHi) / 2.0f; this.pidCoef = pidCoef; this.measuredFlow = measuredFlow; diff --git a/TestBenchFramework/BenchControl/Elde/RegulValveCoax/SetFlowOp.cs b/TestBenchFramework/BenchControl/Elde/RegulValveCoax/SetFlowOp.cs index c3a84ee0a..a3a18b9cf 100644 --- a/TestBenchFramework/BenchControl/Elde/RegulValveCoax/SetFlowOp.cs +++ b/TestBenchFramework/BenchControl/Elde/RegulValveCoax/SetFlowOp.cs @@ -103,9 +103,9 @@ namespace TBF.BenchControl.Elde.RegulValveCoax nominalFlow = flowMeter.NominalFlow; - this.reqFlowLo = requiredFlowLo; - this.reqFlowHi = requiredFlowHi; - this.reqFlowAve = (reqFlowLo + reqFlowHi) / 2.0f; + this.reqFlowLo = (3.0f * requiredFlowLo + requiredFlowHi) / 4.0f; + this.reqFlowHi = (3.0f * requiredFlowHi + requiredFlowLo) / 4.0f; + this.reqFlowAve = (reqFlowLo + reqFlowHi) / 2.0f; this.pidCoef = pidCoef; this.measuredFlow = measuredFlow; this.reTryCommands = reTryCmds; diff --git a/TestBenchFramework/BenchControl/Elde/RegulValveTandem/SetFlowOp.cs b/TestBenchFramework/BenchControl/Elde/RegulValveTandem/SetFlowOp.cs index d32d08895..d7e7d9a0b 100644 --- a/TestBenchFramework/BenchControl/Elde/RegulValveTandem/SetFlowOp.cs +++ b/TestBenchFramework/BenchControl/Elde/RegulValveTandem/SetFlowOp.cs @@ -106,9 +106,9 @@ namespace TBF.BenchControl.Elde.RegulValveTandem nominalFlow = flowMeter.NominalFlow; - this.reqFlowLo = requiredFlowLo; - this.reqFlowHi = requiredFlowHi; - this.reqFlowAve = (reqFlowLo + reqFlowHi) / 2.0f; + this.reqFlowLo = (3.0f * requiredFlowLo + requiredFlowHi) / 4.0f; + this.reqFlowHi = (3.0f * requiredFlowHi + requiredFlowLo) / 4.0f; + this.reqFlowAve = (reqFlowLo + reqFlowHi) / 2.0f; this.pidCoef = pidCoef; this.measuredFlow = measuredFlow; diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index cdbb7ce74..cb2e36eac 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.17.699.1")] -[assembly: AssemblyFileVersion("2.17.699.1")] +[assembly: AssemblyVersion("2.17.700.1")] +[assembly: AssemblyFileVersion("2.17.700.1")]