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

Uni.FlyingStartStopTestOp bug fix, ver. 3.1.1899

Browse Source
This commit is contained in:
Milan Hanajik
2022-04-29 15:36:45 +02:00
parent e3bb64ef0f
commit 9a42e199e3
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/Properties/AssemblyInfo.cs
+3 -3
View File
@@ -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")]
TBF/Rig/ControlBoard/Uni/FlyingStartStopTestOp.cs
+4 -4
View File
@@ -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;
/// <summary>
@@ -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