Set version to 1.3.4.

of the main window ("update status").
Use insertPlainText() when adding to the text edit to simplify code.

OnDemandUpdatePTU.pro

@@ -15,7 +15,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
 # In order to do so, uncomment the following line.
 # You can also select to disable deprecated APIs only up to a certain version of Qt.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-VERSION=1.0.0
+VERSION=1.3.4
 
 INCLUDEPATH += plugins
 
@@ -78,6 +78,7 @@ contains( CONFIG, DesktopLinux ) {
 SOURCES += \
         main.cpp \
         progress_event.cpp \
+        update_dc_event.cpp \
         mainwindow.cpp \
         utils.cpp \
         update.cpp \
@@ -91,6 +92,7 @@ SOURCES += \
 HEADERS += \
         update.h \
         progress_event.h \
+        update_dc_event.h \
         utils.h \
         mainwindow.h \
         git/git_client.h \

git/git_client.cpp

@@ -114,6 +114,55 @@ bool GitClient::gitCloneAndCheckoutBranch() {
     return false;
 }
 
+QStringList GitClient::gitShowReason() {
+    QStringList lst;
+    if (QDir(m_customerRepository).exists()) {
+        // %h: commit (short form)
+        // %s: commit message
+        // %cI: commit date, strict ISO 8601 format
+        // Note: use master branch. By convention, there is a ChangeLog file
+        // in the root of the repository, which has to be always the last file
+        // to be checked in when the customer repository somehow changed.
+        Command c("git show origin/master -s --format=\"c=%h m=%s d=%cI\"");
+        if (c.execute(m_customerRepository)) {
+            QString const s = c.getCommandResult().trimmed();
+            int const c = s.indexOf("c=");
+            int const m = s.indexOf("m=");
+            int const d = s.indexOf("d=");
+
+            QString msg = IsmasClient::getReasonForLastSendVersion();
+            QString commit{""}, date{""};
+
+            if (c != -1) {
+                int start = c + 2;
+                if (m >= start) {
+                    int length = m - start;
+                    commit = s.mid(start, length).trimmed();
+
+                    start = m + 2;
+                    if (d >= start) {
+                        length = d - start;
+                        msg += " (";
+                        msg = s.mid(start, length).trimmed();
+                        msg += ")";
+
+                        start = d + 2;
+                        date = s.mid(start);
+                    }
+                }
+
+                if (!commit.isEmpty() && !msg.isEmpty() && !date.isEmpty()) {
+                    lst << commit << msg << date;
+                }
+            }
+        }
+    } else {
+        qCritical() << "CUSTOMER_REPOSITORY" << m_customerRepository
+                    << "DOES NOT EXIST";
+    }
+    return lst;
+}
+
 /*
  Zu beachten: wird eine datei neu hinzugefuegt (git add/commit) dann aber gleich
  wieder geloscht, so wird sie im diff nicht angezeigt.
@@ -289,7 +338,7 @@ QString GitClient::gitBlob(QString fileName) {
     if (fi.exists()) {
         QString const gitCommand = QString("git hash-object %1").arg(fileName);
         Command c(gitCommand);
-        if (c.execute(m_workingDirectory)) {
+        if (c.execute("/tmp")) {
             return c.getCommandResult().trimmed();
         }
     }

git/git_client.h

@@ -50,7 +50,8 @@ class GitClient : public QObject {
     std::optional<QStringList> gitMerge();
 
     QString gitLastCommit(QString fileName);
-    QString gitBlob(QString fileName);
+    QStringList gitShowReason();
+    static QString gitBlob(QString fileName);
     QString gitCommitForBlob(QString blob);
     bool gitIsFileTracked(QString file2name);
 };

ismas/ismas_client.cpp

@@ -1,4 +1,5 @@
 #include "ismas/ismas_client.h"
+#include "utils.h"
 
 #include <cstring>
 #include <cstdio>
@@ -137,7 +138,12 @@ IsmasClient::sendRequestReceiveResponse(int port, QString const &request) {
     so_linger.l_onoff = 1;
     so_linger.l_linger = 0;
 
+    int maxfdp1;
+    fd_set rset;
+    fd_set wset;
+
     setsockopt(sockfd, SOL_SOCKET, SO_LINGER, &so_linger, sizeof(so_linger));
+    // no reliable, but does not harm, as we use select() as well
     setsockopt(sockfd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
     setsockopt(sockfd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
     int flag = 1;
@@ -151,24 +157,56 @@ IsmasClient::sendRequestReceiveResponse(int port, QString const &request) {
     int loop = 0;
     int bytesWritten = 0;
     while (bytesWritten < bytesToWrite) {
-        int n = ::sendto(sockfd, buf+bytesWritten, bytesToWrite-bytesWritten, 0, NULL, 0);
-        if (n >= 0) {
-            bytesWritten += n;
-        } else {
-            if (errno == EWOULDBLOCK) {
-                if (++loop < 10) {
-                    QThread::msleep(500);
-                    continue;
-                }
-                printErrorMessage(port, clientIP, clientPort,
-                    QString("WRITE TIMEOUT %1(").arg(loop) + strerror(errno) + ")");
-                ::close(sockfd);
-                return std::nullopt;
-            } else
+        errno = 0;
+        FD_ZERO(&wset);
+        FD_SET(sockfd, &wset);
+        maxfdp1 = sockfd + 1;
+        tv.tv_sec = 60;  /* 60 secs timeout for read and write -> APISM cuts the connection after 30s */
+        tv.tv_usec = 0;
+
+        int const w = select(maxfdp1, NULL, &wset, NULL, &tv);
+        if (w < 0) { // error
             if (errno == EINTR) {
                 printErrorMessage(port, clientIP, clientPort,
-                    QString("WRITE INTERRUPTED BY SIGNAL (1) (") + strerror(errno) + ")");
+                    QString("INTERRUPTED BY SIGNAL (1) (") + strerror(errno) + ")");
                 continue;
+            } else {
+                printErrorMessage(port, clientIP, clientPort,
+                        QString("SELECT-ERROR (WRITE) %1(").arg(loop) + strerror(errno) + ")");
+                ::close(sockfd);
+                return std::nullopt;
+            }
+        } else
+        if (w == 0) { // timeout
+            printErrorMessage(port, clientIP, clientPort,
+                    QString("SELECT-TIMEOUT (WRITE) %1(").arg(loop) + strerror(errno) + ")");
+            if (++loop < 10) {
+                QThread::msleep(500);
+                continue;
+            }
+            ::close(sockfd);
+            return std::nullopt;
+        } else
+        if (w > 0) {
+            int n = ::sendto(sockfd, buf+bytesWritten, bytesToWrite-bytesWritten, 0, NULL, 0);
+            if (n >= 0) {
+                bytesWritten += n;
+            } else {
+                if (errno == EWOULDBLOCK) {
+                    if (++loop < 10) {
+                        QThread::msleep(500);
+                        continue;
+                    }
+                    printErrorMessage(port, clientIP, clientPort,
+                        QString("WRITE TIMEOUT %1(").arg(loop) + strerror(errno) + ")");
+                    ::close(sockfd);
+                    return std::nullopt;
+                } else
+                if (errno == EINTR) {
+                    printErrorMessage(port, clientIP, clientPort,
+                        QString("WRITE INTERRUPTED BY SIGNAL (1) (") + strerror(errno) + ")");
+                    continue;
+                }
             }
         }
     }
@@ -180,7 +218,7 @@ IsmasClient::sendRequestReceiveResponse(int port, QString const &request) {
     //        QString("CANNOT CLOSE WRITING END (") + strerror(errno) + ")");
     // }
 
-    printInfoMessage(port, clientIP, clientPort, QString("MESSAGE SENT ") + buf);
+    printInfoMessage(port, clientIP, clientPort, QString("MESSAGE SENT <<<") + buf + ">>>");
 
     loop = 0;
     bzero(buf, sizeof(buf));
@@ -188,33 +226,69 @@ IsmasClient::sendRequestReceiveResponse(int port, QString const &request) {
     int bytesRead = 0;
     while (bytesRead < bytesToRead) {
         errno = 0;
-        int n = ::recvfrom(sockfd, buf+bytesRead, bytesToRead-bytesRead,
-                           0, NULL, NULL);
-        if (n > 0) { //
-            bytesRead += n;
-        } else
-        if (n == 0) {
-            // The return value will be 0 when the peer has performed an orderly shutdown.
-            printErrorMessage(port, clientIP, clientPort,
-                QString("PEER CLOSED CONNECTION (") + strerror(errno) + ")");
-            ::close(sockfd);
-            return std::nullopt;
-        } else
-        if (n < 0) {
-            if (errno == EWOULDBLOCK) {
-                if (++loop < 10) {
-                    QThread::msleep(500);
-                    continue;
-                }
-                printErrorMessage(port, clientIP, clientPort,
-                        QString("READ TIMEOUT %1(").arg(loop) + strerror(errno) + ")");
-                ::close(sockfd);
-                return std::nullopt;
-            }
+        FD_ZERO(&rset);
+        FD_SET(sockfd, &rset);
+        maxfdp1 = sockfd + 1;
+        tv.tv_sec = 60;  /* 60 secs timeout for read and write */
+        tv.tv_usec = 0;
+
+        QString const selectStart = QDateTime::currentDateTime().toString(Qt::ISODateWithMs);
+
+        int const r = select(maxfdp1, &rset, NULL, NULL, &tv);
+        if (r < 0) { // error
             if (errno == EINTR) {
                 printErrorMessage(port, clientIP, clientPort,
                     QString("INTERRUPTED BY SIGNAL (2) (") + strerror(errno) + ")");
                 continue;
+            } else {
+                printErrorMessage(port, clientIP, clientPort,
+                        QString("SELECT-ERROR (READ) %1(").arg(loop) + strerror(errno) + ")");
+                ::close(sockfd);
+                return std::nullopt;
+            }
+        } else
+        if (r == 0) { // timeout
+            printErrorMessage(port, clientIP, clientPort,
+                    QString("SELECT-TIMEOUT (READ) %1(").arg(loop) + strerror(errno) + ")");
+            if (++loop < 10) {
+                QThread::msleep(500);
+                continue;
+            }
+            ::close(sockfd);
+            return std::nullopt;
+        } else
+        if (r > 0) {
+            if (FD_ISSET(sockfd, &rset)) {
+                int n = ::recvfrom(sockfd, buf+bytesRead, bytesToRead-bytesRead,
+                                   0, NULL, NULL);
+                if (n > 0) { //
+                    bytesRead += n;
+                } else
+                if (n == 0) {
+                    // The return value will be 0 when the peer has performed an orderly shutdown.
+                    printErrorMessage(port, clientIP, clientPort,
+                        QString("PEER CLOSED CONNECTION (") + strerror(errno) + ") START AT" +
+                                selectStart + " NOW " + QDateTime::currentDateTime().toString(Qt::ISODateWithMs));
+                    ::close(sockfd);
+                    return std::nullopt;
+                } else
+                if (n < 0) {
+                    if (errno == EWOULDBLOCK) { // check just in case
+                        if (++loop < 10) {
+                            QThread::msleep(500);
+                            continue;
+                        }
+                        printErrorMessage(port, clientIP, clientPort,
+                                QString("READ TIMEOUT %1(").arg(loop) + strerror(errno) + ")");
+                        ::close(sockfd);
+                        return std::nullopt;
+                    }
+                    if (errno == EINTR) {
+                        printErrorMessage(port, clientIP, clientPort,
+                            QString("INTERRUPTED BY SIGNAL (2) (") + strerror(errno) + ")");
+                        continue;
+                    }
+                }
             }
         }
 
@@ -320,6 +394,15 @@ QString IsmasClient::execOpkgCommand(QString const &info, QString const &version
                              version.toStdString().c_str());
 }
 
+QString IsmasClient::rsyncFile(QString const &info, QString const &version) {
+    return updateNewsToIsmas("U0010",
+                             m_progressInPercent,
+                             RESULT_CODE::SUCCESS,
+                             "RSYNC FILE",
+                             info.toStdString().c_str(),
+                             version.toStdString().c_str());
+}
+
 QString IsmasClient::updateTriggerSet(QString const &info, QString const &version) {
     return updateNewsToIsmas("U0010",
                              m_progressInPercent,
@@ -345,13 +428,11 @@ QString IsmasClient::updateOfPSASendVersion(PSAInstalled const &psa) {
     static char buf[4096*2];
     memset(buf, 0, sizeof(buf));
 
-    QString const ts = QDateTime::currentDateTime().toString(Qt::ISODateWithMs);
-    QString sendVersionHash = "N/A";
-
     // local data="#M=APISM#C=CMD_SENDVERSION#J=
     snprintf(buf, sizeof(buf)-1,
         "{"
             "\"VERSION_INFO\" : {"
+                "\"REASON\":\"%s\","
                 "\"CREATED\":\"%s\","
                 "\"HASH\":\"%s\""
             "},"
@@ -361,6 +442,13 @@ QString IsmasClient::updateOfPSASendVersion(PSAInstalled const &psa) {
                 "\"ZONE\" : %d,"
                 "\"INFO\" : \"%s\","
                 "\"BLOB\" : \"%s\","
+                "\"LAST-COMMIT\" : \"%s\","
+                "\"SIZE\" : %d,"
+                "\"LOADED\" : \"%s\""
+            "},"
+            "\"OPKG_COMMANDS\" : {"
+                "\"BLOB\" : \"%s\","
+                "\"LAST-COMMIT\" : \"%s\","
                 "\"SIZE\" : %d,"
                 "\"LOADED\" : \"%s\""
             "},"
@@ -529,8 +617,9 @@ QString IsmasClient::updateOfPSASendVersion(PSAInstalled const &psa) {
                 "}"
             "},"
             "\"SOFTWARE\": {"
-                "\"RAUC\" : \"%s\","
-                "\"OPKG\" : \"%s\","
+                "\"APISM\" : {"
+                    "\"VERSION\" : \"%s\""
+                "},"
                 "\"ATBQT\" : {"
                     "\"VERSION\" : \"%s\""
                 "}"
@@ -559,17 +648,24 @@ QString IsmasClient::updateOfPSASendVersion(PSAInstalled const &psa) {
                 "}"
             "}"
         "}",
-        ts.toStdString().c_str(),
-        sendVersionHash.toStdString().c_str(),
+        psa.versionInfo.reason.toStdString().c_str(),
+        psa.versionInfo.created.toStdString().c_str(),
+        psa.versionInfo.lastCommit.toStdString().c_str(),
 
         psa.tariff.version.toStdString().c_str(),
         psa.tariff.project.toStdString().c_str(),
         psa.tariff.zone,
         psa.tariff.info.toStdString().c_str(),
         psa.tariff.blob.toStdString().c_str(),
+        psa.tariff.lastCommit.toStdString().c_str(),
         psa.tariff.size,
         psa.tariff.loadTime.toStdString().c_str(),
 
+        psa.opkg.blob.toStdString().c_str(),
+        psa.opkg.lastCommit.toStdString().c_str(),
+        psa.opkg.size,
+        psa.opkg.loadTime.toStdString().c_str(),
+
         psa.cash.blob.toStdString().c_str(),
         psa.cash.size,
         psa.conf.blob.toStdString().c_str(),
@@ -651,8 +747,7 @@ QString IsmasClient::updateOfPSASendVersion(PSAInstalled const &psa) {
         psa.dc.gitBlob.toStdString().c_str(),
         psa.dc.gitLastCommit.toStdString().c_str(),
 
-        psa.sw.raucVersion.toStdString().c_str(),
-        psa.sw.opkgVersion.toStdString().c_str(),
+        psa.sw.apismVersion.toStdString().c_str(),
         psa.sw.atbQTVersion.toStdString().c_str(),
 
         psa.pluginVersion.deviceController.toStdString().c_str(),
@@ -735,7 +830,7 @@ QString IsmasClient::updateOfPSAActivated(QString const &version) {   // sent ev
 }
 
 QString IsmasClient::updateOfPSASucceeded(QString const &version) {
-    m_progressInPercent = 0;
+    m_progressInPercent = 100;
     return updateNewsToIsmas("U0001",
                              m_progressInPercent,
                              RESULT_CODE::SUCCESS,
@@ -763,13 +858,13 @@ QString IsmasClient::jsonParseFailed(int resultCode, QString reason, QString con
 }
 
 std::optional<QString> IsmasClient::finalResult(int resultCode, QString reason, QString const &version) {
-    m_progressInPercent = 0;
+    m_progressInPercent = 100;
     if (resultCode == RESULT_CODE::SUCCESS) {
         return updateNewsToIsmas("U0002",
                                  m_progressInPercent,
-                                 RESULT_CODE::SUCCESS,
+                                 resultCode,
                                  "FINAL-UPDATE-RESULT",
-                                 "(re-)set WAIT state",
+                                 reason.toStdString().c_str(),
                                  version.toStdString().c_str());
     }
     if (resultCode == RESULT_CODE::INSTALL_ERROR) {
@@ -792,3 +887,18 @@ QString IsmasClient::updateOfPSAFailed(int resultCode, QString step,
                              reason.toStdString().c_str(),
                              version.toStdString().c_str());
 }
+
+char const *IsmasClient::reason[REASON::ENTRIES] = {
+    "TIME-TRIGGERED", "SERVICE", "DEV-TEST"
+};
+
+QString IsmasClient::getReasonForLastSendVersion() {
+    QString const &parentName = Utils::getParentName();
+    if (parentName == "ATBQT") {
+        return reason[REASON::SERVICE];
+    }
+    if (parentName == "systemd") {
+        return reason[REASON::TIME_TRIGGERED];
+    }
+    return reason[REASON::DEV_TEST];
+}

ismas/ismas_client.h

@@ -7,6 +7,12 @@
 #include <optional>
 
 struct PSAInstalled {
+    struct VersionInfo {
+        QString created;
+        QString reason;
+        QString lastCommit;
+    } versionInfo;
+
     struct Tariff {
         QString name;
         QString version;
@@ -24,6 +30,13 @@ struct PSAInstalled {
         QString cpuSerial;
     } hw;
 
+    struct Opkg {
+        int size;
+        QString blob;
+        QString lastCommit;
+        QString loadTime;
+    } opkg;
+
     struct DC {
         QString versionHW;
         QString versionSW;
@@ -33,8 +46,7 @@ struct PSAInstalled {
     } dc;
 
     struct SoftWare {
-        QString raucVersion;
-        QString opkgVersion;
+        QString apismVersion;
         QString atbQTVersion;
     } sw;
 
@@ -73,14 +85,18 @@ struct PSAInstalled {
         hw.linuxVersion = "N/A";
         hw.cpuSerial = "N/A";
 
+        opkg.size = -1;
+        opkg.blob = "N/A";
+        opkg.lastCommit = "N/A";
+        opkg.loadTime = "N/A";
+
         dc.versionHW = "N/A";
         dc.versionSW = "N/A";
         dc.gitBlob = "N/A";
         dc.gitLastCommit = "N/A";
         dc.size = -1;
 
-        sw.raucVersion = "N/A";
-        sw.opkgVersion = "N/A";
+        sw.apismVersion = "N/A";
         sw.atbQTVersion = "N/A";
 
         pluginVersion.deviceController = "N/A";
@@ -123,6 +139,7 @@ public:
         DIRECT_PORT = 7778
     };
 
+
     enum RESULT_CODE {
         SUCCESS=0,
         NO_UPDATE_NECESSARY=1,
@@ -130,9 +147,20 @@ public:
         WRONG_PACKAGE=3,
         INSTALL_ERROR=4};
 
+    enum REASON {
+        TIME_TRIGGERED = 0,
+        SERVICE,
+        DEV_TEST,
+        ENTRIES
+    };
+
+    static char const *reason[REASON::ENTRIES];
+
     static std::optional<QString>
         sendRequestReceiveResponse(int port, QString const &request);
 
+    static QString getReasonForLastSendVersion();
+
     int getProgressInPercent() const {return m_progressInPercent; }
     void setProgressInPercent(int procent) { m_progressInPercent = procent; }
 
@@ -153,6 +181,7 @@ public:
     QString errorUpdateTrigger(QString const &info, QString const &version = QString());
     QString gitFetch(QString const &info, QString const &version = QString());
     QString execOpkgCommand(QString const &info, QString const &version = QString());
+    QString rsyncFile(QString const &info, QString const &version = QString());
     QString errorGitFetch(int resultCode, QString const &info, QString const &version = QString());
     QString updateOfPSAActivated(QString const &version = QString());
                                     // and update accepted

main.cpp

@@ -31,6 +31,13 @@
 #include "utils.h"
 
 #include <QThread>
+#include <QtWidgets>
+#include <QScopedPointer>
+
+#if defined (Q_OS_UNIX) || defined (Q_OS_LINUX)
+#include <unistd.h>
+#include <errno.h>
+#endif
 
 #ifdef PTU5
 #define SERIAL_PORT "ttymxc2"
@@ -57,6 +64,24 @@ int main(int argc, char *argv[]) {
         setDebugLevel(LOG_NOTICE);
     }
 
+//#if defined (Q_OS_UNIX) || defined (Q_OS_LINUX)
+//#ifdef _POSIX_THREAD_PROCESS_SHARED
+//    errno = 0;
+//    int res = 0;
+//    if ((res = sysconf(_SC_THREAD_PROCESS_SHARED)) < 0) {
+//        if (errno != 0) {
+//            qCritical() << "_POSIX_THREAD_PROCESS_SHARED NOT SUPPORTED"
+//                        << strerror(errno);
+//            exit(-1);
+//        }
+//    } else {
+//        if (res == _POSIX_THREAD_PROCESS_SHARED) {
+//            Utils::printInfoMsg("_POSIX_THREAD_PROCESS_SHARED SUPPORTED");
+//        }
+//    }
+//#endif
+//#endif
+
     QCommandLineParser parser;
     parser.setApplicationDescription("Download tool for downloading device controller firmware, printer json-files and executing opkg-commands.");
     parser.addHelpOption();
@@ -65,21 +90,21 @@ int main(int argc, char *argv[]) {
     QCommandLineOption pluginDirectoryOption(QStringList() << "plugin-directory" << "plugin-directory",
         QCoreApplication::translate("main", "Where to find dc-plugin."),
         QCoreApplication::translate("main", "directory"));
-    QString const pluginDefault = "./plugins";
+    QString const pluginDefault = "/usr/lib";
     pluginDirectoryOption.setDefaultValue(pluginDefault);
     parser.addOption(pluginDirectoryOption);
 
     QCommandLineOption pluginNameOption(QStringList() << "plugin-name" << "plugin-name",
         QCoreApplication::translate("main", "Name of dc-plugin."),
         QCoreApplication::translate("main", "directory"));
-    QString const pluginNameDefault = "libCAmaster.so";
+    QString const pluginNameDefault = "libCAslave.so";
     pluginNameOption.setDefaultValue(pluginNameDefault);
     parser.addOption(pluginNameOption);
 
     QCommandLineOption workingDirectoryOption(QStringList() << "working-directory" << "working-directory",
         QCoreApplication::translate("main", "working directory of update-script."),
         QCoreApplication::translate("main", "directory"));
-    QString const workingDirectoryDefault = ".";
+    QString const workingDirectoryDefault = "/opt/app/tools/atbupdate";
     workingDirectoryOption.setDefaultValue(workingDirectoryDefault);
     parser.addOption(workingDirectoryOption);
 
@@ -87,14 +112,6 @@ int main(int argc, char *argv[]) {
         QCoreApplication::translate("main", "Start ATBUpdateTool in dry-run-mode. No actual actions."));
     parser.addOption(dryRunOption);
 
-    // TODO:
-    // add some additional parameters
-    // --dry-run
-    // -d: only update device-controller firmware
-    // -j: only update json-files
-    // -o: only execute opkg-commnds
-    // -f: force. update_psa shall always perform a 'git pull'
-
     // Process the actual command line arguments given by the user
     parser.process(a);
     QString plugInDir = parser.value(pluginDirectoryOption);
@@ -103,9 +120,6 @@ int main(int argc, char *argv[]) {
     bool dryRun = parser.isSet(dryRunOption);
     QString const rtPath = QCoreApplication::applicationDirPath();
 
-    if (plugInDir == pluginDefault) {
-        plugInDir = (rtPath + "/" + pluginDefault);
-    }
     if (!QDir(plugInDir).exists()) {
         qCritical() << plugInDir
                     << "does not exists, but has to contain dc-library";
@@ -126,7 +140,8 @@ int main(int argc, char *argv[]) {
 #endif
 
     hwinf *hw = Update::loadDCPlugin(QDir(plugInDir), plugInName);
-    // hw->dc_autoRequest(false);
+    hw->dc_autoRequest(true);
+    // hw->dc_openSerial(5, "115200", "ttymxc2", 1);
 
     int machineNr = Utils::read1stLineOfFile("/etc/machine_nr");
     int customerNr = Utils::read1stLineOfFile("/etc/cust_nr");
@@ -137,15 +152,31 @@ int main(int argc, char *argv[]) {
     QThread::currentThread()->setObjectName("main thread");
     qInfo() << "Main thread" << QThread::currentThreadId();
 
-    Worker worker(hw,
-                  customerNr,
+    Worker worker(customerNr,
                   machineNr,
                   zoneNr,
                   branchName,
+                  plugInName,
                   workingDir,
                   dryRun);
 
-    MainWindow mw(&worker);
+    QString const customerNrStr(
+        QString("customer_") + QString::number(customerNr).rightJustified(3, '0'));
+
+    QScopedPointer<Update> update(
+        new Update(hw,
+                   &worker,
+                   QDir::cleanPath(workingDir + QDir::separator() + customerNrStr),
+                   customerNrStr,
+                   branchName,
+                   plugInName,
+                   workingDir,
+                   dryRun,
+                   nullptr,
+                   SERIAL_PORT,
+                   "115200"));
+
+    MainWindow mw(hw, &worker, update.get());
     worker.setMainWindow(&mw);
 
     mw.setWindowFlags(Qt::Window | Qt::FramelessWindowHint);

mainwindow.cpp

@@ -3,18 +3,119 @@
 #include "worker.h"
 #include "utils.h"
 #include "progress_event.h"
+#include "update_dc_event.h"
+#include "plugins/interfaces.h"
 
 #include <QDateTime>
 #include <QMessageBox>
 #include <QDebug>
+#include <QScrollBar>
 
-MainWindow::MainWindow(Worker *worker, QWidget *parent)
+
+
+#if EMERGENCY_LEAVE_BL==1
+static int step = 0;
+
+void MainWindow::emergencyLeaveBL() {
+    //
+    qCritical() << __func__ << step;
+    switch(step) {
+    case 0:
+        if (m_hw->dc_openSerial(5, "115200", "ttymxc2", 1)) {
+            qCritical() << __func__ << "open ok";
+            step++;
+            QThread::msleep(2000);
+            m_hw->dc_autoRequest(false);
+            emit leaveBL();
+        }
+        break;
+    case 1:
+        m_hw->bl_rebootDC();
+        QThread::msleep(1000);
+        qCritical() << __func__ << "reboot ok" << QDateTime::currentDateTime().toString(Qt::ISODateWithMs);
+        step++;
+        emit leaveBL();
+        break;
+    case 2:
+    case 3:
+    case 4:
+    case 5:
+    case 6:
+        m_hw->bl_startBL();
+        QThread::msleep(1000);
+        qCritical() << __func__ << "start" << QDateTime::currentDateTime().toString(Qt::ISODateWithMs);
+        step++;
+        emit leaveBL();
+        break;
+    case 7:
+    case 9:
+    case 11:
+    case 13:
+    case 15:
+        m_hw->bl_checkBL();
+        qCritical() << __func__ << "check" << QDateTime::currentDateTime().toString(Qt::ISODateWithMs);
+        QThread::msleep(1500);
+        ++step;
+        emit leaveBL();
+        break;
+    case 8:
+    case 10:
+    case 12:
+    case 14:
+    case 16:
+        qCritical() << __func__ << "is Up..." << QDateTime::currentDateTime().toString(Qt::ISODateWithMs);
+        if (m_hw->bl_isUp()) {
+            qCritical() << __func__ << "is Up...OK" << step << QDateTime::currentDateTime().toString(Qt::ISODateWithMs);
+            QThread::msleep(5000);
+            step = 16;
+        } else {
+            qCritical() << __func__ << "is Up...NO" << step << QDateTime::currentDateTime().toString(Qt::ISODateWithMs);
+        }
+        ++step;
+        emit leaveBL();
+        break;
+    case 17:
+    case 18:
+    case 19:
+        qCritical() << __func__ << "stop" << QDateTime::currentDateTime().toString(Qt::ISODateWithMs);
+        m_hw->bl_stopBL();
+        QThread::msleep(1000);
+        //m_hw->dc_closeSerial();
+        ++step;
+        emit leaveBL();
+        break;
+    }
+}
+#endif
+
+MainWindow::MainWindow(hwinf *hw, Worker *worker, Update *update, QWidget *parent)
     : QMainWindow(parent)
     , ui(new Ui::MainWindow)
+    , m_hw(hw)
     , m_worker(worker)
     , m_width(70)
     , m_progressRunning(false)
-    , m_progressValue(0) {
+    , m_progressValue(0)
+    , m_update(update)
+    , m_updateStep(UpdateDcEvent::UpdateStep::NONE) {
+
+#if EMERGENCY_LEAVE_BL==1
+    QTimer *t = new QTimer(this);
+    connect(t, SIGNAL(timeout()), this, SLOT(emergencyLeaveBL()));
+    connect(this, SIGNAL(leaveBL()), this, SLOT(emergencyLeaveBL()), Qt::QueuedConnection);
+    t->setSingleShot(true);
+    t->start(1000);
+    return;
+#endif
+
+    this->setStatusBar(new QStatusBar(this));
+    QFont f;
+    f.setStyleHint(QFont::Monospace);
+    f.setWeight(QFont::Bold);
+    f.setFamily("Misc Fixed");
+    f.setPixelSize(12);
+    this->statusBar()->setFont(f);
+
     ui->setupUi(this);
 
     ui->updateProgress->setRange(0, 100);
@@ -27,10 +128,12 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
     lst << QString("Machine number  : %1 ").arg(m_worker->machineNr()).leftJustified(m_width-3);
     lst << QString("Customer number : %1 ").arg(m_worker->customerNr()).leftJustified(m_width-3);
     lst << QString("Zone number     : %1 (%2)").arg(m_worker->zoneNr()).arg(Utils::zoneName(m_worker->zoneNr())).leftJustified(m_width-3);
+    lst << QString("APISM version   : %1").arg(m_worker->apismVersion()).leftJustified(m_width-3);
     lst << QString("").leftJustified(m_width-3, '=');
 
     ui->updateStatus->setText(lst.join('\n'));
     ui->updateStatus->setEnabled(true);
+    // ui->updateStatus->installEventFilter(this);
 
     m_startTimer = new QTimer(this);
     connect(m_startTimer, SIGNAL(timeout()), m_worker, SLOT(update()));
@@ -42,17 +145,16 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
     m_exitTimer->setSingleShot(true);
     m_exitTimer->start(1800 * 1000);
 
-    connect(ui->exit, SIGNAL(clicked()), this, SLOT(onQuit()));
-    connect(m_worker, SIGNAL(disableExit()), this, SLOT(onDisableExit()));
-    connect(m_worker, SIGNAL(enableExit()), this, SLOT(onEnableExit()));
-    connect(m_worker, SIGNAL(stopStartTimer()), this, SLOT(onStopStartTimer()));
-    connect(m_worker, SIGNAL(restartExitTimer()), this, SLOT(onRestartExitTimer()));
-    connect(m_worker, SIGNAL(appendText(QString, QString)), this, SLOT(onAppendText(QString, QString)));
-    connect(m_worker, SIGNAL(showErrorMessage(QString,QString)), this, SLOT(onShowErrorMessage(QString,QString)));
-    connect(m_worker, SIGNAL(replaceLast(QString, QString)), this, SLOT(onReplaceLast(QString,QString)));
-
-    ui->updateStatus->setText(lst.join('\n'));
-    ui->updateStatus->setEnabled(true);
+    connect(ui->exit, SIGNAL(clicked()),this,SLOT(onQuit()));
+    connect(m_worker, SIGNAL(disableExit()),this,SLOT(onDisableExit()));
+    connect(m_worker, SIGNAL(enableExit()),this,SLOT(onEnableExit()));
+    connect(m_worker, SIGNAL(stopStartTimer()),this,SLOT(onStopStartTimer()));
+    connect(m_worker, SIGNAL(restartExitTimer()),this,SLOT(onRestartExitTimer()));
+    connect(m_worker, SIGNAL(appendText(QString,QString)),this,SLOT(onAppendText(QString,QString)));
+    connect(m_worker, SIGNAL(showErrorMessage(QString,QString)),this, SLOT(onShowErrorMessage(QString,QString)));
+    connect(m_worker, SIGNAL(showStatusMessage(QString,QString)),this, SLOT(onShowStatusMessage(QString,QString)));
+    connect(m_worker, SIGNAL(replaceLast(QString,QString)),this,SLOT(onReplaceLast(QString,QString)));
+    connect(m_worker, SIGNAL(replaceLast(QStringList,QString)),this, SLOT(onReplaceLast(QStringList,QString)));
 }
 
 MainWindow::~MainWindow() {
@@ -109,6 +211,86 @@ void MainWindow::customEvent(QEvent *event) {
         } else {
             qCritical() << "!!! UNKNOWN SENDER !!!";
         }
+    } else
+    if (event->type() == UpdateDcEvent::type()) {
+        UpdateDcEvent *pevent = (UpdateDcEvent *)event;
+        UpdateDcEvent::UpdateStep const updateStep = pevent->updateStep();
+        QObject const *sender = pevent->sender();
+        if (sender == m_worker) {
+            QDateTime const &recv = QDateTime::currentDateTime();
+            QDateTime const &send = pevent->sendDateTime();
+            qint64 const delay = recv.toMSecsSinceEpoch() - send.toMSecsSinceEpoch();
+            switch(updateStep) {
+            case UpdateDcEvent::UpdateStep::NONE:
+                break;
+            case UpdateDcEvent::UpdateStep::DC_REBOOT: {
+                m_hw->bl_rebootDC();
+                QString msg = QDateTime::currentDateTime().toString(Qt::ISODateWithMs)
+                          + QString(": reset device controller (delay=%1ms").arg(delay);
+                emit m_worker->showStatusMessage("dc update", msg);
+                Utils::printInfoMsg(msg.toUpper());
+                m_updateStep = UpdateDcEvent::UpdateStep::DC_REBOOT;
+            } break;
+            case UpdateDcEvent::UpdateStep::BL_START: {
+                QString const &msg = recv.toString(Qt::ISODateWithMs)
+                    + QString(": start bootloader (%1, delay=%2ms)").arg(pevent->count()).arg(delay);
+                emit m_worker->showStatusMessage("dc update", msg);
+                Utils::printInfoMsg(msg.toUpper());
+                m_hw->bl_startBL();
+                if (pevent->count() == BL_START_COUNT) {
+                    m_updateStep = UpdateDcEvent::UpdateStep::BL_START;
+                }
+            } break;
+            case UpdateDcEvent::UpdateStep::BL_CHECK: {
+                if (m_updateStep != UpdateDcEvent::UpdateStep::BL_IS_UP) {
+                    QString const &msg = recv.toString(Qt::ISODateWithMs)
+                        + QString(": request bootloader version (%1, delay=%2ms)").arg(pevent->count()).arg(delay);
+                    emit m_worker->showStatusMessage("dc update", msg);
+                    Utils::printInfoMsg(msg.toUpper());
+                    m_hw->bl_checkBL();
+                    //m_updateStep = UpdateDcEvent::UpdateStep::BL_CHECK;
+                }
+            } break;
+            case UpdateDcEvent::UpdateStep::BL_IS_UP: {
+                QString msg = recv.toString(Qt::ISODateWithMs)
+                    + QString(": check running bootloader (%1, delay=%2ms)").arg(pevent->count()).arg(delay);
+                emit m_worker->showStatusMessage("dc update", msg);
+                Utils::printInfoMsg(msg.toUpper());
+                if (m_updateStep != UpdateDcEvent::UpdateStep::BL_IS_UP) {
+                    if (m_hw->bl_isUp()) {
+                        msg = recv.toString(Qt::ISODateWithMs)
+                            + QString(": bootloader running (%1, delay=%2ms)").arg(pevent->count()).arg(delay);
+                        emit m_worker->showStatusMessage("dc update", msg);
+                        Utils::printInfoMsg(msg.toUpper());
+                        m_updateStep = UpdateDcEvent::UpdateStep::BL_IS_UP;
+                    } else {
+                        msg = recv.toString(Qt::ISODateWithMs)
+                            + QString(": bootloader stop requested (%1, delay=%2ms)").arg(pevent->count()).arg(delay);
+                        emit m_worker->showStatusMessage("dc update", msg);
+                        Utils::printInfoMsg(msg.toUpper());
+                        if (m_updateStep == UpdateDcEvent::UpdateStep::BL_STOP) {
+                            msg = QDateTime::currentDateTime().toString(Qt::ISODateWithMs)
+                                    + QString(": bootloader down (%1, delay=%2ms)").arg(pevent->count()).arg(delay);
+                            emit m_worker->showStatusMessage("dc update", msg);
+                            Utils::printInfoMsg(msg.toUpper());
+                            m_updateStep = UpdateDcEvent::UpdateStep::BL_IS_DOWN;
+                        }
+                    }
+                }
+            } break;
+            case UpdateDcEvent::UpdateStep::BL_STOP: {
+                QString const &msg = QDateTime::currentDateTime().toString(Qt::ISODateWithMs)
+                    + QString(": stop bootloader (%1, delay=%2ms)").arg(pevent->count()).arg(delay);
+                emit m_worker->showStatusMessage("dc update", msg);
+                Utils::printInfoMsg(msg.toUpper());
+                //if (m_bootLoaderIsUp) {
+                m_hw->bl_stopBL();
+                m_updateStep = UpdateDcEvent::UpdateStep::BL_STOP;
+                //}
+            } break;
+            default: ;
+            }
+        }
     }
 
     QThread::yieldCurrentThread();
@@ -126,9 +308,18 @@ void MainWindow::onEnableExit() {
    ui->exit->setEnabled(true);
 }
 
+//bool MainWindow::eventFilter(QObject *obj, QEvent *ev) {
+//    if (obj == ui->updateStatus) {
+//        qCritical() << "REc. event for text edit" << ev->type();
+//    }
+//    return QMainWindow::eventFilter(obj, ev);
+//}
+
 void MainWindow::onRestartExitTimer() {
     m_exitTimer->stop();
     m_exitTimer->start(60 * 1000);
+
+    // ui->updateStatus->blockSignals(true);
 }
 
 void MainWindow::onQuit() {
@@ -137,61 +328,118 @@ void MainWindow::onQuit() {
     qApp->exit(m_worker->returnCode());
 }
 
+void MainWindow::scrollDownTextEdit() {
+    Utils::printInfoMsg(QString("SCROLL-DOWN-TEXT_EDIT CALLED AT ")
+        + QDateTime::currentDateTime().toString(Qt::ISODateWithMs));
+
+    ui->updateStatus->setEnabled(true);
+
+    QTextCursor tmpCursor = ui->updateStatus->textCursor();
+    tmpCursor.movePosition(QTextCursor::End);
+    ui->updateStatus->setTextCursor(tmpCursor);
+    ui->updateStatus->ensureCursorVisible();
+}
+
 void MainWindow::onAppendText(QString text, QString suffix) {
+    Utils::printInfoMsg(QString("ON APPEND CALLED AT ")
+        + QDateTime::currentDateTime().toString(Qt::ISODateWithMs));
+
     QString editText = ui->updateStatus->toPlainText();
     if (!suffix.isNull() && suffix.size() > 0) {
-        qInfo() << "TEXT" << text << "SUFFIX" << suffix;
+        //qInfo() << "TEXT" << text << "SUFFIX" << suffix;
         if (suffix == Worker::UPDATE_STEP_SUCCESS || suffix == Worker::UPDATE_STEP_FAIL) {
-            editText += QString("\n").leftJustified(m_width-3, '=');
-            editText += " ";
+            ui->updateStatus->insertPlainText(QString("\n").leftJustified(m_width-3, '=') + " ");
+            // editText += QString("\n").leftJustified(m_width-3, '=');
+            // editText += " ";
         }
-        editText += (QString("\n") + text).leftJustified(m_width - (2 + suffix.size()) ) + suffix;
+        QString const &add = (QString("\n") + text).leftJustified(m_width - (2 + suffix.size())) + suffix;
+        ui->updateStatus->insertPlainText(add);
+        // editText += add;
     } else {
-        editText += text.leftJustified(m_width-9);
+        QString const &add = text.leftJustified(m_width-9);
+        ui->updateStatus->insertPlainText(add);
+        //editText += add;
     }
 
-    Utils::printLineEditInfo(editText.split('\n'));
+    // debug
+    // QString editText = ui->updateStatus->toPlainText();
+    // Utils::printLineEditInfo(editText.split('\n', QString::SplitBehavior::SkipEmptyParts));
+    // ui->updateStatus->setText(editText.trimmed());
 
-    ui->updateStatus->setPlainText(editText.trimmed());
-    ui->updateStatus->setEnabled(true);
+    scrollDownTextEdit();
+}
+
+void MainWindow::onReplaceLast(QStringList newTextLines, QString suffix) {
+    Utils::printInfoMsg(QString("ON REPLACE LAST (LIST) CALLED AT ")
+        + QDateTime::currentDateTime().toString(Qt::ISODateWithMs));
+
+    int const s = newTextLines.size();
+    if (s > 0) {
+        QString editText = ui->updateStatus->toPlainText();
+        QStringList lines = editText.split('\n', QString::SplitBehavior::SkipEmptyParts);
+        QString newText;
+        if (lines.size() >= s) {
+            for (int i = 0; i < s; ++i) {
+                lines.removeLast();
+            }
+            if (lines.size() > 0) {
+                newText = lines.join('\n');
+                newText += '\n';
+            }
+            QStringList newLines;
+            for (int i = 0; i < s; ++i) {
+                if (i == 0 && !suffix.isNull() && suffix.size() > 0 && suffix != "\n") {
+                    newLines += Utils::rstrip(newTextLines.at(i).leftJustified(m_width-10) + suffix);
+                } else {
+                    newLines += Utils::rstrip(newTextLines.at(i).leftJustified(m_width-10));
+                }
+            }
+            lines += newLines;
+            newText += newLines.join(' ');
+        }
+
+        ui->updateStatus->setText(newText);
+        Utils::printLineEditInfo(lines);
+        scrollDownTextEdit();
+    }
 }
 
 void MainWindow::onReplaceLast(QString text, QString suffix) {
-        qInfo() << "REPL TEXT" << text << "SUFFIX" << suffix;
+    Utils::printInfoMsg(QString("ON REPLACE LAST (TEXT) CALLED AT ")
+        + QDateTime::currentDateTime().toString(Qt::ISODateWithMs));
 
     QString editText = ui->updateStatus->toPlainText();
-    QStringList lines = editText.split('\n');
+    QStringList lines = editText.split('\n', QString::SplitBehavior::SkipEmptyParts);
     if (lines.size() > 0) {
         lines.removeLast();
         if (!suffix.isNull() && suffix.size() > 0 && suffix != "\n") {
-            lines += text.leftJustified(m_width-10) + suffix;
+            QString const add = text.leftJustified(m_width-10) + suffix;
+            if (!add.isEmpty()) {
+                lines += text.leftJustified(m_width-10) + suffix;
+            }
         } else {
-            lines += text.leftJustified(m_width-10);
+            QString const add = text.leftJustified(m_width-10);
+            if (!add.isEmpty()) {
+                lines += text.leftJustified(m_width-10);
+            }
         }
     }
 
     Utils::printLineEditInfo(lines);
-
     ui->updateStatus->setText(lines.join('\n').trimmed());
-    ui->updateStatus->setEnabled(true);
+    scrollDownTextEdit();
+}
+
+void MainWindow::onShowMessage(QString title, QString text) {
+    this->statusBar()->clearMessage();
+    this->statusBar()->showMessage( // timeout: 10000
+        QString(title + " " + text).leftJustified(80, ' '), 10000);
 }
 
 void MainWindow::onShowErrorMessage(QString title, QString text) {
-    text = text.leftJustified(50, ' ');
-    QMessageBox msgBox(QMessageBox::NoIcon, title,
-                       text, QMessageBox::Ok,
-                       nullptr, Qt::FramelessWindowHint);
-    msgBox.setDefaultButton(QMessageBox::Ok);
-    msgBox.defaultButton()->setVisible(false);
-
-    QTimer *t = new QTimer(this);
-    connect(t, SIGNAL(timeout()), msgBox.defaultButton(), SLOT(click()));
-    t->setSingleShot(true);
-    t->start(5 * 1000);
-
-    if(msgBox.exec() == QMessageBox::Ok) {
-      // do something
-    } else {
-      // do something else
-    }
+    onShowMessage(title, text);
+}
+
+void MainWindow::onShowStatusMessage(QString title, QString text) {
+    onShowMessage(title, text);
 }

mainwindow.h

@@ -3,47 +3,81 @@
 
 #include <QMainWindow>
 #include <QTimer>
+#include <QStatusBar>
 
 QT_BEGIN_NAMESPACE
 namespace Ui { class MainWindow; }
 QT_END_NAMESPACE
 
 #include "worker.h"
+#include "update.h"
+#include "update_dc_event.h"
 
+#define EMERGENCY_LEAVE_BL 0
+
+class hwinf;
 class MainWindow : public QMainWindow {
     Q_OBJECT
 
 protected:
     void customEvent(QEvent *event) override;
+    // bool eventFilter(QObject *obj, QEvent *ev) override;
 
 public:
-    MainWindow(Worker *worker, QWidget *parent = nullptr);
+    MainWindow(hwinf *hw, Worker *worker, Update *update, QWidget *parent = nullptr);
     ~MainWindow();
 
     static const int START_PROGRESS_LOOP = -1;
     static const int STOP_PROGRESS_LOOP = -2;
+    static const int BL_START_COUNT = 5;
+    static const int BL_CHECK_COUNT = 5;
+    static const int BL_IS_UP_COUNT = 5;
+    static const int BL_STOP_COUNT = 5;
 
     int progressValue() const { return m_progressValue; }
+    hwinf *getPlugin() { return m_hw; }
+    hwinf const *getPlugin() const { return m_hw; }
+    Update *getUpdate() { return m_update; }
+    Update const *getUpdate() const { return m_update; }
+    UpdateDcEvent::UpdateStep updateStep() const { return m_updateStep; }
+    void setUpdateStep(UpdateDcEvent::UpdateStep updateStep) { m_updateStep = updateStep; }
 
 public slots:
     void onAppendText(QString, QString suffix = "");
+    void onReplaceLast(QStringList, QString suffix = "");
     void onReplaceLast(QString, QString suffix = "");
     void onShowErrorMessage(QString, QString);
+    void onShowStatusMessage(QString, QString);
     void onStopStartTimer();
     void onRestartExitTimer();
     void onEnableExit();
     void onDisableExit();
+#if EMERGENCY_LEAVE_BL==1
+    void emergencyLeaveBL();
+#endif
+
+signals:
+
+#if EMERGENCY_LEAVE_BL==1
+    void leaveBL();
+#endif
 
 private slots:
     void onQuit();
 
 private:
+    void scrollDownTextEdit();
+    void onShowMessage(QString, QString);
+
     Ui::MainWindow *ui;
+    hwinf *m_hw;
     Worker *m_worker;
-    int m_width;
+    int const m_width;
     QTimer *m_startTimer;
     QTimer *m_exitTimer;
     bool m_progressRunning;
     int m_progressValue;
+    Update *m_update;
+    UpdateDcEvent::UpdateStep m_updateStep;
 };
 #endif // MAINWINDOW_H

mainwindow.ui

@@ -25,7 +25,7 @@
       <x>10</x>
       <y>10</y>
       <width>781</width>
-      <height>461</height>
+      <height>441</height>
      </rect>
     </property>
     <layout class="QGridLayout" name="gridLayout">
@@ -55,6 +55,15 @@
          <bold>true</bold>
         </font>
        </property>
+       <property name="verticalScrollBarPolicy">
+        <enum>Qt::ScrollBarAsNeeded</enum>
+       </property>
+       <property name="horizontalScrollBarPolicy">
+        <enum>Qt::ScrollBarAsNeeded</enum>
+       </property>
+       <property name="sizeAdjustPolicy">
+        <enum>QAbstractScrollArea::AdjustToContents</enum>
+       </property>
       </widget>
      </item>
     </layout>

process/command.cpp

@@ -2,13 +2,15 @@
 
 #include <QProcess>
 #include <QDebug>
+#include <QDir>
 #include <QRegularExpression>
 
 Command::Command(QString const &command, int start_timeout, int finish_timeout)
     : m_command(command.trimmed())
     , m_commandResult("")
     , m_waitForStartTimeout(start_timeout)
-    , m_waitForFinishTimeout(finish_timeout) {
+    , m_waitForFinishTimeout(finish_timeout)
+    , m_exitCode(-1) {
 }
 
 QString Command::getCommandResult() const {
@@ -39,46 +41,64 @@ void Command::finished(int /*exitCode*/, QProcess::ExitStatus /*exitStatus*/) {
 }
 
 bool Command::execute(QString workingDirectory, QStringList args) {
+
+    if (!QDir::setCurrent(workingDirectory)) {
+        qCritical() << "SET WORKING_DIRECTORY" << workingDirectory
+                    << "FAILED FOR" << m_command;
+        return false;
+    }
+
     QScopedPointer<QProcess> p(new QProcess(this));
+    p->setWorkingDirectory(workingDirectory);
     p->setProcessChannelMode(QProcess::MergedChannels);
 
     connect(&(*p), SIGNAL(readyReadStandardOutput()), this, SLOT(readyReadStandardOutput()));
     connect(&(*p), SIGNAL(readyReadStandardError()), this, SLOT(readyReadStandardError()));
 
-    //qCritical() << "START COMMAND" << m_command << "WITH ARGS" << args
-    //            << "IN" << workingDirectory;
-
-    p->setWorkingDirectory(workingDirectory);
     if (!args.isEmpty()) {
+        qDebug() << "START COMMAND" << m_command << "WITH ARGS" << args
+                 << "IN" << p->workingDirectory();
         p->start(m_command, args);
     } else {
+        qDebug() << "START COMMAND" << m_command
+                 << "IN" << p->workingDirectory();
         p->start(m_command);
     }
 
     if (p->waitForStarted(m_waitForStartTimeout)) {
-        //qDebug() << "PROCESS" << m_command << "STARTED";
+        qDebug() << "PROCESS" << m_command << "STARTED IN" << p->workingDirectory();
         if (p->state() == QProcess::ProcessState::Running) {
-            //qDebug() << "PROCESS" << m_command << "RUNNING";
+            qDebug() << "PROCESS" << m_command << "RUNNING IN" << p->workingDirectory();
             if (p->waitForFinished(m_waitForFinishTimeout)) {
-                //qDebug() << "PROCESS" << m_command << "FINISHED";
+                qDebug() << "PROCESS" << m_command << "FINISHED IN" << p->workingDirectory();
                 if (p->exitStatus() == QProcess::NormalExit) {
-                    if (p->exitCode() == 0) {
+                    if ((m_exitCode = p->exitCode()) == 0) {
+                        qDebug() << "EXECUTED" << m_command
+                                 << "with code" << m_exitCode
+                                 << "IN" << p->workingDirectory();
                         return true;
                     } else {
-                        qCritical() << "EXECUTED" << m_command << "with code" << p->exitCode();
+                        qCritical() << "EXECUTED" << m_command
+                                    << "with code" << m_exitCode
+                                    << "IN" << p->workingDirectory();
                     }
                 } else {
                     qCritical() << "PROCESS" << m_command << "CRASHED with code"
-                                << p->exitCode();
+                                << p->exitCode()
+                                << "IN" << p->workingDirectory();
                 }
             } else {
-                qCritical() << "PROCESS" << m_command << "DID NOT FINISH";
+                qCritical() << "PROCESS" << m_command
+                            << "DID NOT FINISH"
+                            << "IN" << p->workingDirectory();
             }
         } else {
-            qCritical() << "WRONG PROCESS STATE" << p->state();
+            qCritical() << "WRONG PROCESS STATE" << p->state()
+                        << "IN" << p->workingDirectory();
         }
     } else {
-        qCritical() << "PROCESS" << m_command << "TIMEOUT AT START";
+        qCritical() << "PROCESS" << m_command << "TIMEOUT AT START"
+                    << "IN" << p->workingDirectory();
     }
     return false;
 }

process/command.h

@@ -16,15 +16,17 @@ class Command : public QObject {
     QString m_commandResult;
     int m_waitForStartTimeout;
     int m_waitForFinishTimeout;
-
+    int m_exitCode;
 public:
     explicit Command(QString const &command,
                      int start_timeout = 100000,
                      int finish_timeout = 100000);
 
     QString getCommandResult() const;
+    QString command() const { return m_command; }
 
     bool execute(QString workingDirectory, QStringList args = QStringList());
+    int exitCode() const { return m_exitCode; }
 
 private slots:
     void readyReadStandardOutput();

update.cpp

@@ -1,5 +1,8 @@
 #include "update.h"
 #include "worker.h"
+#include "utils.h"
+#include "update_dc_event.h"
+#include "mainwindow.h"
 
 #include <QCoreApplication>
 #include <QApplication>
@@ -9,10 +12,11 @@
 #include <QTextStream>
 #include <QRegularExpression>
 #include <QRegExp>
+#include <QApplication>
 
-//#include <iostream>
-//#include <fstream>
-//#include <ctime>
+#if defined (Q_OS_UNIX) || defined (Q_OS_LINUX)
+#include "unistd.h"
+#endif
 
 #include "plugins/interfaces.h"
 
@@ -36,6 +40,8 @@ static const QMap<QString, int> baudrateMap = {
   {"57600"  ,   4}, {"115200" ,   5}
 };
 
+QPluginLoader Update::pluginLoader;
+
 hwinf *Update::loadDCPlugin(QDir const &plugInDir, QString const &fname) {
     hwinf *hw = nullptr;
     if (plugInDir.exists()) {
@@ -44,7 +50,8 @@ hwinf *Update::loadDCPlugin(QDir const &plugInDir, QString const &fname) {
         QFileInfo info(pluginLibName);
         if (info.exists()) {
             pluginLibName = plugInDir.absoluteFilePath(pluginLibName);
-            static QPluginLoader pluginLoader(pluginLibName);
+            pluginLoader.setFileName(pluginLibName);
+            // static QPluginLoader pluginLoader(pluginLibName);
             if (!pluginLoader.load()) {
                 qCritical() << "in directory" << plugInDir.absolutePath();
                 qCritical() << "cannot load plugin" << pluginLoader.fileName();
@@ -76,11 +83,27 @@ hwinf *Update::loadDCPlugin(QDir const &plugInDir, QString const &fname) {
     return hw;
 }
 
+bool Update::unloadDCPlugin() {
+    if (pluginLoader.unload()) {
+        qCritical() << "unloaded plugin" << pluginLoader.fileName();
+        // Note: will re-instantiate the library !
+        // QObject *rootObject = pluginLoader.instance();
+        // if (rootObject) {
+        //    qCritical() << "reloaded plugin: root object again available";
+        //    return false;
+        // }
+        // qCritical()unloaded plugin: root object gone";
+        return true;
+    }
+    return false;
+}
+
 Update::Update(hwinf *hw,
                Worker *worker,
                QString customerRepository,
                QString customerNrStr,
                QString branchName,
+               QString pluginName,
                QString workingDir,
                bool dryRun,
                QObject *parent,
@@ -94,8 +117,17 @@ Update::Update(hwinf *hw,
     , m_customerRepository(customerRepository)
     , m_customerNrStr(customerNrStr)
     , m_branchName(branchName)
+    , m_pluginName(pluginName)
     , m_workingDir(workingDir)
     , m_dryRun(dryRun) {
+
+    qInfo() << "UPDATE: m_serialInterface    ..." << m_serialInterface;
+    qInfo() << "UPDATE: m_baudrate           ..." << m_baudrate;
+    qInfo() << "UPDATE: m_customerRepository ..." << m_customerRepository;
+    qInfo() << "UPDATE: m_customerNr ..........." << m_customerNrStr;
+    qInfo() << "UPDATE: m_branchName ..........." << m_branchName;
+    qInfo() << "UPDATE: m_pluginName ..........." << m_pluginName;
+    qInfo() << "UPDATE: m_workingDirectory ....." << m_workingDir;
 }
 
 Update::~Update() {
@@ -221,48 +253,99 @@ Update::DownloadResult Update::dc_downloadBinary(QByteArray const &b) const {
     return res;
 }
 
-bool Update::startBootloader() const {
-    qDebug() << "starting bootloader...";
-    int nTry = 5;
-    while (--nTry >= 0) {
+bool Update::startBootloader() const { // deprecated
+    return false;
+#if 0
+    int nStartTry = 5;
+    while (--nStartTry >= 0) {
         m_hw->bl_startBL();
-        QThread::msleep(5000);
-        m_hw->bl_checkBL();
-        if (m_hw->bl_isUp()) {
-            qInfo() << "starting bootloader...OK";
-            QThread::msleep(5000);
-            return true;
-        } else {
-            qCritical() << "bootloader not up (" << nTry << ")";
+        QThread::msleep(500);
+        int nCheckTry = 10;
+        while (--nCheckTry >= 0) {
+            m_hw->bl_checkBL();
+            QThread::msleep(500);
+            if (m_hw->bl_isUp()) {
+                qInfo() << "starting bootloader...OK";
+                return true;
+            } else {
+                qCritical() << "bootloader not up ("
+                            << nStartTry << "," << nCheckTry << ")" << QThread::currentThread();
+            }
         }
     }
-    qCritical() << "starting bootloader...FAILED";
+    qCritical() << "starting bootloader...FAILED" << QThread::currentThread();
     return false;
+#endif
 }
 
 bool Update::stopBootloader() const {
-    qDebug() << "stopping bootloader...";
-    int nTry = 5;
-    while (--nTry >= 0) {
-        m_hw->bl_stopBL();
-        QThread::msleep(500);
-        if (!m_hw->bl_isUp()) {
-            qInfo() << "stopping bootloader...OK";
-            return true;
+    // stop bootloader: this MUST work -> otherwise the PSA has to be restarted
+    // manually
+    emit m_worker->showErrorMessage("dc update", "stopping bootloader...");
+
+    int nTryFinalize = 1; // could do this in an endless loop
+
+    do {
+        // in principle, any value except BL_STOP will do, as we want to detect
+        // change to BL_STOP
+        m_worker->mainWindow()->setUpdateStep(UpdateDcEvent::UpdateStep::BL_CHECK);
+
+        QApplication::postEvent(
+            m_worker->mainWindow(),
+            new UpdateDcEvent(m_worker, UpdateDcEvent::UpdateStep::BL_STOP, nTryFinalize));
+
+        QThread::sleep(1);
+
+        int const cntLimit = 20;
+        int cnt = 0;
+        while (++cnt < cntLimit &&
+            m_worker->mainWindow()->updateStep() != UpdateDcEvent::UpdateStep::BL_STOP) {
+            // wait until bl_stopBL() has been sent
+            QThread::msleep(500);
         }
-    }
-    qCritical() << "stopping bootloader...FAILED";
-    return false;
+
+        QApplication::postEvent(
+            m_worker->mainWindow(),
+            new UpdateDcEvent(m_worker, UpdateDcEvent::UpdateStep::BL_CHECK, nTryFinalize));
+        QThread::sleep(1);
+
+        QApplication::postEvent(
+            m_worker->mainWindow(),
+            new UpdateDcEvent(m_worker, UpdateDcEvent::UpdateStep::BL_IS_UP, nTryFinalize));
+        QThread::sleep(1);
+
+        cnt = 0;
+        while (++cnt < cntLimit &&
+            m_worker->mainWindow()->updateStep() != UpdateDcEvent::UpdateStep::BL_IS_DOWN) {
+            // wait until  done
+            QThread::msleep(200);
+        }
+
+    } while (++nTryFinalize <= MainWindow::BL_STOP_COUNT &&
+             m_worker->mainWindow()->updateStep() != UpdateDcEvent::UpdateStep::BL_IS_DOWN);
+
+    return (m_worker->mainWindow()->updateStep() == UpdateDcEvent::UpdateStep::BL_IS_DOWN);
 }
 
 // br is a index into a table, used for historical reasons.
 bool Update::openSerial(int br, QString baudrate, QString comPort) const {
     qDebug() << "opening serial" << br << baudrate << comPort << "...";
-    if (m_hw->dc_openSerial(br, baudrate, comPort, 1)) { // 1 for connect
-        qInfo() << "opening serial" << br << baudrate << comPort << "...OK";
+    if (m_hw->dc_openSerial(br, baudrate, comPort, 1) == true) { // 1 for connect
+        Utils::printInfoMsg(
+            QString("OPENING SERIAL %1").arg(br)
+                  + " " + baudrate + " " + comPort + "...OK");
+
+        // m_hw->dc_autoRequest(true);
+        m_hw->dc_autoRequest(false);
+        QThread::sleep(1);
+
+        Utils::printInfoMsg(QString("IS PORT OPEN %1").arg(m_hw->dc_isPortOpen()));
         return true;
     }
-    qCritical() << "opening serial" << br << baudrate << comPort << "...FAILED";
+
+    Utils::printCriticalErrorMsg(
+        QString("OPENING SERIAL %1").arg(br)
+              + " " + baudrate + " " + comPort + "...FAILED");
     return false;
 }
 
@@ -275,13 +358,15 @@ bool Update::isSerialOpen() const {
     return m_hw->dc_isPortOpen();
 }
 
-bool Update::resetDeviceController() const {
+bool Update::resetDeviceController() const { // deprecated
+    return false;
+#if 0
     qDebug() << "resetting device controller...";
     m_hw->bl_rebootDC();
     // wait maximally 3 seconds, before starting bootloader
-    QThread::sleep(1);
     qInfo() << "resetting device controller...OK";
     return true;
+#endif
 }
 
 QByteArray Update::loadBinaryDCFile(QString filename) const {
@@ -319,17 +404,61 @@ bool Update::downloadBinaryToDC(QString const &bFile) const {
 }
 
 /*
- Using the DC bootloader:
- 1  :   bl_reboot()      // send to application, want DC2 to reset (in order to start
-                        // the bootloader)
- 2  :   bl_startBL():   // send within 4s after DC poewer-on, otherwise bl is left
- 3  :   bl_check():     // send command to verify if bl is up
- 4  :   bl_isUp():      // returns true if bl is up and running
 
+ ///////////////////////////////////////////////////////////////////////////////
+ //
+ //                        USING THE DC BOOTLOADER
+ //
+ ///////////////////////////////////////////////////////////////////////////////
+
+ 1  :   bl_reboot()     // send to application, want DC2 to reset (in order to
+                        // start the bootloader)
+                        //
+                        // NOTE: this function is NOT reliable !!! Sometimes it
+                        // simply does not work, in which case bl_startBL,
+                        // bl_checkBL and bl_isUp do not work as well.
+                        // Alas, there is no feedback if bl_reboot worked!
+                        //
+                        // NOTE: this function can be called only once per
+                        // minute, because once called again, the controller
+                        // performs some self-checks consuming some time.
+                        //
+                        // NOTE: after a successful bl_reboot(), the device is
+                        // waiting about 4 seconds in the bootloader. To stay in
+                        // the bootloader, we have to send the command
+                        // bl_startBL(), which is kind of a misnomer, as it
+                        // should be bl_doNotLeaveBL().
+                        //
+ 2  :   bl_startBL():   // send within 4s after DC power-on, otherwise
+                        // bootloader is left.
+                        //
+                        // NOTE: a running bootloader is a MUST for the download
+                        // process of a device controller firmware as it does
+                        // the actual writing of the memory (the bl_reboot()
+                        // from above erases the available memory).
+                        //
+ 3  :   bl_check():     // send command to verify if bl is up
+                        //
+                        // NOTE: this command is kind of a request that we want
+                        // to check if the bootloader is up. The device
+                        // (actually the bootloader) responds with its version.
+                        //
+ 4  :   bl_isUp():      // returns true if bl is up and running
+                        //
+                        // NOTE: we know what the bootloader version actually is
+                        // as the bootloader does not change. By comparing the
+                        // string received in the previous step with this known
+                        // version string we know if the bootloader is up.
+                        //
+                        // NOTE FOR ALL PREVIOUS STEPS: execute them in their
+                        // own slots each to be sure to receive any possible
+                        // responds from the device.
+                        //
  5  :   bl_sendAddress(blockNumber)
                         // send start address, nr of 64-byte block, start with 0
                         // will be sent only for following block-numbers:
-                        // 0, 1024, 2048, 3072 and 4096, so basically every 64kByte
+                        // 0, 1024, 2048, 3072 and 4096, so basically every
+                        // 64kByte.
                         // for other addresses nothing happens
 
  6  :   bl_wasSendingAddOK()
@@ -349,54 +478,119 @@ bool Update::downloadBinaryToDC(QString const &bFile) const {
                         //             10: OK
 
  10 :   bl_stopBL()     // leave bl and start (the new) application
+                        //
+                        // NOTE: this function MUST work under all conditions.
+                        // Alas, there is no direct result for this command, so
+                        // the only way of knowing it was successful is to ask
+                        // the device if the bootloader is still running.
+                        // There is no problem to repeat this command until the
+                        // bootloader is really not running anymore.
  */
 bool Update::updateBinary(char const *fileToSendToDC) {
-    qInfo() << "UPDATING DEVICE CONTROLLER BINARY" << fileToSendToDC;
+    qInfo() << "UPDATING DEVICE CONTROLLER FIRMWARE BINARY" << fileToSendToDC;
     QFile fn(fileToSendToDC);
     bool r;
     if ((r = fn.exists()) == true) {
         QFileInfo fi(fn);
-        qInfo() << "      UPDATING BINARY" << fi.fileName() << "(size=" << fi.size() << ")";
         if ((r = updateDC(fileToSendToDC)) == true) {
-            qCritical() << QString(80, '*');
-            qInfo() << "      UPDATING BINARY" << fi.fileName() << "(size=" << fi.size() << ") DONE";
-            qCritical() << QString(80, '*');
+            Utils::printInfoMsg(
+                QString("      UPDATING BINARY ") + fi.fileName()
+                      + QString(" (size=%1").arg(fi.size()) + ") DONE");
         } else {
-            qCritical() << QString(80, '*');
-            qCritical() << "      UPDATING BINARY" << fi.fileName() << "(size=" << fi.size() << ") FAILED";
-            qCritical() << QString(80, '*');
+            Utils::printCriticalErrorMsg(
+                QString("      UPDATING BINARY ") + fi.fileName()
+                      + QString(" (size=%1").arg(fi.size()) + ") FAILED");
         }
     } else {
-        qCritical() << QString(80, '*');
-        qCritical() << fileToSendToDC << "does not exist -> NO UPDATE OF DC FIRMWARE";
-        qCritical() << QString(80, '*');
+        Utils::printCriticalErrorMsg(
+            QString(fileToSendToDC) + " DOES NOT EXIST -> NO UPDATE OF DC FIRMWARE");
     }
     return r;
 }
 
 bool Update::updateDC(QString bFile) const {
-    qDebug() << "updating dc...";
-    qDebug() << "updating dc: file to send" << bFile;
-    if (!resetDeviceController()) {
-        return false;
+    qDebug() << "IN UPDATEDC: UPDATING DC: FILE TO SEND" << bFile;
+
+    m_worker->mainWindow()->setUpdateStep(UpdateDcEvent::UpdateStep::NONE);
+
+    QApplication::postEvent(            // step 1: reset device controller
+        m_worker->mainWindow(),
+        new UpdateDcEvent(m_worker, UpdateDcEvent::UpdateStep::DC_REBOOT, 1));
+    QThread::sleep(1);
+
+    for (int i=1; i <= MainWindow::BL_START_COUNT; ++i) {
+        QApplication::postEvent(        // step 2: start bootloader (5x)
+            m_worker->mainWindow(),
+            new UpdateDcEvent(m_worker, UpdateDcEvent::UpdateStep::BL_START, i));
+        QThread::sleep(1);
     }
-    if (!startBootloader()) {
-        // even when start seems to fail, stopping the boot loader does not harm
-        stopBootloader();
+
+    int const cntLimit = 100;       // wait until its for sure that bl_startBL()
+    int cnt = 0;                    // has been excuted
+    while (++cnt < cntLimit &&
+        m_worker->mainWindow()->updateStep() != UpdateDcEvent::UpdateStep::BL_START) {
+        // wait until all bl_startBL() are done
+        QThread::msleep(200);
+    }
+
+    if (cnt == cntLimit) {
+        // start events not received ???
+        Utils::printCriticalErrorMsg("BL_START EVENT NOT RECEIVED AFTER 20 SECS");
         return false;
     }
 
-    if (!downloadBinaryToDC(bFile)) {
-        stopBootloader();
-        qCritical() << "updating dc: " << bFile << "...FAILED";
+    m_worker->mainWindow()->setUpdateStep(UpdateDcEvent::UpdateStep::BL_CHECK);
+
+    for (int i=1; i <= MainWindow::BL_IS_UP_COUNT; ++i) {
+        QApplication::postEvent(m_worker->mainWindow(), new UpdateDcEvent(m_worker, UpdateDcEvent::UpdateStep::BL_CHECK, i));
+        QThread::sleep(1);
+        QApplication::postEvent(m_worker->mainWindow(), new UpdateDcEvent(m_worker, UpdateDcEvent::UpdateStep::BL_IS_UP, i));
+        if (m_worker->mainWindow()->updateStep() == UpdateDcEvent::UpdateStep::BL_IS_UP) {
+            break;
+        }
+        QThread::sleep(1);
+    }
+
+    cnt = 0;
+    while (++cnt < cntLimit &&
+        m_worker->mainWindow()->updateStep() != UpdateDcEvent::UpdateStep::BL_IS_UP) {
+        // wait until all bl_startBL() are done
+        QThread::msleep(200);
+    }
+
+    if (cnt == cntLimit) {
+        // really not up
+        Utils::printCriticalErrorMsg("BL_IS_UP EVENT NOT RECEIVED AFTER 20 SECS");
+        stopBootloader(); // try to stop bootloader whichhas been already started
         return false;
     }
-    qInfo() << "updating dc: " << bFile << "...OK";
 
-    stopBootloader();
-    //resetDeviceController();
+    if (m_worker->mainWindow()->updateStep() == UpdateDcEvent::UpdateStep::BL_IS_UP) {
+        // bootloader MUST be running to download device-controller
+#if 0
+        if (!downloadBinaryToDC(bFile)) {
+            Utils::printCriticalErrorMsg(
+                QString("UPDATING DC: ") + bFile + " ...DOWNLOAD FAILED");
+        }
+#endif
 
-    QThread::sleep(3);
+    } else {
+        Utils::printCriticalErrorMsg(
+            QString("UPDATING DC: ") + bFile + " BOOT LOADER NOT RUNNING -> NO DOWNLOAD ("
+                  + QThread::currentThread()->objectName() + ")");
+        return false;
+    }
+
+    // do this unconditionally, even if bootloader is not running at all ->
+    // the controller possibly tells us nonsense.
+    if (!stopBootloader()) {
+        Utils::printCriticalErrorMsg(
+            QString("UPDATING DC: ") + bFile + " BOOT LOADER STILL RUNNING ("
+                  + QThread::currentThread()->objectName() + ")");
+        return false;
+    }
+
+    Utils::printInfoMsg(QString("UPDATING DC: ") + bFile + " ...OK");
     return true;
 }
 
@@ -518,25 +712,81 @@ void Update::finished(int /*exitCode*/, QProcess::ExitStatus /*exitStatus*/) {
     disconnect(p, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(readyReadStandardError()));
 }
 
+QStringList Update::getDcSoftAndHardWareVersion() {
+    m_hw->dc_autoRequest(true);
+    QThread::sleep(1); // make sure the timer-slots are active
+
+    for (int i=0; i < 3; ++i) { // send explicit reuests to get
+                                // current SW/HW-versions
+        m_hw->request_DC2_SWversion();
+        m_hw->request_DC2_HWversion();
+        QThread::sleep(1);
+    }
+
+    QString const &hwVersion = m_hw->dc_getHWversion().toLower().trimmed();
+    QString const &swVersion = m_hw->dc_getSWversion().toLower().trimmed();
+
+    m_hw->dc_autoRequest(false);
+    QThread::sleep(1); // make sure the timer-slots are inactive
+
+    if (!hwVersion.isEmpty() && !swVersion.isEmpty()) {
+        return QStringList() << hwVersion << swVersion;
+    }
+
+    return QStringList() << "DC HW-version not available"
+                         << "DC SW-version not available";
+}
+
 bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
-    //
-    // ACHTUNG !!!
-    //
-    return true;
-
     bool serialOpened = false;
-    bool serialOpen = false;
 
-    if (!serialOpen) {
-        if (!isSerialOpen()) { // open serial only if not already open
-            if ((serialOpened = openSerial(baudrateMap.value(m_baudrate), m_baudrate, m_serialInterface)) == false) {
-                qCritical() << "CANNOT OPEN" << m_serialInterface << "(BAUDRATE="
-                            << m_baudrate << ")";
-                return false;
-            }
+    QString const &parentName = Utils::getParentName();
+
+    Utils::printInfoMsg(
+        QString("PARENT OF ATB-UPDATE-TOOL (ppid=%1) ").arg(getppid()) + parentName);
+
+    if (parentName == "ATBQT" || parentName == "systemd") {
+        // the tool was not called during 'service' ot during an automatic
+        // update procedure. and it was called explicitly with libCAmaster.so
+        if (m_pluginName.contains("master", Qt::CaseInsensitive)) {
+            Utils::printCriticalErrorMsg(parentName
+                + " IS MASTER, BUT ATB-UPDATE-TOOL CALLED WITH libCAmaster.so");
+            return false;
         }
-        serialOpen = true;
-        qInfo() << "SERIAL OPEN" << m_serialInterface << "(BAUDRATE=" << m_baudrate << ")";
+        Utils::printInfoMsg(
+            QString("ATB-UPDATE-TOOL STARTED AS SLAVE OF ") + parentName);
+    } else
+    if (Utils::isATBQTRunning()) {  // manual testing
+        if (m_pluginName.contains("master", Qt::CaseInsensitive)) {
+            Utils::printCriticalErrorMsg(
+                "ATBQT IS MASTER, BUT ATB-UPDATE-TOOL CALLED WITH libCAmaster.so");
+            return false;
+        }
+        Utils::printInfoMsg(
+            "ATB-UPDATE-TOOL STARTED AS SLAVE-SIBLING OF ATBQT-MASTER");
+    } else {
+        if (m_pluginName.contains("slave", Qt::CaseInsensitive)) {
+            Utils::printCriticalErrorMsg(
+                "ATB-UPDATE-TOOL CALLED WITH libCAslave.so ALTHOUGH MASTER");
+            return false;
+        }
+        Utils::printInfoMsg("ATB-UPDATE-TOOL STARTED AS MASTER");
+
+        if ((serialOpened = openSerial(baudrateMap.value(m_baudrate),
+                                       m_baudrate,
+                                       m_serialInterface)) == false) {
+                Utils::printCriticalErrorMsg(
+                    QString("CANNOT OPEN ")
+                          + m_serialInterface
+                          + "( BAUDRATE=" + m_baudrate + ")");
+                return false;
+        }
+
+        m_hw->dc_autoRequest(false);
+
+        Utils::printInfoMsg(
+            QString("SERIAL OPEN ") + m_serialInterface
+                + " (BAUDRATE=" + m_baudrate + ")");
     }
 
     bool res = false;
@@ -546,67 +796,49 @@ bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
         QString fToWorkOn = (*it).trimmed();
         fToWorkOn = QDir::cleanPath(m_customerRepository + QDir::separator() + fToWorkOn);
 
-        static const QRegularExpression version("^.*dc2c[.][0-9][0-9][.][0-9][0-9][.]bin.*$");
+        static const QRegularExpression version("^.*dc2c[.][0-9]{1,2}[.][0-9]{1,2}[.]bin.*$");
         if (fToWorkOn.contains(version)) {
-
-            qInfo() << QString(80, '*');
-            qInfo() << "DO-UPDATE FILE-TO-WORK-ON" << fToWorkOn;
-            qInfo() << QString(80, '*');
-
-            for (int i=0; i < 3; ++i) { // send explicit reuests to get
-                                        // current SW/HW-versions
-                m_hw->request_DC2_SWversion();
-                m_hw->request_DC2_HWversion();
-                QThread::sleep(1);
-            }
-
-            QString const hwVersion = m_hw->dc_getHWversion().toLower();
-            QString const fwVersion = m_hw->dc_getSWversion().toLower();
-
-            qInfo() << "current dc-hardware-version" << hwVersion;
-            qInfo() << "current dc-firmware-version" << fwVersion;
+            Utils::printInfoMsg("DO-UPDATE FILE-TO-WORK-ON " + fToWorkOn);
 
             QFile fn(fToWorkOn);
             QFileInfo finfo(fn);
             if (!fn.exists()) { // check for broken link
-                qCritical() << QString(80, '*');
-                qCritical() << "FILE-TO-WORK-ON" << fn << "DOES NOT EXIST";
-                qCritical() << QString(80, '*');
+                Utils::printCriticalErrorMsg("DO-UPDATE FILE-TO-WORK-ON "
+                    + fToWorkOn + " DOES NOT EXIST");
                 res = false;
             } else {
-                if (false) {
-                //if (fwVersion.startsWith(linkTarget.completeBaseName())) {
-                //    qCritical() << "current dc-firmware-version" << fwVersion
-                //                << "already installed";
-                //    res = false;
-                } else {
-                    res = true;
+                bool updateBinaryRes = true;
 
-                    qInfo() << "DOWNLOADING" << finfo.completeBaseName() << "TO DC";
+                qInfo() << "DOWNLOADING" << finfo.completeBaseName() << "TO DC";
 #if UPDATE_DC == 1
-                    m_hw->dc_autoRequest(false);// default: turn auto-request setting off
-                    QThread::sleep(1);          // wait to be sure that there are no more
-                                                // commands sent to dc-hardware
-                    qInfo() << "SET AUTO-REQUEST=FALSE";
+                m_hw->dc_autoRequest(false);// default: turn auto-request setting off
+                QThread::sleep(1);          // wait to be sure that there are no more
+                                            // commands sent to dc-hardware
+                qInfo() << "SET AUTO-REQUEST=FALSE";
 
-                    if ((res = updateBinary(fToWorkOn.toStdString().c_str())) == true) {
-                        qCritical() << "downloaded binary" << fToWorkOn;
-                        ++displayIndex;
-                        emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(2, ' ') + QString(")")
-                            + QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
-                            Worker::UPDATE_STEP_DONE);
-                    }
-
-                    m_hw->dc_autoRequest(true); // turn auto-request setting on
-                    qInfo() << "SET AUTO-REQUEST=TRUE";
-                    qInfo() << "WAIT 10 SECS TO RECEIVE RESPONSES...";
-
-                    QThread::sleep(10); // wait to be sure that responses
-                                        // have been received
-                    qInfo() << "updated dc-hardware-version" << m_hw->dc_getHWversion();
-                    qInfo() << "updated dc-firmware-version" << m_hw->dc_getSWversion();
-#endif
+                if ((updateBinaryRes = updateBinary(fToWorkOn.toStdString().c_str())) == true) {
+                    qCritical() << "downloaded binary" << fToWorkOn;
+                    ++displayIndex;
+                    emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(2, ' ') + QString(")")
+                        + QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
+                        Worker::UPDATE_STEP_DONE);
                 }
+
+                m_hw->dc_autoRequest(true); // turn auto-request setting on
+                qInfo() << "SET AUTO-REQUEST=TRUE";
+
+                QStringList const &versions = Update::getDcSoftAndHardWareVersion();
+                if (versions.size() >= 2) {
+                    if (updateBinaryRes == true) {
+                        qInfo() << "dc-hardware-version (UPDATED)" << versions[0];
+                        qInfo() << "dc-firmware-version (UPDATED)" << versions[1];
+                    } else {
+                        qInfo() << "dc-hardware-version (NOT UPDATED)" << versions[0];
+                        qInfo() << "dc-firmware-version (NOT UPDATED)" << versions[1];
+                    }
+                }
+#endif
+                res = updateBinaryRes;
             }
         } else if (fToWorkOn.contains("DC2C_print", Qt::CaseInsensitive)
                 && fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
@@ -675,8 +907,12 @@ bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
         }
     } // for (it = openLines.cbegin(); it != openLines.end(); ++it) {
 
-    m_hw->dc_autoRequest(true);  // ALWAYS turn autoRequest ON
-    qDebug() << "SET AUTO-REQUEST=TRUE";
+    //m_hw->dc_autoRequest(true);  // ALWAYS turn autoRequest ON
+    //qDebug() << "SET AUTO-REQUEST=TRUE";
+
+    if (serialOpened) {
+        m_hw->dc_closeSerial();
+    }
 
     return res;
 }

update.h

@@ -7,6 +7,7 @@
 #include <QDir>
 #include <QByteArray>
 #include <QProcess>
+#include <QPluginLoader>
 
 #include "plugins/interfaces.h"
 
@@ -27,15 +28,19 @@ class Update : public QObject {
     QString m_customerRepository;
     QString m_customerNrStr;
     QString m_branchName;
+    QString m_pluginName;
     QString m_workingDir;
     bool m_maintenanceMode;
     bool m_dryRun;
 
+    static QPluginLoader pluginLoader;
+
 public:
     enum class DownloadResult {OK, ERROR, TIMEOUT, NOP};
     enum class FileTypeJson {CONFIG=1, DEVICE=2, CASH=3, SERIAL=4, TIME=5, PRINTER=6};
 
     static hwinf *loadDCPlugin(QDir const &plugInDir, QString const &fn);
+    static bool unloadDCPlugin();
     static QStringList split(QString line, QChar sep = ',');
 
 
@@ -44,6 +49,7 @@ public:
                     QString customerRepository,
                     QString customerNrStr,
                     QString branchName,
+                    QString pluginName,
                     QString workingDir,
                     bool dryRun = false,
                     QObject *parent = nullptr,
@@ -85,6 +91,7 @@ private:
     bool updateDeviceConf(QString jsFileToSendToDC);
     bool downloadJson(enum FileTypeJson type, int templateIdx,
                       QString jsFileToSendToDC) const;
+    QStringList getDcSoftAndHardWareVersion();
 
 private slots:
     void readyReadStandardOutput();

update_dc_event.cpp

@@ -0,0 +1,25 @@
+#include "update_dc_event.h"
+
+QEvent::Type UpdateDcEvent::customEventType = QEvent::None;
+
+UpdateDcEvent::UpdateDcEvent(QObject const *sender,
+                             UpdateStep updateStep,
+                             int count,
+                             QDateTime const &sendDateTime)
+    : QEvent(UpdateDcEvent::type())
+    , m_sender(sender)
+    , m_updateStep(updateStep)
+    , m_count(count)
+    , m_sendDateTime(sendDateTime) {
+}
+
+UpdateDcEvent::~UpdateDcEvent() {
+}
+
+QEvent::Type UpdateDcEvent::type() {
+    if (customEventType == QEvent::None) {
+        int generatedType = QEvent::registerEventType();
+        customEventType = static_cast<QEvent::Type>(generatedType);
+    }
+    return customEventType;
+}

update_dc_event.h

@@ -0,0 +1,40 @@
+#ifndef UPDATE_DC_EVENT_H_INCLUDED
+#define UPDATE_DC_EVENT_H_INCLUDED
+
+#include <QEvent>
+#include <QDateTime>
+
+class UpdateDcEvent : public QEvent {
+public:
+    enum UpdateStep { NONE, DC_REBOOT, BL_START, BL_CHECK, BL_CHECK_AFTER_STOP, BL_IS_UP, BL_IS_DOWN, BL_STOP};
+
+private:
+    QObject const *m_sender;
+    UpdateStep m_updateStep;
+    int m_count;
+    QDateTime m_sendDateTime;
+
+public:
+    explicit UpdateDcEvent(QObject const *sender, UpdateStep updateStep,
+                           int count,
+                           QDateTime const &sendDateTime = QDateTime::currentDateTime());
+    virtual ~UpdateDcEvent();
+    static QEvent::Type type();
+
+    QObject const *sender() { return m_sender; }
+    QObject const *sender() const { return m_sender; }
+
+    void setUpdateStep(UpdateStep updateStep) { m_updateStep = updateStep; }
+    UpdateStep updateStep() { return m_updateStep; }
+    UpdateStep updateStep() const { return m_updateStep; }
+    int count() const { return m_count; }
+    void setCount(int count) { m_count = count; }
+    QDateTime &sendDateTime() { return m_sendDateTime; }
+    QDateTime const &sendDateTime() const { return m_sendDateTime; }
+
+private:
+    static QEvent::Type customEventType;
+};
+
+
+#endif // PROGRESS_EVENT_H_INCLUDED

utils.cpp

@@ -1,9 +1,20 @@
 #include "utils.h"
 #include "message_handler.h"
+#include "git/git_client.h"
+
+
+#if defined (Q_OS_UNIX) || defined (Q_OS_LINUX)
+#include "unistd.h"
+#endif
 
 #include <QFile>
 #include <QTextStream>
 #include <QDebug>
+#include <QDir>
+#include <QDirIterator>
+#include <QRegularExpression>
+
+#include <fstream>
 
 int Utils::read1stLineOfFile(QString fileName) {
     QFile f(fileName);
@@ -77,3 +88,144 @@ QString Utils::getTariffLoadTime(QString fileName) {
     return "N/A";
 }
 
+QString Utils::rstrip(QString const &str) {
+    int n = str.size() - 1;
+    for (; n >= 0; --n) {
+        if (!str.at(n).isSpace()) {
+            return str.left(n + 1);
+        }
+    }
+    return "";
+}
+
+bool Utils::sameFilesInDirs(QDir const &dir1, QDir const &dir2,
+                            QStringList const &nameFilters) {
+    if (!dir1.exists()) {
+        printCriticalErrorMsg(dir1.dirName() + " DOES NOT EXIST");
+        return false;
+    }
+    if (!dir2.exists()) {
+        printCriticalErrorMsg(dir2.dirName() + " DOES NOT EXIST");
+        return false;
+    }
+    if (dir1.absolutePath() == dir2.absolutePath()) {
+        printCriticalErrorMsg(dir1.dirName() + " AND "+ dir2.dirName() + " HAVE SAME PATH");
+        return false;
+    }
+
+    // files, sorted by name
+    QFileInfoList const &lst1 = dir1.entryInfoList(nameFilters, QDir::Files, QDir::Name);
+    QFileInfoList const &lst2 = dir2.entryInfoList(nameFilters, QDir::Files, QDir::Name);
+
+    QStringList fileNameLst1{};
+    QStringList fileNameLst2{};
+    QListIterator<QFileInfo> i1(lst1);
+    while (i1.hasNext()) {
+        fileNameLst1 << i1.next().fileName();
+    }
+    QListIterator<QFileInfo> i2(lst2);
+    while (i2.hasNext()) {
+        fileNameLst2 << i2.next().fileName();
+    }
+
+    if (fileNameLst1.isEmpty()) {
+        qCritical() << "DIR1" << dir1.dirName() << " DOES NOT CONTAIN EXPECTED FILES";
+        return false;
+    }
+    if (fileNameLst2.isEmpty())  {
+        qCritical() << "DIR1" << dir2.dirName() << " DOES NOT CONTAIN EXPECTED FILES";
+        return false;
+    }
+    if (fileNameLst1 != fileNameLst2) {
+        printCriticalErrorMsg(dir1.dirName() + " AND " + dir2.dirName()
+                            + " DIFFER: [" + fileNameLst1.join(',') + "],["
+                            + fileNameLst2.join(',') + "]");
+        return false;
+    } else {
+        printInfoMsg(dir1.dirName() + " AND " + dir2.dirName()
+                    + " ARE EQUAL: [" + fileNameLst1.join(',') + "]");
+    }
+
+    QStringList gitBlobLst1{};
+    QStringList gitBlobLst2{};
+    QListIterator<QFileInfo> i3(lst1);
+    while (i3.hasNext()) {
+        gitBlobLst1 << GitClient::gitBlob(i3.next().fileName());
+    }
+    QListIterator<QFileInfo> i4(lst2);
+    while (i4.hasNext()) {
+        gitBlobLst2 << GitClient::gitBlob(i4.next().fileName());
+    }
+
+    if (gitBlobLst1.isEmpty()) {
+        qCritical() << "DIR1" << dir1.dirName() << " DOES NOT CONTAIN EXPECTED FILES";
+        return false;
+    }
+    if (gitBlobLst2.isEmpty())  {
+        qCritical() << "DIR1" << dir2.dirName() << " DOES NOT CONTAIN EXPECTED FILES";
+        return false;
+    }
+
+    if (gitBlobLst1 != gitBlobLst2) {
+        printCriticalErrorMsg(dir1.dirName() + " AND " + dir2.dirName()
+                            + " DIFFER: [" + gitBlobLst1.join(',') + "],["
+                            + gitBlobLst2.join(',') + "]");
+        return false;
+    } else {
+        printInfoMsg(dir1.dirName() + " AND " + dir2.dirName()
+                    + " CONTAIN SAME GIT-BLOBS FOR FILES: [" + fileNameLst1.join(',') + "]");
+
+    }
+
+    return true;
+}
+
+
+QString Utils::getParentName() { // get name of parent process
+    QString ppid = QString("/proc/%1/status").arg(getppid());
+    std::ifstream f(ppid.toStdString().c_str());
+    if (f.is_open()) {
+        std::string next;
+        while (std::getline(f, next)) {
+            QString line = QString(next.c_str()).simplified();
+            if (line.startsWith("Name")) {
+                int const idx = line.indexOf(QChar(':'));
+                if (idx != -1) {
+                    return line.mid(idx+1).trimmed();
+                }
+            }
+        }
+    }
+    return "";
+}
+
+bool Utils::isATBQTRunning() {
+    QDirIterator it("/proc",
+                    QStringList() << "status",
+                    QDir::Files,
+                    QDirIterator::Subdirectories);
+    while (it.hasNext()) {
+        QString const &nextStatusFile = it.next();
+        static const QRegularExpression re("^/proc/[0-9]{1,}/status");
+        QRegularExpressionMatch match = re.match(nextStatusFile);
+        if (match.hasMatch()) {
+            std::ifstream f(nextStatusFile.toStdString().c_str());
+            if (f.is_open()) {
+                std::string next;
+                while (std::getline(f, next)) {
+                    QString line = QString(next.c_str()).simplified();
+                    if (line.startsWith("Name")) {
+                        int const idx = line.indexOf(QChar(':'));
+                        if (idx != -1) {
+                            QString const binary = line.mid(idx+1).trimmed();
+                            if (binary == "ATBQT") {
+                                return true;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return false;
+}

utils.h

@@ -7,6 +7,7 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QDateTime>
+#include <QDir>
 
 namespace Utils {
     int read1stLineOfFile(QString fileName);
@@ -15,6 +16,13 @@ namespace Utils {
     void printInfoMsg(QString const &infoMsg);
     void printLineEditInfo(QStringList const &lines);
     QString getTariffLoadTime(QString fileName);
+    QString rstrip(QString const &str);
+    bool sameFilesInDirs(QDir const &dir1, QDir const &dir2,
+                         QStringList const &nameFilters = {"*.json"});
+
+
+    QString getParentName();
+    bool isATBQTRunning();
 }
 
 #endif // UTILS_H_INCLUDED

worker.h

@@ -9,6 +9,8 @@
 #include <QJsonObject>
 #include <QHash>
 
+#include <optional>
+
 #include "worker_thread.h"
 #include "update.h"
 #include "git/git_client.h"
@@ -23,55 +25,28 @@
 
 enum class UPDATE_STATUS : quint8 {
     NOT_DEFINED,
-    STEP_OK,
-    STEP_DONE,
-    STEP_FAIL,
     ISMAS_WAIT_STATE_CHECK_PENDING,
     ISMAS_WAIT_STATE_CHECK_FAILURE,
-    ISMAS_WAIT_STATE_CHECK_TIMEOUT,
-    ISMAS_WAIT_STATE_CHECK_SUCCESS,
     ISMAS_RESPONSE_RECEIVED,
-    BACKEND_CONNECTED,
     BACKEND_CHECK,
     BACKEND_CHECK_FAILURE,
-    ISMAS_BACKEND_CHECK_FAILURE,
     BACKEND_NOT_CONNECTED,
-    UPDATE_TRIGGER_SET,
-    UPDATE_TRIGGER_NOT_SET_OR_WRONG,
+    ISMAS_UPDATE_TRIGGER_SET,
+    ISMAS_UPDATE_TRIGGER_NOT_SET_OR_WRONG,
     GIT_CLONE_AND_CHECKOUT_SUCCESS,
     GIT_CLONE_AND_CHECKOUT_FAILURE,
     GIT_CHECKOUT_BRANCH,
-    GIT_CHECKOUT_BRANCH_REQUEST_FAILURE,
-    GIT_CHECKOUT_BRANCH_NOT_EXISTS,
-    GIT_CHECKOUT_BRANCH_CHECKOUT_ERROR,
+    GIT_CHECKOUT_BRANCH_FAILURE,
     GIT_FETCH_UPDATES,
     GIT_FETCH_UPDATES_REQUEST_FAILURE,
-    GIT_FETCH_UPDATES_REQUEST_SUCCESS,
-    GIT_PULL_UPDATES_SUCCESS,
-    GIT_PULL_UPDATES_FAILURE,
     EXEC_OPKG_COMMAND,
     EXEC_OPKG_COMMANDS,
-    EXEC_OPKG_COMMAND_FAILURE,
-    EXEC_OPKG_COMMAND_SUCCESS,
-    EXEC_OPKG_COMMANDS_SUCCESS,
-    RSYNC_UPDATES,
     RSYNC_UPDATES_FAILURE,
-    RSYNC_UPDATES_SUCESS,
-    DEVICE_CONTROLLER_UPDATE,
-    DEVICE_CONTROLLER_UPDATE_FAILURE,
-    DEVICE_CONTROLLER_UPDATE_SUCCESS,
-    JSON_UPDATE,
-    JSON_UPDATE_FAILURE,
+    RSYNC_UPDATES_SUCCESS,
+    RSYNC_FILE_SUCCESS,
     JSON_PARSE_FAILURE,
-    JSON_UPDATE_SUCCESS,
     UPDATE_PROCESS_SUCCESS,
     UPDATE_PROCESS_FAILURE,
-    ISMAS_UPDATE_INFO_CONFIRM,
-    ISMAS_UPDATE_INFO_CONFIRM_FAILURE,
-    ISMAS_UPDATE_INFO_CONFIRM_SUCCESS,
-    ISMAS_CURRENT_PSA_STATUS_CONFIRM,
-    ISMAS_CURRENT_PSA_STATUS_CONFIRM_FAILURE,
-    ISMAS_CURRENT_PSA_STATUS_CONFIRM_SUCCESS,
     ISMAS_SANITY_CHECK_OK,
     ISMAS_UPDATE_TRIGGER_SET_FAILURE,
     PSA_UPDATE_FILES_FAILED,
@@ -99,24 +74,25 @@ class hwinf;
 class Worker : public QObject {
     Q_OBJECT
 
-    hwinf *m_hw;
     WorkerThread m_workerThread;
     int const m_customerNr;
     QString const m_customerNrStr;
     int const m_machineNr;
     int const m_zoneNr;
+    QString const m_pluginName;
     QString const m_workingDirectory;
     QString const m_branchName;
     QString const m_customerRepositoryPath;
     QString const m_customerRepository;
-    Update *m_update;
+    bool const m_dryRun;
+    QObject *m_parent;
+    QString const m_serialInterface;
+    QString const m_baudrate;
     IsmasClient m_ismasClient;
     GitClient m_gc;
     QString const m_osVersion;
     QString const m_atbqtVersion;
     QString const m_cpuSerial;
-    QString const m_raucVersion;
-    QString const m_opkgVersion;
     QString const m_pluginVersionATBDeciceController;
     QString const m_pluginVersionIngenicoISelf;
     QString const m_pluginVersionMobilisisCalc;
@@ -138,6 +114,7 @@ class Worker : public QObject {
     MainWindow *m_mainWindow;
     int m_progressValue;
     bool m_withoutIsmasDirectPort;
+    QString m_apismVersion;
 
     bool executeOpkgCommand(QString opkgCommand);
     QString getOsVersion() const;
@@ -156,11 +133,11 @@ public:
     static const QString UPDATE_STEP_FAIL;
     static const QString UPDATE_STEP_SUCCESS;
 
-    explicit Worker(hwinf *hw,
-                    int customerNr, // 281
+    explicit Worker(int customerNr, // 281
                     int machineNr,
                     int zoneNr,
                     QString branchName,
+                    QString pluginName,
                     QString workingDir = ".",
                     bool dryRun = false,
                     QObject *parent = nullptr,
@@ -169,6 +146,8 @@ public:
     ~Worker();
 
     void setMainWindow(MainWindow *mainWindow) { m_mainWindow = mainWindow; }
+    hwinf *getPlugin();
+    hwinf const *getPlugin() const;
     void setProgress(int progress);
     void startProgressLoop();
     void stopProgressLoop();
@@ -182,6 +161,10 @@ public:
     int machineNr() const { return m_machineNr; }
     int customerNr() const { return m_customerNr; }
     int zoneNr() const { return m_zoneNr; }
+    QString apismVersion() const { return m_apismVersion; }
+
+    MainWindow *mainWindow() { return m_mainWindow; }
+    MainWindow const *mainWindow() const { return m_mainWindow; }
 
     //friend QDebug operator<<(QDebug debug, Worker const &w) {
     //    Q_UNUSED(w);
@@ -195,7 +178,9 @@ public:
 signals:
     void appendText(QString, QString suffix = "");
     void replaceLast(QString, QString);
+    void replaceLast(QStringList, QString);
     void showErrorMessage(QString title, QString description);
+    void showStatusMessage(QString title, QString description);
     void stopStartTimer();
     void restartExitTimer();
     void enableExit();
@@ -205,7 +190,6 @@ public slots:
     void update();
 
 private slots:
-    bool backendConnected();
     bool updateTriggerSet();
     bool customerEnvironment();
     bool filesToUpdate();
@@ -216,8 +200,8 @@ private slots:
 
 private:
     PSAInstalled getPSAInstalled();
-    QString sendCmdSendVersionToIsmas();
     void privateUpdate();
+    std::optional<QString> getApismVersion();
 };
 
 #endif // WORKER_H_INCLUDED