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

Diverter ADC calibration values used to initialize RegValveCalib[,] array, version 1.6.152.

Browse Source
This commit is contained in:
Milan Hanajik 2015-12-02 14:10:54 +01:00
parent d488f62648
commit c593ed903e
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
TestBenchFramework/BenchControl/Elde/Diverter/Diverter.cs
View File

@ -24,8 +24,8 @@ namespace TBF.BenchControl.Elde.Diverter
public static int DivertersCount { get { return nextIdx; } }
public static GenericDevices.IDiverter[] Diverters;
public static int[] DiverterLevelsPct;
///
protected int diverterNr; /// 0-based balance number
protected int diverterNr; /// 0-based diverter number
@ -62,8 +62,10 @@ namespace TBF.BenchControl.Elde.Diverter
{
GenericDevices.IDiverter[] divertersSoFar = Diverters;
int[] levelsSoFar = DiverterLevelsPct;
Diverters = new GenericDevices.IDiverter[nextIdx];
DiverterLevelsPct = new int[nextIdx];
if (divertersSoFar != null)
{
for (int i = 0; i < divertersSoFar.Length; i++)
@ -72,10 +74,18 @@ namespace TBF.BenchControl.Elde.Diverter
DiverterLevelsPct[i] = levelsSoFar[i];
}
}
Diverters[nextIdx - 1] = this;
DiverterLevelsPct[nextIdx - 1] = diverterCfg.StartingLevel;
}
/// Prepare arguments of SendCalibData()
if (diverterNr >= 0 && diverterNr < 3)
{
controlBoard.RegValveCalib[5 + diverterNr, 0] = (uint)diverterCfg.AdcValueToSink;
controlBoard.RegValveCalib[5 + diverterNr, 1] = (uint)diverterCfg.AdcValueToTank;
}
log.Debug(this.ToString());
}

4
TestBenchFramework/Properties/AssemblyInfo.cs
View File

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