From 9a42e199e33688c59627a6f32fbf8eba1766d7f3 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Fri, 29 Apr 2022 15:36:45 +0200 Subject: [PATCH] Uni.FlyingStartStopTestOp bug fix, ver. 3.1.1899 --- TBF/Properties/AssemblyInfo.cs | 6 +++--- TBF/Rig/ControlBoard/Uni/FlyingStartStopTestOp.cs | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index ddabd33ea..3ddce6cbe 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Sensus")] [assembly: AssemblyProduct("TestBenchFramework")] -[assembly: AssemblyCopyright("Copyright © 2013 - 2021 Sensus Slovensko, a.s.")] +[assembly: AssemblyCopyright("Copyright © 2013 - 2022 Sensus Slovensko, a.s.")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("3.1.1898.0")] -[assembly: AssemblyFileVersion("3.1.1898.0")] +[assembly: AssemblyVersion("3.1.1899.0")] +[assembly: AssemblyFileVersion("3.1.1899.0")] diff --git a/TBF/Rig/ControlBoard/Uni/FlyingStartStopTestOp.cs b/TBF/Rig/ControlBoard/Uni/FlyingStartStopTestOp.cs index 2c4a6d9eb..4a159482a 100644 --- a/TBF/Rig/ControlBoard/Uni/FlyingStartStopTestOp.cs +++ b/TBF/Rig/ControlBoard/Uni/FlyingStartStopTestOp.cs @@ -24,7 +24,7 @@ namespace TBF.Rig.ControlBoard.Uni readonly Statistics divStartPlotter; readonly Statistics divStopPlotter; readonly TBF.Rig.Uni.RegValve.RegValve regV; - readonly TBF.Rig.Uni.FlowMeter.FlowMeter flowMeter; + readonly TBF.Rig.GenericDevices.IFlowMeter flowMeter; readonly TBF.Rig.Uni.Diverter.Diverter diverter; /// @@ -63,7 +63,7 @@ namespace TBF.Rig.ControlBoard.Uni this.divStartPlotter = divStartPlotter; this.divStopPlotter = divStopPlotter; - flowMeter = devices.FlowMeter as TBF.Rig.Uni.FlowMeter.FlowMeter; + flowMeter = devices.FlowMeter; if (flowMeter == null) throw new ArgumentNullException("Invalid flow meter"); regV = devices.RegValve as TBF.Rig.Uni.RegValve.RegValve; @@ -144,8 +144,8 @@ namespace TBF.Rig.ControlBoard.Uni double reqFlowLo = (0.7 * qFrom) + (0.3 * reqFlowAve); /// Move the lower limit 15% of the range up double reqFlowHi = (0.7 * qTo) + (0.3 * reqFlowAve); /// Move the upper limit 15% of the range down /// - uniCB.SetFlow(false, regV.Idx1, 2000 * reqFlowLo / flowMeter.NominalFlow, - 2000 * reqFlowHi / flowMeter.NominalFlow); + uniCB.SetFlow(false, regV.Idx1, flowMeter.NominalFreq * reqFlowLo / flowMeter.NominalFlow, + flowMeter.NominalFreq * reqFlowHi / flowMeter.NominalFlow); if (readDivTransition) { /// Schedule reading diverter transition data