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

Badger stredna trat : Flowmeter + diverter number when starting a test fixed, ver. 2.18.831

Browse Source
This commit is contained in:
Milan Hanajik 2018-03-09 12:25:58 +01:00
parent 4a7d14b01f
commit 4452b62cbd
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
TBF/BenchControl/Elde/Diverter/Diverter.cs
View File

@ -29,8 +29,8 @@ namespace TBF.BenchControl.Elde.Diverter
public static int[] DivStartingLevelPct;
public static int[] DivStoppingLevelPct;
protected int diverterNr; /// 0-based diverter number
readonly int diverterNr0; /// 0-based diverter number
public int DiverterNr { get { return diverterNr0 + 1; } } /// 1-based public diverter number
readonly DiverterCfg diverterCfg;
@ -64,7 +64,7 @@ namespace TBF.BenchControl.Elde.Diverter
diverterNr = nextIdx++;
diverterNr0 = nextIdx++;
///
if (Diverters == null || Diverters.Length < nextIdx)
{

4
TBF/BenchControl/Elde/StartMeasurementOp.cs
View File

@ -90,7 +90,7 @@ namespace TBF.BenchControl.Elde
if (outputPath.Diverter is Elde.Diverter.Diverter)
{
diverterNr = (outputPath.Diverter as Elde.Diverter.Diverter).AdcNr - 4;
diverterNr = (outputPath.Diverter as Elde.Diverter.Diverter).DiverterNr;
}
nominalFlow = outputPath.FlowMeter.NominalFlow;
@ -114,7 +114,7 @@ namespace TBF.BenchControl.Elde
#if TURA_IPERL || TURA_SPECIAL || BADGER_VELKA_TRAT || SLM_50
int flowMeterIdxAndDiv = flowMeterNr + 16 * diverterNr;
#elif BADGER_STREDNA_TRAT
int flowMeterIdxAndDiv = flowMeterNr + 8 * diverterNr;
int flowMeterIdxAndDiv = flowMeterNr + 8 * (diverterNr - 1);
#else
int flowMeterIdxAndDiv = flowMeterNr;
#endif

4
TBF/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.18.829.0")]
[assembly: AssemblyFileVersion("2.18.829.0")]
[assembly: AssemblyVersion("2.18.831.0")]
[assembly: AssemblyFileVersion("2.18.831.0")]