From 6f65f0085e7927cd5cdde34325b1ecc0d60a24e6 Mon Sep 17 00:00:00 2001
From: Milan Hanajik <milan.hanajik@xyleminc.com>
Date: Wed, 30 Jun 2021 11:02:06 +0200
Subject: [PATCH] Milwaukee: TempCalibData = new float[16, 5], Diverters count
 bug fix, ver. 3.1.1688

---
 TBF/BenchControl/Elde/ControlBoardDev.cs   |  2 +-
 TBF/BenchControl/Elde/Diverter/Diverter.cs | 34 +++++++++++-----------
 TBF/Properties/AssemblyInfo.cs             |  4 +--
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/TBF/BenchControl/Elde/ControlBoardDev.cs b/TBF/BenchControl/Elde/ControlBoardDev.cs
index b3d5cfc6f..5ef8b28f5 100644
--- a/TBF/BenchControl/Elde/ControlBoardDev.cs
+++ b/TBF/BenchControl/Elde/ControlBoardDev.cs
@@ -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];
diff --git a/TBF/BenchControl/Elde/Diverter/Diverter.cs b/TBF/BenchControl/Elde/Diverter/Diverter.cs
index ae126eda3..5e1be1cae 100644
--- a/TBF/BenchControl/Elde/Diverter/Diverter.cs
+++ b/TBF/BenchControl/Elde/Diverter/Diverter.cs
@@ -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))
             {
diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index e72086064..e37104c94 100644
--- a/TBF/Properties/AssemblyInfo.cs
+++ b/TBF/Properties/AssemblyInfo.cs
@@ -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")]