diff --git a/TestBenchFramework/BenchControl/Elde/Diverter/Diverter.cs b/TestBenchFramework/BenchControl/Elde/Diverter/Diverter.cs index 2c8dea570..6c2239df0 100644 --- a/TestBenchFramework/BenchControl/Elde/Diverter/Diverter.cs +++ b/TestBenchFramework/BenchControl/Elde/Diverter/Diverter.cs @@ -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()); } diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 06bbbac6d..7ab0f28d5 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -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")]