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

Milwaukee: TempCalibData = new float[16, 5], Diverters count bug fix, ver. 3.1.1688

Browse Source
This commit is contained in:
Milan Hanajik 2021-06-30 11:02:06 +02:00
parent 319cf0b8d4
commit 6f65f0085e
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TBF/BenchControl/Elde/ControlBoardDev.cs
View File

@ -101,7 +101,7 @@ namespace TBF.BenchControl.Elde
/// Initialization data updated by constructors of children components
/// and sent to 'controlCom2panel' by SendCalibData() method.
///
#if DEWA_300 || ROMA_200
#if DEWA_300 || ROMA_200 || MILWAUKEE
public float[,] TempCalibData = new float[16, 5];
#else
public float[,] TempCalibData = new float[8, 5];

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

@ -70,6 +70,23 @@ namespace TBF.BenchControl.Elde.Diverter
{
controlBoard.RegValveCalib[diverterCfg.AdcNr, 0] = (uint)diverterCfg.AdcValueToSink;
controlBoard.RegValveCalib[diverterCfg.AdcNr, 1] = (uint)diverterCfg.AdcValueToTank;
diverterNr0 = nextIdx++;
///
if (Diverters == null || Diverters.Length < nextIdx)
{
GenericDevices.IDiverter[] divertersSoFar = Diverters;
Diverters = new GenericDevices.IDiverter[nextIdx];
if (divertersSoFar != null)
{
for (int i = 0; i < divertersSoFar.Length; i++) Diverters[i] = divertersSoFar[i];
}
Diverters[nextIdx - 1] = this;
}
}
else
{
@ -86,23 +103,6 @@ namespace TBF.BenchControl.Elde.Diverter
switchTimeStart = new FloatBox(diverterCfg.DfltSwithTimeStartMs / 1000.0f);
switchTimeEnd = new FloatBox(diverterCfg.DfltSwithTimeEndMs / 1000.0f);
diverterNr0 = nextIdx++;
///
if (Diverters == null || Diverters.Length < nextIdx)
{
GenericDevices.IDiverter[] divertersSoFar = Diverters;
Diverters = new GenericDevices.IDiverter[nextIdx];
if (divertersSoFar != null)
{
for (int i = 0; i < divertersSoFar.Length; i++) Diverters[i] = divertersSoFar[i];
}
Diverters[nextIdx - 1] = this;
}
int divNrFromName;
if (!int.TryParse(Name.Substring(3), out divNrFromName))
{

4
TBF/Properties/AssemblyInfo.cs
View File

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