Removed some DEBUG-output.

sendLastVersion-message to ISMAS.

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.1.1
 
 INCLUDEPATH += plugins
 

git/git_client.cpp

@@ -114,6 +114,47 @@ 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
+        Command c("git show -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 commit{""}, msg{""}, 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 = s.mid(start, length).trimmed();
+
+                        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.

git/git_client.h

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

ismas/ismas_client.cpp

@@ -137,7 +137,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 +156,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);
+        errno = 0;
-        if (n >= 0) {
+        FD_ZERO(&wset);
-            bytesWritten += n;
+        FD_SET(sockfd, &wset);
-        } else {
+        maxfdp1 = sockfd + 1;
-            if (errno == EWOULDBLOCK) {
+        tv.tv_sec = 60;  /* 60 secs timeout for read and write -> APISM cuts the connection after 30s */
-                if (++loop < 10) {
+        tv.tv_usec = 0;
-                    QThread::msleep(500);
+
-                    continue;
+        int const w = select(maxfdp1, NULL, &wset, NULL, &tv);
-                }
+        if (w < 0) { // error
-                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) + ")");
+                    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;
+                }
             }
         }
     }
@@ -188,33 +225,69 @@ IsmasClient::sendRequestReceiveResponse(int port, QString const &request) {
     int bytesRead = 0;
     while (bytesRead < bytesToRead) {
         errno = 0;
-        int n = ::recvfrom(sockfd, buf+bytesRead, bytesToRead-bytesRead,
+        FD_ZERO(&rset);
-                           0, NULL, NULL);
+        FD_SET(sockfd, &rset);
-        if (n > 0) { //
+        maxfdp1 = sockfd + 1;
-            bytesRead += n;
+        tv.tv_sec = 60;  /* 60 secs timeout for read and write */
-        } else
+        tv.tv_usec = 0;
-        if (n == 0) {
+
-            // The return value will be 0 when the peer has performed an orderly shutdown.
+        QString const selectStart = QDateTime::currentDateTime().toString(Qt::ISODateWithMs);
-            printErrorMessage(port, clientIP, clientPort,
+
-                QString("PEER CLOSED CONNECTION (") + strerror(errno) + ")");
+        int const r = select(maxfdp1, &rset, NULL, NULL, &tv);
-            ::close(sockfd);
+        if (r < 0) { // error
-            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;
-            }
             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;
+                    }
+                }
             }
         }
 
@@ -345,13 +418,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\""
             "},"
@@ -559,8 +630,9 @@ QString IsmasClient::updateOfPSASendVersion(PSAInstalled const &psa) {
                 "}"
             "}"
         "}",
-        ts.toStdString().c_str(),
+        psa.versionInfo.reason.toStdString().c_str(),
-        sendVersionHash.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(),
@@ -762,6 +834,27 @@ QString IsmasClient::jsonParseFailed(int resultCode, QString reason, QString con
                              version.toStdString().c_str());
 }
 
+std::optional<QString> IsmasClient::finalResult(int resultCode, QString reason, QString const &version) {
+    m_progressInPercent = 0;
+    if (resultCode == RESULT_CODE::SUCCESS) {
+        return updateNewsToIsmas("U0002",
+                                 m_progressInPercent,
+                                 RESULT_CODE::SUCCESS,
+                                 "FINAL-UPDATE-RESULT",
+                                 "(re-)set WAIT state",
+                                 version.toStdString().c_str());
+    }
+    if (resultCode == RESULT_CODE::INSTALL_ERROR) {
+        return updateNewsToIsmas("U0003",
+                                 m_progressInPercent,
+                                 resultCode,
+                                 "FINAL-UPDATE-RESULT",
+                                 reason.toStdString().c_str(),
+                                 version.toStdString().c_str());
+    }
+    return std::nullopt;
+}
+
 QString IsmasClient::updateOfPSAFailed(int resultCode, QString step,
                                        QString reason, QString const &version) {
     return updateNewsToIsmas("U0003",

ismas/ismas_client.h

@@ -4,7 +4,15 @@
 #include <QObject>
 #include <QString>
 
+#include <optional>
+
 struct PSAInstalled {
+    struct VersionInfo {
+        QString created;
+        QString reason;
+        QString lastCommit;
+    } versionInfo;
+
     struct Tariff {
         QString name;
         QString version;
@@ -159,6 +167,7 @@ public:
     QString updateOfPSAFailed(int resultCode, QString step, QString reason, QString const &version = QString());
     QString sanityCheckFailed(int resultCode, QString reason, QString const &version = QString());
     QString jsonParseFailed(int resultCode, QString reason, QString const &version = QString());
+    std::optional<QString> finalResult(int resultCode, QString reason, QString const &version = QString());
 
     QString updateOfPSASendVersion(PSAInstalled const &psa);
 

main.cpp

@@ -65,7 +65,7 @@ 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);
 
@@ -79,7 +79,7 @@ int main(int argc, char *argv[]) {
     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 +87,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 +95,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";

mainwindow.cpp

@@ -140,7 +140,7 @@ void MainWindow::onQuit() {
 void MainWindow::onAppendText(QString text, QString suffix) {
     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 += " ";
@@ -157,8 +157,7 @@ void MainWindow::onAppendText(QString text, QString suffix) {
 }
 
 void MainWindow::onReplaceLast(QString text, QString suffix) {
-        qInfo() << "REPL TEXT" << text << "SUFFIX" << suffix;
+        //qInfo() << "REPL TEXT" << text << "SUFFIX" << suffix;
-
     QString editText = ui->updateStatus->toPlainText();
     QStringList lines = editText.split('\n');
     if (lines.size() > 0) {

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();

worker.cpp

@@ -169,7 +169,7 @@ void Worker::privateUpdate() {
             int progress = (m_mainWindow->progressValue()/10) + 10;
             setProgress(progress);
 
-            m_updateStatus = UpdateStatus(UPDATE_STATUS::UPDATE_PROCESS_SUCCESS,
+            m_updateStatus = UpdateStatus(UPDATE_STATUS::GIT_CLONE_AND_CHECKOUT_SUCCESS,
                                   QString("CLONED AND CHECKED OUT: ") + m_customerRepository);
 
             IsmasClient::sendRequestReceiveResponse(IsmasClient::APISM::DB_PORT,
@@ -197,7 +197,7 @@ void Worker::privateUpdate() {
 
             emit replaceLast("Initializing customer environment", UPDATE_STEP_FAIL);
 
-            m_updateStatus = UpdateStatus(UPDATE_STATUS::UPDATE_PROCESS_FAILURE,
+            m_updateStatus = UpdateStatus(UPDATE_STATUS::GIT_CLONE_AND_CHECKOUT_FAILURE,
                                   QString("CLONE OR CHECKOUT FAILED: ") + m_customerRepository);
             IsmasClient::sendRequestReceiveResponse(IsmasClient::APISM::DB_PORT,
                 QString("#M=APISM#C=CMD_EVENT#J=") +
@@ -295,7 +295,7 @@ void Worker::privateUpdate() {
                         m_returnCode = -7;
                     }
                 } else {
-                    m_updateStatus = UpdateStatus(UPDATE_STATUS::GIT_CHECKOUT_BRANCH_REQUEST_FAILURE,
+                    m_updateStatus = UpdateStatus(UPDATE_STATUS::GIT_CHECKOUT_BRANCH_FAILURE,
                                         QString("Configuring customer environment failed"));
                     IsmasClient::sendRequestReceiveResponse(IsmasClient::APISM::DB_PORT,
                         QString("#M=APISM#C=CMD_EVENT#J=") +
@@ -315,7 +315,7 @@ void Worker::privateUpdate() {
                 m_returnCode = -5;
             }
         } else {
-            m_updateStatus = UpdateStatus(UPDATE_STATUS::ISMAS_BACKEND_CHECK_FAILURE,
+            m_updateStatus = UpdateStatus(UPDATE_STATUS::BACKEND_CHECK_FAILURE,
                                 QString("ISMAS backend not available"));
             IsmasClient::sendRequestReceiveResponse(IsmasClient::APISM::DB_PORT,
                 QString("#M=APISM#C=CMD_EVENT#J=") +
@@ -327,20 +327,38 @@ void Worker::privateUpdate() {
     }
 
     m_ismasClient.setProgressInPercent(100);
+    setProgress(100);
+
+    if (m_returnCode != 0) {
+        stopProgressLoop();
+        emit appendText(QString("UPDATE "), UPDATE_STEP_FAIL);
+
+        m_updateStatus = UpdateStatus(UPDATE_STATUS::UPDATE_PROCESS_FAILURE,
+                                      QString("Update process failed"));
+        if (std::optional<QString> s = m_ismasClient.finalResult(IsmasClient::RESULT_CODE::INSTALL_ERROR,
+                                                                 "FINAL-UPDATE-RESULT",
+                                                                 m_updateStatus.m_statusDescription)) {
+            IsmasClient::sendRequestReceiveResponse(IsmasClient::APISM::DB_PORT,
+                QString("#M=APISM#C=CMD_EVENT#J=") + s.value());
+        }
+    } else {
+        emit appendText(QString("UPDATE "), UPDATE_STEP_SUCCESS);
+
+        m_updateStatus = UpdateStatus(UPDATE_STATUS::UPDATE_PROCESS_SUCCESS,
+                                      QString("Update process succeeded"));
+        if (std::optional<QString> s = m_ismasClient.finalResult(IsmasClient::RESULT_CODE::SUCCESS,
+                                                                 "FINAL-UPDATE-RESULT",
+                                                                 m_updateStatus.m_statusDescription)) {
+            IsmasClient::sendRequestReceiveResponse(IsmasClient::APISM::DB_PORT,
+                QString("#M=APISM#C=CMD_EVENT#J=") + s.value());
+        }
+    }
 
     if (!sentIsmasLastVersionNotification) {
         // try even if the backend is not connected
         sendIsmasLastVersionNotification();
     }
 
-    if (m_returnCode != 0) {
-        stopProgressLoop();
-        emit appendText(QString("UPDATE "), UPDATE_STEP_FAIL);
-    } else {
-        emit appendText(QString("UPDATE "), UPDATE_STEP_SUCCESS);
-    }
-
-    setProgress(100);
     m_updateProcessRunning = false;
     emit enableExit();
     emit restartExitTimer();
@@ -355,7 +373,7 @@ bool Worker::backendConnected() {
     emit appendText("\nConnecting backend ...");
 
     if (false) { // so linker removes dead code
-        for (int repeat = 0; repeat < 50; ++repeat) {
+        for (int repeat = 0; repeat < 100; ++repeat) {
             qInfo() << "REPEAT" << repeat << "In backendConnected() -> #M=APISM#C=REQ_SELF#J={}";
             startProgressLoop();
             std::optional<QString> result
@@ -479,15 +497,17 @@ bool Worker::backendConnected() {
     return false;
 }
 
+#define CHECK_UPDATE_TRIGGER_SET "Check update trigger ..."
+
 bool Worker::updateTriggerSet() {
     if (m_withoutIsmasDirectPort) { // useful for testing
         return true;
     }
 
-    emit appendText("\nUpdate trigger set ...");
+    emit appendText("\n" CHECK_UPDATE_TRIGGER_SET);
     QString triggerValue("");
 
-    for (int repeat = 0; repeat < 50; ++repeat) {
+    for (int repeat = 0; repeat < 100; ++repeat) {
         qInfo() << "UPDATE TRIGGER SET -> REPEAT" << repeat;
 
         startProgressLoop();
@@ -500,7 +520,7 @@ bool Worker::updateTriggerSet() {
 
             QString msg = result.value();
 
-            qInfo() << "REPEAT" << repeat << "APISM RESPONSE" << msg;
+            qInfo() << "REPEAT" << repeat << "APISM RESPONSE (" << msg << ")";
 
             QJsonParseError parseError;
             QJsonDocument document(QJsonDocument::fromJson(msg.toUtf8(), &parseError));
@@ -519,7 +539,7 @@ bool Worker::updateTriggerSet() {
                                                       m_updateStatus.m_statusDescription));
                 emit showErrorMessage("check update trigger",
                                       QString("invalid json ") + msg.mid(0, 20));
-                emit replaceLast("Update trigger set ...", UPDATE_STEP_FAIL);
+                emit replaceLast(CHECK_UPDATE_TRIGGER_SET, UPDATE_STEP_FAIL);
                 return false;
             }
             if (!document.isObject()) {
@@ -532,13 +552,25 @@ bool Worker::updateTriggerSet() {
                         m_ismasClient.jsonParseFailed(IsmasClient::RESULT_CODE::INSTALL_ERROR,
                                                       m_updateStatus.m_statusDescription));
                 emit showErrorMessage("check update trigger", QString("not a json object") + msg);
-                emit replaceLast("Update trigger set ...", UPDATE_STEP_FAIL);
+                emit replaceLast(CHECK_UPDATE_TRIGGER_SET, UPDATE_STEP_FAIL);
                 return false;
             }
             progress += 1;
             setProgress(progress);
 
             QJsonObject obj = document.object();
+
+            // always look for an 'error' first
+            if (obj.contains("error")) {
+                progress += 1;
+                setProgress(progress);
+                QString value = obj.value("error").toString();
+                emit showErrorMessage("check update trigger", QString("REPEAT %1 error=<").arg(repeat) + value + ">");
+                qInfo() << "REPEAT" << repeat << "In updateTriggerSet() error=<"
+                        << value << ">";
+                QThread::sleep(6);
+                continue;
+            }
             // sanity check: cust_nr and machine_nr of PSA correct ?
             // note: this check has to be done here, as the cust_nr and the machine_nr
             // of the PSA are sent by ISMAS.
@@ -561,7 +593,7 @@ bool Worker::updateTriggerSet() {
                                     m_ismasClient.sanityCheckFailed(IsmasClient::RESULT_CODE::INSTALL_ERROR,
                                                                     m_updateStatus.m_statusDescription));
                             emit showErrorMessage("check update trigger", m_updateStatus.m_statusDescription);
-                            emit replaceLast("Update trigger set ...", UPDATE_STEP_FAIL);
+                            emit replaceLast(CHECK_UPDATE_TRIGGER_SET, UPDATE_STEP_FAIL);
                             return false;
                         }
                         if (machineNr != m_machineNr) {
@@ -574,7 +606,7 @@ bool Worker::updateTriggerSet() {
                                     m_ismasClient.sanityCheckFailed(IsmasClient::RESULT_CODE::INSTALL_ERROR,
                                                                     m_updateStatus.m_statusDescription));
                             emit showErrorMessage("check update trigger", m_updateStatus.m_statusDescription);
-                            emit replaceLast("Update trigger set ...", UPDATE_STEP_FAIL);
+                            emit replaceLast(CHECK_UPDATE_TRIGGER_SET, UPDATE_STEP_FAIL);
                             return false;
                         }
 
@@ -589,7 +621,7 @@ bool Worker::updateTriggerSet() {
                                 m_ismasClient.sanityCheckFailed(IsmasClient::RESULT_CODE::INSTALL_ERROR,
                                                                 m_updateStatus.m_statusDescription));
                         emit showErrorMessage("check update trigger", m_updateStatus.m_statusDescription);
-                        emit replaceLast("Update trigger set ...", UPDATE_STEP_FAIL);
+                        emit replaceLast(CHECK_UPDATE_TRIGGER_SET, UPDATE_STEP_FAIL);
                         return false;
                     }
                 } else {
@@ -601,7 +633,7 @@ bool Worker::updateTriggerSet() {
                             m_ismasClient.sanityCheckFailed(IsmasClient::RESULT_CODE::INSTALL_ERROR,
                                                             m_updateStatus.m_statusDescription));
                     emit showErrorMessage("check update trigger", m_updateStatus.m_statusDescription);
-                    emit replaceLast("Update trigger set ...", UPDATE_STEP_FAIL);
+                    emit replaceLast(CHECK_UPDATE_TRIGGER_SET, UPDATE_STEP_FAIL);
                     return false;
                 }
             } else {
@@ -613,7 +645,7 @@ bool Worker::updateTriggerSet() {
                         m_ismasClient.sanityCheckFailed(IsmasClient::RESULT_CODE::INSTALL_ERROR,
                                                         m_updateStatus.m_statusDescription));
                 emit showErrorMessage("check update trigger", m_updateStatus.m_statusDescription);
-                emit replaceLast("Update trigger set ...", UPDATE_STEP_FAIL);
+                emit replaceLast(CHECK_UPDATE_TRIGGER_SET, UPDATE_STEP_FAIL);
                 return false;
             }
             progress += 1;
@@ -640,25 +672,34 @@ bool Worker::updateTriggerSet() {
                                     m_ismasClient.updateOfPSAContinues("MACHINE-AND-CUSTOMER-CHECK",
                                                                    m_updateStatus.m_statusDescription));
 
-                            m_updateStatus = UpdateStatus(UPDATE_STATUS::UPDATE_TRIGGER_SET,
+                            m_updateStatus = UpdateStatus(UPDATE_STATUS::ISMAS_UPDATE_TRIGGER_SET,
                                 QString("UPDATE TRIGGER SET. CONTINUE. "));
                             IsmasClient::sendRequestReceiveResponse(IsmasClient::APISM::DB_PORT,
                                 QString("#M=APISM#C=CMD_EVENT#J=") +
                                     m_ismasClient.updateTriggerSet(m_updateStatus.m_statusDescription, ""));
 
-                            emit replaceLast("Update trigger set ...", UPDATE_STEP_OK);
+                            emit replaceLast(CHECK_UPDATE_TRIGGER_SET, UPDATE_STEP_DONE);
                             return true;
+                        } else
+                        if (QRegExp("\\s*").exactMatch(triggerValue)) { // check for whitespace
+                            stopProgressLoop();
+                            int progress = (m_mainWindow->progressValue()/10) + 10;
+                            progress += 1;
+                            setProgress(progress);
+                            emit showErrorMessage("check update trigger", "empty update-trigger");
+                            QThread::sleep(6);
+                            continue;
                         } else {
                             // if the download-button once has the wrong value, it will never recover
                             setProgress(100);
                             m_updateStatus = UpdateStatus(UPDATE_STATUS::ISMAS_WAIT_STATE_CHECK_FAILURE,
-                                             QString("TRIGGER-VALUE ") + triggerValue + " NOT 'WAIT'");
+                                             QString("TRIGGER-VALUE=<") + triggerValue + "> NOT 'WAIT'");
                             IsmasClient::sendRequestReceiveResponse(IsmasClient::APISM::DB_PORT,
                                             QString("#M=APISM#C=CMD_EVENT#J=") +
                                                 m_ismasClient.sanityCheckFailed(IsmasClient::RESULT_CODE::INSTALL_ERROR,
                                                                                 m_updateStatus.m_statusDescription));
                             emit showErrorMessage("check update trigger", m_updateStatus.m_statusDescription);
-                            emit replaceLast("Update trigger set ...", UPDATE_STEP_FAIL);
+                            emit replaceLast(CHECK_UPDATE_TRIGGER_SET, UPDATE_STEP_FAIL);
                             return false;
                         }
                     } else {
@@ -669,7 +710,7 @@ bool Worker::updateTriggerSet() {
                             QString("#M=APISM#C=CMD_EVENT#J=") +
                         m_ismasClient.sanityCheckFailed(IsmasClient::RESULT_CODE::INSTALL_ERROR,
                                                         m_updateStatus.m_statusDescription));
-                        emit replaceLast("Update trigger set ...", UPDATE_STEP_FAIL);
+                        emit replaceLast(CHECK_UPDATE_TRIGGER_SET, UPDATE_STEP_FAIL);
                         emit showErrorMessage("check update trigger", m_updateStatus.m_statusDescription);
                         return false;
                     }
@@ -681,7 +722,7 @@ bool Worker::updateTriggerSet() {
                         QString("#M=APISM#C=CMD_EVENT#J=") +
                     m_ismasClient.sanityCheckFailed(IsmasClient::RESULT_CODE::INSTALL_ERROR,
                                                     m_updateStatus.m_statusDescription));
-                    emit replaceLast("Update trigger set ...", UPDATE_STEP_FAIL);
+                    emit replaceLast(CHECK_UPDATE_TRIGGER_SET, UPDATE_STEP_FAIL);
                     emit showErrorMessage("check update trigger", m_updateStatus.m_statusDescription);
                     return false;
                 }
@@ -693,20 +734,10 @@ bool Worker::updateTriggerSet() {
                     QString("#M=APISM#C=CMD_EVENT#J=") +
                         m_ismasClient.sanityCheckFailed(IsmasClient::RESULT_CODE::INSTALL_ERROR,
                                                         m_updateStatus.m_statusDescription));
-                emit replaceLast("Update trigger set ...", UPDATE_STEP_FAIL);
+                emit replaceLast(CHECK_UPDATE_TRIGGER_SET, UPDATE_STEP_FAIL);
                 emit showErrorMessage("check update trigger", m_updateStatus.m_statusDescription);
                 return false;
             }
-
-            if (obj.contains("error")) {
-                progress += 1;
-                setProgress(progress);
-                QString value = obj.value("error").toString();
-                emit showErrorMessage("check update trigger", QString("REPEAT %1 error=<").arg(repeat) + value + ">");
-                qInfo() << "REPEAT" << repeat << "In updateTriggerSet() error=<"
-                        << value << ">";
-                QThread::sleep(6);
-            }
         } else {
             stopProgressLoop();
             int progress = (m_mainWindow->progressValue()/10) + 10;
@@ -718,14 +749,14 @@ bool Worker::updateTriggerSet() {
     }
 
     setProgress(100);
-    m_updateStatus = UpdateStatus(UPDATE_STATUS::UPDATE_TRIGGER_NOT_SET_OR_WRONG,
+    m_updateStatus = UpdateStatus(UPDATE_STATUS::ISMAS_UPDATE_TRIGGER_NOT_SET_OR_WRONG,
-                                  QString("UPDATE-TRIGGER-NOT-SET-OR-WRONG: VALUE=(") +
+                                  QString("ISMAS_UPDATE-TRIGGER-NOT-SET-OR-WRONG: VALUE=(") +
                                   triggerValue + ")");
     IsmasClient::sendRequestReceiveResponse(IsmasClient::APISM::DB_PORT,
         QString("#M=APISM#C=CMD_EVENT#J=") +
             m_ismasClient.errorUpdateTrigger(m_updateStatus.m_statusDescription, ""));
 
-    emit replaceLast("Update trigger set ...", UPDATE_STEP_OK);
+    emit replaceLast(CHECK_UPDATE_TRIGGER_SET, UPDATE_STEP_FAIL);
     return false;
 }
 
@@ -901,10 +932,16 @@ bool Worker::updateFiles(quint8 percent) {
 }
 
 bool Worker::syncCustomerRepositoryAndFS() {
+    // this step is currently needed only for updating tariff-files
     setProgress(0);
     emit appendText("\nSync customer environment with filesystem ...");
     if (QDir(m_customerRepository).exists()) {
         if (QDir::setCurrent(m_customerRepository)) {
+            Command md("bash");
+            if (!md.execute(m_customerRepository,
+                            QStringList() << "-c" << "mkdir -p /etc/psa_config /etc/psa_update /etc/dc /etc/psa_tariff")) {
+                qCritical() << "COULD NOT EXECUTE '" << md.command() << "' exitCode=(" << md.exitCode() << ")";
+            }
             int progress = 10;
             setProgress(progress);
             QString const params("-vv                     "
@@ -935,7 +972,7 @@ bool Worker::syncCustomerRepositoryAndFS() {
                         }
                     } else {
                         Utils::printCriticalErrorMsg(QString("CMD ") + cmd + " FAILED: "
-                                                   + c.getCommandResult());
+                                                   + c.getCommandResult() + QString(" EXIT_CODE=(%1)").arg(c.exitCode()));
                         error = true;
                     }
                 }
@@ -1080,6 +1117,17 @@ PSAInstalled Worker::getPSAInstalled() {
     QString absPathName;
     QString absPathNameRepository;
 
+    psaInstalled.versionInfo.lastCommit = "";
+    psaInstalled.versionInfo.reason = "";
+    psaInstalled.versionInfo.created = "";
+
+    QStringList versionInfo = m_gc.gitShowReason();
+    if (versionInfo.size() == 3) {
+        psaInstalled.versionInfo.lastCommit = versionInfo.at(0);
+        psaInstalled.versionInfo.reason = versionInfo.at(1);
+        psaInstalled.versionInfo.created = versionInfo.at(2);
+    }
+
     if (m_zoneNr != 0) {
         QString const &n = QString("%1").arg(m_zoneNr).rightJustified(2, '0');
         psaInstalled.tariff.name = QString("tariff%1.json").arg(n);
@@ -1142,89 +1190,95 @@ PSAInstalled Worker::getPSAInstalled() {
     return psaInstalled;
 }
 
-QString Worker::sendCmdSendVersionToIsmas() {
-
-    QStringList const dcVersion = getDCVersion();
-    QString const deviceControllerVersionHW = dcVersion.first();
-    QString const deviceControllerVersionSW = dcVersion.last();
-
-    qInfo() << "CURRENT DC-HW-VERSION: " << deviceControllerVersionHW;
-    qInfo() << "CURRENT DC-SW-VERSION: " << deviceControllerVersionSW;
-
-    QString const deviceControllerGitBlob = "N/A";
-    QString const deviceControllerGitLastCommit = "N/A";
-
-    PSAInstalled psaInstalled;
-    QString printSysDir("/etc/psa_config");
-    QString tariffSysDir("/etc/psa_tariff");
-    QString absPathName;
-
-    if (m_zoneNr != 0) {
-        QString const &n = QString("%1").arg(m_zoneNr).rightJustified(2, '0');
-        psaInstalled.tariff.name = QString("tariff%1.json").arg(n);
-        absPathName = QDir::cleanPath(tariffSysDir + QDir::separator() + psaInstalled.tariff.name);
-        psaInstalled.tariff.blob = m_gc.gitBlob(absPathName);
-        psaInstalled.tariff.size = getFileSize(absPathName);
-        psaInstalled.tariff.zone = m_zoneNr;
-    }
-    psaInstalled.tariff.project = "Szeged";
-    psaInstalled.tariff.info = "N/A";
-    psaInstalled.tariff.loadTime = "N/A"; // QDateTime::currentDateTime().toString(Qt::ISODateWithMs);
-    psaInstalled.tariff.version = "N/A";
-
-    psaInstalled.hw.linuxVersion = m_osVersion;
-    psaInstalled.hw.cpuSerial = m_cpuSerial;
-
-    psaInstalled.dc.versionHW = deviceControllerVersionHW;
-    psaInstalled.dc.versionSW = deviceControllerVersionSW;
-    psaInstalled.dc.gitBlob = "N/A";
-    psaInstalled.dc.gitLastCommit = "N/A";
-    psaInstalled.dc.size = -1;
-
-    psaInstalled.sw.raucVersion = m_raucVersion;
-    psaInstalled.sw.opkgVersion = m_opkgVersion;
-    psaInstalled.sw.atbQTVersion = m_atbqtVersion;
-
-    psaInstalled.pluginVersion.deviceController = m_pluginVersionATBDeciceController;
-    psaInstalled.pluginVersion.ingenicoISelfCC = m_pluginVersionIngenicoISelf;
-    psaInstalled.pluginVersion.mobilisisCalculatePrice = m_pluginVersionMobilisisCalc;
-    psaInstalled.pluginVersion.mobilisisCalculatePriceConfigUi = m_pluginVersionMobilisisCalcConfig;
-    psaInstalled.pluginVersion.prmCalculatePrice = m_pluginVersionPrmCalc;
-    psaInstalled.pluginVersion.prmCalculatePriceConfigUi = m_pluginVersionPrmCalcConfig;
-    psaInstalled.pluginVersion.tcpZVT = m_pluginVersionTcpZvt;
-
-    psaInstalled.cash.name = "DC2C_cash.json";
-    absPathName = QDir::cleanPath(printSysDir + QDir::separator() + psaInstalled.cash.name);
-    psaInstalled.cash.blob = m_gc.gitBlob(absPathName);
-    psaInstalled.cash.size = getFileSize(absPathName);
-
-    psaInstalled.conf.name = "DC2C_conf.json";
-    absPathName = QDir::cleanPath(printSysDir + QDir::separator() + psaInstalled.conf.name);
-    psaInstalled.conf.blob = m_gc.gitBlob(absPathName);
-    psaInstalled.conf.size = getFileSize(absPathName);
-
-    psaInstalled.device.name = "DC2C_device.json";
-    absPathName = QDir::cleanPath(printSysDir + QDir::separator() + psaInstalled.device.name);
-    psaInstalled.device.blob = m_gc.gitBlob(absPathName);
-    psaInstalled.device.size = getFileSize(absPathName);
-
-    for (int i=0; i < 32; ++i) {
-        QString const &n = QString("%1").arg(i+1).rightJustified(2, '0');
-        psaInstalled.print[i].name = QString("DC2C_print%1.json").arg(n);
-        absPathName = QDir::cleanPath(printSysDir + QDir::separator() + psaInstalled.print[i].name);
-        psaInstalled.print[i].blob = m_gc.gitBlob(absPathName);
-        psaInstalled.print[i].size = getFileSize(absPathName);
-    }
-
-    // QByteArray data = "#M=APISM#C=CMD_SENDVERSION#J=";
-    return m_ismasClient.updateOfPSASendVersion(psaInstalled);
-}
-
 /************************************************************************************************
  * operators
  */
 QDebug operator<< (QDebug debug, UpdateStatus status) {
     switch(status.m_updateStatus) {
+    case UPDATE_STATUS::ISMAS_SEND_LAST_VERSION_FAILED:
+        debug << QString("UPDATE_STATUS::ISMAS_SEND_LAST_VERSION_FAILED: ")
+              << status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::SAVE_LOG_FILES_FAILED:
+        debug << QString("UPDATE_STATUS::SAVE_LOG_FILES_FAILED: ")
+              << status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::GIT_CHECK_FILES_TO_UPDATE_SUCCESS:
+        debug << QString("UPDATE_STATUS::GIT_CHECK_FILES_TO_UPDATE_SUCCESS: ")
+              << status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::PSA_UPDATE_FILES_FAILED:
+        debug << QString("UPDATE_STATUS::PSA_UPDATE_FILES_FAILED: ")
+              << status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::RSYNC_UPDATES_SUCCESS:
+        debug << QString("UPDATE_STATUS::RSYNC_UPDATES_SUCCESS: ")
+              << status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::RSYNC_UPDATES_FAILURE:
+        debug << QString("UPDATE_STATUS::RSYNC_UPDATES_FAILURE: ")
+              << status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::EXEC_OPKG_COMMAND:
+        debug << QString("UPDATE_STATUS::EXEC_OPKG_COMMAND: ")
+              << status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::GIT_CLONE_AND_CHECKOUT_SUCCESS:
+        debug << QString("UPDATE_STATUS::GIT_CLONE_AND_CHECKOUT_SUCCESS: ")
+              << status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::GIT_CLONE_AND_CHECKOUT_FAILURE:
+        debug << QString("UPDATE_STATUS::GIT_CLONE_AND_CHECKOUT_FAILURE: ")
+              << status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::NOT_DEFINED:
+        debug << QString("UPDATE_STATUS::NOT_DEFINED: ")
+              << status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::UPDATE_PROCESS_FAILURE:
+        debug << QString("UPDATE_STATUS::UPDATE_PROCESS_FAILURE: ")
+              << status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::ISMAS_UPDATE_TRIGGER_SET_FAILURE:
+        debug << QString("UPDATE_STATUS::ISMAS_UPDATE_TRIGGER_FAILURE: ")
+              << status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::GIT_CHECKOUT_BRANCH_FAILURE:
+        debug << QString("UPDATE_STATUS::GIT_CHECKOUT_BRANCH_FAILURE: ")
+              << status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::GIT_CHECKOUT_BRANCH:
+        debug << QString("UPDATE_STATUS::GIT_CHECKOUT_BRANCH: ")
+              << status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::ISMAS_UPDATE_TRIGGER_NOT_SET_OR_WRONG:
+        debug << QString("UPDATE_STATUS::ISMAS_UPDATE_TRIGGER_NOT_SET_OR_WRONG: ")
+              << status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::ISMAS_UPDATE_TRIGGER_SET:
+        debug << QString("UPDATE_STATUS::ISMAS_UPDATE_TRIGGER_SET: ")
+              << status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::ISMAS_SANITY_CHECK_OK:
+        debug << QString("UPDATE_STATUS::ISMAS_SANITY_CHECK_OK: ")
+              << status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::JSON_PARSE_FAILURE:
+        debug << QString("UPDATE_STATUS::JSON_PARSE_FAILURE: ")
+              << status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::BACKEND_CHECK:
+        debug << QString("UPDATE_STATUS::BACKEND_CHECK: ")
+              << status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::BACKEND_CHECK_FAILURE:
+        debug << QString("UPDATE_STATUS::BACKEND_CHECK_FAILURE: ")
+              << status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::BACKEND_NOT_CONNECTED:
+        debug << QString("UPDATE_STATUS::BACKEND_NOT_CONNECTED: ")
+              << status.m_statusDescription;
+        break;
     case UPDATE_STATUS::UPDATE_PROCESS_SUCCESS:
         debug << QString("UPDATE_STATUS::UPDATE_PROCESS_SUCCESS: ")
               << status.m_statusDescription;
@@ -1237,14 +1291,6 @@ QDebug operator<< (QDebug debug, UpdateStatus status) {
         debug << QString("UPDATE_STATUS::ISMAS_WAIT_STATE_CHECK_FAILURE: ")
               << status.m_statusDescription;
         break;
-    case UPDATE_STATUS::ISMAS_WAIT_STATE_CHECK_TIMEOUT:
-        debug << QString("UPDATE_STATUS::ISMAS_WAIT_STATE_CHECK_: ")
-              << status.m_statusDescription;
-        break;
-    case UPDATE_STATUS::ISMAS_WAIT_STATE_CHECK_SUCCESS:
-        debug << QString("UPDATE_STATUS::ISMAS_WAIT_STATE_CHECK_SUCCESS: ")
-              << status.m_statusDescription;
-    break;
     case UPDATE_STATUS::GIT_FETCH_UPDATES:
         debug << QString("UPDATE_STATUS::GIT_FETCH_UPDATES: ")
               << status.m_statusDescription;
@@ -1253,45 +1299,109 @@ QDebug operator<< (QDebug debug, UpdateStatus status) {
         debug << QString("UPDATE_STATUS::GIT_FETCH_UPDATES_REQUEST_FAILURE: ")
               << status.m_statusDescription;
     break;
-    case UPDATE_STATUS::GIT_FETCH_UPDATES_REQUEST_SUCCESS:
-        debug << QString("UPDATE_STATUS::GIT_FETCH_UPDATES_REQUEST_SUCCESS: ")
-              << status.m_statusDescription;
-    break;
     case UPDATE_STATUS::ISMAS_RESPONSE_RECEIVED:
         debug << QString("UPDATE_STATUS::ISMAS_RESPONSE_RECEIVED: ")
               << status.m_statusDescription;
     break;
-    case UPDATE_STATUS::GIT_PULL_UPDATES_SUCCESS:
-        debug << QString("UPDATE_STATUS::GIT_PULL_UPDATES_REQUEST: ")
-              << status.m_statusDescription;
-    break;
-    case UPDATE_STATUS::GIT_PULL_UPDATES_FAILURE:
-        debug << QString("UPDATE_STATUS::GIT_PULL_UPDATES_FAILURE: ")
-              << status.m_statusDescription;
-    break;
     case UPDATE_STATUS::EXEC_OPKG_COMMANDS:
         debug << QString("UPDATE_STATUS::EXEC_OPKG_COMMANDS: ")
               << status.m_statusDescription;
     break;
-    case UPDATE_STATUS::EXEC_OPKG_COMMANDS_SUCCESS:
+    // default:;
-        debug << QString("UPDATE_STATUS::EXEC_OPKG_COMMANDS_SUCCESS: ")
-              << status.m_statusDescription;
-    break;
-    case UPDATE_STATUS::EXEC_OPKG_COMMAND_SUCCESS:
-        debug << QString("UPDATE_STATUS::EXEC_OPKG_COMMAND_SUCCESS: ")
-              << status.m_statusDescription;
-    break;
-    case UPDATE_STATUS::EXEC_OPKG_COMMAND_FAILURE:
-        debug << QString("UPDATE_STATUS::EXEC_OPKG_COMMAND_FAILURE: ")
-              << status.m_statusDescription;
-    break;
-    default:;
     }
     return debug;
 }
 
 QString& operator<< (QString& str, UpdateStatus status) {
     switch(status.m_updateStatus) {
+    case UPDATE_STATUS::ISMAS_SEND_LAST_VERSION_FAILED:
+        str = QString("UPDATE_STATUS::ISMAS_SEND_LAST_VERSION_FAILED: ");
+        str += status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::SAVE_LOG_FILES_FAILED:
+        str = QString("UPDATE_STATUS::SAVE_LOG_FILES_FAILED: ");
+        str += status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::GIT_CHECK_FILES_TO_UPDATE_SUCCESS:
+        str = QString("UPDATE_STATUS::GIT_CHECK_FILES_TO_UPDATE_SUCCESS: ");
+        str += status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::PSA_UPDATE_FILES_FAILED:
+        str = QString("UPDATE_STATUS::PSA_UPDATE_FILES_FAILED: ");
+        str += status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::RSYNC_UPDATES_SUCCESS:
+        str = QString("UPDATE_STATUS::RSYNC_UPDATES_SUCCESS: ");
+        str += status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::RSYNC_UPDATES_FAILURE:
+        str = QString("UPDATE_STATUS::RSYNC_UPDATES_FAILURE: ");
+        str += status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::EXEC_OPKG_COMMAND:
+        str = QString("UPDATE_STATUS::EXEC_OPKG_COMMAND: ");
+        str += status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::GIT_CLONE_AND_CHECKOUT_SUCCESS:
+        str = QString("UPDATE_STATUS::GIT_CLONE_AND_CHECKOUT_SUCCESS: ");
+        str += status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::GIT_CLONE_AND_CHECKOUT_FAILURE:
+        str = QString("UPDATE_STATUS::GIT_CLONE_AND_CHECKOUT_FAILURE: ");
+        str += status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::NOT_DEFINED:
+        str = QString("UPDATE_STATUS::NOT_DEFINED: ");
+        str += status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::UPDATE_PROCESS_FAILURE:
+        str = QString("UPDATE_STATUS::UPDATE_PROCESS_FAILURE: ");
+        str += status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::ISMAS_UPDATE_TRIGGER_SET_FAILURE:
+        str = QString("UPDATE_STATUS::ISMAS_UPDATE_TRIGGER_FAILURE: ");
+        str += status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::GIT_CHECKOUT_BRANCH_FAILURE:
+        str = QString("UPDATE_STATUS::GIT_CHECKOUT_BRANCH_FAILURE: ");
+        str += status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::GIT_CHECKOUT_BRANCH:
+        str = QString("UPDATE_STATUS::GIT_CHECKOUT_BRANCH: ");
+        str += status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::ISMAS_UPDATE_TRIGGER_NOT_SET_OR_WRONG:
+        str = QString("UPDATE_STATUS::ISMAS_UPDATE_TRIGGER_NOT_SET_OR_WRONG: ");
+        str += status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::ISMAS_WAIT_STATE_CHECK_FAILURE:
+        str = QString("UPDATE_STATUS::ISMAS_WAIT_STATE_CHECK_FAILURE: ");
+        str += status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::ISMAS_UPDATE_TRIGGER_SET:
+        str = QString("UPDATE_STATUS::ISMAS_UPDATE_TRIGGER_SET: ");
+        str += status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::ISMAS_SANITY_CHECK_OK:
+        str = QString("UPDATE_STATUS::ISMAS_SANITY_CHECK_OK: ");
+        str += status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::JSON_PARSE_FAILURE:
+        str = QString("UPDATE_STATUS::JSON_PARSE_FAILURE: ");
+        str += status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::BACKEND_CHECK:
+        str = QString("UPDATE_STATUS::BACKEND_CHECK: ");
+        str += status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::BACKEND_CHECK_FAILURE:
+        str = QString("UPDATE_STATUS::BACKEND_CHECK_FAILURE: ");
+        str += status.m_statusDescription;
+        break;
+    case UPDATE_STATUS::BACKEND_NOT_CONNECTED:
+        str = QString("UPDATE_STATUS::BACKEND_NOT_CONNECTED: ");
+        str += status.m_statusDescription;
+        break;
     case UPDATE_STATUS::UPDATE_PROCESS_SUCCESS:
         str = QString("UPDATE_STATUS::UPDATE_PROCESS_SUCCESS: ");
         str += status.m_statusDescription;
@@ -1300,10 +1410,6 @@ QString& operator<< (QString& str, UpdateStatus status) {
         str = QString("UPDATE_STATUS::ISMAS_WAIT_STATE_CHECK_PENDING: ");
         str += status.m_statusDescription;
     break;
-    case UPDATE_STATUS::ISMAS_WAIT_STATE_CHECK_SUCCESS:
-        str = QString("UPDATE_STATUS::ISMAS_WAIT_STATE_CHECK_SUCCESS: ");
-        str += status.m_statusDescription;
-    break;
     case UPDATE_STATUS::GIT_FETCH_UPDATES:
         str = QString("UPDATE_STATUS::GIT_FETCH_UPDATES: ");
         str += status.m_statusDescription;
@@ -1312,18 +1418,6 @@ QString& operator<< (QString& str, UpdateStatus status) {
         str = QString("UPDATE_STATUS::GIT_FETCH_UPDATES_REQUEST_FAILURE: ");
         str += status.m_statusDescription;
     break;
-    case UPDATE_STATUS::GIT_FETCH_UPDATES_REQUEST_SUCCESS:
-        str = QString("UPDATE_STATUS::GIT_FETCH_UPDATES_REQUEST_SUCCESS: ");
-        str += status.m_statusDescription;
-    break;
-    case UPDATE_STATUS::GIT_PULL_UPDATES_SUCCESS:
-        str = QString("UPDATE_STATUS::GIT_PULL_UPDATES_SUCCESS: ");
-        str += status.m_statusDescription;
-    break;
-    case UPDATE_STATUS::GIT_PULL_UPDATES_FAILURE:
-        str = QString("UPDATE_STATUS::GIT_PULL_UPDATES_FAILURE: ");
-        str += status.m_statusDescription;
-    break;
     case UPDATE_STATUS::ISMAS_RESPONSE_RECEIVED:
         str = QString("UPDATE_STATUS::ISMAS_RESPONSE_RECEIVED: ");
         str += status.m_statusDescription;
@@ -1332,19 +1426,7 @@ QString& operator<< (QString& str, UpdateStatus status) {
         str = QString("UPDATE_STATUS::EXEC_OPKG_COMMANDS: ");
         str += status.m_statusDescription;
     break;
-    case UPDATE_STATUS::EXEC_OPKG_COMMANDS_SUCCESS:
+    //default:;
-        str = QString("UPDATE_STATUS::EXEC_OPKG_COMMANDS_SUCCESS: ");
-        str += status.m_statusDescription;
-    break;
-    case UPDATE_STATUS::EXEC_OPKG_COMMAND_SUCCESS:
-        str = QString("UPDATE_STATUS::EXEC_OPKG_COMMAND_SUCCESS: ");
-        str += status.m_statusDescription;
-    break;
-    case UPDATE_STATUS::EXEC_OPKG_COMMAND_FAILURE:
-        str = QString("UPDATE_STATUS::EXEC_OPKG_COMMAND_FAILURE: ");
-        str += status.m_statusDescription;
-    break;
-    default:;
     }
     return str;
 }

worker.h

@@ -23,55 +23,27 @@
 
 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,
+    ISMAS_UPDATE_TRIGGER_SET,
-    UPDATE_TRIGGER_NOT_SET_OR_WRONG,
+    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_FAILURE,
-    GIT_CHECKOUT_BRANCH_NOT_EXISTS,
-    GIT_CHECKOUT_BRANCH_CHECKOUT_ERROR,
     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,
+    RSYNC_UPDATES_SUCCESS,
-    DEVICE_CONTROLLER_UPDATE,
-    DEVICE_CONTROLLER_UPDATE_FAILURE,
-    DEVICE_CONTROLLER_UPDATE_SUCCESS,
-    JSON_UPDATE,
-    JSON_UPDATE_FAILURE,
     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,
@@ -216,7 +188,6 @@ private slots:
 
 private:
     PSAInstalled getPSAInstalled();
-    QString sendCmdSendVersionToIsmas();
     void privateUpdate();
 };