ATBUpdateTool.ini

@@ -1,5 +1,5 @@
 [REPOSITORY_URL]
-repository-url="gitea@ptu-config.atb-comm.de:ATB/"
+repository-url="https://git.mimbach49.de/GerhardHoffmann"
 
 [DIRECTORIES]
 plugin-directory="/usr/lib/"

DownloadDCFirmware/dc_download.cpp

@@ -1,7 +1,6 @@
 #include "dc_download.h"
-#include <DeviceController/interfaces.h>
+#include "hwapi.h"
 
-#include <QFile>
 #include <QDebug>
 #include <QDateTime>
 #include <QThread>

DownloadDCFirmware/main.cpp

@@ -55,7 +55,7 @@ int main(int argc, char **argv) {
     openlog("ATB-UPDATE-DC-FIRMWARE", LOG_PERROR | LOG_PID | LOG_CONS, LOG_USER);
 
     QApplication a(argc, argv);
-    QApplication::setApplicationName("ATBDownloadDCFirmware");
+    QApplication::setApplicationName("ATBUpdateTool");
     QApplication::setApplicationVersion(APP_VERSION);
 
     if (!messageHandlerInstalled()) { // change internal qt-QDebug-handling
@@ -124,12 +124,11 @@ int main(int argc, char **argv) {
     MainWindow mw;
 
     mw.setWindowFlags(Qt::Window | Qt::FramelessWindowHint);
-    // mw.showFullScreen();
+    //mw.showFullScreen();
 
-    // qCritical() << "SHOW";
+    qCritical() << "SHOW";
 
-    // mw.show();
+    mw.show();
 
-    return 0;
+    return a.exec();
-    // return a.exec();
 }

DownloadDCJsonFiles/update.cpp

@@ -414,6 +414,10 @@ bool Update::downloadJson(enum FileTypeJson type,
         }
     }
 
+    m_hw->dc_autoRequest(false);
+    qDebug() << "SET AUTO-REQUEST=FALSE";
+    QThread::sleep(1);  // make sure the auto-request flag is acknowledged
+
     return ret;
 }
 

UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro

@@ -127,28 +127,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
 # 1.4.8   : Improve reading Json-file versions of Json-files actually loaded
 #           in DC. If available, show version info instead of blob-info of
 #           Json file.
-# 1.4.9   : Improve ISMAS output: add messages for JSON downloads.
+VERSION="1.4.9"
-#           Do not send CHECK_ISMAS_TRIGGER_SUCCESS to ISMAS for an automatic
-#           update.
-#           In case there is an automatic update (00:00-04:00) use M0100 instead
-#           of U0002.
-# 1.4.10  : Fix: for the time being, never set the autoRequest-flag to false.
-# 1.4.11  : Fix: remove hard-coded path to git-repos of gitea in mimbach. Read
-#           from ATBUpdateTool.ini the url for the gitrepositories.
-# 1.5.0   : Use ptu-config.atb-comm.de (given in ini-file) as new server for
-#           customer repositories.
-#           Fix: allow empty lines in opkg_commands.
-# 1.5.1   : Fix: do not use cleanPath() on a url-address.
-# 1.5.2   : Remove .ipk and .gz files in /var/cache/opkg.
-# 1.5.3   : Build customer_(id) name without right justification.
-# 1.5.4   : Try to run opkg-commands even under some error conditions (failure
-#           of customerEnvironment(), filesToUpdate() or
-#           syncCustomerRepositoryAndFS().
-# 1.5.5   : Call into binary ptuPackageVersion to get installed package
-#           versions.
-# 1.5.6   : Show additional update progress info in status bar.
-# 1.5.7   : Add support for dynamic portrait / landscape.
-VERSION="1.5.7"
 # PLANNED TODOS:
 #   1:  Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
 #   2:  Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu

UpdatePTUDevCtrl/git/git_client.cpp

@@ -9,15 +9,14 @@
 #include <QStringList>
 
 
-GitClient::GitClient(QString const &customerRepositoryPath,
+GitClient::GitClient(QString const &customerNrStr,
-                     QString const &customerNrStr,
                      QString const &customerRepository,
                      QString const &workingDirectory,
                      QString const &branchName,
                      QObject *parent)
   : QObject(parent)
   , m_worker(qobject_cast<Worker *>(parent))
-  , m_repositoryPath(customerRepositoryPath)
+  , m_repositoryPath(QString("https://git.mimbach49.de/GerhardHoffmann/%1.git").arg(customerNrStr))
   , m_customerNr(customerNrStr)
   , m_workingDirectory(workingDirectory)
   , m_branchName(branchName)
@@ -393,45 +392,6 @@ std::optional<QString> GitClient::gitPull() {
     if (QDir(m_customerRepository).exists()) {
         qInfo() << "BRANCH NAME" << m_branchName;
 
-#if 0
-        IMPORTANT COMMENT:
-
-        If remote host keys are changed, then
-
-        export GIT_SSH_COMMAND="ssh -i /opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig"
-        git pull
-
-        leads to the following warning/error message:
-
-        @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-        @    WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!     @
-        @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-        IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!
-        Someone could be eavesdropping on you right now (man-in-the-middle attack)!
-        It is also possible that a host key has just been changed.
-        The fingerprint for the ECDSA key sent by the remote host is
-        SHA256:vOD5jF2hglGktqLhK9ABxfEjwEgIK68/v9erdT05NDQ.
-        Please contact your system administrator.
-        Add correct host key in /home/root/.ssh/known_hosts to get rid of this message.
-        Offending ECDSA key in /home/root/.ssh/known_hosts:1
-        Password authentication is disabled to avoid man-in-the-middle attacks.
-        Keyboard-interactive authentication is disabled to avoid man-in-the-middle attacks.
-        Agent forwarding is disabled to avoid man-in-the-middle attacks.
-        X11 forwarding is disabled to avoid man-in-the-middle attacks.
-        Already up to date.
-
-        This first part is from ssh itself. Only the last line is the git message.
-
-        Here an output of running ATBUpdateTool with a corrupted known-hosts-file:
-
-        ...
-        Oct 23 14:18:18 ATB_PTU5 ATBUpdateTool[2696]: ( branchExistsRemotely : 310 ) branch "zg1/zone1" EXISTS REMOTELY. ( "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\r\n@    WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!     @\r\n@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\r\nIT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!\r\nSomeone could be eavesdropping on you right now (man-in-the-middle attack)!\r\nIt is also possible that a host key has just been changed.\r\nThe fingerprint for the ECDSA key sent by the remote host is\nSHA256:vOD5jF2hglGktqLhK9ABxfEjwEgIK68/v9erdT05NDQ.\r\nPlease contact your system administrator.\r\nAdd correct host key in /home/root/.ssh/known_hosts to get rid of this message.\r\nOffending ECDSA key in /home/root/.ssh/known_hosts:1\r\nPassword authentication is disabled to avoid man-in-the-middle attacks.\r\nKeyboard-interactive authentication is disabled to avoid man-in-the-middle attacks.\r\nAgent forwarding is disabled to avoid man-in-the-middle attacks.\r\nX11 forwarding is disabled to avoid man-in-the-middle attacks.\r\nbd4e8da4780b1a7d6be3d3ce8419f43ccf7e706f\trefs/heads/zg1/zone1" )
-        Oct 23 14:18:18 ATB_PTU5 ATBUpdateTool[2696]: EXECUTED "git branch -l" "(runtime 16ms)" with code 0 IN "/opt/app/tools/atbupdate/customer_336"
-        Oct 23 14:18:18 ATB_PTU5 ATBUpdateTool[2696]: "UPDATE_STEP::PULL_NEW_BRANCH"
-        Oct 23 14:18:18 ATB_PTU5 ATBUpdateTool[2696]: "BRANCH-NAME zg1/zone1 CONTAINED IN RESULT master\n* zg1/zone1" .....
-
-        The download continues.
-#endif
         Command c("git pull");
         if (c.execute(m_customerRepository)) {
             QString const s = c.getCommandResult().trimmed();

UpdatePTUDevCtrl/git/git_client.h

@@ -22,8 +22,7 @@ class GitClient : public QObject {
     bool copyGitConfigFromMaster();
 
   public:
-    explicit GitClient(QString const &customerRepositoryUrl,
+    explicit GitClient(QString const &customerNrStr,
-                       QString const &customerNrStr,
                        QString const &repositoryPath,
                        QString const &workingDirectory = QCoreApplication::applicationDirPath(),
                        QString const &branchName = "master",

UpdatePTUDevCtrl/ismas/ismas_client.cpp

@@ -363,19 +363,7 @@ QString IsmasClient::updateNewsToIsmas(char const *event,
     char buf[1024];
     memset(buf, 0, sizeof(buf));
 
-    QDateTime const local(QDateTime::currentDateTime());
+    QString const ts = QDateTime::currentDateTime().toString(Qt::ISODateWithMs);
-
-    QDateTime utc(local);
-    utc.setTimeSpec(Qt::UTC);
-
-    int const diff = (int)local.secsTo(utc); // diff between UTC and local time
-
-    QTime t(0, 0, 0);
-    t = t.addSecs((uint)diff);
-
-    QString const st(QString("%1%2").arg(diff < 0 ? "-" : "+").arg(t.toString("hh:mm")));
-    QString const ts(local.toString(Qt::ISODateWithMs) + st);
-
     snprintf(buf, sizeof(buf)-1,
         "{"
             "\"REASON\":\"SW_UP\","
@@ -690,8 +678,7 @@ QString IsmasClient::updateOfPSASendVersion(PSAInstalled const &psa) {
                 "\"libTCP_ZVT_CCPlugin.so\" : {"
                     "\"VERSION\" : \"%s\""
                 "}"
-            "},"
+            "}"
-             "\"PTU-PACKAGE-VERSIONS\" : %s"
         "}",
         psa.versionInfo.reason.toStdString().c_str(),
         psa.versionInfo.created.toStdString().c_str(),
@@ -802,11 +789,9 @@ QString IsmasClient::updateOfPSASendVersion(PSAInstalled const &psa) {
         psa.pluginVersion.mobilisisCalculatePriceConfigUi.toStdString().c_str(),
         psa.pluginVersion.prmCalculatePrice.toStdString().c_str(),
         psa.pluginVersion.prmCalculatePriceConfigUi.toStdString().c_str(),
-        psa.pluginVersion.tcpZVT.toStdString().c_str(),
+        psa.pluginVersion.tcpZVT.toStdString().c_str());
 
-        psa.ptuPackageVersion.toStdString().c_str());
+    qInfo() << buf;
-
-        qInfo() << buf;
 
     return buf;
 }

UpdatePTUDevCtrl/ismas/ismas_client.h

@@ -77,8 +77,6 @@ struct PSAInstalled {
 
     DC2C print[32];
 
-    QString ptuPackageVersion;
-
     explicit PSAInstalled() {
         tariff.name = "N/A";
         tariff.version = "N/A";

UpdatePTUDevCtrl/main.cpp

@@ -50,11 +50,9 @@
 // argv[1]: file to send to dc
 int main(int argc, char *argv[]) {
     QByteArray const value = qgetenv("LC_ALL");
-    if (value.isEmpty() || value != "C") {
+    if (value != "C") {
         qputenv("LC_ALL", "C");
     }
-
-
     // qputenv("XDG_RUNTIME_DIR", "/var/run/user/0");
 
     openlog("ATB-UPDATE", LOG_PERROR | LOG_PID | LOG_CONS, LOG_USER);
@@ -74,38 +72,6 @@ int main(int argc, char *argv[]) {
     parser.readSettings();
 
     QString repositoryUrl = parser.repositoryUrl();
-
-    if (repositoryUrl.endsWith('/')) {
-        repositoryUrl.chop(1);
-    }
-
-    QString gitSSHCommand("");
-
-    if (repositoryUrl.contains("ptu-config.atb-comm.de")) {
-        QByteArray const v = qgetenv("GIT_SSH_COMMAND");
-        if (v.isEmpty()) {
-            QString sshKeyFile("/opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig");
-            if (QFileInfo(sshKeyFile).exists()) {
-                gitSSHCommand = "ssh -i /opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig";
-                if (!qputenv("GIT_SSH_COMMAND", QByteArray(gitSSHCommand.toStdString().c_str()))) {
-                    qCritical() << "ERROR: GIT_SSH_COMMAND not put into env. Exiting...";
-                    return -1;
-                }
-            } else {
-                qCritical() << "ERROR ssh-key-file" << sshKeyFile << "does not exists. Exiting...";
-                return -1;
-            }
-        } else {
-            gitSSHCommand = QString(v.toStdString().c_str());
-            qCritical() << "WARNING GIT_SSH_COMMAND already set in enviroment:"
-                        << gitSSHCommand;
-            if (gitSSHCommand != "ssh -i /opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig") {
-                qCritical() << "ERROR" << gitSSHCommand << "wrong. Exiting...";
-                return -1;
-            }
-        }
-    }
-
     QString plugInDir = parser.plugInDir();
     QString plugInName = parser.plugInName();
     QString workingDir = parser.workingDir();
@@ -128,9 +94,6 @@ int main(int argc, char *argv[]) {
 
     qInfo() << "pwd ......................" << rtPath;
     qInfo() << "repositoryUrl ............" << repositoryUrl;
-    if (!gitSSHCommand.isEmpty()) {
-        qInfo() << "GIT_SSH_COMMAND .........." << gitSSHCommand;
-    }
     qInfo() << "plugInDir ................" << plugInDir;
     qInfo() << "plugInName ..............." << plugInName;
     qInfo() << "workingDir ..............." << workingDir;

UpdatePTUDevCtrl/mainwindow.cpp

@@ -12,9 +12,6 @@
 #include <QScrollBar>
 #include <QEvent>
 
-#include <QScreen>
-
-
 
 MainWindow::MainWindow(Worker *worker, QWidget *parent)
     : QMainWindow(parent)
@@ -33,7 +30,6 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
     this->statusBar()->setFont(f);
 
     ui->setupUi(this);
-    checkOrientation();
 
     ui->updateProgress->setRange(0, 100);
     ui->updateProgress->reset();
@@ -63,24 +59,6 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
     m_exitTimer->setSingleShot(true);
     m_exitTimer->start(1800 * 1000);
 
-    m_statusTimer = new QTimer(this);
-    if (m_statusTimer) {
-        connect(m_statusTimer, &QTimer::timeout, [this]() {
-            static QString p(".");
-            QTime const &t = QDateTime::currentDateTime().time();
-            QString s = t.toString(Qt::ISODate);
-            s += ": Update might take several minutes " + p;
-            if (p.length() >= 5) {
-                p = ".";
-            } else {
-                p += ".";
-            }
-            this->statusBar()->showMessage(s);
-        });
-        m_statusTimer->setSingleShot(false);
-        m_statusTimer->start(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()));
@@ -98,60 +76,9 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
 MainWindow::~MainWindow() {
     delete m_startTimer;
     delete m_exitTimer;
-    delete m_statusTimer;
     delete ui;
 }
 
-
-// ----------------------------- Ui::LAYOUT setting -------------------------------------
-
-void MainWindow::checkOrientation()
-{
-    QScreen *screen = QGuiApplication::primaryScreen();
-    Qt::ScreenOrientation orientation = screen->orientation();
-
-    switch (orientation) {
-    case Qt::PrimaryOrientation:
-        this->setLandscapeLayout();
-        break;
-    case Qt::LandscapeOrientation:
-        this->setLandscapeLayout();
-        break;
-    case Qt::PortraitOrientation:
-        this->setPortraitLayout();
-        break;
-    case Qt::InvertedLandscapeOrientation:
-        this->setLandscapeLayout();
-        break;
-    case Qt::InvertedPortraitOrientation:
-        this->setPortraitLayout();
-        break;
-    }
-
-    this->currentOrientation = orientation;
-}
-
-
-
-void MainWindow::setPortraitLayout()
-{
-    // Adjust layout for portrait mode (480x800)
-    this->setFixedSize(480, 800);
-    ui->centralwidget->setFixedSize(480, 800);
-}
-
-void MainWindow::setLandscapeLayout()
-{
-    // Adjust layout for landscape mode (800x480)
-    this->setFixedSize(800, 480);
-    ui->centralwidget->setFixedSize(800, 480);
-}
-
-
-
-
-
-
 void MainWindow::customEvent(QEvent *event) {
     if (event->type() == ProgressEvent::type()) {
         ProgressEvent *pevent = (ProgressEvent *)event;

UpdatePTUDevCtrl/mainwindow.h

@@ -66,12 +66,6 @@ private:
     void onShowMessage(QString, QString);
 
     Ui::MainWindow *ui;
-    void checkOrientation();
-    void setPortraitLayout();
-    void setLandscapeLayout();
-    Qt::ScreenOrientation currentOrientation;
-
-
     Worker *m_worker;
     int const m_width;
     QTimer *m_startTimer;
@@ -79,6 +73,5 @@ private:
     bool m_progressRunning;
     //int m_progressValue;
     UpdateDcEvent::UpdateStep m_updateStep;
-    QTimer *m_statusTimer;
 };
 #endif // MAINWINDOW_H

UpdatePTUDevCtrl/mainwindow.ui

@@ -10,12 +10,6 @@
     <height>480</height>
    </rect>
   </property>
-  <property name="minimumSize">
-   <size>
-    <width>480</width>
-    <height>480</height>
-   </size>
-  </property>
   <property name="font">
    <font>
     <family>Source Code Pro</family>
@@ -25,47 +19,55 @@
    <string>MainWindow</string>
   </property>
   <widget class="QWidget" name="centralwidget">
-   <layout class="QVBoxLayout" name="verticalLayout">
+   <widget class="QWidget" name="layoutWidget">
-    <item>
+    <property name="geometry">
-     <layout class="QGridLayout" name="gridLayout">
+     <rect>
-      <item row="3" column="2">
+      <x>10</x>
-       <widget class="QPushButton" name="exit">
+      <y>10</y>
-        <property name="text">
+      <width>781</width>
-         <string>Exit</string>
+      <height>441</height>
-        </property>
+     </rect>
-       </widget>
+    </property>
-      </item>
+    <layout class="QGridLayout" name="gridLayout">
-      <item row="3" column="1">
+     <item row="3" column="2">
-       <widget class="QProgressBar" name="updateProgress">
+      <widget class="QPushButton" name="exit">
-        <property name="value">
+       <property name="text">
-         <number>1</number>
+        <string>Exit</string>
-        </property>
+       </property>
-       </widget>
+      </widget>
-      </item>
+     </item>
-      <item row="0" column="0" rowspan="3" colspan="3">
+     <item row="3" column="1">
-       <widget class="QTextEdit" name="updateStatus">
+      <widget class="QProgressBar" name="updateProgress">
-        <property name="enabled">
+       <property name="value">
-         <bool>true</bool>
+        <number>1</number>
-        </property>
+       </property>
-        <property name="font">
+      </widget>
-         <font>
+     </item>
-          <family>Misc Fixed</family>
+     <item row="0" column="0" rowspan="3" colspan="3">
-          <pointsize>11</pointsize>
+      <widget class="QTextEdit" name="updateStatus">
-          <weight>75</weight>
+       <property name="enabled">
-          <bold>true</bold>
+        <bool>true</bool>
-         </font>
+       </property>
-        </property>
+       <property name="font">
-        <property name="verticalScrollBarPolicy">
+        <font>
-         <enum>Qt::ScrollBarAsNeeded</enum>
+         <family>Misc Fixed</family>
-        </property>
+         <pointsize>11</pointsize>
-        <property name="horizontalScrollBarPolicy">
+         <bold>true</bold>
-         <enum>Qt::ScrollBarAsNeeded</enum>
+        </font>
-        </property>
+       </property>
-       </widget>
+       <property name="verticalScrollBarPolicy">
-      </item>
+        <enum>Qt::ScrollBarAsNeeded</enum>
-     </layout>
+       </property>
-    </item>
+       <property name="horizontalScrollBarPolicy">
-   </layout>
+        <enum>Qt::ScrollBarAsNeeded</enum>
+       </property>
+       <property name="sizeAdjustPolicy">
+        <enum>QAbstractScrollArea::AdjustToContents</enum>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </widget>
   </widget>
  </widget>
  <resources/>

UpdatePTUDevCtrl/update.cpp

@@ -193,8 +193,8 @@ bool Update::openSerial(int br, QString baudrate, QString comPort) const {
                       + " " + baudrate + " " + comPort + "...OK");
 
             // m_hw->dc_autoRequest(true);
-            // m_hw->dc_autoRequest(false);
+            m_hw->dc_autoRequest(false);
-            // QThread::sleep(1);
+            QThread::sleep(1);
 
             Utils::printInfoMsg(QString("IS PORT OPEN %1").arg(m_hw->dc_isPortOpen()));
             return true;
@@ -410,7 +410,7 @@ bool Update::downloadJson(enum FileTypeJson type,
                 lst << msg;
 
                 if (m_worker) {
-                    m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_JSON_FILE_FAILURE));
+                    m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
                 }
                 break;
             }
@@ -463,20 +463,22 @@ bool Update::downloadJson(enum FileTypeJson type,
                             */
 
                             if (m_worker) {
-                                lst.clear();
                                 if (templateIdx >= 1 && templateIdx <= 32) {
-                                    lst << QString("LOADED %1 (%2) TO DC").arg(fi.fileName()).arg(templateIdx);
+                                    msg = QString("SUCCESSFULLY LOADED %1 (INDEX=%2) TO DC").arg(file.fileName()).arg(templateIdx);
                                 } else {
-                                    lst << QString("LOADED %1 (%2) TO DC").arg(fi.fileName()).arg((uint8_t)type);
+                                    msg = QString("SUCCESSFULLY LOADED %1 (KIND=%2) TO DC").arg(file.fileName()).arg((uint8_t)type);
                                 }
-                                m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_JSON_FILE));
+                                lst.clear();
+                                lst << msg;
+                                m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
                             }
                         } else {
                             msg = QString("ERROR SEND JSON-FILE %1 TO DC").arg(file.fileName());
                             Utils::printCriticalErrorMsg(msg);
                             lst << msg;
                             if (m_worker) {
-                                m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_JSON_FILE_FAILURE);
+                                m_worker->ISMAS(lst) <<  (m_worker->GUI(lst) << (m_worker->CONSOLE(lst)
+                                                     << Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
                             }
                         }
                     } else {
@@ -484,7 +486,8 @@ bool Update::downloadJson(enum FileTypeJson type,
                         Utils::printCriticalErrorMsg(msg);
                         lst << msg;
                         if (m_worker) {
-                            m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_JSON_FILE_FAILURE);
+                            m_worker->ISMAS(lst) <<  (m_worker->GUI(lst) << (m_worker->CONSOLE(lst)
+                                                 << Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
                         }
                     }
                 } else {
@@ -493,7 +496,8 @@ bool Update::downloadJson(enum FileTypeJson type,
                     lst << msg;
 
                     if (m_worker) {
-                        m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_JSON_FILE_FAILURE);
+                        m_worker->ISMAS(lst) <<  (m_worker->GUI(lst) << (m_worker->CONSOLE(lst)
+                                             << Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
                     }
                 }
             } else {
@@ -502,14 +506,15 @@ bool Update::downloadJson(enum FileTypeJson type,
                 lst << msg;
 
                 if (m_worker) {
-                    m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_JSON_FILE_FAILURE);
+                    m_worker->ISMAS(lst) <<  (m_worker->GUI(lst) << (m_worker->CONSOLE(lst)
+                                         << Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
                 }
             }
         }
 
-        // m_hw->dc_autoRequest(false);
+        m_hw->dc_autoRequest(false);
-        // qDebug() << "SET AUTO-REQUEST=FALSE";
+        qDebug() << "SET AUTO-REQUEST=FALSE";
-        // QThread::sleep(1);  // make sure the auto-request flag is acknowledged
+        QThread::sleep(1);  // make sure the auto-request flag is acknowledged
     }
 
     return true;
@@ -584,8 +589,8 @@ QStringList Update::getDcSoftAndHardWareVersion() {
         QString const &hwVersion = m_hw->dc_getHWversion().toLower().trimmed();
         QString const &swVersion = m_hw->dc_getSWversion().toLower().trimmed();
 
-        //m_hw->dc_autoRequest(false);
+        m_hw->dc_autoRequest(false);
-        //QThread::sleep(1); // make sure the timer-slots are inactive
+        QThread::sleep(1); // make sure the timer-slots are inactive
 
         if (!hwVersion.isEmpty() && !swVersion.isEmpty()) {
             return QStringList() << hwVersion << swVersion;
@@ -951,58 +956,45 @@ bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
                 res = false;
             } else {
                 if ((res = updatePrinterTemplate(templateIdx, fToWorkOn))) {
-                    if (m_worker) {
+                    Utils::printInfoMsg(
-                        QStringList lst(QString("DL:%1 (%2)").arg(QFileInfo(fToWorkOn).fileName()).arg(templateIdx));
+                        QString("DOWNLOADED PRINTER TEMPLATE %1 WITH INDEX=%2")
-                        m_worker->ISMAS(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_JSON_FILE_SUCCESS);
+                            .arg(fToWorkOn)
-
+                            .arg(templateIdx));
-                        ++displayIndex;
+                    ++displayIndex;
-                        emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
+                    emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
-                              + QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
+                          + QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
-                                Worker::UPDATE_STEP_DONE);
+                            Worker::UPDATE_STEP_DONE);
-                    }
                 }
             }
         } else if (fToWorkOn.contains("DC2C_cash", Qt::CaseInsensitive)
                 && fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
             res = true;
             if ((res = updateCashConf(fToWorkOn))) {
-                if (m_worker) {
+                Utils::printInfoMsg(QString("DOWNLOADED CASH TEMPLATE %1").arg(fToWorkOn));
-                    QStringList lst(QString("DL:%1").arg(QFileInfo(fToWorkOn).fileName()));
+                ++displayIndex;
-                    m_worker->ISMAS(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_CASH_FILE_SUCCESS);
+                emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
-
+                      + QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
-                    ++displayIndex;
+                        Worker::UPDATE_STEP_DONE);
-                    emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
-                          + QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
-                            Worker::UPDATE_STEP_DONE);
-                }
             }
         } else if (fToWorkOn.contains("DC2C_conf", Qt::CaseInsensitive)
                 && fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
             res = true;
             if ((res= updateConfig(fToWorkOn))) {
-                if (m_worker) {
+                Utils::printInfoMsg(QString("DOWNLOADED CONFIG TEMPLATE %1").arg(fToWorkOn));
-                    QStringList lst(QString("DL:%1").arg(QFileInfo(fToWorkOn).fileName()));
+                ++displayIndex;
-                    m_worker->ISMAS(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_CONFIG_FILE_SUCCESS);
+                emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
-
+                      + QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
-                    ++displayIndex;
+                        Worker::UPDATE_STEP_DONE);
-                    emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
-                          + QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
-                            Worker::UPDATE_STEP_DONE);
-                }
             }
         } else if (fToWorkOn.contains("DC2C_device", Qt::CaseInsensitive)
                 && fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
             res = true;
             if ((res = updateDeviceConf(fToWorkOn))) {
-                if (m_worker) {
+                Utils::printInfoMsg(QString("DOWNLOADED DEVICE TEMPLATE %1").arg(fToWorkOn));
-                    QStringList lst(QString("DL:%1").arg(QFileInfo(fToWorkOn).fileName()));
+                ++displayIndex;
-                    m_worker->ISMAS(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_DEVICE_FILE_SUCCESS);
+                emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
-
+                      + QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
-                    ++displayIndex;
+                        Worker::UPDATE_STEP_DONE);
-                    emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
-                          + QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
-                            Worker::UPDATE_STEP_DONE);
-                }
             }
         } else {
             qCritical() << "UNKNOWN JSON FILE NAME" << fToWorkOn;

UpdatePTUDevCtrl/utils.cpp

@@ -110,19 +110,19 @@ QString Utils::getTariffInfo(QString fileName) {
 }
 
 QString Utils::zoneName(quint8 i) {
-    //static constexpr char const *zName[] = {
+    static constexpr char const *zName[] = {
-    //    "",
+        "",
-    //    "purple",
+        "purple",
-    //    "blue",
+        "blue",
-    //    "yellow",
+        "yellow",
-    //    "green",
+        "green",
-    //    "yellow (mars)",
+        "yellow (mars)",
-    //    "green (mars)"
+        "green (mars)"
-    //};
+    };
-    //if (i < (sizeof(zName)/sizeof(char const *))) {
+    if (i < (sizeof(zName)/sizeof(char const *))) {
-    //    return zName[i];
+        return zName[i];
-    //}
+    }
-    return "---";
+    return "N/A";
 }
 
 void Utils::printCriticalErrorMsg(QString const &errorMsg, bool upper, bool lower) {
@@ -293,7 +293,7 @@ bool Utils::sameFilesInDirs(QDir const &dir1, QDir const &dir2,
     }
     if (fileNameLst1 != fileNameLst2) {
         printCriticalErrorMsg(dirPath1 + " AND " + dirPath2
-                            + " HAVE DIFFERENT FILES: [" + fileNameLst1.join(',') + "],["
+                            + " DIFFER: [" + fileNameLst1.join(',') + "],["
                             + fileNameLst2.join(',') + "]");
         return false;
     } else {
@@ -323,7 +323,7 @@ bool Utils::sameFilesInDirs(QDir const &dir1, QDir const &dir2,
 
     if (gitBlobLst1 != gitBlobLst2) {
         printCriticalErrorMsg(dirPath1 + " AND " + dirPath2
-                            + " HAVE DIFFERENT BLOBS: [" + gitBlobLst1.join(',') + "],["
+                            + " DIFFER: [" + gitBlobLst1.join(',') + "],["
                             + gitBlobLst2.join(',') + "]");
         return false;
     } else {

UpdatePTUDevCtrl/worker.cpp

@@ -18,7 +18,6 @@
 #include <Qt>
 #include <QScopedPointer>
 #include <QRegularExpression>
-#include <QJsonArray>
 
 #include "message_handler.h"
 #include <DeviceController/interfaces.h>
@@ -90,15 +89,6 @@ const QMap<UPDATE_STEP, const char*> Worker::smap (
         INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_CONFIG_FILE),
         INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_CONFIG_FILE_SUCCESS),
         INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_CONFIG_FILE_FAILURE),
-        INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_CASH_FILE),
-        INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_CASH_FILE_FAILURE),
-        INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_CASH_FILE_SUCCESS),
-        INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_DEVICE_FILE),
-        INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_DEVICE_FILE_FAILURE),
-        INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_DEVICE_FILE_SUCCESS),
-        INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_JSON_FILE),
-        INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_JSON_FILE_FAILURE),
-        INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_JSON_FILE_SUCCESS),
         INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER),
         INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER_SUCCESS),
         INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER_FAILURE),
@@ -142,7 +132,7 @@ Worker::Worker(int customerNr,
                char const *serialInterface,
                char const *baudrate)
   : m_customerNr(customerNr)
-  , m_customerNrStr(QString("customer_") + QString::number(m_customerNr))
+  , m_customerNrStr(QString("customer_") + QString::number(m_customerNr).rightJustified(3, '0'))
   , m_machineNr(machineNr)
   , m_zoneNr(zoneNr)
   , m_pluginDir(pluginDir)
@@ -158,7 +148,7 @@ Worker::Worker(int customerNr,
   , m_parent(parent)
   , m_serialInterface(serialInterface)
   , m_baudrate(baudrate)
-  , m_gc(m_customerRepositoryPath, m_customerNrStr, m_customerRepository, m_workingDirectory, m_branchName, this)
+  , m_gc(m_customerNrStr, m_customerRepository, m_workingDirectory, m_branchName, this)
   , m_versionInfo(QStringList())
   , m_osVersion(getOsVersion())
   , m_atbqtVersion(getATBQTVersion())
@@ -326,7 +316,7 @@ void Worker::privateUpdate() {
 
                 QStringList lst = m_ismasTriggerStatusMessage;
                 // trigger message to ISMAS and CONSOLE
-                CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_SUCCESS);
+                ISMAS(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_SUCCESS));
                 // overwrite m_lastFailedUpdateStep
                 m_lastFailedUpdateStep = UPDATE_STEP::NONE;
                 return;
@@ -457,14 +447,6 @@ void Worker::privateUpdate() {
     //
     ////////////////////////////////////////////////////////////////////////////
     if ((continueUpdate = customerEnvironment()) == false) {
-        // even if something goes wrong creating the environment, try to execute
-        // opkg_commands
-        if (QDir(m_customerRepository).exists()) {
-            // always execute contents of opkg_commands-file
-            m_filesToUpdate.clear();
-            m_filesToUpdate << "etc/psa_update/opkg_commands";
-            execOpkgCommands();
-        }
         return;
     }
     m_versionInfo = m_gc.gitShowReason(m_branchName);
@@ -479,14 +461,6 @@ void Worker::privateUpdate() {
     //
     ////////////////////////////////////////////////////////////////////////////
     if ((continueUpdate = filesToUpdate()) == false) {
-        // even if something goes wrong in filesToUpdate, try to execute
-        // opkg_commands
-        if (QDir(m_customerRepository).exists()) {
-            // always execute contents of opkg_commands-file
-            m_filesToUpdate.clear();
-            m_filesToUpdate << "etc/psa_update/opkg_commands";
-            execOpkgCommands();
-        }
         return;
     }
     m_versionInfo = m_gc.gitShowReason(m_branchName);
@@ -500,14 +474,6 @@ void Worker::privateUpdate() {
     //
     ////////////////////////////////////////////////////////////////////////////
     if ((continueUpdate = syncCustomerRepositoryAndFS()) == false) {
-        // even if something goes wrong with rsync, try to execute
-        // opkg_commands
-        if (QDir(m_customerRepository).exists()) {
-            // always execute contents of opkg_commands-file
-            m_filesToUpdate.clear();
-            m_filesToUpdate << "etc/psa_update/opkg_commands";
-            execOpkgCommands();
-        }
         return;
     }
     lst = QStringList(QString(smap[UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS]));
@@ -536,8 +502,9 @@ void Worker::privateUpdate() {
     if ((continueUpdate = downloadFilesToPSAHardware()) == false) {
         return;
     }
-    lst = QStringList(QString("DONE"));
+    lst = QStringList(QString(smap[UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS]));
-    ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS));
+    ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
+    setProgress(_DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS);
 
     ////////////////////////////////////////////////////////////////////////////
     //
@@ -889,24 +856,7 @@ bool Worker::computeFilesToDownload() {
     return (m_filesToDownload.size() > 0);
 }
 
-
-bool Worker::cleanUpOpkgCache() {
-    bool removedFiles = true;
-    QDir dir("/var/cache/opkg");
-    if (dir.exists()) {
-        dir.setNameFilters(QStringList() << ".gz" << ".ipk");
-        dir.setFilter(QDir::Files);
-        foreach(QString dirFile, dir.entryList()) {
-            removedFiles &= dir.remove(dirFile);
-        }
-    }
-    return removedFiles;
-}
-
 bool Worker::execOpkgCommands() {
-    if (!cleanUpOpkgCache()) {
-        CONSOLE() << "INFO: some cached opkg files not removed";
-    }
     for (int i = 0; i < m_filesToUpdate.size(); ++i) {
         QString const fName = m_filesToUpdate.at(i);
         if (fName.contains("opkg_commands", Qt::CaseInsensitive)) {
@@ -922,12 +872,10 @@ bool Worker::execOpkgCommands() {
                         while (!in.atEnd()) {
                             QString line = in.readLine();
                             // TODO: "^\\s*[#]{0,}$" : empty line or comment line starting with #
-                            static const QRegularExpression comment("^\\s*[#].*$");
+                            static const QRegularExpression comment("^\\s*#.*$");
-                            static const QRegularExpression emptyLine("^\\s*$");
+                            if (line.indexOf(comment, 0) == -1) {
-                            if (line.indexOf(emptyLine, 0) == -1 &&
+                                // found opkg command
-                                line.indexOf(comment, 0) == -1) {
                                 QString opkgCommand = line.trimmed();
-                                qCritical() << "Found opkg-command" << opkgCommand;
                                 if (!executeOpkgCommand(opkgCommand)) {
                                     opkgErrorLst << opkgCommand;
                                 } else {
@@ -1006,16 +954,13 @@ bool Worker::execOpkgCommands() {
 
 bool Worker::downloadFilesToPSAHardware() {
     m_displayIndex = 0;
-    QStringList lst(QString("START"));
 
-    ISMAS(lst) << (GUI(m_filesToDownload) << (CONSOLE(m_filesToDownload) << UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
+    GUI(m_filesToDownload) << (CONSOLE(m_filesToDownload) << UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE);
+    setProgress(_DOWNLOAD_FILES_TO_PSA_HARDWARE);
 
     if (m_noUpdatePsaHardware == false) {
         if (computeFilesToDownload() > 0) {
-            lst.clear();
+            QStringList lst = m_filesToDownload;
-            for (int i = 0; i < m_filesToDownload.size(); ++i) {
-                lst << QFileInfo(m_filesToDownload.at(i)).fileName();
-            }
             ISMAS(lst) << (CONSOLE(lst) << UPDATE_STEP::FILES_TO_DOWNLOAD);
 
             if (m_update && m_update->doUpdate(m_displayIndex, m_filesToDownload)) {
@@ -1028,7 +973,7 @@ bool Worker::downloadFilesToPSAHardware() {
                 return true;
             }
 
-            ISMAS(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE));
+            CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE);
             setProgress(_DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE);
 
             return false;
@@ -1039,20 +984,14 @@ bool Worker::downloadFilesToPSAHardware() {
 }
 
 bool Worker::syncCustomerRepositoryAndFS() {
-    QString msg("START");
+    ISMAS() << (GUI() << (CONSOLE() << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY));
-    QStringList lst(msg);
-    ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY));
-    lst.clear();
 
     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/dc /etc/psa_tariff")) {
-                msg = QString("COULD NOT EXECUTE '%1', exitCode=%2").arg(md.command()).arg(md.exitCode());
+                qCritical() << "COULD NOT EXECUTE '" << md.command() << "' exitCode=(" << md.exitCode() << ")";
-                qCritical() << msg;
-                QStringList lst2(msg);
-                ISMAS(lst2) << (CONSOLE(lst2) << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY);
             }
             QString const params("-v                      "
                                  "--recursive             "
@@ -1111,22 +1050,12 @@ bool Worker::syncCustomerRepositoryAndFS() {
                         error = true;
                     }
                 }
-                if (!error) {
-                    lst.clear();
-                    lst << QString("SUCCESS %1").arg(cmd);
-                    ISMAS(lst) << (CONSOLE(lst) << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY);
-                } else {
-                    msg = QString("FAILURE %1").arg(cmd);
-                    lst << msg;
-                    QStringList lst2(msg);
-                    ISMAS(lst2) << (CONSOLE(lst2) << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY);
-                }
             }
             if (!error) {
                 // now check tariff-files in etc and /etc/psa_tariff
                 QDir dir1(QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/psa_tariff"));
                 QDir dir2("/etc/psa_tariff");
-                if (Utils::sameFilesInDirs(dir1, dir2) == false) {
+                if (Utils::sameFilesInDirs(dir1, dir2)) {
                     CONSOLE() <<  QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/psa_tariff")
                               << "AND /etc/psa_tariff ARE DIFFERENT: CHANGED CUSTOMER-NUMBER?";
                 }
@@ -1134,13 +1063,9 @@ bool Worker::syncCustomerRepositoryAndFS() {
                 setProgress(_SYNC_CUSTOMER_REPOSITORY_SUCCESS);
                 return true;
             }
-        } else {
-            lst << QString("CAN NOT CD TO CUST-REPO %1").arg(m_customerRepository);
         }
-    } else {
-        lst << QString("CUST-REPO %1 DOES NOT EXIST").arg(m_customerRepository);
     }
-    ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_FAILURE)));
+    ISMAS() << (GUI() << (CONSOLE() << (m_lastFailedUpdateStep = UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_FAILURE)));
     setProgress(_SYNC_CUSTOMER_REPOSITORY_FAILURE);
     return false;
 }
@@ -1462,41 +1387,5 @@ PSAInstalled Worker::getPSAInstalled() {
         }
     }
 
-    psaInstalled.ptuPackageVersion = "{}";
-    if (QFile::exists("/usr/bin/ptuPackageVersions")) {
-        Command c("/usr/bin/ptuPackageVersions -i -o json");
-        if (c.execute(m_workingDirectory)) {
-            QString r = c.getCommandResult();
-            // ptuPackageVersions returns a json-array
-            QJsonArray const &ja = QJsonDocument::fromJson(r.remove(QRegExp("\\n")).toUtf8()).array();
-            if (!ja.empty()) {
-                // transform the array into an object, containing the objects
-                // of the array (christian needs it this way)
-                QJsonObject o;
-                foreach (QJsonValue const &value, ja) {
-                    if (value.isObject()) {
-                        QJsonObject obj = value.toObject();
-                        QStringList keys = obj.keys();
-                        if (!keys.isEmpty()) {
-                            QString const &k = obj.keys().first();
-                            QJsonValue const &v = obj.value(k);
-                            o.insert(k, v);
-                        }
-                    }
-                }
-
-                psaInstalled.ptuPackageVersion =
-                    QJsonDocument(o).toJson(QJsonDocument::Compact);
-
-            } else {
-                qCritical() << __func__ << ":" << __LINE__
-                            << "ERROR array return by ptuPackageVersions empty";
-            }
-        } else {
-            qCritical() << __func__ << ":" << __LINE__
-                        << "ERROR executing ptuPackageVersions";
-        }
-    }
-
     return psaInstalled;
 }

UpdatePTUDevCtrl/worker.h

@@ -35,13 +35,12 @@
     ! U0003: Update finished but FAILed.
  */
 
-#define _ISMAS_DONE                 "U0001" // 100%, Check: Resultcode: 0
+#define _ISMAS_DONE         "U0001" // 100%, Check: Resultcode: 0
-#define _ISMAS_SET_WAIT_OK          "U0002" // empty WAIT-button (""), ResultCode: 0
+#define _ISMAS_SET_WAIT_OK  "U0002" // empty WAIT-button (""), ResultCode: 0
-#define _ISMAS_NO_UPDATE_NECESSARY  "M0100" // empty WAIT-button (""), ResultCode: 0
+#define _ISMAS_FAILURE      "U0003" // FAIL
-#define _ISMAS_FAILURE              "U0003" // FAIL
+#define _ISMAS_CONTINUE     "U0010" // %-values: Update laeuft, Resultcodes entsprechend laufender Schritt
-#define _ISMAS_CONTINUE             "U0010" // %-values: Update laeuft, Resultcodes entsprechend laufender Schritt
+#define _ISMAS_RESET_WAIT   "ISMAS" // reset WAIT-button to "WAIT"
-#define _ISMAS_RESET_WAIT           "ISMAS" // reset WAIT-button to "WAIT"
+#define _ISMAS_TEST_TRIGGER "U0099" // check the WAIT-button
-#define _ISMAS_TEST_TRIGGER         "U0099" // check the WAIT-button
 
 #define _STARTED                                    (1)
 #define _CHECK_ISMAS_TRIGGER                        (2)
@@ -80,6 +79,7 @@
 #define _SYNC_CUSTOMER_REPOSITORY_SUCCESS           (35)
 #define _FILES_TO_UPDATE                            (36)
 #define _CHECK_FOR_REPOSITORY_CHANGES_FAILURE       (37)
+#define _FILES_TO_DOWNLOAD                          (38)
 #define _EXEC_OPKG_COMMANDS                         (39)
 #define _EXEC_OPKG_COMMAND_1                        (40)
 #define _EXEC_OPKG_COMMAND_2                        (41)
@@ -93,23 +93,13 @@
 #define _EXEC_OPKG_COMMAND_LAST                     (49)
 #define _EXEC_OPKG_COMMAND_FAILURE                  (50)
 #define _EXEC_OPKG_COMMAND_SUCCESS                  (51)
-#define _DOWNLOAD_FILES_TO_PSA_HARDWARE             (59)
+#define _DOWNLOAD_FILES_TO_PSA_HARDWARE             (60)
-#define _FILES_TO_DOWNLOAD                          (60)
+#define _DOWNLOAD_CONFIG_FILE                       (61)
-#define _DOWNLOAD_CASH_FILE                         (61)
+#define _DOWNLOAD_CONFIG_FILE_SUCCESS               (62)
-#define _DOWNLOAD_CASH_FILE_FAILURE                 (62)
+#define _DOWNLOAD_CONFIG_FILE_FAILURE               (63)
-#define _DOWNLOAD_CASH_FILE_SUCCESS                 (63)
+#define _DOWNLOAD_DEVICE_CONTROLLER                 (64)
-#define _DOWNLOAD_CONFIG_FILE                       (64)
+#define _DOWNLOAD_DEVICE_CONTROLLER_SUCCESS         (85)
-#define _DOWNLOAD_CONFIG_FILE_FAILURE               (65)
+#define _DOWNLOAD_DEVICE_CONTROLLER_FAILURE         (86)
-#define _DOWNLOAD_CONFIG_FILE_SUCCESS               (66)
-#define _DOWNLOAD_DEVICE_FILE                       (67)
-#define _DOWNLOAD_DEVICE_FILE_FAILURE               (68)
-#define _DOWNLOAD_DEVICE_FILE_SUCCESS               (69)
-#define _DOWNLOAD_JSON_FILE                         (70)
-#define _DOWNLOAD_JSON_FILE_FAILURE                 (71)
-#define _DOWNLOAD_JSON_FILE_SUCCESS                 (72)
-#define _DOWNLOAD_DEVICE_CONTROLLER                 (84)
-#define _DOWNLOAD_DEVICE_CONTROLLER_FAILURE         (85)
-#define _DOWNLOAD_DEVICE_CONTROLLER_SUCCESS         (86)
 #define _DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE     (87)
 #define _DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS     (88)
 #define _SAVE_LOGS                                  (92)
@@ -193,7 +183,6 @@ class Worker : public QThread{
     QString m_apismVersion;
 
     bool executeOpkgCommand(QString opkgCommand);
-    bool cleanUpOpkgCache();
     QString getOsVersion() const;
     QString getATBQTVersion() const;
     QString getATBUpdateToolVersion() const;
@@ -337,15 +326,6 @@ public:
         DOWNLOAD_CONFIG_FILE = _DOWNLOAD_CONFIG_FILE,
         DOWNLOAD_CONFIG_FILE_SUCCESS = _DOWNLOAD_CONFIG_FILE_SUCCESS,
         DOWNLOAD_CONFIG_FILE_FAILURE = _DOWNLOAD_CONFIG_FILE_FAILURE,
-        DOWNLOAD_CASH_FILE = _DOWNLOAD_CASH_FILE,
-        DOWNLOAD_CASH_FILE_FAILURE = _DOWNLOAD_CASH_FILE_FAILURE,
-        DOWNLOAD_CASH_FILE_SUCCESS = _DOWNLOAD_CASH_FILE_SUCCESS,
-        DOWNLOAD_DEVICE_FILE = _DOWNLOAD_DEVICE_FILE,
-        DOWNLOAD_DEVICE_FILE_FAILURE = _DOWNLOAD_DEVICE_FILE_FAILURE,
-        DOWNLOAD_DEVICE_FILE_SUCCESS = _DOWNLOAD_DEVICE_FILE_SUCCESS,
-        DOWNLOAD_JSON_FILE = _DOWNLOAD_JSON_FILE,
-        DOWNLOAD_JSON_FILE_FAILURE = _DOWNLOAD_JSON_FILE_FAILURE,
-        DOWNLOAD_JSON_FILE_SUCCESS = _DOWNLOAD_JSON_FILE_SUCCESS,
         DOWNLOAD_DEVICE_CONTROLLER = _DOWNLOAD_DEVICE_CONTROLLER,
         DOWNLOAD_DEVICE_CONTROLLER_SUCCESS = _DOWNLOAD_DEVICE_CONTROLLER_SUCCESS,
         DOWNLOAD_DEVICE_CONTROLLER_FAILURE = _DOWNLOAD_DEVICE_CONTROLLER_FAILURE,
@@ -675,24 +655,6 @@ private:
         break;
         case UPDATE_STEP::DOWNLOAD_CONFIG_FILE_FAILURE:
         break;
-        case UPDATE_STEP::DOWNLOAD_CASH_FILE: {
-        } break;
-        case UPDATE_STEP::DOWNLOAD_CASH_FILE_FAILURE: {
-        } break;
-        case UPDATE_STEP::DOWNLOAD_CASH_FILE_SUCCESS: {
-        } break;
-        case UPDATE_STEP::DOWNLOAD_DEVICE_FILE: {
-        } break;
-        case UPDATE_STEP::DOWNLOAD_DEVICE_FILE_FAILURE: {
-        } break;
-        case UPDATE_STEP::DOWNLOAD_DEVICE_FILE_SUCCESS: {
-        } break;
-        case UPDATE_STEP::DOWNLOAD_JSON_FILE: {
-        } break;
-        case UPDATE_STEP::DOWNLOAD_JSON_FILE_FAILURE: {
-        } break;
-        case UPDATE_STEP::DOWNLOAD_JSON_FILE_SUCCESS: {
-        } break;
         case UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER:
             lst << instance->m_debugMsg;
             Utils::printUpdateStatusMsg(debug, lst);
@@ -1126,34 +1088,12 @@ private:
         case UPDATE_STEP::FILES_TO_UPDATE:
             ismasClient.setProgressInPercent(_FILES_TO_UPDATE);
         break;
-        case UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE: {
+        case UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE:
             ismasClient.setProgressInPercent(_DOWNLOAD_FILES_TO_PSA_HARDWARE);
-            QString const &ismasUpdateNews =
+        break;
-                QString("#M=APISM#C=CMD_EVENT#J=") +
+        case UPDATE_STEP::FILES_TO_DOWNLOAD:
-                    ismasClient.updateNewsToIsmas(
-                        _ISMAS_CONTINUE,
-                        ismasClient.getProgressInPercent(),
-                        IsmasClient::RESULT_CODE::SUCCESS,
-                        smap[UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE],
-                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
-            ismasClient.sendRequestReceiveResponse(
-                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
-        } break;
-        case UPDATE_STEP::FILES_TO_DOWNLOAD: {
             ismasClient.setProgressInPercent(_FILES_TO_DOWNLOAD);
-            QString const &ismasUpdateNews =
+        break;
-                QString("#M=APISM#C=CMD_EVENT#J=") +
-                    ismasClient.updateNewsToIsmas(
-                        _ISMAS_CONTINUE,
-                        ismasClient.getProgressInPercent(),
-                        IsmasClient::RESULT_CODE::SUCCESS,
-                        smap[UPDATE_STEP::DOWNLOAD_JSON_FILE],
-                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
-            ismasClient.sendRequestReceiveResponse(
-                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
-        } break;
         case UPDATE_STEP::EXEC_OPKG_COMMANDS:
             ismasClient.setProgressInPercent(_EXEC_OPKG_COMMANDS);
         break;
@@ -1289,180 +1229,15 @@ private:
             ismasClient.sendRequestReceiveResponse(
                 IsmasClient::APISM::DB_PORT, ismasUpdateNews);
         } break;
-        case UPDATE_STEP::DOWNLOAD_CONFIG_FILE: {
+        case UPDATE_STEP::DOWNLOAD_CONFIG_FILE:
-            //ismasClient.setProgressInPercent(_DOWNLOAD_CONFIG_FILE);
+            ismasClient.setProgressInPercent(_DOWNLOAD_CONFIG_FILE);
-            ismasClient.setProgressInPercent(_DOWNLOAD_JSON_FILE);
+        break;
-            QString const &ismasUpdateNews =
+        case UPDATE_STEP::DOWNLOAD_CONFIG_FILE_SUCCESS:
-                QString("#M=APISM#C=CMD_EVENT#J=") +
+            ismasClient.setProgressInPercent(_DOWNLOAD_CONFIG_FILE_SUCCESS);
-                    ismasClient.updateNewsToIsmas(
+        break;
-                        _ISMAS_CONTINUE,
+        case UPDATE_STEP::DOWNLOAD_CONFIG_FILE_FAILURE:
-                        ismasClient.getProgressInPercent(),
-                        IsmasClient::RESULT_CODE::SUCCESS,
-                        smap[UPDATE_STEP::DOWNLOAD_CONFIG_FILE],
-                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
-            ismasClient.sendRequestReceiveResponse(
-                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
-        } break;
-        case UPDATE_STEP::DOWNLOAD_CONFIG_FILE_SUCCESS: {
-            //ismasClient.setProgressInPercent(_DOWNLOAD_CONFIG_FILE_SUCCESS);
-            ismasClient.setProgressInPercent(_DOWNLOAD_JSON_FILE);
-            QString const &ismasUpdateNews =
-                QString("#M=APISM#C=CMD_EVENT#J=") +
-                    ismasClient.updateNewsToIsmas(
-                        _ISMAS_CONTINUE,
-                        ismasClient.getProgressInPercent(),
-                        IsmasClient::RESULT_CODE::SUCCESS,
-                        smap[UPDATE_STEP::DOWNLOAD_CONFIG_FILE_SUCCESS],
-                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
-            ismasClient.sendRequestReceiveResponse(
-                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
-        } break;
-        case UPDATE_STEP::DOWNLOAD_CONFIG_FILE_FAILURE: {
             ismasClient.setProgressInPercent(_DOWNLOAD_CONFIG_FILE_FAILURE);
-            QString const &ismasUpdateNews =
+        break;
-                QString("#M=APISM#C=CMD_EVENT#J=") +
-                    ismasClient.updateNewsToIsmas(
-                        _ISMAS_CONTINUE,
-                        ismasClient.getProgressInPercent(),
-                        IsmasClient::RESULT_CODE::JSON_FILES_DOWNLOAD_ERROR,
-                        smap[UPDATE_STEP::DOWNLOAD_CASH_FILE_FAILURE],
-                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
-            ismasClient.sendRequestReceiveResponse(
-                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
-        } break;
-        case UPDATE_STEP::DOWNLOAD_CASH_FILE: {
-            //ismasClient.setProgressInPercent(_DOWNLOAD_CASH_FILE);
-            ismasClient.setProgressInPercent(_DOWNLOAD_JSON_FILE);
-            QString const &ismasUpdateNews =
-                QString("#M=APISM#C=CMD_EVENT#J=") +
-                    ismasClient.updateNewsToIsmas(
-                        _ISMAS_CONTINUE,
-                        ismasClient.getProgressInPercent(),
-                        IsmasClient::RESULT_CODE::SUCCESS,
-                        smap[UPDATE_STEP::DOWNLOAD_CASH_FILE],
-                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
-            ismasClient.sendRequestReceiveResponse(
-                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
-        } break;
-        case UPDATE_STEP::DOWNLOAD_CASH_FILE_FAILURE: {
-            ismasClient.setProgressInPercent(_DOWNLOAD_CASH_FILE_FAILURE);
-            QString const &ismasUpdateNews =
-                QString("#M=APISM#C=CMD_EVENT#J=") +
-                    ismasClient.updateNewsToIsmas(
-                        _ISMAS_CONTINUE,
-                        ismasClient.getProgressInPercent(),
-                        IsmasClient::RESULT_CODE::JSON_FILES_DOWNLOAD_ERROR,
-                        smap[UPDATE_STEP::DOWNLOAD_CASH_FILE_FAILURE],
-                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
-            ismasClient.sendRequestReceiveResponse(
-                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
-        } break;
-        case UPDATE_STEP::DOWNLOAD_CASH_FILE_SUCCESS: {
-            //ismasClient.setProgressInPercent(_DOWNLOAD_CASH_FILE_SUCCESS);
-            ismasClient.setProgressInPercent(_DOWNLOAD_JSON_FILE);
-            QString const &ismasUpdateNews =
-                QString("#M=APISM#C=CMD_EVENT#J=") +
-                    ismasClient.updateNewsToIsmas(
-                        _ISMAS_CONTINUE,
-                        ismasClient.getProgressInPercent(),
-                        IsmasClient::RESULT_CODE::SUCCESS,
-                        smap[UPDATE_STEP::DOWNLOAD_CASH_FILE_SUCCESS],
-                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
-            ismasClient.sendRequestReceiveResponse(
-                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
-        } break;
-        case UPDATE_STEP::DOWNLOAD_DEVICE_FILE: {
-            //ismasClient.setProgressInPercent(_DOWNLOAD_DEVICE_FILE);
-            ismasClient.setProgressInPercent(_DOWNLOAD_JSON_FILE);
-            QString const &ismasUpdateNews =
-                QString("#M=APISM#C=CMD_EVENT#J=") +
-                    ismasClient.updateNewsToIsmas(
-                        _ISMAS_CONTINUE,
-                        ismasClient.getProgressInPercent(),
-                        IsmasClient::RESULT_CODE::SUCCESS,
-                        smap[UPDATE_STEP::DOWNLOAD_DEVICE_FILE],
-                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
-            ismasClient.sendRequestReceiveResponse(
-                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
-        } break;
-        case UPDATE_STEP::DOWNLOAD_DEVICE_FILE_FAILURE: {
-            ismasClient.setProgressInPercent(_DOWNLOAD_DEVICE_FILE_FAILURE);
-            QString const &ismasUpdateNews =
-                QString("#M=APISM#C=CMD_EVENT#J=") +
-                    ismasClient.updateNewsToIsmas(
-                        _ISMAS_CONTINUE,
-                        ismasClient.getProgressInPercent(),
-                        IsmasClient::RESULT_CODE::JSON_FILES_DOWNLOAD_ERROR,
-                        smap[UPDATE_STEP::DOWNLOAD_DEVICE_FILE_FAILURE],
-                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
-            ismasClient.sendRequestReceiveResponse(
-                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
-        } break;
-        case UPDATE_STEP::DOWNLOAD_DEVICE_FILE_SUCCESS: {
-            //ismasClient.setProgressInPercent(_DOWNLOAD_DEVICE_FILE_SUCCESS);
-            ismasClient.setProgressInPercent(_DOWNLOAD_JSON_FILE);
-            QString const &ismasUpdateNews =
-                QString("#M=APISM#C=CMD_EVENT#J=") +
-                    ismasClient.updateNewsToIsmas(
-                        _ISMAS_CONTINUE,
-                        ismasClient.getProgressInPercent(),
-                        IsmasClient::RESULT_CODE::SUCCESS,
-                        smap[UPDATE_STEP::DOWNLOAD_DEVICE_FILE_SUCCESS],
-                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
-            ismasClient.sendRequestReceiveResponse(
-                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
-        } break;
-        case UPDATE_STEP::DOWNLOAD_JSON_FILE: {
-            ismasClient.setProgressInPercent(_DOWNLOAD_JSON_FILE);
-            QString const &ismasUpdateNews =
-                QString("#M=APISM#C=CMD_EVENT#J=") +
-                    ismasClient.updateNewsToIsmas(
-                        _ISMAS_CONTINUE,
-                        ismasClient.getProgressInPercent(),
-                        IsmasClient::RESULT_CODE::SUCCESS,
-                        smap[UPDATE_STEP::DOWNLOAD_JSON_FILE],
-                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
-            ismasClient.sendRequestReceiveResponse(
-                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
-        } break;
-        case UPDATE_STEP::DOWNLOAD_JSON_FILE_FAILURE: {
-            ismasClient.setProgressInPercent(_DOWNLOAD_JSON_FILE_FAILURE);
-            QString const &ismasUpdateNews =
-                QString("#M=APISM#C=CMD_EVENT#J=") +
-                    ismasClient.updateNewsToIsmas(
-                        _ISMAS_CONTINUE,
-                        ismasClient.getProgressInPercent(),
-                        IsmasClient::RESULT_CODE::JSON_FILES_DOWNLOAD_ERROR,
-                        smap[UPDATE_STEP::DOWNLOAD_JSON_FILE_FAILURE],
-                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
-            ismasClient.sendRequestReceiveResponse(
-                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
-        } break;
-        case UPDATE_STEP::DOWNLOAD_JSON_FILE_SUCCESS: {
-            ismasClient.setProgressInPercent(_DOWNLOAD_JSON_FILE);
-            QString const &ismasUpdateNews =
-                QString("#M=APISM#C=CMD_EVENT#J=") +
-                    ismasClient.updateNewsToIsmas(
-                        _ISMAS_CONTINUE,
-                        ismasClient.getProgressInPercent(),
-                        IsmasClient::RESULT_CODE::SUCCESS,
-                        smap[UPDATE_STEP::DOWNLOAD_JSON_FILE_SUCCESS],
-                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
-            ismasClient.sendRequestReceiveResponse(
-                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
-        } break;
         case UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER:
             ismasClient.setProgressInPercent(_DOWNLOAD_DEVICE_CONTROLLER);
         break;
@@ -1500,20 +1275,9 @@ private:
         case UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE:
             ismasClient.setProgressInPercent(_DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE);
         break;
-        case UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY: {
+        case UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY:
             ismasClient.setProgressInPercent(_SYNC_CUSTOMER_REPOSITORY);
-            QString const &ismasUpdateNews =
+        break;
-                QString("#M=APISM#C=CMD_EVENT#J=") +
-                    ismasClient.updateNewsToIsmas(
-                        _ISMAS_CONTINUE,
-                        ismasClient.getProgressInPercent(),
-                        IsmasClient::RESULT_CODE::SUCCESS,
-                        smap[UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY],
-                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
-            ismasClient.sendRequestReceiveResponse(
-                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
-        } break;
         case UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS: {
             ismasClient.setProgressInPercent(_SYNC_CUSTOMER_REPOSITORY_SUCCESS);
             QString const &ismasUpdateNews =
@@ -1522,7 +1286,7 @@ private:
                         _ISMAS_CONTINUE,
                         ismasClient.getProgressInPercent(),
                         IsmasClient::RESULT_CODE::SUCCESS,
-                        smap[UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS],
+                        smap[UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY],
                         instance->m_ismasMsg.join(' ').toStdString().c_str(),
                         instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
             ismasClient.sendRequestReceiveResponse(
@@ -1562,26 +1326,24 @@ private:
         } break;
         case UPDATE_STEP::UPDATE_SUCCEEDED: {
             ismasClient.setProgressInPercent(_UPDATE_SUCCEEDED + _UPDATE_SUCCEEDED_CORRECTION);
-            if (instance->m_automaticUpdate == false) {
+            QString const &ismasUpdateNews =
-                QString const &ismasUpdateNews =
+                QString("#M=APISM#C=CMD_EVENT#J=") +
-                    QString("#M=APISM#C=CMD_EVENT#J=") +
+                    ismasClient.updateNewsToIsmas(
-                        ismasClient.updateNewsToIsmas(
+                        _ISMAS_DONE, // WAIT-button set to 100%
-                            _ISMAS_DONE, // WAIT-button set to 100%
+                        ismasClient.getProgressInPercent(),
-                            ismasClient.getProgressInPercent(),
+                        IsmasClient::RESULT_CODE::SUCCESS,
-                            IsmasClient::RESULT_CODE::SUCCESS,
+                        smap[UPDATE_STEP::UPDATE_FINALIZE],
-                            smap[UPDATE_STEP::UPDATE_FINALIZE],
+                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                            instance->m_ismasMsg.join(' ').toStdString().c_str(),
+                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
-                            instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
+            ismasClient.sendRequestReceiveResponse(
-                ismasClient.sendRequestReceiveResponse(
+                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
-                    IsmasClient::APISM::DB_PORT, ismasUpdateNews);
-            }
         } break;
         case UPDATE_STEP::UPDATE_ACTIVATED: {
             ismasClient.setProgressInPercent(_UPDATE_ACTIVATED + _UPDATE_ACTIVATED_CORRECTION);
             QString const &ismasUpdateNews =
                 QString("#M=APISM#C=CMD_EVENT#J=") +
                     ismasClient.updateNewsToIsmas(
-                        (instance->m_automaticUpdate ? _ISMAS_NO_UPDATE_NECESSARY : _ISMAS_SET_WAIT_OK), // U0002 or M0100
+                        _ISMAS_SET_WAIT_OK, // U0002
                         ismasClient.getProgressInPercent(),
                         IsmasClient::RESULT_CODE::SUCCESS,
                         smap[UPDATE_STEP::UPDATE_FINALIZE],
@@ -1595,7 +1357,7 @@ private:
             QString const &ismasUpdateNews =
                 QString("#M=APISM#C=CMD_EVENT#J=") +
                     ismasClient.updateNewsToIsmas(
-                        (instance->m_automaticUpdate ? _ISMAS_NO_UPDATE_NECESSARY : _ISMAS_SET_WAIT_OK), // U0002 or M0100
+                        _ISMAS_SET_WAIT_OK, // U0002
                         ismasClient.getProgressInPercent(),
                         IsmasClient::RESULT_CODE::NO_UPDATE_NECESSARY,
                         smap[UPDATE_STEP::UPDATE_FINALIZE],
@@ -1790,24 +1552,6 @@ private:
         break;
         case UPDATE_STEP::DOWNLOAD_CONFIG_FILE_FAILURE:
         break;
-        case UPDATE_STEP::DOWNLOAD_CASH_FILE: {
-        } break;
-        case UPDATE_STEP::DOWNLOAD_CASH_FILE_FAILURE: {
-        } break;
-        case UPDATE_STEP::DOWNLOAD_CASH_FILE_SUCCESS: {
-        } break;
-        case UPDATE_STEP::DOWNLOAD_DEVICE_FILE: {
-        } break;
-        case UPDATE_STEP::DOWNLOAD_DEVICE_FILE_FAILURE: {
-        } break;
-        case UPDATE_STEP::DOWNLOAD_DEVICE_FILE_SUCCESS: {
-        } break;
-        case UPDATE_STEP::DOWNLOAD_JSON_FILE: {
-        } break;
-        case UPDATE_STEP::DOWNLOAD_JSON_FILE_FAILURE: {
-        } break;
-        case UPDATE_STEP::DOWNLOAD_JSON_FILE_SUCCESS: {
-        } break;
         case UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER:
         break;
         case UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER_SUCCESS: