From a83e648a2d3192a4897b570d4027d25f153a6c4d Mon Sep 17 00:00:00 2001
From: Thomas Wiedebusch <thomas.wiedebusch@t-wiedebusch.de>
Date: Thu, 1 Jun 2023 10:50:29 +0200
Subject: [PATCH 1/2] MagFlux: - Sort on read of calibPoints removed

---
 .../MagFlux/Protocols/RequestProtocol/RequestProtocol.cs         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Common/Hardware/WaterMeter/MagFlux/Protocols/RequestProtocol/RequestProtocol.cs b/Common/Hardware/WaterMeter/MagFlux/Protocols/RequestProtocol/RequestProtocol.cs
index ed396ef2..760851c5 100644
--- a/Common/Hardware/WaterMeter/MagFlux/Protocols/RequestProtocol/RequestProtocol.cs
+++ b/Common/Hardware/WaterMeter/MagFlux/Protocols/RequestProtocol/RequestProtocol.cs
@@ -258,7 +258,6 @@ namespace Xylem.Common.Hardware.WaterMeter.MagFlux.Protocols.RequestProtocol
             if (_magFluxRequestProtocol == null) return false;
             var retVal = _magFluxRequestProtocol.GetCalibrationPoints(out var calibrations);
             calibPoints = calibrations?.calibrations?.ToList();
-            calibPoints?.Sort();
             _logger.Debug(retVal ? $"{_ident} MagFlux calibration successfully read" : 
                 $"{_ident} MagFlux calibration read failed!");
             return retVal;

From 6c91248d0059883830e274a9415aa53b8ccfdfe0 Mon Sep 17 00:00:00 2001
From: Thomas Wiedebusch <thomas.wiedebusch@t-wiedebusch.de>
Date: Thu, 1 Jun 2023 10:57:41 +0200
Subject: [PATCH 2/2] MagFluxToolBox: - Download locked during execution

---
 Common/Ui/MagFluxToolBox/FrmTest.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Common/Ui/MagFluxToolBox/FrmTest.cs b/Common/Ui/MagFluxToolBox/FrmTest.cs
index 8d68ee12..26401072 100644
--- a/Common/Ui/MagFluxToolBox/FrmTest.cs
+++ b/Common/Ui/MagFluxToolBox/FrmTest.cs
@@ -8,7 +8,6 @@ using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using System.Xml.Serialization;
 using Xylem.Common.Hardware.WaterMeter.MagFlux.DataPackages.EventArguments;
 using Xylem.Common.Hardware.WaterMeter.MagFlux.MagFluxCore;
 using Xylem.Common.Hardware.WaterMeter.WaterMeterCore;
@@ -641,13 +640,16 @@ namespace Xylem.Common.Ui.MagFluxToolBox
         #region Buttons
         private void btnPrepareCalibration_Click(Object sender, EventArgs e)
         {
+            SetControlsDownloadIsOngoing();
             _magFluxMeter?.InitCalibration();
             btnAbortCalibration.Enabled = true;
             btnReadCalibration_Click(this, null);
+            SetControlsDownloadIsFinished();
         }
 
         private void btnReadCalibration_Click(Object sender, EventArgs e)
         {
+            SetControlsDownloadIsOngoing();
             var calibPoints = new List<CalibrationPoint>();
             _magFluxMeter?.ReadCalibration(out calibPoints);
             if (calibPoints == null) return;
@@ -663,10 +665,12 @@ namespace Xylem.Common.Ui.MagFluxToolBox
 
             _dataTableCalibPoints?.Clear();
             FillDataGridWithCalibInfos();
+            SetControlsDownloadIsFinished();
         }
 
         private void btnWriteCalibration_Click(Object sender, EventArgs e)
         {
+            SetControlsDownloadIsOngoing();
             if (_calibPointsCmPerH == null)
                 return;
             var calibPoints = new List<CalibrationPoint>();
@@ -682,6 +686,7 @@ namespace Xylem.Common.Ui.MagFluxToolBox
             }
 
             _magFluxMeter?.WriteCalibration(calibPoints);
+            SetControlsDownloadIsFinished();
         }
 
         private void btnAbortCalibration_Click(Object sender, EventArgs e)