From 9ed8603dfb9419047ecb6be55ba84803fe699dd7 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 19 Aug 2025 10:57:19 +0200 Subject: [PATCH] DCUpdate runs before download jsons and before sync. with ptu-filesystem. Show this in main-window. --- UpdatePTUDevCtrl/mainwindow.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/UpdatePTUDevCtrl/mainwindow.cpp b/UpdatePTUDevCtrl/mainwindow.cpp index fb2323e..d0acb4b 100644 --- a/UpdatePTUDevCtrl/mainwindow.cpp +++ b/UpdatePTUDevCtrl/mainwindow.cpp @@ -22,9 +22,9 @@ #define UPDATE_CUSTOMER_REPOSITORY 2 #define INSTALL_SW_PACKETS_DRY_RUN 3 #define INSTALL_SW_PACKETS 4 -#define INSTALL_DC_CONFIGURATION 5 +#define UPDATE_DC 5 #define SYNCHRONIZE_REPOSITORY 6 -#define UPDATE_DC 7 +#define INSTALL_DC_CONFIGURATION 7 #define CHECK_ISMAS_CONNECT_PERCENT_START ( 1) #define CHECK_ISMAS_CONNECT_PERCENT_END (10) @@ -41,14 +41,14 @@ #define UPDATE_OPKG_PERCENT_START (25) #define UPDATE_OPKG_PERCENT_END (40) -#define UPDATE_DOWNLOAD_JSON_START (40) -#define UPDATE_DOWNLOAD_JSON_END (49) +#define UPDATE_DOWNLOAD_DC_START (41) +#define UPDATE_DOWNLOAD_DC_END (80) -#define UPDATE_SYNC_START (49) -#define UPDATE_SYNC_END (50) +#define UPDATE_SYNC_START (81) +#define UPDATE_SYNC_END (90) -#define UPDATE_DOWNLOAD_DC_START (50) -#define UPDATE_DOWNLOAD_DC_END (100) +#define UPDATE_DOWNLOAD_JSON_START (91) +#define UPDATE_DOWNLOAD_JSON_END (100) void MainWindow::onFileChanged(QString const& /*f*/) { static int i = 30; @@ -84,9 +84,9 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent) m_updateSteps[UPDATE_CUSTOMER_REPOSITORY] = "Update customer repository "; m_updateSteps[INSTALL_SW_PACKETS_DRY_RUN] = "Install SW packets (dry run) "; m_updateSteps[INSTALL_SW_PACKETS] = "Install SW packets "; - m_updateSteps[INSTALL_DC_CONFIGURATION] = "Install DC configuration "; - m_updateSteps[SYNCHRONIZE_REPOSITORY] = "Synchronize repository/filesystem "; m_updateSteps[UPDATE_DC] = "Update DC "; + m_updateSteps[SYNCHRONIZE_REPOSITORY] = "Synchronize repository/filesystem "; + m_updateSteps[INSTALL_DC_CONFIGURATION] = "Install DC configuration "; QString text{}; for (int i = 0; i < m_updateSteps.size(); ++i) {