From 57cf172d6519827d8caadfbd066cdf942fd077fa Mon Sep 17 00:00:00 2001 From: Roland Drabesch Date: Thu, 31 Aug 2023 09:43:34 +0200 Subject: [PATCH] Fixing Zerflow progressbar for magflux and move zeroflow into a task --- Common/CordonelPreadjustmentUi/CordonelPreadjustmentUi.csproj | 2 +- Common/CordonelPreadjustmentUi/MainForm.cs | 4 ++++ Common/Ui/GenesisToolBox/frmRegisterStore.cs | 2 +- Common/Ui/LegacyGenesisControl/ctlBatch.cs | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Common/CordonelPreadjustmentUi/CordonelPreadjustmentUi.csproj b/Common/CordonelPreadjustmentUi/CordonelPreadjustmentUi.csproj index 804b5946..f1dd9808 100644 --- a/Common/CordonelPreadjustmentUi/CordonelPreadjustmentUi.csproj +++ b/Common/CordonelPreadjustmentUi/CordonelPreadjustmentUi.csproj @@ -5,7 +5,7 @@ Debug AnyCPU {D0C8D887-ED52-40AB-A069-90BCE0E801E2} - Library + WinExe Properties Xylem.Common.Ui.CordonelPreadjustmentUi Xylem.Common.Ui.CordonelPreadjustmentUi diff --git a/Common/CordonelPreadjustmentUi/MainForm.cs b/Common/CordonelPreadjustmentUi/MainForm.cs index 9a3cbdfb..606d4408 100644 --- a/Common/CordonelPreadjustmentUi/MainForm.cs +++ b/Common/CordonelPreadjustmentUi/MainForm.cs @@ -58,6 +58,10 @@ namespace CordonelPreadjustmentUi nUD_Settings_Samplerate.Value = mainSettings.Samplerate; + + + + } private void tab_Maintab_Selected(object sender, TabControlEventArgs e) diff --git a/Common/Ui/GenesisToolBox/frmRegisterStore.cs b/Common/Ui/GenesisToolBox/frmRegisterStore.cs index 55eb7a29..fcaae403 100644 --- a/Common/Ui/GenesisToolBox/frmRegisterStore.cs +++ b/Common/Ui/GenesisToolBox/frmRegisterStore.cs @@ -432,7 +432,7 @@ namespace Xylem.Common.Ui.GenesisToolBox { Logger.Value.Error(ex, $"Slot #{slotNR} failed: {ex.Message}"); } - _currentGenesis.Login(); + _currentGenesis.Login("B507CC0978D6"); _currentPcbId = _currentGenesis.PcbId; diff --git a/Common/Ui/LegacyGenesisControl/ctlBatch.cs b/Common/Ui/LegacyGenesisControl/ctlBatch.cs index 0282814e..91660f2e 100644 --- a/Common/Ui/LegacyGenesisControl/ctlBatch.cs +++ b/Common/Ui/LegacyGenesisControl/ctlBatch.cs @@ -191,6 +191,7 @@ namespace XylemCommonUiLegacyGenCtl { // this loop calls the function and assigns the return states on success and error // remind backup state to avoid repeated execution and side effects + _logger.Info($"StateMachine has change from {_backupState} to {_currentState}"); _backupState = _currentState; switch (_currentState) {