activate opkg with --noaction

to test the download without actual dc-controller on the PTU.

ATBUpdateTool.ini

@@ -1,5 +1,5 @@
 [REPOSITORY_URL]
-repository-url="gitea@ptu-config.atb-comm.de:ATB/"
+repository-url="gitea@ptu-config.atb-comm.de:ATB"
 
 [DIRECTORIES]
 plugin-directory="/usr/lib/"
@@ -19,3 +19,21 @@ yocto-version=false
 yocto-install=false
 always-download-config=true
 always-download-dc=false
+
+
+[ATBUpdateCheck]
+
+[ATBUpdateDC]
+debug=true
+workingDir=/tmp
+libca=/usr/lib/libCAslave.so
+
+[ATBUpdateGit]
+
+[ATBUpdateJsonFiles]
+
+[ATBUpdateOpkg]
+
+[ATBUpdateShow]
+
+[ATBUpdateSync]

Check/main.cpp

@@ -15,6 +15,8 @@
 #include <QRegularExpression>
 #include <QFile>
 #include <QTextStream>
+#include <QDateTime>
+#include <QThread>
 
 #include <optional>
 
@@ -53,8 +55,13 @@ int main(int argc, char **argv) {
 
     QString connectionStatus{internal::ISMAS_NOT_CONNECTED};
     QString updateRequestStatus{internal::UPDATE_NOT_REQUESTED};
+
+    {
         QDebug debug = qCritical();
 
+        int tries = 10;
+
+        while (--tries > 0) {
             if (std::optional<QString> result
                     = IsmasClient::sendRequestReceiveResponse(
                         IsmasClient::APISM::DIRECT_PORT,
@@ -63,23 +70,26 @@ int main(int argc, char **argv) {
                 for (QString const &k : d.object().keys()) {
                     if (k.contains("CMD_GET_APISMSTATUS_RESPONSE")) {
                         QJsonObject o = d.object()[k].toObject();
-                QJsonObject::const_iterator it = o.find("Broker");
-                if (it != o.constEnd()) {
+                        QJsonObject::const_iterator bit = o.find("Broker");
+                        QJsonObject::const_iterator ismit = o.find("ISMAS");
+                        if (bit != o.constEnd() && ismit != o.constEnd()) {
                             // value for "Broker"
-                    QString const &v = it->toString();
-                    if (v.contains(internal::ISMAS_CONNECTED, Qt::CaseInsensitive)) {
+                            QString const &v = bit->toString();
+                            bool ismas = ismit->toBool();
+                            if (ismas && v.contains(internal::BROKER_CONNECTED, Qt::CaseInsensitive)) {
                                 connectionStatus = internal::ISMAS_CONNECTED;
+                                break;
                             } else
-                    if (v.contains(internal::ISMAS_NOT_CONNECTED, Qt::CaseInsensitive)) {
+                            if (v.contains(internal::BROKER_NOT_CONNECTED, Qt::CaseInsensitive)) {
                                 connectionStatus = internal::ISMAS_NOT_CONNECTED;
                             } else
-                    if (v.contains(internal::ISMAS_DISCONNECTED, Qt::CaseInsensitive)) {
+                            if (v.contains(internal::BROKER_DISCONNECTED, Qt::CaseInsensitive)) {
                                 connectionStatus = internal::ISMAS_NOT_CONNECTED;
                             } else
-                    if (v.contains(internal::ISMAS_CONNECTION_IN_PROGRESS, Qt::CaseInsensitive)) {
+                            if (v.contains(internal::BROKER_CONNECTION_IN_PROGRESS, Qt::CaseInsensitive)) {
                                 connectionStatus = internal::ISMAS_NOT_CONNECTED;
                             } else
-                    if (v.contains(internal::ISMAS_DISCONNECTING, Qt::CaseInsensitive)) {
+                            if (v.contains(internal::BROKER_DISCONNECTING, Qt::CaseInsensitive)) {
                                 connectionStatus = internal::ISMAS_NOT_CONNECTED;
                             }
                             break;
@@ -88,6 +98,13 @@ int main(int argc, char **argv) {
                 }
             }
 
+            if (connectionStatus == internal::ISMAS_CONNECTED) {
+                break;
+            }
+
+            QThread::sleep(5);
+        }
+
         if (connectionStatus != internal::ISMAS_CONNECTED) {
             if (internal::customerRepoExists() == false) {
                 debug.noquote() << internal::NO_CUSTOMER_REPOSITORY;
@@ -98,7 +115,7 @@ int main(int argc, char **argv) {
             if (internal::customerRepoExists() == false) {
                 // if the customer repository does not exists, it does not matter is
                 // ISMAS is connected or how the setting for the WAIT-button is.
-            updateRequestStatus = internal::NO_CUSTOMER_REPOSITORY;
+                updateRequestStatus = internal::UPDATE_INITIAL;
             } else {
                 if (connectionStatus == internal::ISMAS_CONNECTED) {
                     if (std::optional<QString> result
@@ -119,16 +136,25 @@ int main(int argc, char **argv) {
 
                                 for (QString const &m : d.object().keys()) { // request ack
                                     if (!m.contains("FileUpload", Qt::CaseInsensitive)) continue;
-                                QJsonObject o = d.object()[m].toObject();
+                                    QJsonObject o2 = d.object()[m].toObject();
 
-                                QJsonObject::const_iterator it = o.find("TRG");
-                                if (it == o.constEnd()) break;
+                                    QJsonObject::const_iterator it2 = o2.find("TRG");
+                                    if (it2 == o2.constEnd()) break;
 
-                                QString const &v = it->toString();
-                                if (v == "WAIT") {
+                                    QString const &v2 = it2->toString();
+                                    if (v2 == "WAIT") {
                                         updateRequestStatus = internal::UPDATE_REQUESTED;
                                     } else {
+                                        // the customer-repository does exist, and the ISMAS-trigger is
+                                        // *NOT* "WAIT", but from 00:00:00 - 00:03:59 this counts as an
+                                        // automatic update
+                                        QDateTime const &current = QDateTime::currentDateTime();
+                                        if (current.time().hour() < 4) {
                                             updateRequestStatus = internal::UPDATE_NOT_NECESSARY;
+                                        } else {
+                                            updateRequestStatus = internal::UPDATE_NOT_REQUESTED;
+                                            exitCode = -2;
+                                        }
                                     }
                                     break;
                                 }
@@ -148,8 +174,7 @@ int main(int argc, char **argv) {
         if (parser.isSet(ismasConnectOption)) {
             debug.noquote() << connectionStatus;
         }
-
-    qCritical() << __func__ << ":" << __LINE__ << exitCode;
+    }
 
     return exitCode;
 }

DownloadDCFirmware/DownloadDCFirmware.pro

@@ -1,7 +1,6 @@
-QT += core gui
-QT += widgets serialport network
+QT += core serialport
 
-TARGET = ATBDownloadDCFirmware
+TARGET = ATBUpdateDC
 
 VERSION="0.1.0"
 win32 {
@@ -77,21 +76,21 @@ contains( CONFIG, DesktopLinux ) {
 
 SOURCES += \
         main.cpp \
-        mainwindow.cpp \
         ../common/src/message_handler.cpp \
         ../UpdatePTUDevCtrl/commandline_parser.cpp \
         update.cpp \
-        dc_download.cpp \
-        ../common/src/System.cpp
+        ../common/src/System.cpp \
+        ../common/src/utils_internal.cpp \
+        ../common/src/command.cpp
 
 
 HEADERS += \
-        mainwindow.h \
         ../common/include/message_handler.h \
         ../UpdatePTUDevCtrl/commandline_parser.h \
         update.h \
-        dc_download.h \
-        ../common/include/System.h
+        ../common/include/System.h \
+        ../common/include/utils_internal.h \
+        ../common/include/command.h
 
 
 OTHER_FILES += \

DownloadDCFirmware/main.cpp

@@ -1,7 +1,6 @@
 
 #include <QtGlobal>
 #include <QCoreApplication>
-#include <QApplication>
 #include <QByteArray>
 
 #include <QProcess>
@@ -11,12 +10,13 @@
 #include <QDir>
 #include <QDebug>
 #include <QThread>
+#include <QRegularExpression>
 
 #include "message_handler.h"
 #include "commandline_parser.h"
 #include "utils.h"
+#include "utils_internal.h"
 #include "update.h"
-#include "mainwindow.h"
 #include "System.h"
 
 #include <DeviceController/interfaces.h>
@@ -54,15 +54,20 @@ int main(int argc, char **argv) {
 
     openlog("DC", LOG_PERROR | LOG_CONS, LOG_USER);
 
-    QApplication a(argc, argv);
-    QApplication::setApplicationName("ATBDownloadDCFirmware");
-    QApplication::setApplicationVersion(APP_VERSION);
+    QCoreApplication a(argc, argv);
+    QCoreApplication::setOrganizationName("ATB Automatentechnik Baumann GmBH");
+    QCoreApplication::setApplicationName("ATBUpdateDC");
+    QCoreApplication::setApplicationVersion(APP_VERSION);
+
 
     if (!messageHandlerInstalled()) { // change internal qt-QDebug-handling
         atbInstallMessageHandler(atbDebugOutput);
         setDebugLevel(LOG_NOTICE);
     }
 
+    //return 0;
+
+/*
     CommandLineParser parser;
     parser.process(a);
     parser.readSettings();
@@ -127,6 +132,27 @@ int main(int argc, char **argv) {
 
     QString const &customerRepo
         = QDir::cleanPath(workingDir + QDir::separator() + QString("customer_%1").arg(customerNr));
+*/
+
+    QString const &psaDcDir = internal::customerRepoDcDir();
+    QString const &psaRepoRootDir = internal::customerRepoRoot();
+    QString const &psaRepoDir = internal::customerRepoDir();
+    QString const &branchName = internal::branchName();
+
+    bool debug = false;
+    bool noaction = true;
+    QString workingDir;
+    QString libca;
+
+    std::unique_ptr<QSettings> settings = internal::readSettings();
+
+    if (settings) {
+        settings->beginGroup("ATBUpdateDC");
+        debug = settings->value("debug", false).toBool();
+        workingDir = settings->value("workingdir", "/tmp").toString();
+        libca = settings->value("libca", "/usr/lib/libCAslave.so").toString();
+        settings->endGroup();
+    }
 
     // etc/dc: located under mount-path
     std::optional<QString> mountPath = System::checkForUSBStick(psaDcDir);
@@ -137,47 +163,32 @@ int main(int argc, char **argv) {
     if ((mountPath = System::checkForSDCard(psaDcDir)).has_value()) {
         fi.setFile(mountPath.value(), System::getDCFileOnSDCard(mountPath.value()));
     } else {
-        qInfo() << "using customer repository" << customerRepo;
 
-        QDir dir(QDir::cleanPath(customerRepo + QDir::separator() + "etc/dc"));
-        if (dir.exists()) {
-            fi.setFile(dir, dir.absoluteFilePath("dc2c.bin"));
-        } else {
-            qCritical() << "DIRECTORY" << dir << "DOES NOT EXIST";
+        if (debug) {
+            qInfo() << "using customer repository" << psaRepoDir;
+        }
+
+        std::unique_ptr<QString> c = internal::dcCandidateToInstall("/etc/dc/");
+        if (c) {
+            fi.setFile(*c);
+            if (fi.exists() == false) {
+                qCritical() << "dc2c.bin candidate" << *c << "does not exist. STOP.";
                 return -1;
             }
+            qInfo() << "dc2c.bin canditate" << fi.absoluteFilePath();
+        }
     }
 
-    qInfo() << "downloading dc-firmware .." << fi.absoluteFilePath();
-    qInfo() << "dc-firmware size (bytes) ." << fi.size();
-    if (readDCVersion) {
-        qInfo() << "dc-version ..............." << Update::dcVersion(fi.absoluteFilePath());
+    if (debug) {
+        qInfo() << "downloading dc-firmware" << fi.absoluteFilePath();
+        qInfo() << "dc-firmware size (bytes)" << fi.size();
+        qInfo() << "dc-version" << Update::dcVersion(fi.absoluteFilePath());
     }
 
-    QThread::currentThread()->setObjectName("main thread");
-    // qInfo() << "Main thread" << QThread::currentThreadId();
-
-    Update update(customerRepo,
-                  QString::number(customerNr),
-                  branchName,
-                  plugInDir,
-                  plugInName,
-                  workingDir,
-                  psaDcDir);
-
-    update.doUpdate(fi.absoluteFilePath());
-
-    // MainWindow mw;
-
-    // mw.setWindowFlags(Qt::Window | Qt::FramelessWindowHint);
-    // mw.showFullScreen();
-
-    // qCritical() << "SHOW";
-
-    // mw.show();
+    Update u(fi.absoluteFilePath(), libca, debug, noaction);
+    u.run();
 
     qInfo() << "<DC-UPDATE-FINISH>";
 
     return 0;
-    // return a.exec();
 }

DownloadDCFirmware/mainwindow.h

@@ -1,10 +1,7 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QMainWindow>
 #include <QTimer>
-#include <QStatusBar>
-#include <QWidget>
 #include <QSerialPort>
 #include <QSerialPortInfo>
 

DownloadDCFirmware/update.cpp

@@ -24,10 +24,14 @@
 #include <QMap>
 #include <QStringList>
 #include <QString>
+#include <QSerialPort>
+#include <QSerialPortInfo>
+#include <QSettings>
 
 #define UPDATE_OPKG                 (1)
 #define UPDATE_DC                   (0)
 
+
 static const QMap<QString, int> baudrateMap = {
   {"1200"   ,   0}, {"9600"   ,   1}, {"19200"  ,   2}, {"38400"  ,   3},
   {"57600"  ,   4}, {"115200" ,   5}
@@ -35,25 +39,19 @@ static const QMap<QString, int> baudrateMap = {
 
 QPluginLoader Update::pluginLoader;
 
-hwinf *Update::loadDCPlugin(QDir const &plugInDir, QString const &fname) {
+hwinf *Update::loadDCPlugin(QString const &libCA /* absolute file path */) {
     hwinf *hw = nullptr;
-    if (plugInDir.exists()) {
-        QString pluginLibName(fname);
-        pluginLibName = plugInDir.absoluteFilePath(pluginLibName);
-        QFileInfo info(pluginLibName);
-        if (info.exists()) {
-            pluginLibName = plugInDir.absoluteFilePath(pluginLibName);
-            pluginLoader.setFileName(pluginLibName);
+    QFileInfo libCAInfo(libCA);
+    if (libCAInfo.exists()) {
+        pluginLoader.setFileName(libCA);
         // static QPluginLoader pluginLoader(pluginLibName);
         if (!pluginLoader.load()) {
-                qCritical() << "in directory" << plugInDir.absolutePath();
             qCritical() << "cannot load plugin" << pluginLoader.fileName();
             qCritical() << pluginLoader.errorString();
             return nullptr;
         }
 
-            qCritical() << "loadDCPlugin() plugin directory:" << plugInDir.absolutePath();
-            qCritical() << "loadDCPlugin() plugin file name:" << pluginLoader.fileName();
+        // qCritical() << "loadDCPlugin() plugin file name:" << pluginLoader.fileName();
 
         if (!pluginLoader.isLoaded()) {
             qCritical() << pluginLoader.errorString();
@@ -69,14 +67,10 @@ hwinf *Update::loadDCPlugin(QDir const &plugInDir, QString const &fname) {
             return nullptr;
         }
     } else {
-            qCritical() << pluginLibName << "does not exist";
-            return nullptr;
-        }
-    } else {
-        qCritical() << "plugins directory" << plugInDir.absolutePath()
-                    << "does not exist";
+        qCritical() << libCAInfo.absoluteFilePath() << "does not exist";
         return nullptr;
     }
+
     return hw;
 }
 
@@ -107,40 +101,12 @@ QString Update::dcVersion(QString const &dcBinFile) {
 }
 
 class hwapi;
-Update::Update(QString customerRepository,
-               QString customerNrStr,
-               QString branchName,
-               QString plugInDir,
-               QString pluginName,
-               QString workingDir,
-               QString psaDcDir,
-               bool dryRun,
-               QObject *parent,
-               char const *serialInterface,
-               char const *baudrate)
-    : QObject(parent) {
-#if 0
-
-    , m_hw(loadDCPlugin(QDir(plugInDir), pluginName))
-    , m_serialInterface(serialInterface)
-    , m_baudrate(baudrate)
-    , m_customerRepository(customerRepository)
-    , m_customerNrStr(customerNrStr)
-    , m_branchName(branchName)
-    , m_pluginName(pluginName)
-    , m_workingDir(workingDir)
-    , m_psaDcDir(psaDcDir)
-    , m_dryRun(dryRun)
-    , m_sys_areDCdataValid(false) {
-
-    if (!m_hw) {
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_hw == nullptr -> ca-slave plugin loaded ???";
-    } else {
-
-        // carun stoppen
-    }
-#endif
-    m_start = QDateTime::currentDateTime();
+Update::Update(QString const &dcFileName, QString const &libCA, bool debug, bool noaction)
+    : m_dcFileName(dcFileName)
+    , m_hw(loadDCPlugin(libCA))
+    , m_sys_areDCdataValid(false)
+    , m_debug(debug)
+    , m_noaction(noaction) {
 }
 
 Update::~Update() {
@@ -166,15 +132,15 @@ Update::sendNextAddress(int bNum) const {
     if ( bNum==0 || bNum==1024 || bNum==2048 || bNum==3072 || bNum==4096 ) {
         // qDebug() << "addr-block" << bNum << "...";
         while (noAnswerCount <= 250) {
-            // TODO
-            // m_hw->bl_sendAddress(bNum);
 
-            QThread::msleep(100);
+            DownloadResult res = DownloadResult::OK;
+            if (!m_debug) {
+                m_hw->bl_sendAddress(bNum);
 
-            // TODO
-            // DownloadResult const res = sendStatus(m_hw->bl_wasSendingAddOK());
-
-            DownloadResult const res = DownloadResult::OK;
+                QThread::msleep(10); //from 100ms to 20ms
+//###################################################################################
+                res = sendStatus(m_hw->bl_wasSendingAddOK());
+            }
 
             if (res != DownloadResult::NOP) {
                 if (res == DownloadResult::ERROR) {
@@ -189,7 +155,7 @@ Update::sendNextAddress(int bNum) const {
             } else {
                 noAnswerCount += 1; // no answer by now
             }
-        }
+        } // while
         // wait max. about 3 seconds
         return DownloadResult::TIMEOUT;
     }
@@ -214,20 +180,20 @@ Update::sendNextDataBlock(QByteArray const &binary, int bNum) const {
 
     qInfo() << s.toUtf8().constData();
 
-    QThread::msleep(200);
-    return DownloadResult::OK;
+    QThread::msleep(20); //reduce from 200 to 50 ms
+    //############################################################################
 
-    // QByteArray b((const char *)(&local[0]), 64);
-    // qCritical() << "SNDB" << bNum << b.size() << b.toHex();
+    QByteArray b((const char *)(&local[0]), 64);
+    qCritical() << "SNDB" << bNum << b.size() << b.toHex();
 
     while (noAnswerCount <= 250) {
-        // TODO
-        // m_hw->bl_sendDataBlock(64, local);
 
-        // TODO
-        // DownloadResult const res = sendStatus(m_hw->bl_wasSendingDataOK());
+        DownloadResult res = DownloadResult::OK;
 
-        DownloadResult const res = DownloadResult::OK;
+        if (!m_debug) {
+            m_hw->bl_sendDataBlock(64, local);
+            res = sendStatus(m_hw->bl_wasSendingDataOK());
+        }
 
         if (res != DownloadResult::NOP) {
             if (res == DownloadResult::ERROR) {
@@ -249,15 +215,13 @@ Update::sendNextDataBlock(QByteArray const &binary, int bNum) const {
 }
 
 bool Update::startBootloader() const {
-    QThread::msleep(1000);
-    qInfo() << nextTimePoint().toUtf8().constData() << "starting bootloader ...done";
-    return true;
+    qDebug() << "starting bootloader...";
 
-#if 0
-    int nTry = 5;
+    if (!m_debug) {
+        int nTry = 10;
         while (--nTry >= 0) {
             m_hw->bl_startBL();
-        QThread::msleep(5000);
+            QThread::msleep(1000);
             m_hw->bl_checkBL();
             if (m_hw->bl_isUp()) {
                 qInfo() << "starting bootloader...OK";
@@ -265,24 +229,27 @@ bool Update::startBootloader() const {
                 return true;
             } else {
                 qCritical() << "bootloader not up (" << nTry << ")";
+                qCritical() << "IS BOOTLOADER INSTALLED ???";
             }
         }
         qCritical() << "starting bootloader...FAILED";
         return false;
-#endif
+    } else {
+        QThread::msleep(1000);
+        qInfo() << "starting bootloader...OK";
+    }
+
+    return true;
 }
 
 bool Update::stopBootloader() const {
-    QThread::msleep(1000);
-    qInfo() << nextTimePoint().toUtf8().constData() << "stopping bootloader ...done";
-    return true;
-
-#if 0
     qDebug() << "stopping bootloader...";
+
+    if (!m_debug) {
         int nTry = 5;
         while (--nTry >= 0) {
             m_hw->bl_stopBL();
-        QThread::msleep(500);
+            QThread::msleep(1000);
             if (!m_hw->bl_isUp()) {
                 qInfo() << "stopping bootloader...OK";
                 return true;
@@ -290,12 +257,21 @@ bool Update::stopBootloader() const {
         }
         qCritical() << "stopping bootloader...FAILED";
         return false;
-#endif
+
+    } else {
+        QThread::msleep(1000);
+        qInfo() << "stopping bootloader...OK";
+    }
+
+    return true;
 }
 
 bool Update::resetDeviceController() const {
-    // TODO
-    // m_hw->bl_rebootDC();
+    qInfo() << nextTimePoint().toUtf8().constData() << "resetting device controller";
+
+    if (!m_debug) {
+        m_hw->bl_rebootDC();
+    }
 
     // wait maximally 3 seconds, before starting bootloader
     QThread::sleep(1);
@@ -313,12 +289,12 @@ QByteArray Update::loadBinaryDCFile(QString const &filename) const {
     if (!file.exists()) {
         qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
                     << file.fileName() << "does not exist";
-        return QByteArray();
+        return QByteArray{};
     }
     if (!file.open(QIODevice::ReadOnly)) {
         qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
                     << "cannot open file" << file.fileName();
-        return QByteArray();
+        return QByteArray{};
     }
 
     qInfo() << nextTimePoint().toUtf8().constData()
@@ -408,19 +384,26 @@ QByteArray Update::loadBinaryDCFile(QString const &filename) const {
                         // There is no problem to repeat this command until the
                         // bootloader is really not running anymore.
  */
-bool Update::doUpdate(QString const &dcFileName) {
-    qInfo() << "<DC-VERSION>" << Update::dcVersion(dcFileName);
+int Update::run() {
+    if (!m_hw) {
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_hw == nullptr -> ca-slave plugin loaded ???";
+        return -(int)Result::PLUGIN_LOAD_ERROR;
+    }
 
-    m_dcFileName = dcFileName;
+    m_start = QDateTime::currentDateTime();
 
-    //QString const &fToWorkOn = usbStickDetected ? QDir::cleanPath(it->trimmed())
-    //: QDir::cleanPath(m_customerRepository + QDir::separator() + it->trimmed());
+    if (m_debug) {
+        qInfo() << "start dc-update for" << m_dcFileName << "at" << m_start.toString(Qt::ISODate);
+        qInfo() << "<DC-VERSION>" << Update::dcVersion(m_dcFileName);
+    }
 
-    //if (!m_hw) {
-    //    qCritical() << "(" << __func__ << ":" << __LINE__ << "):"
-    //                << "ERROR!!! m_hw == nullptr";
-    //    return false;
-    //}
+    if (!m_debug) {
+        m_hw->dc_autoRequest(false);
+    }
+
+    qInfo() << "DC auto request OFF";
+
+    qCritical() << "start dc-update for" << m_dcFileName << "at" << m_start.toString(Qt::ISODate);
 
     QByteArray ba = loadBinaryDCFile(m_dcFileName);
     if (ba.size() > 0) {
@@ -433,15 +416,14 @@ bool Update::doUpdate(QString const &dcFileName) {
 
         resetDeviceController();
         if (startBootloader()) {
+
             int currentBlock = 0;
             DownloadResult res = DownloadResult::OK;
             qInfo() << nextTimePoint().toUtf8().constData() << "64-byte block" << currentBlock;
 
-            while (res != DownloadResult::ERROR && currentBlock < m_totalBlocks) {
+            while (res != DownloadResult::ERROR && currentBlock <= m_totalBlocks) {
                 if ((res = sendNextAddress(currentBlock)) != DownloadResult::ERROR) {
                     if ((res = sendNextDataBlock(ba, currentBlock)) != DownloadResult::ERROR) {
-                        // TODO
-                        // m_hw->dcDownloadSetCurrentBlockNumber(currentBlock);
                         currentBlock += 1;
                     } else break;
                 }
@@ -470,243 +452,26 @@ bool Update::doUpdate(QString const &dcFileName) {
         }
         stopBootloader();   // there is no harm in stopping the bootloader even
                             // if starting the bootloader failed
+
+        // check if update was successful
+        if (!m_debug) {
+            m_hw->dc_autoRequest(true); //restart dc_autoRequest after download else E255!
+        }
+
+        for (int i = 0; i < 3; ++i) {
+            qInfo() << "waiting for device controller restart...(" << i << ")";
+            QThread::sleep(20);
+
+            resetDeviceController();
+            if (startBootloader()) {
                 qInfo() << nextTimePoint().toUtf8().constData() << "<DC-UPDATE-SUCCESS>";
-        return true;
+                stopBootloader();
+                return -(int)Result::SUCCESS;
+            }
+        }
     }
 
     qInfo() << nextTimePoint().toUtf8().constData() << "<DC-UPDATE-FAILURE>";
+    //To Do Error handling if Dc doesnt start after download
     return false;
 }
-
-#if 0
-bool Update::checkJsonVersions(QStringList const& jsonFileNames) {
-    if (!m_hw) {
-        qCritical() << "(" << __func__ << ":" << __LINE__ << "):"
-                    << "ERROR!!! m_hw == nullptr";
-        return false;
-    }
-
-    int tries = 20;
-    while ((m_sys_areDCdataValid = m_hw->sys_areDCdataValid()) == false) {
-        // must deliver 'true', only then are all data from hwapi valid
-        if (--tries < 0) {
-            qCritical() << "(" << __func__ << ":" << __LINE__ << "):"
-                        << "ERROR!!! DC DATA NOT VALID -> CA-SLAVE-PLUGIN NOT CONNECTED";
-            return false;
-        }
-        qCritical() << "(" << __func__ << ":" << __LINE__ << "):"
-                    << "ERROR!!! DC DATA NOT VALID -> CA-SLAVE-PLUGIN NOT CONNECTED (" << tries << ")";
-        m_hw->dc_autoRequest(true);
-        QThread::msleep(500);
-    }
-
-    for (QStringList::size_type i=0; i < jsonFileNames.size(); ++i) {
-
-        uint8_t jsonNr = 0;
-
-        QString const &fName = jsonFileNames[i];
-
-        // send one request for every single version
-        // jsonNr=1...36, 1=config file (cust.Nr) 2=devices  3=cash  4=res.
-        //      6=printer template 1 ..... 36= template 32
-
-        if (fName.endsWith("conf.json")) {
-            jsonNr = 1;
-        } else
-        if (fName.endsWith("device.json")) {
-            jsonNr = 2;
-        } else
-        if (fName.endsWith("cash.json")) {
-            jsonNr = 3;
-        } else {
-            QRegularExpressionMatch match;
-            static const QRegularExpression re("^(.*print)([0-3][0-9])\\.json\\s*$");
-            int idx = fName.indexOf(re, 0, &match);
-            if (idx != -1) {
-                QString captured = match.captured(match.lastCapturedIndex());
-                bool ok = false;
-                int n = captured.toInt(&ok);
-                if (ok) {
-                    // note: use 5 (instead of 4 -> index has been shifted)
-                    jsonNr = n + 5;
-                }
-            }
-        }
-
-        if (jsonNr != 0) {
-            // send one request for every single version
-            // jsonNr=1...36, 1=config file (cust.Nr) 2=devices  3=cash  4=res.
-            //      5=printer template 1 ..... 36= template 32
-
-            m_hw->sys_requestJsonVersions(jsonNr);
-            QThread::msleep(500);
-
-            char buf[64];
-            memset(buf, 0x00, sizeof(buf));
-            m_hw->sys_getJsonVersions(jsonNr, buf);
-            buf[16] = '\0'; // the DC only handles 16 bytes
-
-            static const QByteArray cb(16, (char)0xff);
-
-            QString const installedVersion(QString::fromStdString(buf));
-            QString const fileVersion = getFileVersion(jsonFileNames[i]);
-
-            QFileInfo fi(jsonFileNames[i]);
-
-            qCritical() << endl;
-            qCritical() << "                json request nr:" << jsonNr;
-
-            if (installedVersion == fileVersion) {
-                qCritical() << "                      json file:" << fi.fileName();
-                qCritical() << "        installed version in DC:" << installedVersion;
-            } else
-            if (cb == QByteArray(buf) && fileVersion == "") {
-                qCritical() << "unknown json file (repo and DC):" << fi.fileName();
-            } else {
-                qCritical() << "                      json file:" << fi.fileName();
-                qCritical() << "        installed version in DC:" << installedVersion;
-                qCritical() << "     file version in repository:" << fileVersion;
-            }
-
-        } else {
-            qCritical() << "CANNOT FIND JSON-NR FOR" << fName;
-        }
-    }
-
-    return false;
-}
-
-
-QString Update::getFileVersion(QString const& jsonFileName) {
-    // "version":"15.10.2023 14:55 02.00.06",
-    static const QRegularExpression re("^.*(\\\"[Vv]ersion\\\":)([\\s\\\"]{0,})([^,\\\"]{0,}).*$");
-
-    QString fileVersion("");
-    QFile inputFile(QDir::cleanPath(m_customerRepository + QDir::separator() + jsonFileName));
-
-    if (inputFile.exists()) {
-        if (inputFile.open(QIODevice::ReadOnly)) {
-           QTextStream in(&inputFile);
-           while (!in.atEnd()) {
-              QString line = in.readLine();
-
-              QRegularExpressionMatch match;
-              int idx = line.indexOf(re, 0, &match);
-              if (idx != -1) {
-                  int const lastCaptured = match.lastCapturedIndex();
-                  // the dc only sends 16 Byte
-                  fileVersion = match.captured(lastCaptured);
-                  fileVersion.truncate(16);
-                  break;
-              }
-           }
-           inputFile.close();
-        }
-    } else {
-        // qCritical() << "ERROR" << inputFile.fileName() << "does not exist";
-    }
-
-    return fileVersion;
-}
-
-bool Update::downloadJson(enum FileTypeJson type,
-                          int templateIdx,
-                          QString jsFileToSendToDC) const {
-
-    m_hw->dc_autoRequest(true); // downloading Json needs the AutoEmission flag
-    qDebug() << "SET AUTO-REQUEST=TRUE";
-    QThread::sleep(1);  // make sure the auto-request flag is acknowledged
-
-    QStringList lst;
-    bool ready = false;
-    int nTry = 25;
-    while ((ready = m_hw->sys_ready4sending()) == false) {
-        QThread::msleep(200);
-        if (--nTry <= 0) {
-            qCritical() << "SYS NOT READY FOR SENDING AFTER 5 SECONDS";
-            break;
-        }
-    }
-
-    bool ret = false;
-    QString msg;
-    lst.clear();
-    if (ready) {
-        QFile file(jsFileToSendToDC);
-        QFileInfo fi(jsFileToSendToDC); // max. size of template file is 800 bytes
-        if (file.exists()) {
-            if (file.open(QIODevice::ReadOnly)) {
-                if (fi.size() > 0 && fi.size() <= 800) {
-                    QByteArray ba = file.readAll();
-                    // kindOfFile: 1=config, 2=device, 3=cash, 4=serial, 5=time, 6=printer
-                    //      nrOfTemplate=1...32 if kindOfFile==6
-                    //      content = content of the Json file, max 800byte ascii signs
-                    if (m_hw->sys_sendJsonFileToDc((uint8_t)(type),
-                                                   templateIdx,
-                                                   (uint8_t *)ba.data())) {
-
-                        /*
-                         *  Note: the machine id is contained in DC2C_conf.json.
-                         *  The idea was to use this to check if the download of
-                         *  the json-file was correct. It did not work, as the
-                         *  update of the PSA (to reflect a change in the
-                         *  machine id) did not happen immediately.
-                         *
-                            m_hw->dc_autoRequest(true);
-                            QThread::msleep(500);
-
-                            // testing
-                            m_hw->request_ReadbackMachineID();
-                            QThread::msleep(500);
-
-                            uint8_t data[64];
-                            memset(data, 0x00, sizeof(data));
-                            uint8_t length = 0;
-
-                            m_hw->readback_machineIDdata(&length, data);
-
-                            QThread::msleep(500);
-
-                            QByteArray ba((const char*)data, length);
-
-                            qCritical() << length << "MACHINE ID =" << ba.toHex(':');
-                        */
-
-                        ret = true;
-                    } else {
-                        qCritical() << QString("ERROR SEND JSON-FILE %1 TO DC").arg(file.fileName());
-                    }
-                } else {
-                    qCritical() << QString("SIZE OF %1 TOO BIG (%2 BYTES)").arg(jsFileToSendToDC).arg(fi.size());
-                }
-            } else {
-                qCritical() << QString("CAN NOT OPEN ") + jsFileToSendToDC + " FOR READING";
-            }
-        } else {
-            qCritical() << (QString(jsFileToSendToDC) + " DOES NOT EXIST");
-        }
-    }
-
-    m_hw->dc_autoRequest(false);
-    qDebug() << "SET AUTO-REQUEST=FALSE";
-    QThread::sleep(1);  // make sure the auto-request flag is acknowledged
-
-    return ret;
-}
-
-bool Update::updatePrinterTemplate(int templateIdx, QString jsFile) const {
-    return downloadJson(FileTypeJson::PRINTER, templateIdx, jsFile);
-}
-
-bool Update::updateConfig(QString jsFile) {
-    return downloadJson(FileTypeJson::CONFIG, 0, jsFile);
-}
-
-bool Update::updateCashConf(QString jsFile) {
-    return downloadJson(FileTypeJson::CASH, 0, jsFile);
-}
-
-bool Update::updateDeviceConf(QString jsFile) {
-    return downloadJson(FileTypeJson::DEVICE, 0, jsFile);
-}
-#endif

DownloadDCFirmware/update.h

@@ -17,26 +17,21 @@
 
 #ifdef PTU5
 #define SERIAL_PORT "ttymxc2"
+#define BAUDRATE 115200
 #else
 #define SERIAL_PORT "ttyUSB0"
+#define BAUDRATE 115200
 #endif
 
+class QSerialPort;
 class Update : public QObject {
     Q_OBJECT
 
+    QString m_dcFileName{};
     hwinf *m_hw = nullptr;
-    char const *m_serialInterface;
-    char const *m_baudrate;
-    QString m_customerRepository;
-    QString m_customerNrStr;
-    QString m_branchName;
-    QString m_pluginName;
-    QString m_workingDir;
-    QString m_psaDcDir;
-    QString m_dcFileName;
-    bool m_maintenanceMode;
-    bool m_dryRun;
-    bool m_sys_areDCdataValid;
+    bool m_sys_areDCdataValid{};
+    bool m_debug{false};
+    bool m_noaction;
 
     static QPluginLoader pluginLoader;
 
@@ -48,27 +43,16 @@ class Update : public QObject {
 
 public:
     enum class DownloadResult {OK, ERROR, TIMEOUT, NOP};
-    enum class FileTypeJson {CONFIG=1, DEVICE=2, CASH=3, SERIAL=4, TIME=5, PRINTER=6};
+    enum class Result {SUCCESS=0, PLUGIN_LOAD_ERROR};
 
-    static hwinf *loadDCPlugin(QDir const &plugInDir, QString const &fn);
+    static hwinf *loadDCPlugin(QString const &libCA = "/usr/lib/libCAslave.so");
     static bool unloadDCPlugin();
     static QStringList split(QString line, QChar sep = ',');
 
-    explicit Update(QString customerRepository,
-                    QString customerNrStr,
-                    QString branchName,
-                    QString plugInDir,
-                    QString pluginName,
-                    QString workingDir,
-                    QString psaDcDir,
-                    bool dryRun = false,
-                    QObject *parent = nullptr,
-                    char const *serialInterface = SERIAL_PORT,
-                    char const *baudrate = "115200");
-
+    explicit Update(QString const &dcBinFile, QString const &libCA, bool debug, bool noaction);
     virtual ~Update() override;
 
-    bool doUpdate(QString const &dcFileName);
+    int run();
     static QString dcVersion(QString const &dcBinFile);
 
 private:

DownloadDCJsonFiles/DownloadDCJsonFiles.pro

@@ -1,7 +1,7 @@
 QT += core
 QT += serialport network
 
-TARGET = ATBDownloadDCJsonFiles
+TARGET = ATBUpdateJsonFiles
 
 VERSION="0.1.0"
 win32 {

DownloadDCJsonFiles/main.cpp

@@ -144,7 +144,7 @@ int main(int argc, char **argv) {
         }
     }
 
-    // qCritical() << "JSON FILES TO UPDATE" << filesToUpdate;
+    qCritical() << __LINE__ << "JSON FILES TO UPDATE" << filesToUpdate;
 
     Update update(customerRepo,
                   QString::number(customerNr),
@@ -153,8 +153,10 @@ int main(int argc, char **argv) {
                   plugInName,
                   workingDir);
 
-    update.doUpdate();
-    // update.doUpdate(filesToUpdate, mountPath.has_value());
+    if (!filesToUpdate.empty()) {
+        update.doUpdate(filesToUpdate, mountPath.has_value());
+    }
+
     // update.checkJsonVersions();
     //update.checkJsonVersions(filesToUpdate);
 

DownloadDCJsonFiles/update.cpp

@@ -107,7 +107,7 @@ Update::Update(QString customerRepository,
                char const *serialInterface,
                char const *baudrate)
     : QObject(parent)
-    // , m_hw(loadDCPlugin(QDir(plugInDir), pluginName))
+    , m_hw(loadDCPlugin(QDir(plugInDir), pluginName))
     , m_serialInterface(serialInterface)
     , m_baudrate(baudrate)
     , m_customerRepository(customerRepository)
@@ -145,7 +145,8 @@ Update::~Update() {
     // unloadDCPlugin();
 }
 
-bool Update::doUpdate() {
+#if 0
+bool Update::doUpdate() { // test function
 
     int numberOfFiles = 3;
 
@@ -178,6 +179,7 @@ bool Update::doUpdate() {
 
     return true;
 }
+#endif
 
 bool Update::doUpdate(QStringList const &filesToWorkOn, bool usbStickDetected) {
 

Git/git_command.cpp

@@ -50,12 +50,17 @@ GitCommand::GitCommand()
 }
 
 bool GitCommand::exec(QStringList const &options, int start_timeout, int finish_timeout) {
+    bool ret = false;
     if (GitCommand::initEnv) {
         Command cmd(QString("git"), options, m_workingDirectory,
                     start_timeout, finish_timeout);
-        return cmd.exec();
+        ret = cmd.exec();
+        //qCritical() << __func__ << ":" << __LINE__ << cmd.command()
+        //            << "," << cmd.args()
+        //            << ", result" << cmd.commandResult();
+        m_commandResult = cmd.commandResult();
     }
-    return 0;
+    return ret;
 }
 
 bool GitCommand::check(int start_timeout, int finish_timeout) {

Git/git_command.h

@@ -11,9 +11,14 @@ class GitCommand {
 
     bool exec(QStringList const &options, int start_timeout = 100000,
               int finish_timeout = 100000);
+
+    QString m_commandResult{};
+
 public:
     GitCommand();
 
+    void resetCommandResult() { m_commandResult.clear(); }
+    QString const &commandResult() const { return m_commandResult; }
 
     bool status(int start_timeout = 100000, int finish_timeout = 100000);
     bool check(int start_timeout = 100000, int finish_timeout = 100000);

Git/main.cpp

@@ -15,6 +15,7 @@
 #include <QRegularExpression>
 #include <QFile>
 #include <QTextStream>
+#include <QRegularExpression>
 
 #include <optional>
 
@@ -90,6 +91,19 @@ int main(int argc, char **argv) {
             if (!gitCmd.pull()) {
                 return -4;
             }
+            QString const result = gitCmd.commandResult().trimmed();
+            if (result.contains("Already", Qt::CaseInsensitive)
+             && result.contains("up", Qt::CaseInsensitive)
+             && result.contains("to", Qt::CaseInsensitive)
+             && result.contains("date", Qt::CaseInsensitive)) {
+                qCritical() << internal::GIT_CUSTOMER_REPO_NO_UPDATE_NECESSARY;
+                return internal::GIT_NOT_NECESSARY_CODE;
+            } else
+            if (result.contains(QRegularExpression("[Uu]pdating\\s+[a-z0-9]{6,}\\.\\.[a-z0-9]{6,}"))) {
+                // Updating 49a97f5..13a0321
+                qCritical() << internal::GIT_CUSTOMER_REPO_UPDATED;
+                return internal::GIT_UPDATED_CODE;
+            }
         } else {
             if (!gitCmd.clone()) {
                 return -3;

Opkg/Opkg.pro

@@ -1,6 +1,6 @@
 QT += core
 
-TARGET = ExecOpkgCmds
+TARGET = ATBUpdateOpkg
 
 VERSION="1.0.0"
 win32 {
@@ -64,9 +64,17 @@ contains( CONFIG, DesktopLinux ) {
 }
 
 SOURCES += \
-        main.cpp
+        main.cpp \
+        message_handler.cpp \
+        ../common/src/utils_internal.cpp \
+        ../common/src/command.cpp \
+        opkg_command.cpp
 
-# HEADERS += \
+HEADERS += \
+        message_handler.h \
+        ../common/include/utils_internal.h \
+        ../common/include/command.h \
+        opkg_command.h
 
 ##########################################################################################
 # for running program on target through QtCreator

Opkg/main.cpp

@@ -4,11 +4,66 @@
 
 #include <QProcess>
 #include <QCommandLineParser>
+#include <QCommandLineOption>
 #include <QStandardPaths>
 #include <QSettings>
 #include <QDir>
 #include <QDebug>
 
+#include "message_handler.h"
+#include "utils_internal.h"
+#include "opkg_command.h"
+
 int main(int argc, char **argv) {
+
+    QByteArray const value = qgetenv("LC_ALL");
+    if (value.isEmpty() || value != "C") {
+        qputenv("LC_ALL", "C");
+    }
+
+    openlog("ATB-UPDATE-OPKG", LOG_PERROR | LOG_PID | LOG_CONS, LOG_USER);
+
+    QCoreApplication a(argc, argv);
+    QCoreApplication::setApplicationName("ATBUpdateOpkg");
+    QCoreApplication::setApplicationVersion(APP_VERSION);
+
+    if (!messageHandlerInstalled()) { // change internal qt-QDebug-handling
+        atbInstallMessageHandler(nullptr);
+        //atbInstallMessageHandler(atbDebugOutput);
+        setDebugLevel(LOG_NOTICE);
+    }
+
+#if 0
+    QString s = "<OPKG>\n\naaa<OPKG>bbb<OPKG>ccc<OPKG>\n";
+    QString m_standardOutput{};
+    if (!s.isEmpty()) {
+        m_standardOutput += s.replace(QChar('\n'), "");
+        qCritical() << m_standardOutput;
+
+        int startIndex, endIndex{};
+        while (((startIndex = m_standardOutput.indexOf("<OPKG>")) == 0) &&
+               ((endIndex = m_standardOutput.indexOf("<OPKG>", 1)) != -1)) {
+                QString str = m_standardOutput.mid(0, endIndex);
+                qCritical() << "str" << str << str.mid(6);
+                m_standardOutput = m_standardOutput.mid(endIndex);
+                // qCritical() << "m" << m_standardOutput;
+        }
+        qCritical() << "m" << m_standardOutput;
+    }
+
+    return 0;
+#endif
+
+    QCommandLineParser parser;
+    QCommandLineOption noactionOption("noaction");
+    QCommandLineOption verboseOption("verbose");
+    parser.addOption(noactionOption);
+    parser.addOption(verboseOption);
+    parser.process(a);
+
+    bool noaction = parser.isSet(noactionOption);
+    OpkgCommand opkgCmd(noaction);
+
+
     return 0;
 }

Opkg/message_handler.cpp

@@ -0,0 +1,97 @@
+#include "message_handler.h"
+
+#include <QDateTime>
+#include <cstring>
+#include <QString>
+#include <QFileInfo>
+#include <QMessageLogContext>
+
+
+static char const *DBG_NAME[] = { "DBG  ", "WARN ", "CRIT ", "FATAL", "INFO " };
+static bool installedMsgHandler = false;
+static int debugLevel = LOG_NOTICE;
+
+int getDebugLevel() { return debugLevel; }
+void setDebugLevel(int newDebugLevel) {
+    debugLevel = newDebugLevel;
+}
+
+bool messageHandlerInstalled() {
+    return installedMsgHandler;
+}
+
+QtMessageHandler atbInstallMessageHandler(QtMessageHandler handler) {
+    installedMsgHandler = (handler != 0);
+    static QtMessageHandler prevHandler = nullptr;
+    if (handler) {
+        prevHandler = qInstallMessageHandler(handler);
+        return prevHandler;
+    } else {
+        return qInstallMessageHandler(prevHandler);
+    }
+}
+
+///
+/// \brief Print message according to given debug level.
+///
+/// \note Install this function using qInstallMsgHandler().
+///
+///  int main(int argc, char **argv) {
+///     installMsgHandler(atbDebugOutput);
+///     QApplication app(argc, argv);
+///     ...
+///     return app.exec();
+///  }
+///
+#if (QT_VERSION > QT_VERSION_CHECK(5, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+void atbDebugOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg) {
+    Q_UNUSED(context);
+    QString const localMsg = QString(DBG_NAME[type]) + msg.toLocal8Bit();
+
+    switch (debugLevel) {
+        case LOG_DEBUG: { // debug-level message
+            syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
+        } break;
+        case LOG_INFO: { // informational message
+            if (type != QtDebugMsg) {
+                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
+            }
+        } break;
+        case LOG_NOTICE: { // normal, but significant, condition
+            if (type != QtDebugMsg) {
+                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
+            }
+        } break;
+        case LOG_WARNING: { // warning conditions
+            if (type != QtInfoMsg && type != QtDebugMsg) {
+                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
+            }
+        } break;
+        case LOG_ERR: { // error conditions
+            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
+                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
+            }
+        } break;
+        case LOG_CRIT: { // critical conditions
+            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
+                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
+            }
+        } break;
+        case LOG_ALERT: { // action must be taken immediately
+            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
+                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
+            }
+        } break;
+        case LOG_EMERG: { // system is unusable
+            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
+                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
+            }
+        } break;
+        default: {
+            //fprintf(stderr, "%s No ErrorLevel defined! %s\n",
+            //    datetime.toStdString().c_str(), msg.toStdString().c_str());
+        }
+    }
+}
+#endif
+

Opkg/message_handler.h

@@ -0,0 +1,23 @@
+#ifndef MESSAGE_HANDLER_H_INCLUDED
+#define MESSAGE_HANDLER_H_INCLUDED
+
+#include <QtGlobal>
+#ifdef __linux__
+#include <syslog.h>
+#endif
+
+int getDebugLevel();
+void setDebugLevel(int newDebugLevel);
+
+bool messageHandlerInstalled();
+QtMessageHandler atbInstallMessageHandler(QtMessageHandler handler);
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+// typedef void (*QtMessageHandler)(QtMsgType, const char *);
+void atbDebugOutput(QtMsgType type, const char *msg);
+#elif QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+// typedef void (*QtMessageHandler)(QtMsgType, const QMessageLogContext &, const QString &);
+void atbDebugOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg);
+#endif
+
+#endif // MESSAGE_HANDLER_H_INCLUDED

Opkg/opkg_command.cpp

@@ -0,0 +1,176 @@
+#include "opkg_command.h"
+
+#include "command.h"
+#include "utils_internal.h"
+using namespace internal;
+
+#include <QDir>
+#include <QDebug>
+#include <QFlags>
+#include <QRegularExpression>
+
+OpkgCommand::OpkgCommand(bool noaction, QString const &opkg_commands_filename)
+  : m_noaction(noaction)
+  , m_opkg_commands_filename(opkg_commands_filename) {
+    cleanUpOpkgCache();
+    execCommandsInternal();
+}
+
+bool OpkgCommand::readCommands() {
+    QFile opkgFile(QDir::cleanPath(m_opkg_commands_dir + QDir::separator() + m_opkg_commands_filename));
+    if (!opkgFile.exists()) {
+        qCritical() << __func__ << ":" << __LINE__
+                    << opkgFile.fileName() << "does not exists";
+        return false;
+    }
+
+    m_commands.clear();
+
+    if (opkgFile.open(QIODevice::ReadOnly)) {
+        QTextStream in(&opkgFile);
+        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 emptyLine("^\\s*$");
+            if (line.indexOf(emptyLine, 0) == -1 &&
+                line.indexOf(comment, 0) == -1) {
+                QString const &commandLine = line.trimmed();
+                if (!commandLine.isEmpty()) {
+                    m_commands << commandLine;
+                }
+            }
+        }
+    } else {
+        qCritical() << __func__ << ":" << __LINE__
+                    << "error opening" << opkgFile.fileName();
+    }
+
+    return m_commands.size() > 0;
+}
+
+bool OpkgCommand::execCommandsInternal() {
+    if (readCommands()) {
+        // command lines are located between markers: <OPKG>...<OPKG>
+        // they are later removed when used by the update-tool.
+        qCritical().noquote() << "<OPKG>";
+        QListIterator<QString> it(m_commands);
+        while (it.hasNext()) {
+            QString command = it.next();
+            QStringList cmdAndOptions = command.split(u' ', QString::SkipEmptyParts);
+            if (cmdAndOptions.size() > 0) {
+                QString const &cmd = cmdAndOptions.takeFirst();
+                if (m_noaction) {
+                    if (cmd.contains("opkg")) {
+                        cmdAndOptions.prepend("--noaction");
+                    } else continue; // only opkg has the --noaction option
+                }
+                QStringList const &options = cmdAndOptions;
+                if (exec(cmd, options)) {
+                    qCritical().noquote() << cmd << options.join(" ") << "ok" << "<OPKG>";
+                } else {
+                    qCritical().noquote() << cmd << options.join(" ") << "FAIL" << "<OPKG>";
+                }
+            }
+        }
+        return true;
+    }
+    return false;
+
+}
+
+bool OpkgCommand::execCommands() {
+    if (readCommands()) {
+        QListIterator<QString> it(m_commands);
+        while (it.hasNext()) {
+            QString command = it.next();
+            QStringList cmdAndOptions = command.split(u' ', QString::SkipEmptyParts);
+            if (cmdAndOptions.size() > 0) {
+                QString const &cmd = cmdAndOptions.takeFirst();
+                if (m_noaction) {
+                    cmdAndOptions.prepend("--noaction");
+                }
+                QStringList const &options = cmdAndOptions;
+                if (exec(cmd, options)) {
+                    qCritical().noquote() << cmd << options.join(" ");
+                } else {
+                    qCritical().noquote() << cmd << options.join(" ") << "FAIL";
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+    return false;
+
+#if 0
+
+    QFile opkgFile(QDir::cleanPath(m_opkg_commands_dir + QDir::separator() + m_opkg_commands_filename));
+    if (!opkgFile.exists()) {
+        qCritical() << __func__ << ":" << __LINE__
+                    << opkgFile.fileName() << "does not exists";
+        return false;
+    }
+
+    if (opkgFile.open(QIODevice::ReadOnly)) {
+        QTextStream in(&opkgFile);
+        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 emptyLine("^\\s*$");
+            if (line.indexOf(emptyLine, 0) == -1 &&
+                line.indexOf(comment, 0) == -1) {
+                QString const &commandLine = line.trimmed();
+                if (!commandLine.isEmpty()) {
+                    QStringList cmdAndOptions = commandLine.split(u' ', QString::SkipEmptyParts);
+                    if (cmdAndOptions.size() > 0) {
+                        QString const &cmd = cmdAndOptions.takeFirst();
+                        if (m_noaction) {
+                            cmdAndOptions.prepend("--noaction");
+                        }
+                        QStringList const &options = cmdAndOptions;
+                        if (exec(cmd, options)) {
+                            qCritical().noquote() << cmd << options.join(" ") << "ok";
+                        } else {
+                            qCritical().noquote() << cmd << options.join(" ") << "FAIL";
+                        }
+                    } else {
+                        continue;
+                    }
+                }
+            }
+        }
+        return true;
+    } else {
+        qCritical() << __func__ << ":" << __LINE__
+                    << "error opening" << opkgFile.fileName();
+    }
+
+    return false;
+#endif
+}
+
+bool OpkgCommand::exec(QString const &cmd, QStringList const &options,
+                       int start_timeout, int finish_timeout) {
+    bool const verbose = false;
+    return Command(cmd, options, "/tmp", verbose, start_timeout, finish_timeout).exec();
+}
+
+bool OpkgCommand::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);
+        }
+    }
+
+    if (removedFiles == false) {
+        qCritical() << "some errors while cleaning up opkg-cache";
+    }
+
+    return removedFiles;
+}

Opkg/opkg_command.h

@@ -0,0 +1,29 @@
+#ifndef OPKG_COMMND_H_INCLUDED
+#define OPKG_COMMND_H_INCLUDED
+
+#include <QStringList>
+
+class OpkgCommand {
+    QString const m_opkg_commands_dir{"/etc/psa_update/"};
+    bool m_noaction;
+    QString m_opkg_commands_filename;
+    QStringList m_commands;
+
+    bool execCommands();
+    bool execCommandsInternal();
+    bool cleanUpOpkgCache();
+
+public:
+    OpkgCommand(bool noaction = false,
+                QString const &opkg_commands_file_name="opkg_commands");
+
+    bool exec(QString const &cmd, QStringList const &options,
+              int start_timeout = 100000, int finish_timeout = 100000);
+
+    QStringList commands() { return m_commands; }
+    QStringList const &commands() const { return m_commands; }
+
+    bool readCommands();
+};
+
+#endif // OPKG_COMMND_H_INCLUDED

Show/Show.pro

@@ -1,6 +1,6 @@
 QT += core
 
-TARGET = show_update
+TARGET = ATBUpdateShow
 
 VERSION="1.0.0"
 win32 {

Sync/Sync.pro

@@ -1,6 +1,6 @@
 QT += core
 
-TARGET = update_sync_cust_repo
+TARGET = ATBUpdateSync
 
 VERSION="1.0.0"
 win32 {
@@ -64,9 +64,19 @@ contains( CONFIG, DesktopLinux ) {
 }
 
 SOURCES += \
-        main.cpp
+        main.cpp \
+        message_handler.cpp \
+        ../common/src/utils_internal.cpp \
+        ../common/src/command.cpp \
+        sync_command.cpp
 
-# HEADERS += \
+
+
+HEADERS += \
+        message_handler.h \
+        ../common/include/utils_internal.h \
+        ../common/include/command.h \
+        sync_command.h
 
 ##########################################################################################
 # for running program on target through QtCreator

Sync/main.cpp

@@ -9,6 +9,86 @@
 #include <QDir>
 #include <QDebug>
 
+#include "message_handler.h"
+#include "utils_internal.h"
+#include "sync_command.h"
+
 int main(int argc, char **argv) {
-    return 0;
+
+    QByteArray const value = qgetenv("LC_ALL");
+    if (value.isEmpty() || value != "C") {
+        qputenv("LC_ALL", "C");
+    }
+
+    openlog("ATB-UPDATE-SYNC", LOG_PERROR | LOG_PID | LOG_CONS, LOG_USER);
+
+    QCoreApplication a(argc, argv);
+    QCoreApplication::setApplicationName("ATBUpdateSync");
+    QCoreApplication::setApplicationVersion(APP_VERSION);
+
+    QDebug debug = qCritical();
+
+    if (!messageHandlerInstalled()) { // change internal qt-QDebug-handling
+        atbInstallMessageHandler(nullptr);
+        //atbInstallMessageHandler(atbDebugOutput);
+        setDebugLevel(LOG_NOTICE);
+    }
+
+    if (internal::customerRepoExists() == false) {
+        qCritical().noquote() << internal::NO_CUSTOMER_REPOSITORY;
+        return internal::NO_CUSTOMER_REPOSITORY_CODE;
+    }
+
+    QString const crd = internal::customerRepoDir();
+    QString const etcInRepo = QDir::cleanPath(crd + QDir::separator() + "etc/");
+    QString const optInRepo = QDir::cleanPath(crd + QDir::separator() + "opt/");
+
+    if (!QDir(etcInRepo).exists()) {
+        qCritical().noquote() << internal::NO_ETC_CUSTOMER_REPOSITORY;
+        return internal::NO_ETC_CUSTOMER_REPOSITORY_CODE;
+    }
+
+    if (!QDir(optInRepo).exists()) {
+        qCritical().noquote() << internal::NO_OPT_CUSTOMER_REPOSITORY;
+        return internal::NO_OPT_CUSTOMER_REPOSITORY_CODE;
+    }
+
+#if 0
+    error codes for rsync:
+        https://stackoverflow.com/questions/20737204/comprehensive-list-of-rsync-error-codes
+
+     0     Success
+     1     Syntax or usage error
+     2     Protocol incompatibility
+     3     Errors selecting input/output files, dirs
+     4     Requested action not supported: an attempt was made to manipulate 64-bit
+           files on a platform that cannot support them; or an option was specified
+           that is supported by the client and not by the server.
+     5     Error starting client-server protocol
+     6     Daemon unable to append to log-file
+    10     Error in socket I/O
+    11     Error in file I/O
+    12     Error in rsync protocol data stream
+    13     Errors with program diagnostics
+    14     Error in IPC code
+    20     Received SIGUSR1 or SIGINT
+    21     Some error returned by waitpid()
+    22     Error allocating core memory buffers
+    23     Partial transfer due to error
+    24     Partial transfer due to vanished source files
+    25     The --max-delete limit stopped deletions
+    30     Timeout in data send/receive
+    35     Timeout waiting for daemon connection
+#endif
+
+
+    QStringList options({"-v", "--recursive", "--progress", "--checksum",
+                         "--exclude=.*", "--include=*.bin", "--include=*.json",
+                         "--include=*.ini"});
+    int ret = SyncCommand().exec("rsync", options << etcInRepo << "/etc");
+
+    if (ret == 0) {
+       ret = SyncCommand().exec("rsync", options << optInRepo << "/opt");
+    }
+    return (ret > 0) ? -ret : ret;
 }

Sync/message_handler.cpp

@@ -0,0 +1,97 @@
+#include "message_handler.h"
+
+#include <QDateTime>
+#include <cstring>
+#include <QString>
+#include <QFileInfo>
+#include <QMessageLogContext>
+
+
+static char const *DBG_NAME[] = { "DBG  ", "WARN ", "CRIT ", "FATAL", "INFO " };
+static bool installedMsgHandler = false;
+static int debugLevel = LOG_NOTICE;
+
+int getDebugLevel() { return debugLevel; }
+void setDebugLevel(int newDebugLevel) {
+    debugLevel = newDebugLevel;
+}
+
+bool messageHandlerInstalled() {
+    return installedMsgHandler;
+}
+
+QtMessageHandler atbInstallMessageHandler(QtMessageHandler handler) {
+    installedMsgHandler = (handler != 0);
+    static QtMessageHandler prevHandler = nullptr;
+    if (handler) {
+        prevHandler = qInstallMessageHandler(handler);
+        return prevHandler;
+    } else {
+        return qInstallMessageHandler(prevHandler);
+    }
+}
+
+///
+/// \brief Print message according to given debug level.
+///
+/// \note Install this function using qInstallMsgHandler().
+///
+///  int main(int argc, char **argv) {
+///     installMsgHandler(atbDebugOutput);
+///     QApplication app(argc, argv);
+///     ...
+///     return app.exec();
+///  }
+///
+#if (QT_VERSION > QT_VERSION_CHECK(5, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+void atbDebugOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg) {
+    Q_UNUSED(context);
+    QString const localMsg = QString(DBG_NAME[type]) + msg.toLocal8Bit();
+
+    switch (debugLevel) {
+        case LOG_DEBUG: { // debug-level message
+            syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
+        } break;
+        case LOG_INFO: { // informational message
+            if (type != QtDebugMsg) {
+                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
+            }
+        } break;
+        case LOG_NOTICE: { // normal, but significant, condition
+            if (type != QtDebugMsg) {
+                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
+            }
+        } break;
+        case LOG_WARNING: { // warning conditions
+            if (type != QtInfoMsg && type != QtDebugMsg) {
+                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
+            }
+        } break;
+        case LOG_ERR: { // error conditions
+            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
+                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
+            }
+        } break;
+        case LOG_CRIT: { // critical conditions
+            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
+                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
+            }
+        } break;
+        case LOG_ALERT: { // action must be taken immediately
+            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
+                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
+            }
+        } break;
+        case LOG_EMERG: { // system is unusable
+            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
+                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
+            }
+        } break;
+        default: {
+            //fprintf(stderr, "%s No ErrorLevel defined! %s\n",
+            //    datetime.toStdString().c_str(), msg.toStdString().c_str());
+        }
+    }
+}
+#endif
+

Sync/message_handler.h

@@ -0,0 +1,23 @@
+#ifndef MESSAGE_HANDLER_H_INCLUDED
+#define MESSAGE_HANDLER_H_INCLUDED
+
+#include <QtGlobal>
+#ifdef __linux__
+#include <syslog.h>
+#endif
+
+int getDebugLevel();
+void setDebugLevel(int newDebugLevel);
+
+bool messageHandlerInstalled();
+QtMessageHandler atbInstallMessageHandler(QtMessageHandler handler);
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+// typedef void (*QtMessageHandler)(QtMsgType, const char *);
+void atbDebugOutput(QtMsgType type, const char *msg);
+#elif QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+// typedef void (*QtMessageHandler)(QtMsgType, const QMessageLogContext &, const QString &);
+void atbDebugOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg);
+#endif
+
+#endif // MESSAGE_HANDLER_H_INCLUDED

Sync/sync_command.cpp

@@ -0,0 +1,21 @@
+#include "sync_command.h"
+
+#include "command.h"
+#include "utils_internal.h"
+using namespace internal;
+
+#include <QDir>
+#include <QDebug>
+#include <QFlags>
+#include <QRegularExpression>
+
+SyncCommand::SyncCommand() {
+}
+
+int SyncCommand::exec(QString const &cmd, QStringList const &options,
+                       int start_timeout, int finish_timeout) {
+    Command c(cmd, options, internal::customerRepoDir(),
+              start_timeout, finish_timeout);
+    c.exec();
+    return c.exitCode();
+}

Sync/sync_command.h

@@ -0,0 +1,14 @@
+#ifndef SYNC_COMMAND_H_INCLUDED
+#define SYNC_COMMAND_H_INCLUDED
+
+#include <QStringList>
+
+class SyncCommand {
+public:
+    SyncCommand();
+
+    int exec(QString const &cmd, QStringList const &options,
+              int start_timeout = 100000, int finish_timeout = 100000);
+};
+
+#endif // SYNC_COMMAND_H_INCLUDED

UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro

@@ -147,7 +147,8 @@ DEFINES += QT_DEPRECATED_WARNINGS
 # 1.5.5   : Call into binary ptuPackageVersion to get installed package
 #           versions.
 # 1.5.6   : Show additional update progress info in status bar.
-VERSION="1.5.6"
+# 2.0.0   : Rewrite of UpdateTool.
+VERSION="2.0.0"
 # 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
@@ -218,6 +219,7 @@ EXTENDED_VERSION="$${VERSION}-$${GIT_COMMIT}"
 
 # INCLUDEPATH += plugins
 INCLUDEPATH += plugins \
+    $${_PRO_FILE_PWD_}/../common/ \
     $${_PRO_FILE_PWD_}/../common/include
 
 CONFIG += c++17
@@ -294,7 +296,11 @@ SOURCES += \
         worker.cpp \
         commandline_parser.cpp \
         work_process_list.cpp \
-        ../common/src/utils_internal.cpp
+        $${_PRO_FILE_PWD_}/../common/src/utils_internal.cpp \
+        $${_PRO_FILE_PWD_}/../common/ismas/ApismClient.cpp \
+        $${_PRO_FILE_PWD_}/../common/ismas/ApismTcpClient.cpp \
+        $${_PRO_FILE_PWD_}/../common/ismas/ApismClientForUpdate.cpp
+
 
 HEADERS += \
         update.h \
@@ -319,7 +325,12 @@ HEADERS += \
         worker.h \
         commandline_parser.h \
         work_process_list.h \
-        ../common/include/utils_internal.h
+        $${_PRO_FILE_PWD_}/../common/include/utils_internal.h \
+        $${_PRO_FILE_PWD_}/../common/include/log_line_entry.h \
+        $${_PRO_FILE_PWD_}/../common/ismas/ApismClient.h \
+        $${_PRO_FILE_PWD_}/../common/ismas/ApismTcpClient.h \
+        $${_PRO_FILE_PWD_}/../common/ismas/ISMASData.h \
+        $${_PRO_FILE_PWD_}/../common/ismas/ApismClientForUpdate.h
 
 
 OTHER_FILES += \

UpdatePTUDevCtrl/ismas/ismas_client.cpp

@@ -21,6 +21,7 @@
 #include <QThread>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QCoreApplication>
 
 #if 0
 ########################
@@ -380,7 +381,7 @@ QString IsmasClient::updateNewsToIsmas(char const *event,
         "{"
             "\"REASON\":\"SW_UP\","
             "\"TIMESTAMP\":\"%s\","
-            "\"EVENT_ID\":\"0\","
+            "\"EVENT_ID\":\"%d\","
             "\"EVENT\":\"%s\","
             "\"EVENTSTATE\":1,"
             "\"PARAMETER\": {"
@@ -390,7 +391,7 @@ QString IsmasClient::updateNewsToIsmas(char const *event,
                 "\"STEP_RESULT\" : \"%s\","
                 "\"VERSION\" : \"%s\""
             "}"
-        "}", ts.toStdString().c_str(), event, percent, resultCode,
+        "}", ts.toStdString().c_str(), static_cast<int>(QCoreApplication::applicationPid()), event, percent, resultCode,
              step, step_result, version);
     return buf;
 }

UpdatePTUDevCtrl/main.cpp

@@ -49,17 +49,6 @@
 #define SERIAL_PORT "ttyUSB0"
 #endif
 
-//QString Orientation(Qt::ScreenOrientation orientation) {
-//    switch (orientation) {
-//        case Qt::PrimaryOrientation           : return "Primary";
-//        case Qt::LandscapeOrientation         : return "Landscape";
-//        case Qt::PortraitOrientation          : return "Portrait";
-//        case Qt::InvertedLandscapeOrientation : return "Inverted landscape";
-//        case Qt::InvertedPortraitOrientation  : return "Inverted portrait";
-//        default                               : return "Unknown";
-//    }
-//}
-
 // argv[1]: file to send to dc
 int main(int argc, char *argv[]) {
     QByteArray const value = qgetenv("LC_ALL");
@@ -82,15 +71,6 @@ int main(int argc, char *argv[]) {
         setDebugLevel(LOG_NOTICE);
     }
 
-    //qCritical() << "Number of screens:" << QGuiApplication::screens().size();
-    //qCritical() << "Primary screen:" << QGuiApplication::primaryScreen()->name();
-
-    //foreach (QScreen *screen, QGuiApplication::screens()) {
-    //    qDebug() << "Information for screen:" << screen->name();
-    //    qDebug() << "  Orientation:" << Orientation(screen->orientation());
-    //}
-    //return 0;
-
     CommandLineParser parser;
     parser.process(a);
     parser.readSettings();

UpdatePTUDevCtrl/mainwindow.cpp

@@ -3,6 +3,7 @@
 #include "worker.h"
 #include "utils.h"
 #include "utils_internal.h"
+#include "log_line_entry.h"
 #include "progress_event.h"
 #include "update_dc_event.h"
 #include "process/update_command.h"
@@ -16,17 +17,89 @@
 #include <QColor>
 #include <QColorDialog>
 
+#define CHECK_BACKEND_CONNECTION    0
+#define CHECK_UPDATE_REQUEST        1
+#define UPDATE_CUSTOMER_REPOSITORY  2
+#define INSTALL_SW_PACKETS_DRY_RUN  3
+#define INSTALL_SW_PACKETS          4
+#define UPDATE_DC                   5
+#define SYNCHRONIZE_REPOSITORY      6
+#define INSTALL_DC_CONFIGURATION    7
+
+#define CHECK_ISMAS_CONNECT_PERCENT_START   ( 1)
+#define CHECK_ISMAS_CONNECT_PERCENT_END     (10)
+
+#define CHECK_UPDATE_REQUEST_PERCENT_START  (10)
+#define CHECK_UPDATE_REQUEST_PERCENT_END    (20)
+
+#define UPDATE_GIT_PERCENT_START            (20)
+#define UPDATE_GIT_PERCENT_END              (21)
+
+#define UPDATE_OPKG_NOACTION_PERCENT_START  (21)
+#define UPDATE_OPKG_NOACTION_PERCENT_END    (25)
+
+#define UPDATE_OPKG_PERCENT_START           (25)
+#define UPDATE_OPKG_PERCENT_END             (40)
+
+#define UPDATE_DOWNLOAD_DC_START            (41)
+#define UPDATE_DOWNLOAD_DC_END              (80)
+
+#define UPDATE_SYNC_START                   (81)
+#define UPDATE_SYNC_END                     (90)
+
+#define UPDATE_DOWNLOAD_JSON_START          (91)
+#define UPDATE_DOWNLOAD_JSON_END            (100)
+
+
+void MainWindow::onFileChanged(QString const& /*f*/) {
+    static int i = 30;
+    ui->updateProgress->setValue(++i);
+
+    // TODO: daten an ISMAS senden
+}
+
+QProgressBar *MainWindow::progressBar() {
+    return ui ? ui->updateProgress : nullptr;
+}
 
 MainWindow::MainWindow(Worker *worker, QWidget *parent)
     : QMainWindow(parent)
     , ui(new Ui::MainWindow)
     , m_worker(worker)
-    , m_width(70)
+    , m_width(60)
     , m_progressRunning(false)
-    , m_updateStep(UpdateDcEvent::UpdateStep::NONE) {
+    , m_updateStep(UpdateDcEvent::UpdateStep::NONE)
+    , m_updateLog("/opt/app/tools/atbupdate/update.log") { // TODO: in ini-file eintragen
 
     ui->setupUi(this);
 
+    if (!m_updateLog.open(QIODevice::ReadWrite | QIODevice::Unbuffered)) {
+        qCritical() << "ERROR can not open" << m_updateLog.fileName();
+    }
+
+    m_updateSteps.resize(8);
+    m_updateSteps[CHECK_BACKEND_CONNECTION] = "Check backend connection (ISMAS) ";
+    m_updateSteps[CHECK_UPDATE_REQUEST] = "Check update request ";
+    m_updateSteps[UPDATE_CUSTOMER_REPOSITORY] = "Update customer repository ";
+    m_updateSteps[INSTALL_SW_PACKETS_DRY_RUN] = "Install SW packets (dry run) ";
+    m_updateSteps[INSTALL_SW_PACKETS] = "Install SW packets ";
+    m_updateSteps[UPDATE_DC] = "Update DC ";
+    m_updateSteps[SYNCHRONIZE_REPOSITORY] = "Synchronize repository/filesystem ";
+    m_updateSteps[INSTALL_DC_CONFIGURATION] = "Install DC configuration ";
+
+    QString text{};
+    for (int i = 0; i < m_updateSteps.size(); ++i) {
+        QString &tmp = m_updateSteps[i];
+        int len = m_showLineLength - tmp.length();
+        while (--len > 0) {
+           tmp += "&nbsp;";
+        }
+        m_updateSteps[i] = tmp;
+        text += m_updateSteps[i];
+    }
+    ui->stepLabel->setTextFormat(Qt::RichText);
+    ui->stepLabel->setText(text);
+
     this->setStatusBar(new QStatusBar(this));
     QFont f;
     f.setStyleHint(QFont::Monospace);
@@ -45,7 +118,7 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
     lst << QString("Update tool version     : %1 - %2 %3").arg(APP_VERSION).arg(APP_BUILD_DATE).arg(APP_BUILD_TIME).leftJustified(m_width-3);
     lst << QString("Machine number          : %1 ").arg(m_worker->machineNr()).leftJustified(m_width-3);
     lst << QString("Customer number         : %1 ").arg(m_worker->customerNr()).leftJustified(m_width-3);
-    lst << QString("Zone number             : %1 (%2)").arg(m_worker->zoneNr()).arg(Utils::zoneName(m_worker->zoneNr())).leftJustified(m_width-3);
+    lst << QString("Zone number             : %1 ").arg(m_worker->zoneNr()).leftJustified(m_width-3);
     lst << QString("APISM version           : %1").arg(m_worker->apismVersion()).leftJustified(m_width-3);
     lst << QString("").leftJustified(m_width-3, '=');
 
@@ -81,7 +154,12 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
         m_statusTimer->start(1000);
     }
 
+    connect(m_worker->summaryTimer(), SIGNAL(timeout()), this, SLOT(onSummary()));
+    m_worker->summaryTimer()->setSingleShot(true);
+    m_worker->summaryTimer()->setInterval(5000);
+
     connect(ui->exit, SIGNAL(clicked()),this,SLOT(onQuit()));
+    connect(m_worker, SIGNAL(summary()),this,SLOT(onSummary()));
     connect(m_worker, SIGNAL(showSummary(QString)),this,SLOT(onShowSummary(QString)));
     connect(m_worker, SIGNAL(disableExit()),this,SLOT(onDisableExit()));
     connect(m_worker, SIGNAL(showDcDownload(QString)),this,SLOT(onShowDcDownload(QString)));
@@ -95,6 +173,8 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
     connect(m_worker, SIGNAL(showUpdateRequest(QString)),this,SLOT(onShowUpdateRequest(QString)));
     connect(m_worker, SIGNAL(showCustRepoStatus(QString)),this,SLOT(onShowCustRepoStatus(QString)));
     connect(m_worker, SIGNAL(showExecOpkgStatus(QString)),this,SLOT(onShowExecOpkgStatus(QString)));
+    connect(m_worker, SIGNAL(showExecOpkgCommand(QString)),this,SLOT(onShowExecOpkgCommand(QString)));
+    connect(m_worker, SIGNAL(showExecOpkgOverallResult(QString, bool)),this,SLOT(onShowExecOpkgOverallResult(QString,bool)));
     connect(m_worker, SIGNAL(showDownloadDCJsonFilesStatus(QString)),this,SLOT(onShowDownloadDCJsonFilesStatus(QString)));
     connect(m_worker, SIGNAL(showSyncCustRepoStatus(QString)),this,SLOT(onShowSyncCustRepoStatus(QString)));
     connect(m_worker, SIGNAL(showUpdateDCFirmware(QString)),this,SLOT(onShowUpdateDCFirmware(QString)));
@@ -112,8 +192,91 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
     connect(m_worker, SIGNAL(replaceLast(QStringList,QString)),this, SLOT(onReplaceLast(QStringList,QString)));
 }
 
+void MainWindow::onSummary() {
+    QThread::sleep(3);
+
+    QString summary, first, second, line, tmp;
+    QVector<QPair<QString, QString>> vec = Utils::installedPackages();
+
+    if (m_worker) {
+        vec.append(Utils::installedTariffFiles(m_worker, m_worker->customerRepository()));
+        vec.append(Utils::installedJsonFiles(m_worker, m_worker->customerRepository()));
+    }
+    int max_first = 0, max_second = 0;
+    for (int i = 0; i < vec.size(); ++i) {
+        max_first = std::max(max_first, vec[i].first.length());
+        max_second = std::max(max_second, vec[i].second.length());
+    }
+
+    max_first += 5;
+
+    summary = "UPDATE SUMMARY\n\n";
+
+    if (m_worker) {
+        first = QString("%1").arg("start", max_first, QChar(' '));
+        tmp = QString("%1").arg(m_worker->start().toString(Qt::ISODate));
+        second = QString("%1").arg(tmp, -max_second, QChar(' '));
+        line = first + ": " + second;
+        summary += line + "\n";
+    }
+
+    first = QString("%1").arg("update tool version", max_first, QChar(' '));
+    tmp = QString("%1 - %2 %3").arg(APP_VERSION).arg(APP_BUILD_DATE).arg(APP_BUILD_TIME);
+    second = QString("%1").arg(tmp, -max_second, QChar(' '));
+    line = first + ": " + second;
+    summary += line + "\n";
+
+    if (m_worker) {
+        first = QString("%1").arg("machine number", max_first, QChar(' '));
+        tmp = QString("%1").arg(m_worker->machineNr());
+        second = QString("%1").arg(tmp, -max_second, QChar(' '));
+        line = first + ": " + second;
+        summary += line + "\n";
+
+        first = QString("%1").arg("customer number", max_first, QChar(' '));
+        tmp = QString("%1").arg(m_worker->customerNr());
+        second = QString("%1").arg(tmp, -max_second, QChar(' '));
+        line = first + ": " + second;
+        summary += line + "\n";
+
+        first = QString("%1").arg("zone number", max_first, QChar(' '));
+        tmp = QString("%1").arg(m_worker->zoneNr());
+        second = QString("%1").arg(tmp, -max_second, QChar(' '));
+        line = first + ": " + second;
+        summary += line + "\n";
+    }
+
+    tmp = targetDcVersion();
+    if (!tmp.isEmpty()) {
+        first = QString("%1").arg("target device controller", max_first, QChar(' '));
+        second = QString("%1").arg(tmp, -max_second, QChar(' '));
+        line = first + ": " + second;
+        summary += line + "\n";
+    }
+
+    if (m_worker) {
+        first = QString("%1").arg("apism", max_first, QChar(' '));
+        tmp = QString("%1").arg(m_worker->apismVersion());
+        second = QString("%1").arg(tmp, -max_second, QChar(' '));
+        line = first + ": " + second;
+        summary += line + "\n";
+    }
+
+    for (int i = 0; i < vec.size(); ++i) {
+        first = QString("%1").arg(vec[i].first, max_first, QChar(' '));
+        second = QString("%1").arg(vec[i].second, -max_second, QChar(' '));
+        line = first + ": " + second;
+        summary += line + "\n";
+    }
+
+    if (m_worker) {
+        emit m_worker->showSummary(summary);
+        emit m_worker->enableExit();
+    }
+}
 
 void MainWindow::onShowSummary(QString text) {
+
     // QString s = ui->updateLabel->text();
     QString s("\n");
 
@@ -131,6 +294,9 @@ void MainWindow::onSetDcDownloadProgress(int v) {
 }
 
 void MainWindow::onShowTariffUpdate(QString) {
+    return;
+
+
     ui->exit->setEnabled(false);
 
     QString s = ui->stepLabel->text();
@@ -147,68 +313,105 @@ void MainWindow::onShowTariffUpdate(QString) {
 }
 
 void MainWindow::onShowISMASConnectivity(QString status) {
-    // ausgabe: connected, not connected, connecting
+    // qCritical() << __func__ << ":" << __LINE__ << "status" << status;
 
-    qCritical() << __func__ << ":" << __LINE__ << "status" << status;
-
-    QString s = ui->stepLabel->text();
-
-    QString tmp("backend connection (ISMAS) ");
-    int len = m_showLineLength - tmp.length();
-    while (--len > 0) {
-       tmp += "&nbsp;";
-    }
+    QString stepResult;
+    QString s = m_updateSteps[CHECK_BACKEND_CONNECTION].trimmed();
 
     bool const custRepoExists = internal::customerRepoExists();
 
     if (status.contains(UpdateCommand::ISMAS_CONNECTED, Qt::CaseInsensitive)) {
         if (custRepoExists) {
-            s += QString("%1 <font color='Green'>connected</font><br />").arg(tmp);
+            s += " <font color='Green'>connected</font>";
+            stepResult = "ISMAS connected";
         } else {
-            s += QString("%1 <font color='Green'>connected&nbsp;(initial configuration)</font><br />").arg(tmp);
+            s += " <font color='Green'>connected&nbsp;(initial configuration)</font>";
+            stepResult = "ISMAS connected (initial configuration)";
         }
     } else
     if (status.contains(UpdateCommand::NO_CUSTOMER_REPOSITORY, Qt::CaseInsensitive)) {
-        s += QString("%1 <font color='Blue'>NOT CONNECTED</font><br />").arg(tmp);
+        s += " <font color='Blue'>NOT CONNECTED</font>";
+        stepResult = "ISMAS not connected";
     } else
     if (status.contains(UpdateCommand::ISMAS_CONNECTION_IN_PROGRESS, Qt::CaseInsensitive)) {
-        s += QString("%1 <font color='Green'>connecting</font><br />").arg(tmp);
+        s += " <font color='Green'>connecting</font>";
+        stepResult = "connecting ISMAS";
     } else
     if (status.contains(UpdateCommand::ISMAS_NOT_CONNECTED, Qt::CaseInsensitive)) {
         if (custRepoExists) {
-            s += QString(  "%1 <font color='Red'>NOT CONNECTED. STOP</font><br />").arg(tmp);
+            s += " <font color='Red'>NOT CONNECTED. STOP</font>";
+            stepResult = "ISMAS not connected";
         } else {
-            s += QString(  "%1 <font color='Red'>not connected.&nbsp;(initial configuration)</font><br />").arg(tmp);
+            s += " <font color='Red'>not connected.&nbsp;(initial configuration)</font>";
+            stepResult = "ISMAS not connected (initial configuration)";
         }
     } else {
-        s += QString(  "%1 <font color='Red'>UNKNOWN STATUS</font><br />").arg(tmp);
+        s += " <font color='Red'>UNKNOWN STATUS</font>";
+        stepResult = "unknown status";
     }
 
+    struct LogLineEntry logLine =
+        initLogLineEntry(1, // receiver
+                         QDateTime::currentDateTime().toString(Qt::ISODate).toUtf8().constData(),
+                         _ISMAS_CONTINUE,
+                         0, // eventState
+                         CHECK_ISMAS_CONNECT_PERCENT_START,
+                         ISMAS::RESULT_CODE::E_SUCCESS,
+                         "show ISMAS connectivity", // step
+                         stepResult.toUtf8().constData()); // stepResult
+
+    int w = 0;
+    if ((w = m_updateLog.write((char *)(&logLine), sizeof(logLine))) != sizeof(logLine)) {
+        qCritical() << __func__ << ":" << __LINE__ << "ERROR only" << w << "bytes written";
+    }
+
+    m_updateSteps[CHECK_BACKEND_CONNECTION] = s;
+    s.clear();
+    for (int i = 0; i < m_updateSteps.size(); ++i) {
+        s += m_updateSteps[i] + "<br />";
+    }
     ui->stepLabel->setText(s);
+
+    logLine =
+        initLogLineEntry(1, // receiver
+                         QDateTime::currentDateTime().toString(Qt::ISODate).toUtf8().constData(),
+                         _ISMAS_CONTINUE,
+                         0, // eventState
+                         CHECK_ISMAS_CONNECT_PERCENT_END,
+                         ISMAS::RESULT_CODE::E_SUCCESS,
+                         "show ISMAS connectivity", // step
+                         stepResult.toUtf8().constData()); // stepResult
+
+    if ((w = m_updateLog.write((char *)(&logLine), sizeof(logLine))) != sizeof(logLine)) {
+        qCritical() << __func__ << ":" << __LINE__ << "ERROR only" << w << "bytes written";
+    }
 }
 
 void MainWindow::onShowCustRepoStatus(QString status) {
-    qCritical() << __func__ << ":" << __LINE__ << "status" << status;
+    // qCritical() << __func__ << ":" << __LINE__ << "status" << status;
 
-    QString s = ui->stepLabel->text();
+    QString s = m_updateSteps[UPDATE_CUSTOMER_REPOSITORY].trimmed();
 
-    QString tmp("customer repository ");
-    int len = m_showLineLength - tmp.length();
-    while (--len > 0) {
-       tmp += "&nbsp;";
-    }
-
-    if (status.contains(UpdateCommand::GIT_CUSTOMER_REPO_UP_TO_DATE, Qt::CaseInsensitive)) {
-        s += QString("%1 <font color='Green'>up to date</font><br />").arg(tmp);
+    if (status.contains(internal::GIT_CUSTOMER_REPO_UP_TO_DATE, Qt::CaseInsensitive)) {
+        s += QString(" <font color='Green'>%1</font>").arg(internal::GIT_CUSTOMER_REPO_UP_TO_DATE);
+    } else
+    if (status.contains(internal::GIT_CUSTOMER_REPO_NOT_NECESSARY, Qt::CaseInsensitive)) {
+        s += QString(" <font color='Green'>%1</font>").arg(internal::GIT_CUSTOMER_REPO_NOT_NECESSARY);
     } else {
-        s += QString(  "%1 <font color='Red'>UNKNOWN STATUS</font><br />").arg(tmp);
+        s += " <font color='Red'>UNKNOWN STATUS</font>";
     }
 
+    m_updateSteps[UPDATE_CUSTOMER_REPOSITORY] = s;
+    s.clear();
+    for (int i = 0; i < m_updateSteps.size(); ++i) {
+        s += m_updateSteps[i] + "<br />";
+    }
     ui->stepLabel->setText(s);
 }
 
 void MainWindow::onShowExecOpkgStatus(QString status) {
     qCritical() << __func__ << ":" << __LINE__ << "status" << status;
+    return;
 
     QString s = ui->stepLabel->text();
 
@@ -228,64 +431,102 @@ void MainWindow::onShowExecOpkgStatus(QString status) {
     ui->stepLabel->setText(s);
 }
 
-void MainWindow::onShowDownloadDCJsonFilesStatus(QString status) {
-    qCritical() << __func__ << ":" << __LINE__ << "status" << status;
+void MainWindow::onShowExecOpkgCommand(QString cmd) {
+    qCritical() << __func__ << ":" << __LINE__ << "cmd" << cmd;
+    return;
 
-    QString s = ui->stepLabel->text();
-
-    QString tmp = "configure device controller ";
-    int len = m_showLineLength - tmp.length();
-
-    while (--len > 0) {
-       tmp += "&nbsp;";
+    if (cmd.back() != QChar('\n')) {
+        cmd += "\n";
     }
+    onInsertText(cmd);
+}
+
+void MainWindow::onShowExecOpkgOverallResult(QString status, bool noaction) {
+    //qCritical() << __func__ << ":" << __LINE__ << "status" << status;
+
+    QString s = noaction ?
+        m_updateSteps[INSTALL_SW_PACKETS_DRY_RUN].trimmed() :
+        m_updateSteps[INSTALL_SW_PACKETS].trimmed();
+
+    if (status.contains(internal::EXEC_OPKG_COMMANDS_SUCCESS, Qt::CaseInsensitive)) {
+        s += " <font color='Green'>success</font>";
+    } else
+    if (status.contains(internal::EXEC_OPKG_COMMANDS_FAIL, Qt::CaseInsensitive)) {
+        s += QString(" <font color='Red'>%1</font>").arg(internal::EXEC_OPKG_COMMANDS_FAIL);
+    } else {
+        s += " <font color='Red'>UNKNOWN STATUS</font>";
+    }
+
+    if (noaction) {
+        m_updateSteps[INSTALL_SW_PACKETS_DRY_RUN] = s;
+    } else {
+        m_updateSteps[INSTALL_SW_PACKETS] = s;
+    }
+
+    s.clear();
+    for (int i = 0; i < m_updateSteps.size(); ++i) {
+        s += m_updateSteps[i] + "<br />";
+    }
+
+    ui->stepLabel->setText(s);
+}
+
+void MainWindow::onShowDownloadDCJsonFilesStatus(QString status) {
+    //qCritical() << __func__ << ":" << __LINE__ << "status" << status;
+
+    QString s = m_updateSteps[INSTALL_DC_CONFIGURATION].trimmed();
 
     if (status.contains(UpdateCommand::UPDATE_DC_JSON_FILES_SUCCESS, Qt::CaseInsensitive)) {
-        s += QString("%1 <font color='Green'>success</font><br />").arg(tmp);
+        s += " <font color='Green'>success</font>";
     } else {
-        s += QString(  "%1 <font color='Red'>UNKNOWN STATUS</font><br />").arg(tmp);
+        s += " <font color='Red'>UNKNOWN STATUS</font>";
     }
 
+    m_updateSteps[INSTALL_DC_CONFIGURATION] = s;
+    s.clear();
+    for (int i = 0; i < m_updateSteps.size(); ++i) {
+        s += m_updateSteps[i] + "<br />";
+    }
     ui->stepLabel->setText(s);
 }
 
 void MainWindow::onShowSyncCustRepoStatus(QString status) {
-    qCritical() << __func__ << ":" << __LINE__ << "status" << status;
+    //qCritical() << __func__ << ":" << __LINE__ << "status" << status;
 
-    QString s = ui->stepLabel->text();
-
-    QString tmp = "synchronize repository/filesystem ";
-    int len = m_showLineLength - tmp.length();
-
-    while (--len > 0) {
-       tmp += "&nbsp;";
-    }
+    QString s = m_updateSteps[SYNCHRONIZE_REPOSITORY].trimmed();
 
     if (status.contains(UpdateCommand::SYNC_CUSTOMER_REPO_FILES_SUCCESS, Qt::CaseInsensitive)) {
-        s += QString("%1 <font color='Green'>success</font><br />").arg(tmp);
+        s += " <font color='Green'>success</font>";
     } else {
-        s += QString(  "%1 <font color='Red'>UNKNOWN STATUS</font><br />").arg(tmp);
+        s += " <font color='Red'>UNKNOWN STATUS</font>";
     }
 
+    m_updateSteps[SYNCHRONIZE_REPOSITORY] = s;
+    s.clear();
+    for (int i = 0; i < m_updateSteps.size(); ++i) {
+        s += m_updateSteps[i] + "<br />";
+    }
     ui->stepLabel->setText(s);
 }
 
 void MainWindow::onShowUpdateDCFirmware(QString status) {
-    qCritical() << __func__ << ":" << __LINE__ << "status" << status;
+    // qCritical() << __func__ << ":" << __LINE__ << "status" << status;
 
-    QString s = ui->stepLabel->text();
+    QString s = m_updateSteps[UPDATE_DC].trimmed();
 
-    QString tmp = "device controller update ";
-    int len = m_showLineLength - tmp.length();
-
-    while (--len > 0) {
-       tmp += "&nbsp;";
+    if (status.contains(internal::UPDATE_DC_FIRMARE_SUCCESS, Qt::CaseInsensitive)) {
+        s += " <font color='Green'>success</font>";
+    } else {
+        s += " <font color='Red'>UNKNOWN STATUS</font>";
     }
 
-    if (status.contains(UpdateCommand::UPDATE_DC_FIRMARE_SUCCESS, Qt::CaseInsensitive)) {
-        s += QString("%1 <font color='Green'>success</font><br />").arg(tmp);
+    s.clear();
+    for (int i = 0; i < m_updateSteps.size(); ++i) {
+        if (i != UPDATE_DC) {
+            s += m_updateSteps[i] + "<br />";
         } else {
-        s += QString(  "%1 <font color='Red'>UNKNOWN STATUS</font><br />").arg(tmp);
+            s += m_updateSteps[i];
+        }
     }
 
     ui->stepLabel->setText(s);
@@ -293,50 +534,53 @@ void MainWindow::onShowUpdateDCFirmware(QString status) {
 
 
 void MainWindow::onShowUpdateRequest(QString status) {
+    // qCritical() << __func__ << ":" << __LINE__ << "status" << status;
 
-    qCritical() << __func__ << ":" << __LINE__ << "status" << status;
-
-    QString s = ui->stepLabel->text();
-
-    QString tmp = "update request ";
-    int len = m_showLineLength - tmp.length();
-
-    while (--len > 0) {
-       tmp += "&nbsp;";
-    }
+    //ui->updateProgress->setValue(CHECK_UPDATE_REQUEST_PERCENT_START);
+    QString s = m_updateSteps[CHECK_UPDATE_REQUEST].trimmed();
 
     bool const custRepoExists = internal::customerRepoExists();
 
     if (status.contains(UpdateCommand::UPDATE_NOT_REQUESTED, Qt::CaseInsensitive)) {
         if (custRepoExists) {
-            s += QString(  "%1 <font color='Red'>NOT REQUESTED. STOP.</font><br />").arg(tmp);
+            s += " <font color='Red'>NOT REQUESTED. STOP.</font>";
         } else {
-            s += QString("%1 <font color='Blue'>not requested&nbsp;(initial configuration)</font><br />").arg(tmp);
+            s += " <font color='Blue'>not requested&nbsp;(initial configuration)</font>";
         }
     } else
-    if (status.contains(UpdateCommand::UPDATE_REQUESTED, Qt::CaseInsensitive)) {
+    if (status.contains(internal::UPDATE_REQUESTED, Qt::CaseInsensitive)) {
         if (custRepoExists) {
-            s += QString("%1 <font color='Green'>requested</font><br />").arg(tmp);
+            s += " <font color='Green'>requested</font>";
         } else {
-            s += QString("%1 <font color='Blue'>requested&nbsp;(initial configuration)</font><br />").arg(tmp);
+            s += " <font color='Blue'>requested&nbsp;(initial configuration)</font>";
         }
     } else
-    if (status.contains(UpdateCommand::UPDATE_NOT_NECESSARY, Qt::CaseInsensitive)) {
-        s += QString("%1 <font color='Green'>not necessary</font><br />").arg(tmp);
+    if (status.contains(internal::UPDATE_INITIAL, Qt::CaseInsensitive)) {
+        s += " <font color='Green'>requested&nbsp;(initial configuration)</font>";
     } else
-    if (status.contains(UpdateCommand::NO_CUSTOMER_REPOSITORY, Qt::CaseInsensitive)) {
-        s += QString("%1 <font color='Blue'>UNKNOWN (ISMAS not connected)</font><br />").arg(tmp);
+    if (status.contains(internal::UPDATE_NOT_NECESSARY, Qt::CaseInsensitive)) {
+        s += " <font color='Green'>not necessary</font>";
+    } else
+    if (status.contains(internal::NO_CUSTOMER_REPOSITORY, Qt::CaseInsensitive)) {
+        s += " <font color='Blue'>UNKNOWN (ISMAS not connected)</font>";
     } else {
-        s += QString(  "%1 <font color='Red'>UNKNOWN</font><br />").arg(tmp);
+        s += " <font color='Red'>UNKNOWN</font>";
     }
 
+    m_updateSteps[CHECK_UPDATE_REQUEST] = s;
+    s.clear();
+    for (int i = 0; i < m_updateSteps.size(); ++i) {
+        s += m_updateSteps[i] + "<br />";
+    }
     ui->stepLabel->setText(s);
+    //ui->updateProgress->setValue(CHECK_UPDATE_REQUEST_PERCENT_END);
 }
 
 void MainWindow::onShowISMASChecks(QString) {
     // deprecated
 
     QString s = ui->stepLabel->text();
+    return;
 
     QString tmp("Check ISMAS connectivity ");
     int len = m_showLineLength - tmp.length();
@@ -374,6 +618,9 @@ void MainWindow::onShowJsonDownload(QString) {
 }
 
 void MainWindow::onShowDcDownload(QString version) {
+    return;
+
+
     m_targetDcVersion = version;
     ui->exit->setEnabled(false);
 

UpdatePTUDevCtrl/mainwindow.h

@@ -4,6 +4,9 @@
 #include <QMainWindow>
 #include <QTimer>
 #include <QStatusBar>
+#include <QVector>
+#include <QString>
+#include <QProgressBar>
 
 QT_BEGIN_NAMESPACE
 namespace Ui { class MainWindow; }
@@ -37,6 +40,7 @@ public:
     void setUpdateStep(UpdateDcEvent::UpdateStep updateStep) { m_updateStep = updateStep; }
 
     QString targetDcVersion() {return  m_targetDcVersion; }
+    QProgressBar *progressBar();
 
 public slots:
     void onAppendText(QString, QString suffix = "");
@@ -59,11 +63,15 @@ public slots:
     void onShowUpdateRequest(QString);
     void onShowCustRepoStatus(QString);
     void onShowExecOpkgStatus(QString);
+    void onShowExecOpkgCommand(QString);
+    void onShowExecOpkgOverallResult(QString,bool);
     void onShowDownloadDCJsonFilesStatus(QString);
     void onShowSyncCustRepoStatus(QString);
     void onShowUpdateDCFirmware(QString);
     void onSetDcDownloadProgress(int);
     void onShowSummary(QString);
+    void onSummary();
+    void onFileChanged(QString const&);
 #if EMERGENCY_LEAVE_BL==1
     void emergencyLeaveBL();
 #endif
@@ -94,5 +102,10 @@ private:
     UpdateDcEvent::UpdateStep m_updateStep;
     QTimer *m_statusTimer;
     QString m_targetDcVersion;
+    int m_stepLabelChopCount{};
+
+    QVector<QString> m_updateSteps{};
+
+    QFile m_updateLog;
 };
 #endif // MAINWINDOW_H

UpdatePTUDevCtrl/mainwindow.ui

@@ -51,6 +51,9 @@
        <property name="text">
         <string/>
        </property>
+       <property name="textFormat">
+        <enum>Qt::RichText</enum>
+       </property>
       </widget>
      </item>
      <item row="3" column="0" colspan="3">

UpdatePTUDevCtrl/process/check_and_fetch_customer_repository_command.cpp

@@ -13,12 +13,20 @@ void CheckAndFetchCustomerRepositoryCommand::finished(int exitCode, QProcess::Ex
     Worker *w = worker();
     if (w) {
         switch (exitCode) {
-        case -2:
+        case internal::GIT_CHECKOUT_ERROR_CODE:
             emit w->showCustRepoStatus(internal::GIT_CUSTOMER_REPO_CHECKOUT_ERROR);
             break;
-        case -4:
+        case internal::GIT_PULL_ERROR_CODE:
             emit w->showCustRepoStatus(internal::GIT_CUSTOMER_REPO_PULL_ERROR);
             break;
+        case internal::GIT_NOT_NECESSARY_CODE:
+            emit w->showCustRepoStatus(internal::GIT_CUSTOMER_REPO_NOT_NECESSARY);
+            exitCode = 0;
+            break;
+        case internal::GIT_UPDATED_CODE:
+            emit w->showCustRepoStatus(internal::GIT_CUSTOMER_REPO_UPDATED);
+            exitCode = 0;
+            break;
         case 0:
             emit w->showCustRepoStatus(internal::GIT_CUSTOMER_REPO_UP_TO_DATE);
         default:;
@@ -29,13 +37,21 @@ void CheckAndFetchCustomerRepositoryCommand::finished(int exitCode, QProcess::Ex
 }
 
 void CheckAndFetchCustomerRepositoryCommand::readyReadStandardOutput() {
-    //QProcess *p = (QProcess *)sender();
-    //if (p) {
-    //    Worker *w = worker();
-    //    if (w) {
-    //        QString s = p->readAllStandardOutput().trimmed();
-    //
-    //        qCritical() << __func__ << ":" << __LINE__ << s;
+    QProcess *p = (QProcess *)sender();
+    if (p) {
+        Worker *w = worker();
+        if (w) {
+            QString s = p->readAllStandardOutput().trimmed();
+            m_commandResult += s;
+            if (m_commandResult.contains(internal::GIT_CUSTOMER_REPO_NO_UPDATE_NECESSARY)) {
+                //emit w->showCustRepoStatus(internal::GIT_CUSTOMER_REPO_NOT_NECESSARY);
+                m_commandResult.clear();
+            } else
+            if (m_commandResult.contains(internal::GIT_CUSTOMER_REPO_UPDATED)) {
+                //emit w->showCustRepoStatus(internal::GIT_CUSTOMER_REPO_UPDATED);
+            }
+        }
+    }
 
     // static constexpr const char *GIT_CUSTOMER_REPO_UP_TO_DATE{"up to date"};
     //        emit w->showCustRepoStatus(UpdateCommand::GIT_CUSTOMER_REPO_UP_TO_DATE);

UpdatePTUDevCtrl/process/check_and_fetch_customer_repository_command.h

@@ -10,6 +10,7 @@ public:
                                                     int nextCommandIndex,
                                                     int start_timeout = 100000,
                                                     int finish_timeout = 100000);
+    QString m_commandResult{};
 public slots:
     virtual void readyReadStandardOutput() override;
     virtual void finished(int exitCode, QProcess::ExitStatus exitStatus) override;

UpdatePTUDevCtrl/process/check_update_activation_command.cpp

@@ -1,5 +1,6 @@
 #include "process/check_update_activation_command.h"
 #include "worker.h"
+#include "utils_internal.h"
 
 #include <QDebug>
 
@@ -22,17 +23,20 @@ void CheckUpdateActivationCommand::readyReadStandardOutput() {
         Worker *w = worker();
         if (w) {
             QString s = p->readAllStandardOutput().trimmed();
-            if (s == UpdateCommand::UPDATE_REQUESTED) {
-                emit w->showUpdateRequest(UpdateCommand::UPDATE_REQUESTED);
+            if (s == internal::UPDATE_REQUESTED) {
+                emit w->showUpdateRequest(internal::UPDATE_REQUESTED);
             } else
-            if (s == UpdateCommand::UPDATE_NOT_NECESSARY) {
-                emit w->showUpdateRequest(UpdateCommand::UPDATE_NOT_NECESSARY);
+            if (s == internal::UPDATE_NOT_NECESSARY) {
+                emit w->showUpdateRequest(internal::UPDATE_NOT_NECESSARY);
             } else
-            if (s == UpdateCommand::UPDATE_NOT_REQUESTED) {
-                emit w->showUpdateRequest(UpdateCommand::UPDATE_NOT_REQUESTED);
+            if (s == internal::UPDATE_NOT_REQUESTED) {
+                emit w->showUpdateRequest(internal::UPDATE_NOT_REQUESTED);
             } else
-            if (s == UpdateCommand::NO_CUSTOMER_REPOSITORY) {
-                emit w->showUpdateRequest(UpdateCommand::NO_CUSTOMER_REPOSITORY);
+            if (s == internal::NO_CUSTOMER_REPOSITORY) {
+                emit w->showUpdateRequest(internal::NO_CUSTOMER_REPOSITORY);
+            } else
+            if (s == internal::UPDATE_INITIAL) {
+                emit w->showUpdateRequest(internal::UPDATE_INITIAL);
             }
         }
     }

UpdatePTUDevCtrl/process/command.cpp

@@ -50,7 +50,7 @@ void Command::readyReadStandardOutput() {
                         s = s.mid(0, i).trimmed();
                     }
                 }
-                emit m_worker->showDcDownload(s);
+                // emit m_worker->showDcDownload(s);
             } else
             if ((i = s.indexOf("<DC-PROGRESS>")) != -1) {
                 bool ok;
@@ -61,14 +61,15 @@ void Command::readyReadStandardOutput() {
                 }
             } else
             if ((i = s.indexOf("<DC-UPDATE-FINISH>")) != -1) {
-                m_worker->summary();
+                emit m_worker->summary();
                 // qApp->exit(0);
             } else
             if ((i = s.indexOf("<DC-UPDATE-SUCCESS>")) != -1) {
-                m_worker->summary();
+                // TODO
+                emit m_worker->summary();
             } else
             if ((i = s.indexOf("<DC-UPDATE-FAILURE>")) != -1) {
-                m_worker->summary();
+                emit m_worker->summary();
                 //qApp->exit(-1);
             } else
             if ((i = s.indexOf("<JS-PROGRESS>")) != -1) {
@@ -107,9 +108,9 @@ void Command::finished(int /*exitCode*/, QProcess::ExitStatus /*exitStatus*/) {
     disconnect(p, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(readyReadStandardError()));
     disconnect(p, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(finished(int,QProcess::ExitStatus)));
 
-    if (m_command.contains("ATBDownloadDCJsonFiles")) {
-        m_worker->dcUpdate();
-    }
+    //if (m_command.contains("ATBDownloadDCJsonFiles")) {
+    //    m_worker->dcUpdate();
+    //}
 }
 
 // TODO: nach UpdateCommand ziehen

UpdatePTUDevCtrl/process/exec_opkg_command.cpp

@@ -1,5 +1,8 @@
 #include "process/exec_opkg_command.h"
 #include "worker.h"
+#include "utils_internal.h"
+
+#include <QStringList>
 
 ExecOpkgCommand::ExecOpkgCommand(QString const &command,
                                  Worker *worker,
@@ -8,23 +11,75 @@ ExecOpkgCommand::ExecOpkgCommand(QString const &command,
                                  int start_timeout,
                                  int finish_timeout)
   : UpdateCommand(command, worker, nextCommandIndex, start_timeout, finish_timeout)
-  , m_noaction(noaction) {
+  , m_noaction(noaction)
+  , m_ok_count{0}
+  , m_fail_count{0} {
 }
 
 void ExecOpkgCommand::finished(int exitCode, QProcess::ExitStatus exitStatus) {
+    QProcess *p = (QProcess *)sender();
+    if (p) {
+        Worker *w = worker();
+        if (w) {
+            if (m_fail_count == 0 && m_ok_count > 0) {
+                emit w->showExecOpkgOverallResult(internal::EXEC_OPKG_COMMANDS_SUCCESS, m_noaction);
+            } else
+            if (m_ok_count == 0 && m_fail_count > 0) {
+                emit w->showExecOpkgOverallResult(internal::EXEC_OPKG_COMMANDS_FAIL, m_noaction);
+            } else {
+                // TODO
+                emit w->showExecOpkgOverallResult(internal::EXEC_OPKG_COMMANDS_SUCCESS, m_noaction);
+            }
+        }
+    }
     return UpdateCommand::finished(exitCode, exitStatus);
 }
 
 void ExecOpkgCommand::readyReadStandardOutput() {
     QProcess *p = (QProcess *)sender();
     if (p) {
-        QString s = p->readAllStandardOutput();
-
-        // TODO
         Worker *w = worker();
         if (w) {
-    // static constexpr const char *EXEC_OPKG_COMMANDS_SUCCESS{"success"};
-            emit w->showExecOpkgStatus(UpdateCommand::EXEC_OPKG_COMMANDS_SUCCESS);
+            QString s = p->readAllStandardOutput().trimmed();
+            if (!s.isEmpty()) {
+                m_standardOutput += s.replace(QChar('\n'), "");
+
+                // the command lines in etc/psa_update/opkg_commands are
+                // separated by "<OPKG>" markers. Note that the file opkg_commands
+                // itself is *not* changed, of course.
+
+                int startIndex, endIndex{};
+                while (((startIndex = m_standardOutput.indexOf(internal::OPKG_MARKER)) == 0) &&
+                       ((endIndex = m_standardOutput.indexOf(internal::OPKG_MARKER, 1)) != -1)) {
+
+                    QString result = m_standardOutput.mid(0, endIndex).mid(6);
+                    m_standardOutput = m_standardOutput.mid(endIndex);
+
+                    if (!s.isEmpty()) {
+                        QStringList const lst = result.split(u' ', QString::SkipEmptyParts);
+
+                        if (lst.size() >= 2) {
+                            if (lst.last() == "ok") {
+                                m_ok_count += 1;
+                                if (lst.contains("noaction")) {
+                                    emit w->showExecOpkgCommand(result);
+                                } else {
+                                    emit w->showExecOpkgCommand(result);
+                                }
+                            } else {
+                                m_fail_count += 1;
+                                if (lst.contains("noaction")) {
+                                    emit w->showExecOpkgCommand(result);
+                                } else {
+                                    emit w->showExecOpkgCommand(result);
+                                }
+                            }
+                        } else {
+                            emit w->showExecOpkgCommand(result);
+                        }
+                    }
+                }
+            }
         }
     }
 }

UpdatePTUDevCtrl/process/exec_opkg_command.h

@@ -6,6 +6,9 @@
 
 class ExecOpkgCommand : public UpdateCommand {
     bool m_noaction{false};
+    QString m_standardOutput{};
+    int m_ok_count{};
+    int m_fail_count{};
 public:
     explicit ExecOpkgCommand(QString const &command,
                              Worker *worker,

UpdatePTUDevCtrl/process/update_command.cpp

@@ -1,5 +1,6 @@
 #include "update_command.h"
 #include "worker.h"
+#include "utils_internal.h"
 
 #include <QDebug>
 #include <QProcess>
@@ -19,20 +20,13 @@ bool UpdateCommand::stopUpdateOnFailure() {
 }
 
 void UpdateCommand::finished(int exitCode, QProcess::ExitStatus exitStatus) {
-
-    qCritical() << __func__ << ":" << __LINE__ << m_command
-                << "exitCode" << exitCode
-                << "exitStatus" << exitStatus;
-
     QProcess *p = qobject_cast<QProcess *>(sender());
     if (p) {
         // read all remaining data sent to the process, just in case
         QString s = p->readAllStandardOutput().trimmed();
         if (!s.isEmpty()) {
-            qCritical() << __func__ << ":" << __LINE__ << s;
             m_commandResult += s;
         }
-        qCritical() << __func__ << ":" << __LINE__ << "next command" << m_nextCommandIndex;
 
         disconnect(p, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(readyReadStandardOutput()));
         disconnect(p, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(readyReadStandardError()));
@@ -40,15 +34,108 @@ void UpdateCommand::finished(int exitCode, QProcess::ExitStatus exitStatus) {
     }
 
     if (!m_worker->workList().empty()) {
+
+        //static constexpr const int PERCENT_CHECK_ISMAS_CONNECIVITY{10};
+        //static constexpr const int PERCENT_CHECK_UPDATE_REQUEST{20};
+        //static constexpr const int PERCENT_CHECK_CUSTOMER_REPOSITORY{30};
+        //static constexpr const int PERCENT_INSTALL_SW_PACKETS_NOACTION{40};
+        //static constexpr const int PERCENT_INSTALL_SW_PACKETS{50};
+        //static constexpr const int PERCENT_INSTALL_DC_CONFIGURATION{60};
+        //static constexpr const int PERCENT_SYNCHRONIZE_REPO_AND_FILESYS{70};
+        //static constexpr const int PERCENT_UPDATE_DC{80};
+        //static constexpr const int PERCENT_SHOW_FINAL_STATUS{90};
+
         if (exitCode == 0 && exitStatus == QProcess::ExitStatus::NormalExit) {
-        qCritical() << __func__ << ":" << __LINE__;
+            if (m_command.contains("ATBUpdateCheck")) {
+
+                // TODO: resultCodes richtig eintragen
+
+                if (m_command.contains("--ismas-connected")) {
+                    ISMAS::EventData e(ISMAS::CONTINUE,
+                                       internal::PERCENT_CHECK_ISMAS_CONNECIVITY,
+                                       0,
+                                       "ATBUpdateCheck --ismas-connected",
+                                       "ISMAS connected");
+
+                    m_worker->clientForUpdate().sendCmdEvent(e);
+                } else
+                if (m_command.contains("--update-requested")) {
+                    ISMAS::EventData e(ISMAS::CONTINUE,
+                                       internal::PERCENT_CHECK_UPDATE_REQUEST,
+                                       0,
+                                       "ATBUpdateCheck --update-requested",
+                                       "update not necessary");
+                    m_worker->clientForUpdate().sendCmdEvent(e);
+                }
+            } else
+            if (m_command.contains("ATBUpdateGit")) {
+                ISMAS::EventData e(ISMAS::CONTINUE,
+                                   internal::PERCENT_CHECK_CUSTOMER_REPOSITORY,
+                                   0,
+                                   "ATBUpdateGit",
+                                   "customer repository clean and up-to-date");
+                m_worker->clientForUpdate().sendCmdEvent(e);
+            } else
+            if (m_command.contains("ATBUpdateOpkg")) {
+                if (m_command.contains("--noaction")) {
+                    ISMAS::EventData e(ISMAS::CONTINUE,
+                                       internal::PERCENT_INSTALL_SW_PACKETS_NOACTION,
+                                       0,
+                                       "ATBUpdateOpkg --noaction",
+                                       "execute opkg-commands (dry-run)");
+                    m_worker->clientForUpdate().sendCmdEvent(e);
+                } else {
+                    ISMAS::EventData e(ISMAS::CONTINUE,
+                                       internal::PERCENT_INSTALL_SW_PACKETS,
+                                       0,
+                                       "ATBUpdateOpkg",
+                                       "execute opkg-commands");
+                    m_worker->clientForUpdate().sendCmdEvent(e);
+                }
+            } else
+            if (m_command.contains("ATBDownloadDCJsonFiles")) {
+                ISMAS::EventData e(ISMAS::CONTINUE,
+                                   internal::PERCENT_INSTALL_DC_CONFIGURATION,
+                                   0,
+                                   "ATBDownloadDCJsonFiles",
+                                   "download json-files to device controller");
+                m_worker->clientForUpdate().sendCmdEvent(e);
+            } else
+            if (m_command.contains("ATBUpdateSync")) {
+                ISMAS::EventData e(ISMAS::CONTINUE,
+                                   internal::PERCENT_SYNCHRONIZE_REPO_AND_FILESYS,
+                                   0,
+                                   "ATBUpdateSync",
+                                   "sync customer repository with /etc");
+                m_worker->clientForUpdate().sendCmdEvent(e);
+            } else
+            if (m_command.contains("ATBUpdateDC")) {
+                ISMAS::EventData e(ISMAS::CONTINUE,
+                                   internal::PERCENT_UPDATE_DC,
+                                   0,
+                                   "ATBUpdateDC",
+                                   "downloaded new dc-firmware. about to reboot...");
+                m_worker->clientForUpdate().sendCmdEvent(e);
+            } else
+            if (m_command.contains("ATBUpdateShow")) {
+                // TODO
+            }
+
             if (m_worker->workList().nextExec()) {
                 m_worker->workList().exec();
+            } else {
+                // testing
+                qCritical() << __func__ << ":" << __LINE__ << "TEST: SEND UPDATE SUCCEEDED TO ISMAS";
+                m_worker->setLastFailedUpdateStep(Worker::UPDATE_STEP::NONE);
+                Worker::UpdateProcessRunning _(m_worker);
             }
         } else {
-        qCritical() << __func__ << ":" << __LINE__;
             bool execShowStatus = true;
             m_worker->workList().exec(execShowStatus);
         }
+    } else {
+        Q_ASSERT_X(false,
+                QString("%1:%2").arg(__func__).arg(__LINE__).toUtf8().constData(),
+                "empty worker list");
     }
 }

UpdatePTUDevCtrl/process/update_dc_command.cpp

@@ -1,5 +1,6 @@
 #include "process/update_dc_command.h"
 #include "worker.h"
+#include "utils_internal.h"
 
 UpdateDCCommand::UpdateDCCommand(QString const &command,
                                  Worker *worker,
@@ -10,19 +11,55 @@ UpdateDCCommand::UpdateDCCommand(QString const &command,
 }
 
 void UpdateDCCommand::finished(int exitCode, QProcess::ExitStatus exitStatus) {
+    Worker *w = worker();
+    if (w) {
+        w->summaryTimer()->start();
+    }
     return UpdateCommand::finished(exitCode, exitStatus);
 }
 
 void UpdateDCCommand::readyReadStandardOutput() {
     QProcess *p = (QProcess *)sender();
     if (p) {
-        QString s = p->readAllStandardOutput();
-
-        // TODO
         Worker *w = worker();
         if (w) {
-    // static constexpr const char *UPDATE_DC_FIRMARE_SUCCESS"success"};
-            emit w->showUpdateDCFirmware(UpdateCommand::UPDATE_DC_FIRMARE_SUCCESS);
+            QString s = p->readAllStandardOutput();
+            int i = -1;
+            if ((i = s.indexOf("<DC-VERSION>")) != -1) {
+                s = s.mid(i+12).trimmed();
+                if ((i = s.indexOf("\"")) != -1) {
+                    s = s.mid(i+1);
+                    if ((i = s.indexOf("\"")) != -1) {
+                        s = s.mid(0, i).trimmed();
+                    }
+                }
+                // emit w->showDcDownload(s);
+            } else
+            if ((i = s.indexOf("<DC-PROGRESS>")) != -1) {
+                bool ok;
+                int v = s.mid(i+13).trimmed().toInt(&ok);
+                if (ok) {
+                    emit w->setDcDownloadProgress(v);
+                    emit w->insertText(s.mid(0,i) + "\n");
+                }
+            } else
+            if ((i = s.indexOf("<DC-UPDATE-FINISH>")) != -1) {
+                emit w->showUpdateDCFirmware(internal::UPDATE_DC_FIRMARE_SUCCESS);
+                // QThread::sleep(3);
+                // emit w->summary();
+                // qApp->exit(0);
+            } else
+            if ((i = s.indexOf("<DC-UPDATE-SUCCESS>")) != -1) {
+                // TODO
+                emit w->summary();
+            } else
+            if ((i = s.indexOf("<DC-UPDATE-FAILURE>")) != -1) {
+                emit w->summary();
+                //qApp->exit(-1);
+            } else {
+                emit w->insertText(s);
+            }
+            m_commandResult += s;
         }
     }
 }

UpdatePTUDevCtrl/process/update_dc_command.h

@@ -9,7 +9,7 @@ public:
                              Worker *worker,
                              int nextCommandIndex,
                              int start_timeout = 100000,
-                             int finish_timeout = 100000);
+                             int finish_timeout = -1);
 public slots:
     virtual void readyReadStandardOutput() override;
     virtual void finished(int exitCode, QProcess::ExitStatus exitStatus) override;

UpdatePTUDevCtrl/work_process_list.h

@@ -31,6 +31,8 @@ public:
     unsigned nextExecIndex() const;
     bool nextExec() const;
     bool exec(bool last=false);
+
+    unsigned size() { return m_workList.size(); }
 };
 
 #endif // WORK_LIST_H_INCLUDED

UpdatePTUDevCtrl/worker.cpp

@@ -19,6 +19,7 @@
 #include <QScopedPointer>
 #include <QRegularExpression>
 #include <QJsonArray>
+#include <QProgressBar>
 
 #include <memory>
 
@@ -29,6 +30,7 @@
 #include "mainwindow.h"
 #include "utils.h"  // deprecated
 #include "utils_internal.h"
+#include "log_line_entry.h"
 #include "process/command.h"
 #include "process/update_command.h"
 #include "process/check_ismas_connectivity_command.h"
@@ -185,7 +187,7 @@ Worker::Worker(int customerNr,
   , m_pluginVersionPrmCalcConfig(getPluginVersion("/opt/app/ATBAPP/plugins/libPRM_CalculatePricePlugin_ConfigUi.so"))
   , m_pluginVersionTcpZvt(getPluginVersion("/opt/app/ATBAPP/plugins/libTCP_ZVT_CCPlugin.so"))
   , m_ismasUpdateRequests(ISMAS_UPDATE_REQUESTS)
-  , m_waitForNewUpdates(this)
+  , m_summaryTimer(this)
   , m_filesToUpdate()
   , m_updateProcessRunning(true)
   , m_mainWindow(nullptr) /* contains plugin */
@@ -193,7 +195,28 @@ Worker::Worker(int customerNr,
   , m_dcDownloadJsonFiles(new Command(
         QString("/opt/app/tools/atbupdate/ATBDownloadDCJsonFiles --set-ppid %1").arg(QCoreApplication::applicationPid())))
   //, m_withoutIsmasDirectPort(true) /* useful for testing */ {
-  , m_withoutIsmasDirectPort(false) /* useful for testing */  {
+  , m_withoutIsmasDirectPort(false) /* useful for testing */
+  , m_updateLog("/opt/app/tools/atbupdate/update.log") // TODO: in ini-file eintragen
+  , m_updateLogBackup("/opt/app/tools/atbupdate/updateBackup.log") { // TODO: in ini-file eintragen
+
+    if (!m_updateLog.exists()) {
+        qCritical() << "ERROR" << m_updateLog.fileName() << "does not exist";
+    } else {
+        if (!m_updateLog.open(QIODevice::ReadWrite | QIODevice::Unbuffered)) {
+            qCritical() << "ERROR can not open" << m_updateLog.fileName();
+        } else {
+            m_updateLog.resize(0);
+            m_fileWatcher.addPath(QFileInfo(m_updateLog).absoluteFilePath());
+            connect(&m_fileWatcher, SIGNAL(fileChanged(QString const&)), this, SLOT(onFileChanged(QString const&)));
+        }
+    }
+
+    if (!m_updateLogBackup.open(QIODevice::ReadWrite | QIODevice::Unbuffered)) {
+        qCritical() << "ERROR can not open" << m_updateLogBackup.fileName();
+    } else {
+        m_updateLogBackup.resize(0);
+        m_updateLogBackup.close();
+    }
 
     // *** check ISMAS connectivity ***
     // NOTE: if the customer repository does not exist, then it does not matter
@@ -202,7 +225,7 @@ Worker::Worker(int customerNr,
     int next = 1;
     m_workList.push_back(
                 std::make_unique<CheckIsmasConnectivityCommand>(
-                    //QString("echo CheckIsmasConnectivityCommand")
+                    //QString("echo ATBUpdateCheck --ismas-connected")
                     QString("/opt/app/tools/atbupdate/ATBUpdateCheck --ismas-connected")
                     , this, ++next));
 
@@ -211,7 +234,7 @@ Worker::Worker(int customerNr,
     // if the update has been activated via ISMAS.
     m_workList.push_back(
                 std::make_unique<CheckUpdateActivationCommand>(
-                    //QString("echo CheckUpdateActivationCommand")
+                    // QString("echo ATBUpdateCheck --update-requested")
                     QString("/opt/app/tools/atbupdate/ATBUpdateCheck --update-requested")
                     , this, ++next));
 
@@ -221,7 +244,7 @@ Worker::Worker(int customerNr,
     //      the corresponding branch, and check the integrity of the repository.
     m_workList.push_back(
                 std::make_unique<CheckAndFetchCustomerRepositoryCommand>(
-                    // QString("echo CheckAndFetchCustomerRepositoryCommand")
+                    // QString("echo ATBUpdateGit")
                     QString("/opt/app/tools/atbupdate/ATBUpdateGit")
                     , this, ++next));
 
@@ -229,7 +252,8 @@ Worker::Worker(int customerNr,
     // NOTE: first run the opkg commands with no action -> dry-run
     m_workList.push_back(
                 std::make_unique<ExecOpkgCommand>(
-                    QString("echo ExecOpkgCommand dry-run")
+                    // QString("echo ATBUpdateOpkg --noaction")
+                    QString("/opt/app/tools/atbupdate/ATBUpdateOpkg --noaction")
                     , this, ++next, true));
 
     // *** exec opkg-commands ***
@@ -237,32 +261,36 @@ Worker::Worker(int customerNr,
     m_workList.push_back(
                 std::make_unique<ExecOpkgCommand>(
                     QString("echo ExecOpkgCommand run")
-                    , this, ++next, true));
-
-    // *** send json files down to device controller ***
-    m_workList.push_back(
-                std::make_unique<UpdateJsonCommand>(
-                    QString("echo UpdateJsonCommand")
-                    //QString("/opt/app/tools/atbupdate/ATBDownloadDCJsonFiles --set-ppid %1").arg(QCoreApplication::applicationPid())
+                    // QString("/opt/app/tools/atbupdate/ATBUpdateOpkg")
                     , this, ++next, false));
 
-    // sync json files in repo etc-directory with /etc fs-directory
-    m_workList.push_back(
-                std::make_unique<UpdateFileSystemCommand>(
-                    QString("echo UpdateFileSystemCommand")
-                    , this, ++next));
-
     // send device-controller firmware down to device-controller-hardware
     m_workList.push_back(
                 std::make_unique<UpdateDCCommand>(
-                    QString("echo UpdateDCCommand")
-                    // QString("/opt/app/tools/atbupdate/ATBDownloadDCFirmware --read-dc-version true")
+                    // QString("echo ATBUpdateDC")
+                    QString("/opt/app/tools/atbupdate/ATBUpdateDC")
                     , this, ++next));
 
+    // sync json files in repo etc-directory with /etc fs-directory
+    m_workList.push_back(
+                std::make_unique<UpdateFileSystemCommand>(
+                    QString("echo ATBUpdateSync")
+                    , this, ++next));
+
+    // *** send json files down to device controller ***
+    m_workList.push_back(
+                std::make_unique<UpdateJsonCommand>(
+                    //QString("echo ATBUpdateJsonFiles")
+                    //QString("/opt/app/tools/atbupdate/ATBUpdateJsonFiles --set-ppid %1").arg(QCoreApplication::applicationPid())
+
+                    // use customer repo
+                    QString("/opt/app/tools/atbupdate/ATBUpdateJsonFiles").arg(QCoreApplication::applicationPid())
+                    , this, ++next, false));
+
     // show/send software-status
     m_workList.push_back(
                 std::make_unique<ShowSoftwareStatusCommand>(
-                    QString("echo ShowSoftwareStatusCommand")
+                    QString("echo ATBUpdateShow")
                     , this, -1));
 
     // reboot machine
@@ -299,10 +327,91 @@ Worker::~Worker() {
     }
 }
 
+#if 0
+struct LogLineEntry {
+    char receiver;      // 1    receiver can be: ISMAS
+    char reason[5];     // 6    SW_UP
+    char timestamp[19]; // 25   ISO-format: 1900-xx-xxT00:00:00
+    char eventId;       // 26
+    char event[5];      // 31
+    /*
+        Note:
+        ! After U0002 immer ein CMD_SENDVERSION
+        ! Only U0002 and U0003 finish the Update process.
+        ! U0001: Update finished but not activated
+        ! U0002: Update finished and activated
+        ! U0003: Update finished but FAILed.
+    */
+
+    // #define _ISMAS_DONE                 "U0001" // 100%, Check: 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_CONTINUE             "U0010" // %-values: Update laeuft, Resultcodes entsprechend laufender Schritt
+    // #define _ISMAS_RESET_WAIT           "ISMAS" // reset WAIT-button to "WAIT"
+    // #define _ISMAS_TEST_TRIGGER         "U0099" // check the WAIT-button
+    char eventState;    // 32
+    char percent;       // 33   percent in progressbar of update-tool
+    char resultCode;    // 34
+    char step[40];      // 74   step executed
+    char stepResult[40];// 114  result for step
+    char version[14];   // 128
+};
+#endif
+
+void Worker::onFileChanged(QString const& fname) {
+
+    QFile f(fname);
+    //if (m_updateLog.fileName().contains(fname)) {
+    //    if (f.exists() && m_updateLogBackup.exists()) {
+    if (!m_updateLogBackup.open(QIODevice::ReadWrite | QIODevice::Unbuffered)) {
+        qCritical() << "ERROR can not open" << m_updateLogBackup.fileName();
+        return;
+    }
+    if (f.open(QIODevice::ReadOnly)) {
+        QByteArray const &backup = m_updateLogBackup.readAll();
+        QByteArray const &data = f.readAll();
+        int const diff = data.size() - backup.size();
+        if (diff > 0) {
+            QByteArray const &newLines = data.mid(backup.size());
+            int const size = newLines.size();
+            if (size > 0) {
+                LogLineEntry logLine;
+                int pos = 0;
+                while (pos < size) {
+                    QByteArray const &a = newLines.mid(pos, sizeof(logLine));
+                    if (a.size() == sizeof(logLine)) {
+                        memcpy(&logLine, a.data(), sizeof(logLine));
+
+                        qCritical() << "    reason:" << QString(QByteArray(logLine.reason, sizeof(logLine.reason)));
+                        qCritical() << " timestamp:" << QString(QByteArray(logLine.timestamp, sizeof(logLine.timestamp)));
+                        qCritical() << "     event:" << QString(QByteArray(logLine.event, sizeof(logLine.event)));
+                        qCritical() << "      step:" << QString(QByteArray(logLine.step, sizeof(logLine.step)));
+                        qCritical() << "stepResult:" << QString(QByteArray(logLine.stepResult, sizeof(logLine.stepResult)));
+                        qCritical() << "   percent:" << (int)logLine.percent;
+
+                        displayProgressInMainWindow(logLine.percent);
+                    }
+                    pos += sizeof(logLine);
+                }
+                m_updateLogBackup.write(newLines);
+            }
+        }
+        f.close();
+    }
+    //}
+    m_updateLogBackup.close();
+    // TODO: daten an ISMAS senden
+}
+
 void Worker::displayProgressInMainWindow(int progress) {
     if (m_mainWindow) {
-        QApplication::postEvent(m_mainWindow,
-            new ProgressEvent(this, progress));
+        QProgressBar *progressBar = m_mainWindow->progressBar();
+        if (progressBar) {
+            progressBar->setValue(progress);
+        }
+        //QApplication::postEvent(m_mainWindow,
+        //    new ProgressEvent(this, progress));
     }
 }
 
@@ -1613,78 +1722,3 @@ bool Worker::jsUpdate() {
 bool Worker::dcUpdate() {
     return m_dcDownloadFirmware->start("/opt/app/tools/atbupdate");
 }
-
-void Worker::summary() {
-
-    QString summary, first, second, line, tmp;
-    QVector<QPair<QString, QString>> vec = Utils::installedPackages();
-
-    vec.append(Utils::installedTariffFiles(this, m_customerRepository));
-    vec.append(Utils::installedJsonFiles(this, m_customerRepository));
-
-    int max_first = 0, max_second = 0;
-    for (int i = 0; i < vec.size(); ++i) {
-        max_first = std::max(max_first, vec[i].first.length());
-        max_second = std::max(max_second, vec[i].second.length());
-    }
-
-    max_first += 5;
-
-    summary = "UPDATE SUMMARY\n\n";
-
-    first = QString("%1").arg("start", max_first, QChar(' '));
-    tmp = QString("%1").arg(start().toString(Qt::ISODate));
-    second = QString("%1").arg(tmp, -max_second, QChar(' '));
-    line = first + ": " + second;
-    summary += line + "\n";
-
-    first = QString("%1").arg("update tool version", max_first, QChar(' '));
-    tmp = QString("%1 - %2 %3").arg(APP_VERSION).arg(APP_BUILD_DATE).arg(APP_BUILD_TIME);
-    second = QString("%1").arg(tmp, -max_second, QChar(' '));
-    line = first + ": " + second;
-    summary += line + "\n";
-
-    first = QString("%1").arg("machine number", max_first, QChar(' '));
-    tmp = QString("%1").arg(machineNr());
-    second = QString("%1").arg(tmp, -max_second, QChar(' '));
-    line = first + ": " + second;
-    summary += line + "\n";
-
-    first = QString("%1").arg("customer number", max_first, QChar(' '));
-    tmp = QString("%1").arg(customerNr());
-    second = QString("%1").arg(tmp, -max_second, QChar(' '));
-    line = first + ": " + second;
-    summary += line + "\n";
-
-    first = QString("%1").arg("zone number", max_first, QChar(' '));
-    tmp = QString("%1").arg(zoneNr());
-    second = QString("%1").arg(tmp, -max_second, QChar(' '));
-    line = first + ": " + second;
-    summary += line + "\n";
-
-    if (m_mainWindow) {
-        tmp = m_mainWindow->targetDcVersion();
-        if (!tmp.isEmpty()) {
-            first = QString("%1").arg("target device controller", max_first, QChar(' '));
-            second = QString("%1").arg(tmp, -max_second, QChar(' '));
-            line = first + ": " + second;
-            summary += line + "\n";
-        }
-    }
-
-    first = QString("%1").arg("apism", max_first, QChar(' '));
-    tmp = QString("%1").arg(apismVersion());
-    second = QString("%1").arg(tmp, -max_second, QChar(' '));
-    line = first + ": " + second;
-    summary += line + "\n";
-
-    for (int i = 0; i < vec.size(); ++i) {
-        first = QString("%1").arg(vec[i].first, max_first, QChar(' '));
-        second = QString("%1").arg(vec[i].second, -max_second, QChar(' '));
-        line = first + ": " + second;
-        summary += line + "\n";
-    }
-
-    emit showSummary(summary);
-    emit enableExit();
-}

UpdatePTUDevCtrl/worker.h

@@ -13,12 +13,14 @@
 #include <QThread>
 #include <QByteArray>
 #include <QScopedPointer>
+#include <QFileSystemWatcher>
 
 #include <optional>
 #include <initializer_list>
 
 #include "git/git_client.h"
 #include "ismas/ismas_client.h"
+#include "ismas/ApismClientForUpdate.h"
 #include "utils.h"
 #include "work_process_list.h"
 
@@ -177,7 +179,7 @@ class Worker : public QThread{
     QString const m_pluginVersionTcpZvt;
 
     int m_ismasUpdateRequests;
-    QTimer m_waitForNewUpdates;
+    QTimer m_summaryTimer;
 
     QStringList m_filesToUpdate;
     QStringList m_filesToDownload;
@@ -199,6 +201,7 @@ class Worker : public QThread{
     QString m_apismVersion;
 
     WorkList m_workList;
+    ApismClientForUpdate m_clForUpdate;
 
     bool executeOpkgCommand(QString opkgCommand);
     bool cleanUpOpkgCache();
@@ -228,6 +231,7 @@ class Worker : public QThread{
     int sendUpdateSucceededAndActivated();
     int sendFinalResult();
 
+public:
     struct UpdateProcessRunning {
         Worker *m_worker;
 
@@ -392,6 +396,14 @@ protected:
     virtual void run();
 
 public:
+    UPDATE_STEP lastFailedUpdateStep() const {
+        return m_lastFailedUpdateStep;
+    }
+
+    void setLastFailedUpdateStep(UPDATE_STEP step) {
+        m_lastFailedUpdateStep = step;
+    }
+
     QDebug CONSOLE(QStringList const &lst = QStringList()) {
         m_debugMsg = lst;
         return QDebug(QtMsgType::QtInfoMsg);
@@ -402,6 +414,9 @@ public:
         return m_ismasClient;
     }
 
+    ApismClientForUpdate &clientForUpdate() { return m_clForUpdate; }
+    ApismClientForUpdate const &clientForUpdate() const { return m_clForUpdate; }
+
     Worker *GUI(QStringList const &lst = QStringList()) {
         m_guiMsg = lst;
         return this;
@@ -448,6 +463,8 @@ public:
     void setHW(hwinf *hw) { m_hw = hw; }
     hwinf *getHW() { return m_hw; }
 
+    QString customerRepository() { return m_customerRepository; }
+
     IsmasClient &getIsmasClient() { return m_ismasClient; }
     IsmasClient const &getIsmasClient() const { return m_ismasClient; }
 
@@ -468,7 +485,6 @@ public:
 
     bool jsUpdate();
     bool dcUpdate();
-    void summary();
     QDateTime start() { return m_start; }
 
     QByteArray standardOutput() const { return m_standardOutput; }
@@ -476,6 +492,8 @@ public:
     WorkList const &workList() const { return m_workList; }
     WorkList &workList() { return m_workList; }
 
+    QTimer *summaryTimer() { return &m_summaryTimer; }
+
 signals:
     void appendText(QString, QString suffix = "");
     void insertText(QString);
@@ -497,9 +515,12 @@ signals:
     void showCustRepoStatus(QString);
     void showUpdateRequest(QString);
     void showExecOpkgStatus(QString);
+    void showExecOpkgCommand(QString);
+    void showExecOpkgOverallResult(QString,bool);
     void showDownloadDCJsonFilesStatus(QString);
     void showSyncCustRepoStatus(QString);
     void showUpdateDCFirmware(QString);
+    void summary();
     void showSummary(QString);
     void setDcDownloadProgress(int);
 
@@ -511,6 +532,7 @@ private slots:
     bool syncCustomerRepositoryAndFS();
     // bool sendIsmasLastVersionNotification(int progress);
     bool saveLogFile();
+    void onFileChanged(QString const&);
 
 public slots:
     void readyReadStandardOutput();
@@ -524,6 +546,9 @@ private:
 
     QDateTime m_start;
     QByteArray m_standardOutput;
+    QFileSystemWatcher m_fileWatcher;
+    QFile m_updateLog;
+    QFile m_updateLogBackup;
 
     static const QMap<UPDATE_STEP, const char*> smap;
 

common/include/command.h

@@ -16,6 +16,7 @@ class Command : public QObject {
 
     int m_waitForStartTimeout;
     int m_waitForFinishTimeout;
+    bool m_verbose;
     int m_exitCode;
     QString m_workingDirectory;
 
@@ -27,11 +28,15 @@ public:
     Command(QString command,
             QStringList args,
             QString workingDirectory,
+            bool verbose = true,
             int start_timeout = 100000,
             int finish_timeout = 100000);
 
+    void resetCommandResult() { m_commandResult.clear(); }
     QString getCommandResult(bool reset = false);
-    QString command() const { return m_command; }
+    QString const &command() const { return m_command; }
+    QString const &commandResult() const { return m_commandResult; }
+    QStringList const &args() const { return m_args; }
 
     bool exec();
     int exitCode() const { return m_exitCode; }

common/include/log_line_entry.h

@@ -0,0 +1,69 @@
+#ifndef LOG_LINE_ENTRY_H_INCLUDED
+#define LOG_LINE_ENTRY_H_INCLUDED
+
+#include <cstring>
+#include <algorithm>
+
+struct LogLineEntry {
+    char receiver;      // 1    receiver can be: ISMAS
+    char reason[5];     // 6    SW_UP
+    char timestamp[19]; // 25   ISO-format: 1900-xx-xxT00:00:00
+    char eventId;       // 26
+    char event[5];      // 31
+    /*
+        Note:
+        ! After U0002 immer ein CMD_SENDVERSION
+        ! Only U0002 and U0003 finish the Update process.
+        ! U0001: Update finished but not activated
+        ! U0002: Update finished and activated
+        ! U0003: Update finished but FAILed.
+    */
+
+    // #define _ISMAS_DONE                 "U0001" // 100%, Check: 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_CONTINUE             "U0010" // %-values: Update laeuft, Resultcodes entsprechend laufender Schritt
+    // #define _ISMAS_RESET_WAIT           "ISMAS" // reset WAIT-button to "WAIT"
+    // #define _ISMAS_TEST_TRIGGER         "U0099" // check the WAIT-button
+    char eventState;    // 32
+    char percent;       // 33   percent in progressbar of update-tool
+    char resultCode;    // 34
+    char step[40];      // 74   step executed
+    char stepResult[40];// 114  result for step
+    char version[13];   // 127
+    char dummy;         // 128
+};
+
+inline static LogLineEntry initLogLineEntry(
+    char const receiver,
+    char const timestamp[19],
+    char const event[5],
+    char const eventState,
+    char const percent,
+    char const resultCode,
+    char const step[40],
+    char const stepResult[40],
+    char const eventId = 0,
+    char const reason[5] = "SW_UP",
+    char const version[14] = "") {
+    LogLineEntry e;
+    memset(&e, 0, sizeof(e));
+
+    e.receiver = receiver;
+    std::memcpy(e.reason, reason, std::min(sizeof(e.reason), strlen(reason)));
+    std::memcpy(e.timestamp, timestamp, std::min(sizeof(e.timestamp), strlen(timestamp)));
+    e.eventId = eventId;
+    std::memcpy(e.event, event, std::min(sizeof(e.event), strlen(event)));
+    e.eventState = eventState;
+    e.percent = percent;
+    e.resultCode = resultCode;
+    std::memcpy(e.step, step, std::min(sizeof(e.step), strlen(step)));
+    std::memcpy(e.stepResult, stepResult, std::min(sizeof(e.stepResult), strlen(stepResult)));
+    std::memcpy(e.version, version, std::min(sizeof(e.version), strlen(version)));
+    e.dummy = '\0';
+
+    return e;
+}
+
+#endif // LOG_LINE_ENTRY_H_INCLUDED

common/include/utils_internal.h

@@ -2,33 +2,88 @@
 #define UTILS_INTERNAL_H_INCLUDED
 
 #include <QString>
+#include <QSettings>
+#include <memory>
 
 namespace internal {
 
     static constexpr const char *UPDATE_NOT_NECESSARY{"not necessary"};
     static constexpr const char *UPDATE_NOT_REQUESTED{"not requested"};
+    static constexpr const char *UPDATE_INITIAL{"initial update"};
     static constexpr const char *UPDATE_REQUESTED{"requested"};
+
     static constexpr const char *NO_CUSTOMER_REPOSITORY{"no customer repository"};
+    static constexpr const int NO_CUSTOMER_REPOSITORY_CODE{-8};
+    static constexpr const char *NO_ETC_CUSTOMER_REPOSITORY{"no etc/ in customer repository"};
+    static constexpr const int NO_ETC_CUSTOMER_REPOSITORY_CODE{-9};
+    static constexpr const char *NO_OPT_CUSTOMER_REPOSITORY{"no opt/ in customer repository"};
+    static constexpr const int NO_OPT_CUSTOMER_REPOSITORY_CODE{-10};
+
     static constexpr const char *ISMAS_CONNECTED{"connected"};
     static constexpr const char *ISMAS_DISCONNECTED{"disconnected"};
     static constexpr const char *ISMAS_DISCONNECTING{"disconnecting"};
     static constexpr const char *ISMAS_NOT_CONNECTED{"not connected"};
     static constexpr const char *ISMAS_CONNECTION_IN_PROGRESS{"connecting"};
+
+    static constexpr const char *BROKER_CONNECTED{"connected"};
+    static constexpr const char *BROKER_DISCONNECTED{"disconnected"};
+    static constexpr const char *BROKER_DISCONNECTING{"disconnecting"};
+    static constexpr const char *BROKER_NOT_CONNECTED{"not connected"};
+    static constexpr const char *BROKER_CONNECTION_IN_PROGRESS{"connecting"};
+
+    static constexpr const int GIT_CHECKOUT_ERROR_CODE{-2};
+    static constexpr const int GIT_PULL_ERROR_CODE{-4};
+    static constexpr const int GIT_NOT_NECESSARY_CODE{1};
+    static constexpr const int GIT_UPDATED_CODE{2};
+
     static constexpr const char *GIT_CUSTOMER_REPO_CHECKOUT_ERROR{"checkout error"};
     static constexpr const char *GIT_CUSTOMER_REPO_PULL_ERROR{"pull error"};
     static constexpr const char *GIT_CUSTOMER_REPO_UP_TO_DATE{"up to date"};
+    static constexpr const char *GIT_CUSTOMER_REPO_NO_UPDATE_NECESSARY{"no repository update necessary"};
+    static constexpr const char *GIT_CUSTOMER_REPO_NOT_NECESSARY{"not necessary"};
+    static constexpr const char *GIT_CUSTOMER_REPO_UPDATED{"repository updated"};
+    static constexpr const char *GIT_UPDATED{"updated"};
+
     static constexpr const char *EXEC_OPKG_COMMANDS_SUCCESS{"success"};
+    static constexpr const char *EXEC_OPKG_COMMANDS_FAIL{"FAIL"};
+    static constexpr const char *EXEC_OPKG_COMMANDS_NOACTION_SUCCESS{"success"};
+    static constexpr const char *EXEC_OPKG_COMMANDS_NOACTION_FAIL{"FAIL"};
+
     static constexpr const char *UPDATE_DC_JSON_FILES_SUCCESS{"success"};
+
     static constexpr const char *SYNC_CUSTOMER_REPO_FILES_SUCCESS{"success"};
+
     static constexpr const char *UPDATE_DC_FIRMARE_SUCCESS{"success"};
 
+    static constexpr const char *OPKG_MARKER{"<OPKG>"};
+    static constexpr const char *SYNC_MARKER{"<SYNC>"};
+    static constexpr const char *DC_MARKER{"<DC>"};
+    static constexpr const char *GIT_MARKER{"<GIT>"};
+    static constexpr const char *ISMAS_MARKER{"<ISMAS>"};
+
+    static constexpr const int PERCENT_CHECK_ISMAS_CONNECIVITY{10};
+    static constexpr const int PERCENT_CHECK_UPDATE_REQUEST{20};
+    static constexpr const int PERCENT_CHECK_CUSTOMER_REPOSITORY{30};
+    static constexpr const int PERCENT_INSTALL_SW_PACKETS_NOACTION{40};
+    static constexpr const int PERCENT_INSTALL_SW_PACKETS{50};
+    static constexpr const int PERCENT_INSTALL_DC_CONFIGURATION{60};
+    static constexpr const int PERCENT_SYNCHRONIZE_REPO_AND_FILESYS{70};
+    static constexpr const int PERCENT_UPDATE_DC{80};
+    static constexpr const int PERCENT_SHOW_FINAL_STATUS{90};
+
+    static constexpr const char *DEFAULT_INI_DIR{"/etc/tools/atbupdate/"};
+    static constexpr const char *DEFAULT_INSTALL_DIR{"/opt/app/tools/atbupdate/"};
+
     int read1stLineOfFile(QString fileName);
     QString customerRepoRoot();
     QString customerRepoDir();
+    QString customerRepoDcDir();
     QString customerRepoDirName();
     QString repositoryUrl();
     QString branchName();
     bool customerRepoExists();
+    std::unique_ptr<QSettings> readSettings(QString const &optionalDirName = "");
+    std::unique_ptr<QString> dcCandidateToInstall(QString const &dcDirectory = "");
 }
 
 #endif // UTILS_INTERNAL_H_INCLUDED

common/ismas/ApismClient.cpp

@@ -0,0 +1,336 @@
+#include "ApismClient.h"
+
+#include <QDebug>
+#include <QByteArray>
+#include <QHostAddress>
+#include <QString>
+#include <QList>
+#include <QListIterator>
+#include <QScopedPointer>
+#include <QProcess>
+#include <QRegularExpression>
+
+
+ApismClient::ApismClient(QObject *parent)
+    : QObject(parent)
+    , lastError(0)
+    , lastErrorDescription("")
+    , currentRequest(ISMAS::REQUEST::NO_REQUEST)
+    , retryCounter(0)
+    , flagValidParameter(false)
+{   
+    this->apismTcpSendClient.reset(new ApismTcpClient("127.0.0.1", "7777", ApismTcpClient::ExpectedResponse::STATE, this));
+    this->apismTcpRequestResponseClient.reset(new ApismTcpClient("127.0.0.1", "7778", ApismTcpClient::ExpectedResponse::JSON,  this));
+
+    this->apismTcpRequestResponseClient->setResponseTimeout(30000);
+
+    connect(apismTcpRequestResponseClient.get(), &ApismTcpClient::receivedData,
+            this, &ApismClient::onReceivedResponse);
+    connect(apismTcpRequestResponseClient.get(), &ApismTcpClient::responseTimeout,
+            this, &ApismClient::onRequestResponseClientResponseTimeout);
+    connect(apismTcpRequestResponseClient.get(), &ApismTcpClient::connectTimeout,
+            this, &ApismClient::onRequestResponseClientConnectTimeout);
+    connect(apismTcpRequestResponseClient.get(), &ApismTcpClient::connectionClosedByRemoteHost,
+            this, &ApismClient::onRequestResponseClientConnectionClosedByRemoteHost);
+    connect(apismTcpRequestResponseClient.get(), &ApismTcpClient::connectionRefusedError,
+            this, &ApismClient::restartApism);
+
+    connect(apismTcpSendClient.get(), &ApismTcpClient::responseTimeout,
+            this, &ApismClient::onSendClientResponseTimeout);
+    connect(apismTcpSendClient.get(), &ApismTcpClient::connectionRefusedError,
+            this, &ApismClient::restartApism);
+
+
+    // not needed as APISM closes the socket after we send data, so readyRead()
+    // might not even fire
+    // connect(&m_socket, SIGNAL(readyRead()), this, SLOT(onReadyRead()));
+
+    // defined for Qt >= 5.15, we have 5.12
+    // qRegisterMetaType<QAbstractSocket::SocketError>();
+    // connect(&m_socket, SIGNAL(errorOccurred(QAbstractSocket::SocketError)),
+    //    this, SLOT(onSocketError(&QAbstractSocket::SocketError)));
+
+    // switch of DEBUG:
+    this->apismTcpSendClient->setDebug(true);
+    this->apismTcpRequestResponseClient->setDebug(true);
+}
+
+ApismClient::~ApismClient() {
+}
+
+void ApismClient::restartApism() {
+    QProcess::startDetached("/bin/systemctl", {"restart", "apism"});
+}
+
+
+void ApismClient::sendSelfTest() {
+    this->currentRequest = ISMAS::REQUEST::SELF;
+    this->apismTcpRequestResponseClient->sendData("#M=APISM#C=REQ_SELF#J={}");
+}
+
+void ApismClient::sendRequestParameter() {
+    this->currentRequest = ISMAS::REQUEST::PARAMETER;
+    this->apismTcpRequestResponseClient->sendData("#M=APISM#C=REQ_ISMASPARAMETER#J={}");
+}
+
+void ApismClient::handleISMASResponseError()
+{    
+    switch (this->currentRequest) {
+    case ISMAS::REQUEST::NO_REQUEST:
+        qCritical() << "ApismClient::onReceivedResponse() for unknown Request: " << currentRequest;
+        break;
+    case ISMAS::REQUEST::PING:
+        //emit this->sendMininformPingResponse(nsApismInterface::RESULT_STATE::ERROR_BACKEND, QJsonObject());
+        break;
+    case ISMAS::REQUEST::SELF:
+        //emit this->sendReqSelfResponse(nsApismInterface::RESULT_STATE::ERROR_BACKEND, QJsonObject());
+        break;
+    case ISMAS::REQUEST::PARAMETER:
+        //emit this->sendReqParameterResponse(nsApismInterface::RESULT_STATE::ERROR_BACKEND, QJsonObject());
+        break;
+    }
+    this->currentRequest = ISMAS::REQUEST::NO_REQUEST;
+}
+
+
+void ApismClient::handleISMASOfflineResponseError()
+{
+    nsApismInterface::RESULT_STATE resultState;
+
+    if (this->retryCounter < 50) {
+        resultState = nsApismInterface::RESULT_STATE::ERROR_RETRY;
+        this->retryCounter++;
+    }
+    else {
+        resultState = nsApismInterface::RESULT_STATE::ERROR_BACKEND;
+        this->retryCounter = 0;
+    }
+
+    qCritical() << "ApismClient::handleISMASOfflineResponseError(): currentRequest is " << this->currentRequest;
+
+
+    switch (this->currentRequest) {
+    case ISMAS::REQUEST::NO_REQUEST:
+        break;
+    case ISMAS::REQUEST::PING:
+        //emit this->sendMininformPingResponse(resultState, QJsonObject());
+        //break;
+    case ISMAS::REQUEST::SELF:
+        emit this->sendReqSelfResponse(resultState, QJsonObject());
+        break;
+    case ISMAS::REQUEST::PARAMETER:
+        emit this->sendReqParameterResponse(resultState, QJsonObject());
+        break;
+    }
+    this->currentRequest = ISMAS::REQUEST::NO_REQUEST;
+
+    // note: this does not work here, because a new request within this error handling method
+    // must use a new socket connection!
+    // This does not work with an allready open socket connection.
+    /* Communication to APISM must be in the following way:
+     *     1) establish socket connection
+     *     2) send your request to this socket
+     *     3) wait for a possible answer
+     *     4) receive the answer
+     *     5) close socket connection
+     *
+     * => a request can only be sent to apsim if the socket is closed!
+     * => apism (socket) is blocked systemwide until socket is closed!
+     * =>
+     */
+
+    //this->sendSelfTest();
+}
+
+
+
+void ApismClient::private_handleErrorResponse(QString errorString)
+{
+    qCritical() << "------------------------------------------------------";
+    qCritical() << "ApismClient::private_handleErrorResponse(" << errorString << ")";
+    qCritical() << "        this->retryCounter = " << this->retryCounter;
+    qCritical() << "------------------------------------------------------";
+
+    this->handleISMASOfflineResponseError();
+}
+
+
+/*
+{\r\n    \"REQ_START#53365_Response\": {\r\n        \"Aknoledge\": \"OK\"\r\n    },
+ \r\n    \"Response\": {\r\n        \"Result\": \"ERR:Ung<6E>ltiger Datums-String: \"\r\n    }\r\n}
+*/
+
+/*
+: ISMAS received:  "{\r\n    \"REQ_PING#30844_Response\": {\r\n        \"Aknoledge\": \"OK\"\r\n    },
+     "PING": { "IsAviable": "TRUE" }
+  }"
+*/
+
+//void ApismClient::onSendClientResponseTimeout()
+//{
+//
+//}
+
+void ApismClient::private_handleReqSelfResponse(QJsonObject response)
+{
+    bool ismasConnected  = response["ISMAS"].toBool();
+    QString brokerConnectedString = response["Broker"].toString();
+
+    qCritical() << "ApismClient::handleReqSelfResponse() " << endl
+                << "                  ismasConnected = " << ismasConnected << endl
+                << "           brokerConnectedString = " << brokerConnectedString;
+
+    /* possible values:    "Restart connection"
+     *                     "Connected"
+     *                     "NOT CONNECTED"
+     */
+    if (brokerConnectedString == "NOT CONNECTED") {
+        qCritical() << "ApismClient: \"NOT CONNECTED\": restart APISM";
+        this->restartApism();
+    }
+
+    emit this->sendReqSelfResponse(nsApismInterface::RESULT_STATE::SUCCESS, response);
+}
+
+/**
+ * sample parameter response:
+        {
+            "REQ_ISMASPARAMETER#4210959_Response": {
+                "Aknoledge": "OK"
+            },
+            "Dev_ID": {
+                "Device_Type": "2020",
+                "Custom_ID": 332,
+                "Device_ID": 99
+            },
+            "Fileupload": {
+                "TRG": ""
+            },
+            "Parameter": {
+                "Location": "An Der Bahn 11",
+                "Group": "Group1",
+                "Zone": "Zone1",
+                "Name": "PSA",
+                "SecNumber": "0",
+                "LastAcc": "0",
+                "GPSLat": "49.6062",
+                "GPSLon": "12.1244",
+                "TarifID": "none",
+                "UserTextID": "1"
+                "TERMINALID": "",
+                "TERMINALKEY": ""
+            },
+            "Lock": {
+                "Locked": "0"
+            }
+        }
+ */
+void ApismClient::private_handleParameterResponse(QJsonObject response)
+{
+    // extract location info and store location info in persistent data:
+    QJsonValue jsonSubVal_Location;
+    jsonSubVal_Location = response["Location"];
+
+    QString locationString = jsonSubVal_Location.toString("no location");
+
+    //this->persistentData->setParameter("Location", locationString);
+
+    // feature UserText
+    QJsonValue jsonSubVal_UserText;
+    jsonSubVal_UserText = response["UserTextID"];
+    QString userTextIdString = jsonSubVal_UserText.toString("0");
+    //this->persistentData->setParameter("UserTextID", userTextIdString);
+
+    // TERMINALID
+    //QJsonValue jsonSubVal_TERMINALID;
+    //jsonSubVal_TERMINALID = response["TERMINALID"];
+    //QString terminalIdString = jsonSubVal_TERMINALID.toString("");
+    //QString terminalIdFile = this->m_config->getSystemDataPath() + "TERMINALID";
+    //QString terminalIdStringOrigin = ATBSystem::readPSAConfigString(terminalIdFile);
+    //if ( (terminalIdString.size() > 1) &&
+    //     (terminalIdString != terminalIdStringOrigin))
+    //{
+    //    qCritical() << "ApismClient::handleParameterResponse(): new TERMINALID: " << terminalIdString;
+    //    ATBSystem::setPSAConfigString(terminalIdFile, terminalIdString);
+    //}
+
+    // TERMINALKEY
+    //QJsonValue jsonSubVal_TERMINALKEY;
+    //jsonSubVal_TERMINALKEY = response["TERMINALKEY"];
+    //QString terminalKeyString = jsonSubVal_TERMINALKEY.toString("");
+    //QString terminalJeyFile = this->m_config->getSystemDataPath() + "TERMINALKEY";
+    //QString terminalKeyStringOrigin = ATBSystem::readPSAConfigString(terminalJeyFile);
+    //if ( (terminalKeyString.size() > 1) &&
+    //     (terminalKeyString != terminalKeyStringOrigin))
+    //{
+    //    qCritical() << "ApismClient::handleParameterResponse(): new TERMINALKEY: " << terminalKeyString;
+    //
+
+    //    ATBSystem::setPSAConfigString(terminalJeyFile, terminalKeyString);
+    //}
+
+
+    //qCritical() << "ApismClient::handleParameterResponse() " << endl
+    //            << "                  Location = " << locationString   << endl
+    //            << "                UserTextID = " << userTextIdString << endl
+    //            << "                TERMINALID = " << terminalIdString << endl
+    //            << "               TERMINALKEY = " << terminalKeyString;
+
+
+    if (locationString != "no location") {
+        this->flagValidParameter = true;
+        emit this->sendReqParameterResponse(nsApismInterface::RESULT_STATE::SUCCESS, response);
+    }
+}
+
+void ApismClient::private_handleFileUploadResponse(QJsonObject response) {
+    QJsonValue jsonSubVal_TRG{response["TRG"]};
+    if (jsonSubVal_TRG.isUndefined()) {
+        return;
+    }
+
+    bool updateRequested = (jsonSubVal_TRG.toString("") == "WAIT");
+
+}
+
+/************************************************************************************************
+ * operators
+ */
+QDebug operator<< (QDebug debug, ISMAS::REQUEST request)
+{
+    switch(request) {
+    case ISMAS::REQUEST::NO_REQUEST:
+        debug << QString("ISMAS::REQUEST::NO_REQUEST");
+        break;
+    case ISMAS::REQUEST::PING:
+        debug << QString("ISMAS::REQUEST::PING");
+        break;
+    case ISMAS::REQUEST::SELF:
+        debug << QString("ISMAS::REQUEST::SELF");
+        break;
+    case ISMAS::REQUEST::PARAMETER:
+        debug << QString("ISMAS::REQUEST::PARAMETER");
+        break;
+    }
+    return debug;
+}
+
+QString& operator<< (QString& str, ISMAS::REQUEST request)
+{
+    switch(request) {
+    case ISMAS::REQUEST::NO_REQUEST:
+        str = QString("ISMAS::REQUEST::NO_REQUEST");
+        break;
+    case ISMAS::REQUEST::PING:
+        str = QString("ISMAS::REQUEST::PING");
+        break;
+    case ISMAS::REQUEST::SELF:
+        str = QString("ISMAS::REQUEST::SELF");
+        break;
+    case ISMAS::REQUEST::PARAMETER:
+        str = QString("ISMAS::REQUEST::PARAMETER");
+        break;
+    }
+    return str;
+}
+

common/ismas/ApismClient.h

@@ -0,0 +1,99 @@
+#ifndef APISM_CLIENT_H_INCLUDED
+#define APISM_CLIENT_H_INCLUDED
+
+#include "ISMASData.h"
+#include "ApismTcpClient.h"
+
+#include <QObject>
+#include <QAbstractSocket>
+#include <QTcpSocket>
+#include <QJsonDocument>
+#include <QJsonArray>
+#include <QJsonObject>
+#include <QJsonArray>
+#include <QJsonParseError>
+#include <QJsonValue>
+#include <QScopedPointer>
+
+
+QDebug operator<<(QDebug debug, ISMAS::REQUEST request);
+QString& operator<<(QString& str, ISMAS::REQUEST request);
+
+namespace nsApismInterface {
+    enum class RESULT_STATE : quint8 {
+        SUCCESS = 1,
+        ERROR_BACKEND = 2,   // error from backand (e.g. backend replies with error)
+        ERROR_NETWORK = 3,   // error from network (e.g. host not available)
+        ERROR_TIMEOUT = 4,   // the operation timed out
+        ERROR_PROCESS = 5,   // internal plugin error (e.g. bug in implementation)
+        ERROR_RETRY = 6,     // retry operation
+        INFO = 7
+    };
+}
+
+// class ISMAS::EventData;
+class ApismClient : public QObject {
+    Q_OBJECT
+
+public:
+    explicit ApismClient(QObject *parent = 0);
+    virtual ~ApismClient() = 0;
+
+    quint32 getLastError();
+    const QString & getLastErrorDescription();
+
+    ISMAS::REQUEST getCurrentRequest() const { return currentRequest; }
+    void setCurrentRequest(ISMAS::REQUEST r) { currentRequest = r; }
+
+    void resetRetryCounter() { retryCounter = 0; }
+    int getRetryCounter() const { return retryCounter; }
+    int incrRetryCounter() { return ++retryCounter; }
+
+    ApismTcpClient *tcpSendClient() { return apismTcpSendClient.get(); }
+    ApismTcpClient *tcpRequestResponseClient() { return apismTcpRequestResponseClient.get(); }
+
+public slots:
+    void sendSelfTest();
+    void sendRequestParameter();
+    void restartApism();
+
+signals:
+    void sendReqSelfResponse(nsApismInterface::RESULT_STATE result, QJsonObject response);
+    void sendReqParameterResponse(nsApismInterface::RESULT_STATE result, QJsonObject response);
+
+private slots:
+    virtual void onReceivedResponse(QByteArray response) = 0;
+    virtual void onSendClientResponseTimeout() = 0;
+    virtual void onRequestResponseClientResponseTimeout() = 0;
+    virtual void onRequestResponseClientConnectTimeout() = 0;
+    virtual void onRequestResponseClientConnectionClosedByRemoteHost() = 0;
+
+private:
+    QScopedPointer<ApismTcpClient> apismTcpSendClient;
+    QScopedPointer<ApismTcpClient> apismTcpRequestResponseClient;
+
+    quint32 lastError;
+    QString lastErrorDescription;
+
+    ISMAS::REQUEST currentRequest;
+
+    // counter, incremented if we get an offline response from ISMAS
+    // causes a resend of the currentRequest.
+    int retryCounter;
+
+    // true, if ISMAS REQ_ISAMASPARAMETER got a valid response
+    bool flagValidParameter;
+
+    void private_handlePingResponse(QJsonObject response);
+    void private_handleReqSelfResponse(QJsonObject response);
+    void private_handleReqPingResponse(QJsonObject response);
+    void private_handleParameterResponse(QJsonObject response);
+    void private_handleFileUploadResponse(QJsonObject response);
+    void private_handleErrorResponse(QString errorString);
+
+public:
+    void handleISMASResponseError();
+    void handleISMASOfflineResponseError();
+};
+
+#endif // APISM_CLIENT_H_INCLUDED

common/ismas/ApismClientForUpdate.cpp

@@ -0,0 +1,216 @@
+#include "ApismClientForUpdate.h"
+
+#include <QRegularExpression>
+
+ApismClientForUpdate::ApismClientForUpdate(QObject *parent)
+    : ApismClient(parent) {
+
+}
+
+ApismClientForUpdate::~ApismClientForUpdate() {
+
+}
+
+void ApismClientForUpdate::sendCmdEvent(ISMAS::EventData eventData) {
+    // QScopedPointer<ISMAS::EventData> eventData(new ISMAS::EventData());
+ /*
+    struct EventData : public QJsonObject {
+        struct : public QJsonObject {
+            QJsonValue reason;
+            QJsonValue timestamp;
+            QJsonValue eventID;
+            QJsonValue event;
+            QJsonValue eventState;
+            struct : public QJsonObject {
+                QJsonValue percent;
+                QJsonValue resultCode;
+                QJsonValue step;
+                QJsonValue stepResult;
+                QJsonValue Version;
+            } parameter;
+        } newsToIsmas;
+    };
+
+            "\"REASON\":\"SW_UP\","
+            "\"TIMESTAMP\":\"%s\","
+            "\"EVENT_ID\":\"0\","
+            "\"EVENT\":\"%s\","
+            "\"EVENTSTATE\":1,"
+            "\"PARAMETER\": {"
+                "\"PERCENT\" : %d,"
+                "\"RESULTCODE\" : %d,"
+                "\"STEP\" : \"%s\","
+                "\"STEP_RESULT\" : \"%s\","
+                "\"VERSION\" : \"%s\""
+            "}"
+        "}", ts.toStdStr
+
+*/
+    //eventData->newsToIsmas.reason = data.newsToIsmas;
+    eventData.insert("REASON", eventData.newsToIsmas.reason);
+    eventData.insert("TIMESTAMP", eventData.newsToIsmas.timestamp);
+    eventData.insert("EVENT_ID", eventData.newsToIsmas.eventID);
+    eventData.insert("EVENT", eventData.newsToIsmas.event);
+    eventData.insert("EVENT_STATE", eventData.newsToIsmas.eventState);
+
+    QJsonObject parameterJsonObject;
+    parameterJsonObject.insert("PERCENT", eventData.newsToIsmas.parameter.percent);
+    parameterJsonObject.insert("RESULTCODE", eventData.newsToIsmas.parameter.resultCode);
+    parameterJsonObject.insert("STEP", eventData.newsToIsmas.parameter.step);
+    parameterJsonObject.insert("STEP_RESULT", eventData.newsToIsmas.parameter.stepResult);
+    parameterJsonObject.insert("VERSION", eventData.newsToIsmas.parameter.version);
+
+    eventData.insert("PARAMETER", parameterJsonObject);
+
+    qCritical() << __func__ << ":" << __LINE__ << eventData;
+
+    QJsonDocument jsonDoc(eventData);
+    QByteArray data = "#M=APISM#C=CMD_EVENT#J=";
+    data += jsonDoc.toJson(QJsonDocument::Compact);
+
+    qCritical() << __func__ << ":" << __LINE__ << data;
+
+    tcpSendClient()->sendData(data);
+}
+
+
+void ApismClientForUpdate::onReceivedResponse(QByteArray response) {
+    // get the root object
+    QJsonParseError jsonParseError;
+    QJsonDocument responseDoc = QJsonDocument::fromJson(response, &jsonParseError);
+
+    if (jsonParseError.error != QJsonParseError::NoError) {
+        qCritical() << "ApismClient::onReceivedResponse() response is no json data:";
+        qCritical() << "     Error: " << jsonParseError.errorString();
+
+        // workaround for REQ_SELF and offline
+        if (this->getCurrentRequest() == ISMAS::REQUEST::SELF) {
+            if (response.contains("Connecting...")) {
+                qCritical() << "          -> Connecting...";
+                return;
+            }
+            if (response.contains("ISMAS is offline")) {
+                this->restartApism();
+                qCritical() << "          -> Workaround: restart APISM";
+                return;
+            }
+        }
+
+        if (response.contains("ISMAS is offline")) {
+            this->handleISMASOfflineResponseError();
+            return;
+        }
+        else {
+            this->handleISMASResponseError();
+            return;
+        }
+    }
+
+    QJsonObject rootObject = responseDoc.object();
+    QStringList rootObjectKeys = rootObject.keys();
+
+    // DEBUG
+    qCritical() << "ApismClient::onReceivedResponse(): objects: " << rootObjectKeys;
+    // results to:
+    //  ApismClient::onReceivedResponse(): objects:  ("REQ_START#60044_Response", "Response")
+
+    if(rootObjectKeys.indexOf(QRegularExpression("^CMD_GET_APISMSTATUS.*")) >= 0) {
+        resetRetryCounter();
+        //this->private_handleReqSelfResponse(rootObject["CMD_GET_APISMSTATUS_RESPONSE#0"].toObject());
+    }
+    else
+    if(rootObjectKeys.indexOf(QRegularExpression("^REQ_ISMASPARAMETER.*")) >= 0) {
+        resetRetryCounter();
+        //this->private_handleParameterResponse(rootObject["Parameter"].toObject());
+    }
+    else
+    if(rootObjectKeys.indexOf(QRegularExpression("^REQ_PING.*")) >= 0) {
+        resetRetryCounter();
+        //this->private_handleReqPingResponse(rootObject["PING"].toObject());
+    }
+    else
+    if(rootObjectKeys.indexOf(QRegularExpression("^error")) >= 0) {
+        // handle error objects
+        //this->private_handleErrorResponse(rootObject["error"].toString());
+    }
+    else {
+        qCritical() << "ApismClient::onReceivedResponse() for unknown Request: ";
+        qCritical() << "                     currentRequestName: " << getCurrentRequest();
+        qCritical() << "                      rootObject.keys(): " << rootObjectKeys;
+        this->handleISMASResponseError();
+        return;
+    }
+
+    this->setCurrentRequest(ISMAS::REQUEST::NO_REQUEST);
+}
+
+void ApismClientForUpdate::onSendClientResponseTimeout() {
+
+}
+
+void ApismClientForUpdate::onRequestResponseClientResponseTimeout() {
+    qCritical() << "ApismClient::onRequestResponseClientResponseTimeout(): currentRequest is " << this->getCurrentRequest();
+
+    switch (this->getCurrentRequest()) {
+    case ISMAS::REQUEST::NO_REQUEST:
+        break;
+    case ISMAS::REQUEST::PING:
+        //emit this->sendMininformPingResponse(nsApismInterface::RESULT_STATE::ERROR_TIMEOUT, QJsonObject());
+        break;
+    case ISMAS::REQUEST::SELF:
+        //emit this->sendReqSelfResponse(nsApismInterface::RESULT_STATE::ERROR_TIMEOUT, QJsonObject());
+        break;
+    case ISMAS::REQUEST::PARAMETER:
+        //emit this->sendReqParameterResponse(nsApismInterface::RESULT_STATE::ERROR_TIMEOUT, QJsonObject());
+        break;
+    }
+
+    this->setCurrentRequest(ISMAS::REQUEST::NO_REQUEST);
+}
+
+void ApismClientForUpdate::onRequestResponseClientConnectTimeout() {
+
+    qCritical() << "ApismClient::onRequestResponseClientConnectTimeout(): currentRequest is " << this->getCurrentRequest();
+
+    nsApismInterface::RESULT_STATE resultState;
+
+    resultState = nsApismInterface::RESULT_STATE::ERROR_BACKEND;
+
+    switch (this->getCurrentRequest()) {
+    case ISMAS::REQUEST::NO_REQUEST:
+        qCritical() << "ApismClient::onRequestResponseClientConnectTimeout() for unknown Request: " << getCurrentRequest();
+        break;
+    case ISMAS::REQUEST::PING:
+        //emit this->sendMininformPingResponse(resultState, QJsonObject());
+        break;
+    case ISMAS::REQUEST::SELF:
+        //emit this->sendReqSelfResponse(resultState, QJsonObject());
+        break;
+    case ISMAS::REQUEST::PARAMETER:
+        //emit this->sendReqParameterResponse(resultState, QJsonObject());
+        break;
+    }
+
+    this->setCurrentRequest(ISMAS::REQUEST::NO_REQUEST);
+}
+
+void ApismClientForUpdate::onRequestResponseClientConnectionClosedByRemoteHost() {
+    nsApismInterface::RESULT_STATE resultState = nsApismInterface::RESULT_STATE::ERROR_BACKEND;
+
+    switch (this->getCurrentRequest()) {
+    case ISMAS::REQUEST::NO_REQUEST:
+        qCritical() << "ApismClient::onRequestResponseClientConnectionClosedByRemoteHost() for unknown Request: " << getCurrentRequest();
+        break;
+    case ISMAS::REQUEST::PING:
+        //emit this->sendMininformPingResponse(resultState, QJsonObject());
+        break;
+    case ISMAS::REQUEST::SELF:
+        emit this->sendReqSelfResponse(resultState, QJsonObject());
+        break;
+    case ISMAS::REQUEST::PARAMETER:
+        emit this->sendReqParameterResponse(resultState, QJsonObject());
+        break;
+    }
+
+    this->setCurrentRequest(ISMAS::REQUEST::NO_REQUEST);
+}

common/ismas/ApismClientForUpdate.h

@@ -0,0 +1,24 @@
+#ifndef APISM_CLIENT_FOR_UPDATE_H_INCLUDED
+#define APISM_CLIENT_FOR_UPDATE_H_INCLUDED
+
+#include "ApismClient.h"
+
+class ApismClientForUpdate : public ApismClient {
+public:
+    explicit ApismClientForUpdate(QObject *parent = 0);
+    virtual ~ApismClientForUpdate();
+
+public slots:
+    void sendCmdEvent(ISMAS::EventData);
+
+private slots:
+    virtual void onReceivedResponse(QByteArray response) override;
+    virtual void onSendClientResponseTimeout() override;
+    virtual void onRequestResponseClientResponseTimeout() override;
+    virtual void onRequestResponseClientConnectTimeout() override;
+    virtual void onRequestResponseClientConnectionClosedByRemoteHost() override;
+
+};
+
+#endif // APISM_CLIENT_FOR_UPDATE_H_INCLUDED
+

common/ismas/ApismTcpClient.cpp

@@ -0,0 +1,564 @@
+#include "ApismTcpClient.h"
+
+#include <QHostAddress>
+#include <QTimer>
+
+ApismMessage::ApismMessage() : state(MessageState::INVALID) { }
+
+
+ApismTcpClient::ApismTcpClient(const QString & hostname,
+                               const QString & port,
+                               ExpectedResponse expectedResponse,
+                               QObject *parent)
+    : QObject(parent)
+    , hostname(hostname)
+    , port(port)
+    , responseTimerTimeoutCounter(0)
+    , flag_selfClosed(false)
+    , resendCounter(0)
+    , connectionRefusedCounter(0)
+    , expectedResponse(expectedResponse)
+    , isDebug(false)
+{  
+    this->responseTimeoutTimer = new QTimer(this);
+    this->responseTimeoutTimer->setInterval(10000);
+    this->responseTimeoutTimer->setSingleShot(true);
+
+    connect(this->responseTimeoutTimer, SIGNAL(timeout()), this, SLOT(onResponseTimeoutTimerTimeout()));
+
+    this->connectTimeoutTimer = new QTimer(this);
+    this->connectTimeoutTimer->setInterval(10000);
+    this->connectTimeoutTimer->setSingleShot(true);
+
+    connect(this->connectTimeoutTimer, SIGNAL(timeout()), this, SLOT(onConnectTimeoutTimerTimeout()));
+
+    socket = new QTcpSocket(this);
+    connect(socket, SIGNAL(connected()),    this, SLOT(onSocketConnected()));
+    connect(socket, SIGNAL(disconnected()), this, SLOT(onSocketDisconnected()));
+    connect(socket, SIGNAL(readyRead()),    this, SLOT(onSocketReadyRead()));
+    connect(socket, SIGNAL(bytesWritten(qint64)), this, SLOT(onSocketBytesWritten(qint64)));
+    //  note: from Qt 5.15 onward a new signal "errorOccurred" will be introduced which could be used whithout this static_cast.
+    //  see e.g. https://stackoverflow.com/questions/35655512/compile-error-when-connecting-qtcpsocketerror-using-the-new-qt5-signal-slot
+    connect(socket, static_cast<void (QTcpSocket::*)(QAbstractSocket::SocketError)>(&QAbstractSocket::error), this, &ApismTcpClient::onSocketErrorOccured);
+    connect(socket, &QTcpSocket::stateChanged, this, &ApismTcpClient::onSocketStateChanged);
+
+    this->currentMessage = ApismMessage();
+}
+
+
+void ApismTcpClient::setResponseTimeout(const quint32 timeout_ms)
+{
+    this->responseTimeoutTimer->setInterval(timeout_ms);
+}
+
+void ApismTcpClient::setDebug(bool debug)
+{
+    this->isDebug = debug;
+}
+
+void ApismTcpClient::connectToHost()
+{
+    this->connectTimeoutTimer->start();
+    int portNumber = this->port.toInt();
+    this->socket->connectToHost(QHostAddress(this->hostname), portNumber);
+}
+
+void ApismTcpClient::connectToHost(const QString & hostname, const QString & port)
+{
+    qCritical() << "ApismTcpClient(" << this->expectedResponse << ")::connectToHost(" << hostname << ", " << port << ")";
+
+    this->connectTimeoutTimer->start();
+    int portNumber = port.toInt();
+    socket->connectToHost(hostname, portNumber);
+}
+
+void ApismTcpClient::closeConnection()
+{
+    this->flag_selfClosed = true;
+    socket->close();
+}
+
+bool ApismTcpClient::isConnected()
+{
+    bool result = false;
+    QAbstractSocket::SocketState socketState = socket->state();
+
+    switch (socketState) {
+        case QAbstractSocket::UnconnectedState:
+            /* FALLTHRU */
+        case QAbstractSocket::HostLookupState:
+            /* FALLTHRU */
+        case QAbstractSocket::ConnectingState:
+            result = false;
+            break;
+        case QAbstractSocket::ConnectedState:
+            /* FALLTHRU */
+        case QAbstractSocket::BoundState:
+            result = true;
+            break;
+        case QAbstractSocket::ClosingState:
+            /* FALLTHRU */
+        case QAbstractSocket::ListeningState:
+            result = false;
+            break;
+    }
+
+    return result;
+}
+
+
+
+/**
+ * @brief ApismTcpClient::sendData
+ * @param message
+ *
+ * Enqueue message, and try to send it
+ */
+void ApismTcpClient::sendData(const QByteArray &message)
+{
+    if (this->isDebug) {
+        qCritical() << "ApismTcpClient::sendData(" << message << ")";
+    }
+
+    this->sendQueue.enqueue(message);
+
+    this->sendData();
+}
+
+/**
+ * @brief ApismTcpClient::sendData
+ *
+ * Check connection and try to send message from queue.
+ */
+void ApismTcpClient::sendData()
+{
+    if (this->sendQueue.size() == 0) {
+        if (this->isDebug) {
+            qCritical() << "ApismTcpClient::sendData()" << "no messages in send queue";
+        }
+        return;
+    }
+
+    // DEBUG
+    if (this->isDebug) {
+        qCritical() << "ApismTcpClient(" << this->expectedResponse << ")::sendData() sendQueue.size() = " << this->sendQueue.size();
+    }
+
+    switch (this->currentMessage.state) {
+        case ApismMessage::MessageState::INVALID:
+            /* FALLTHROUGH */
+        case ApismMessage::MessageState::NEW:
+            /* FALLTHROUGH */
+        case ApismMessage::MessageState::RESEND:
+            /* FALLTHROUGH */
+        case ApismMessage::MessageState::ANSWERED:
+            // allow send message
+            if (this->isConnected()) {
+                this->private_sendData();
+            }
+            else {
+                this->connectToHost();
+            }
+        break;
+        case ApismMessage::MessageState::SENT:
+            // wait for answer...
+            if (this->isDebug) {
+                qCritical() << "                ... wait for answer";
+            }
+        break;
+    }
+}
+
+/**
+ * @brief ApismTcpClient::private_sendData
+ *
+ * Precondition:
+ *   - queue is not empty,
+ *   - socket state is connected
+ *   - current message is ANSWERED or INVALID
+ */
+void ApismTcpClient::private_sendData()
+{
+    // take message from queue
+    this->currentMessage.data = this->sendQueue.dequeue();
+    this->currentMessage.state = ApismMessage::MessageState::SENT;
+
+    qCritical() << "ApismTcpClient(" << this->expectedResponse << ")::send: " << QString(this->currentMessage.data);
+
+    socket->write(this->currentMessage.data);
+    socket->flush();
+
+    // start timeoutTimer
+    this->responseTimeoutTimer->start();
+}
+
+
+void ApismTcpClient::onSocketConnected()
+{
+    qCritical() << "ApismTcpClient(" << this->expectedResponse << "): Connected!";
+
+    this->connectTimeoutTimer->stop();
+    this->connectionRefusedCounter = 0;
+
+    switch (this->currentMessage.state) {
+        case ApismMessage::MessageState::INVALID:
+            /* FALLTHROUGH */
+        case ApismMessage::MessageState::NEW:
+            /* FALLTHROUGH */
+        case ApismMessage::MessageState::RESEND:
+            /* FALLTHROUGH */
+        case ApismMessage::MessageState::ANSWERED:
+            // allow send next message
+            if (this->sendQueue.size() > 0) {
+                this->private_sendData();
+            }
+        break;
+        case ApismMessage::MessageState::SENT:
+            // wait for answer...
+        break;
+    }
+}
+
+void ApismTcpClient::onSocketDisconnected()
+{
+    qCritical() << "ApismTcpClient(" << this->expectedResponse << "): Disconnected!";
+
+    if (!this->flag_selfClosed) {
+        qCritical() << "        -> SocketErrorString: " << socket->errorString();
+    }
+    this->flag_selfClosed = false;
+
+    if ( (socket->error() == QAbstractSocket::SocketError::RemoteHostClosedError) &&
+         (this->responseTimeoutTimer->isActive()) )
+    {
+        this->responseTimeoutTimer->stop();
+        qCritical() << "        -> still waiting for response ";
+
+        switch (this->expectedResponse) {
+            case ApismTcpClient::ExpectedResponse::STATE:
+                // try resend:
+                this->currentMessage.state = ApismMessage::MessageState::RESEND;
+                // enqeue current message for resend:
+                this->sendQueue.prepend(this->currentMessage.data);
+
+                this->sendData();
+                break;
+            case ApismTcpClient::ExpectedResponse::JSON:
+                this->currentMessage.state = ApismMessage::MessageState::INVALID;
+                emit this->connectionClosedByRemoteHost();
+                break;
+        }
+    }
+}
+
+void ApismTcpClient::onSocketBytesWritten(qint64 bytes)
+{
+    if (this->isDebug) {
+        qCritical() << "ApismTcpClient(" << this->expectedResponse << ")::onSocketBytesWritten() -> " << bytes << " bytes written";
+    }
+}
+
+void ApismTcpClient::onSocketReadyRead()
+{
+    QByteArray readData;
+
+    // stop timeoutTimer
+    this->responseTimeoutTimer->stop();
+
+    readData = socket->readAll();
+
+    qCritical() << "ApismTcpClient(" << this->expectedResponse << ")::received: " << QString(readData);
+
+    switch (this->expectedResponse) {
+        case ApismTcpClient::ExpectedResponse::JSON:
+            this->private_handleJSONResponse(readData);
+        break;
+        case ApismTcpClient::ExpectedResponse::STATE:
+            this->private_handleStateResponse(readData);
+        break;
+    }
+
+
+    if (this->sendQueue.size() > 0) {
+        QTimer::singleShot(1000,
+                           this,
+                           [this]() { this->sendData(); }
+        );
+    }
+    else {
+        this->flag_selfClosed = true;
+        this->socket->close();
+    }
+}
+
+/******************************************************************************
+ * response handler:
+ */
+void ApismTcpClient::private_handleJSONResponse(QByteArray & responseMessage)
+{
+    emit this->receivedData(responseMessage);
+
+    // allow send next message:
+    this->currentMessage.state = ApismMessage::MessageState::ANSWERED;
+    this->resendCounter = 0;
+}
+
+/* possible answers:
+ *    "RECORD SAVED"           --> everything is ok
+ *    "RECORD WRITE ABORTED"   --> initiate a (delayed) resend
+ *
+ */
+void ApismTcpClient::private_handleStateResponse(QByteArray & responseMessage)
+{
+    QString responseMessageString = QString(responseMessage);
+
+    if (responseMessageString.contains("ABORTED")) {
+        // Try to resend later:
+        this->currentMessage.state = ApismMessage::MessageState::RESEND;
+        // enqeue current message for resend:
+        this->sendQueue.prepend(this->currentMessage.data);
+    }
+    else
+    if (responseMessageString.contains("RECORD SAVED")) {
+        // allow send next message:
+        this->currentMessage.state = ApismMessage::MessageState::ANSWERED;
+        this->resendCounter = 0;
+    }
+}
+
+/******************************************************************************
+ */
+
+
+
+
+
+void ApismTcpClient::onResponseTimeoutTimerTimeout()
+{
+    qCritical() << "ApismTcpClient(" << this->expectedResponse << ")::onResponseTimeoutTimerTimeout():";
+
+
+    switch (this->currentMessage.state) {
+        case ApismMessage::MessageState::INVALID:
+            /* FALLTHROUGH */
+        case ApismMessage::MessageState::NEW:
+            /* FALLTHROUGH */
+        case ApismMessage::MessageState::ANSWERED:
+            // ignore
+            qCritical() << "                -> ignore timeout";
+            return;
+        break;
+        case ApismMessage::MessageState::RESEND:
+            qCritical() << "                -> timeout (RESEND)";
+            qCritical() << "                -> resendCounter = " << this->resendCounter;
+            switch (this->expectedResponse) {
+            case ApismTcpClient::ExpectedResponse::STATE:
+                // try resend:
+                this->currentMessage.state = ApismMessage::MessageState::RESEND;
+                // enqeue current message for resend:
+                this->sendQueue.prepend(this->currentMessage.data);
+
+                this->sendData();
+                break;
+            case ApismTcpClient::ExpectedResponse::JSON:
+                this->currentMessage.state = ApismMessage::MessageState::INVALID;
+                emit this->responseTimeout();
+                break;
+        }
+        break;
+        case ApismMessage::MessageState::SENT:
+            // we still do not have a response:
+
+            switch (this->expectedResponse) {
+                case ApismTcpClient::ExpectedResponse::STATE:
+                    // try resend:
+                    this->currentMessage.state = ApismMessage::MessageState::RESEND;
+                    // enqeue current message for resend:
+                    this->sendQueue.prepend(this->currentMessage.data);
+
+                    this->sendData();
+                    break;
+                case ApismTcpClient::ExpectedResponse::JSON:
+                    this->currentMessage.state = ApismMessage::MessageState::INVALID;
+                    emit this->responseTimeout();
+                    break;
+            }
+
+
+        break;
+    }
+
+    // count resends
+    this->resendCounter++;
+}
+
+
+
+void ApismTcpClient::onConnectTimeoutTimerTimeout()
+{
+    if (this->sendQueue.size() == 0) {
+        return;
+    }
+
+    qCritical() << "ApismTcpClient(" << this->expectedResponse << ")::onConnectTimeoutTimerTimeout() -> sendQueue.size() = " << this->sendQueue.size();
+
+    emit this->connectTimeout();
+}
+
+
+void ApismTcpClient::onSocketStateChanged(QAbstractSocket::SocketState socketState)
+{
+    QString msg;
+
+    switch (socketState) {
+        case QAbstractSocket::UnconnectedState:
+            msg = "UnconnectedState";
+            break;
+        case QAbstractSocket::HostLookupState:
+            msg = "HostLookupState";
+            break;
+        case QAbstractSocket::ConnectingState:
+            msg = "ConnectingState";
+            break;
+        case QAbstractSocket::ConnectedState:
+            msg = "ConnectedState";
+            break;
+        case QAbstractSocket::BoundState:
+            msg = "BoundState";
+            break;
+        case QAbstractSocket::ClosingState:
+            msg = "ClosingState";
+            break;
+         case QAbstractSocket::ListeningState:
+            msg = "ListeningState";
+            break;
+    }
+
+    if (this->isDebug) {
+        qCritical() << "ApismTcpClient(" << this->expectedResponse << ")::onSocketStateChanged() to: " << msg;
+    }
+}
+
+void ApismTcpClient::onSocketErrorOccured(QAbstractSocket::SocketError socketError)
+{
+    QString msg;
+    bool flagReconnect = false;
+
+    switch (socketError) {
+        case QAbstractSocket::ConnectionRefusedError:
+            msg = "ConnectionRefusedError";
+            flagReconnect = true;
+            this->private_handleConnectionRefusedError();
+            break;
+        case QAbstractSocket::RemoteHostClosedError:
+            msg = "RemoteHostClosedError";
+            break;
+        case QAbstractSocket::HostNotFoundError:
+            msg = "HostNotFoundError";
+            break;
+        case QAbstractSocket::SocketAccessError:
+            msg = "SocketAccessError";
+            break;
+        case QAbstractSocket::SocketResourceError:
+            msg = "SocketResourceError";
+            break;
+        case QAbstractSocket::SocketTimeoutError:
+            msg = "SocketTimeoutError";
+            break;
+        case QAbstractSocket::DatagramTooLargeError:
+            msg = "DatagramTooLargeError";
+            break;
+        case QAbstractSocket::NetworkError:
+            msg = "NetworkError";
+            break;
+        case QAbstractSocket::AddressInUseError:
+            msg = "AddressInUseError";
+            break;
+        case QAbstractSocket::SocketAddressNotAvailableError:
+            msg = "SocketAddressNotAvailableError";
+            break;
+        case QAbstractSocket::UnsupportedSocketOperationError:
+            msg = "UnsupportedSocketOperationError";
+            break;
+        case QAbstractSocket::ProxyAuthenticationRequiredError:
+            msg = "ProxyAuthenticationRequiredError";
+            break;
+        case QAbstractSocket::SslHandshakeFailedError:
+            msg = "SslHandshakeFailedError";
+            break;
+        case QAbstractSocket::UnfinishedSocketOperationError:
+            msg = "UnfinishedSocketOperationError";
+            break;
+        case QAbstractSocket::ProxyConnectionRefusedError:
+            msg = "ProxyConnectionRefusedError";
+            break;
+        case QAbstractSocket::ProxyConnectionClosedError:
+            msg = "ProxyConnectionClosedError";
+            break;
+        case QAbstractSocket::ProxyConnectionTimeoutError:
+            msg = "ProxyConnectionTimeoutError";
+            break;
+        case QAbstractSocket::ProxyNotFoundError:
+            msg = "ProxyNotFoundError";
+            break;
+        case QAbstractSocket::ProxyProtocolError:
+            msg = "ProxyProtocolError";
+            break;
+        case QAbstractSocket::OperationError:
+            msg = "OperationError";
+            break;
+        case QAbstractSocket::SslInternalError:
+            msg = "SslInternalError";
+            break;
+        case QAbstractSocket::SslInvalidUserDataError:
+            msg = "SslInvalidUserDataError";
+            break;
+        case QAbstractSocket::TemporaryError:
+            msg = "TemporaryError";
+            break;
+        case QAbstractSocket::UnknownSocketError:
+            msg = "UnknownSocketError";
+            break;
+
+    }
+
+    qCritical() << "ApismTcpClient(" << this->expectedResponse << ")::ApismTcpClient::onSocketErrorOccured() -> " << msg;
+
+    if (flagReconnect) {
+        // try to reconnect for sending:
+        if (this->sendQueue.size() > 0) {
+            QTimer::singleShot(1000,
+                               this,
+                               [this]() { this->connectToHost(); }
+            );
+        }
+    }
+}
+
+
+void ApismTcpClient::private_handleConnectionRefusedError()
+{
+    if (this->connectionRefusedCounter > 5) {
+        qCritical() << "ApismTcpClient(" << this->expectedResponse << ")::ApismTcpClient::connectionRefusedError()";
+        this->connectionRefusedCounter = 0;
+        emit this->connectionRefusedError();
+    }
+    else {
+        this->connectionRefusedCounter++;
+    }
+}
+
+
+
+QDebug operator<<(QDebug debug, ApismTcpClient::ExpectedResponse response)
+{
+    switch (response) {
+        case ApismTcpClient::ExpectedResponse::JSON:
+            debug << "JSON";
+        break;
+        case ApismTcpClient::ExpectedResponse::STATE:
+            debug << "STATE";
+        break;
+    }
+    return debug;
+}

common/ismas/ApismTcpClient.h

@@ -0,0 +1,116 @@
+#ifndef APISMTCPCLIENT_H
+#define APISMTCPCLIENT_H
+
+#include <QObject>
+
+#include <QTcpSocket>
+#include <QAbstractSocket>
+#include <QByteArray>
+#include <QQueue>
+
+class QTimer;
+
+
+class ApismMessage
+{
+public:
+
+    enum class MessageState {
+        INVALID,
+        NEW,
+        SENT,
+        ANSWERED,
+        RESEND
+     };
+     MessageState state;
+
+     QByteArray data;
+
+     ApismMessage();
+};
+
+
+
+
+class ApismTcpClient : public QObject
+{
+    Q_OBJECT
+
+public:
+    enum class ExpectedResponse {
+        JSON,
+        STATE
+     };
+
+    explicit ApismTcpClient(const QString & hostname, const QString & port, ExpectedResponse expectedResponse, QObject *parent = nullptr);
+    bool isConnected();
+
+    void connectToHost();
+    void connectToHost(const QString & hostname, const QString & port);
+    void setResponseTimeout(const quint32 timeout_ms);
+
+    // socket is implicitely closed by APISM
+    void closeConnection();
+
+    void sendData(const QByteArray & message);
+    void sendData();
+
+    void setDebug(bool debug);
+
+private slots:
+    // socket interface
+    void onSocketConnected();
+    void onSocketDisconnected();
+    void onSocketBytesWritten(qint64 bytes);
+    void onSocketReadyRead();
+    void onSocketStateChanged(QAbstractSocket::SocketState socketState);
+    void onSocketErrorOccured(QAbstractSocket::SocketError socketError);
+
+signals:
+    void receivedData(QByteArray response);
+
+    void responseTimeout();
+    void connectTimeout();
+    void connectionClosedByRemoteHost();
+    void connectionRefusedError();
+
+private:
+    QTcpSocket *socket;
+
+    QQueue<QByteArray> sendQueue;
+    ApismMessage currentMessage;
+
+    QString hostname;
+    QString port;
+
+    QTimer *responseTimeoutTimer;
+    quint8 responseTimerTimeoutCounter;
+
+    QTimer *connectTimeoutTimer;
+
+    void private_sendData();
+    bool flag_selfClosed;
+
+    int resendCounter;
+    int connectionRefusedCounter;
+
+    ExpectedResponse expectedResponse;
+
+    void private_handleJSONResponse(QByteArray & responseMessage);
+    void private_handleTextResponse(QByteArray & responseMessage);
+    void private_handleStateResponse(QByteArray & responseMessage);
+
+    void private_handleConnectionRefusedError();
+
+    bool isDebug;
+
+public slots:
+    void onResponseTimeoutTimerTimeout();
+    void onConnectTimeoutTimerTimeout();
+
+};
+
+QDebug operator<<(QDebug debug, ApismTcpClient::ExpectedResponse response);
+
+
+#endif // APISMTCPCLIENT_H

common/ismas/ISMASData.h

@@ -0,0 +1,148 @@
+#ifndef ISMASDATA_H
+#define ISMASDATA_H
+
+#include <QJsonObject>
+#include <QJsonArray>
+#include <QDateTime>
+
+namespace ISMAS {
+
+    static QString computeTimeStamp() {
+        QDateTime const local(QDateTime::currentDateTime());
+
+        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")));
+        return QString (local.toString(Qt::ISODateWithMs) + st);
+    }
+
+    enum RESULT_CODE {
+        E_SUCCESS=0,
+        // if between 00:00 - 04:00 Wait-button state not WAIT, then we assume
+        // that's an automatic nightly (not-necessary) update
+        E_NO_UPDATE_NECESSARY=1,
+        // if APISM reports the ISMAS is not available (15x, 6s delay each)
+        E_ISMAS_NO_CONNECTION_ERROR=2,
+        // if not within 00:00-04:00 and WAIT-button was not in state WAIT
+        E_ISMAS_TRIGGER_ERROR=3,
+        // cloning git repo. not possible
+        E_GIT_CLONE_ERROR=4,
+        // pulling from remote git server not possible
+        E_GIT_PULL_ERROR=5,
+        // fetching from remote git server not possible
+        E_GIT_FETCH_ERROR=6,
+        // merging fetched data not possible
+        E_GIT_MERGE_ERROR=7,
+        // check sanity of local customer-repository failed
+        E_GIT_CHECK_REPOSITORY_ERROR=8,
+        // switch/checkout of branch (i.e. zone) on error
+        E_GIT_SWITCH_BRANCH_ERROR=9,
+        // fetch/pull of new branch failed. the new branch was not available
+        // when installing via SD-card followed by intial clone during the
+        // update process.
+        E_GIT_FETCH_NEW_BRANCH_ERROR=10,
+        // error computing git-blob hash-value
+        E_GIT_HASH_ERROR=11,
+        // update for general json files failed.
+        E_JSON_FILES_UPDATE_ERROR=12,
+        // error downloading config-json-files to device controller
+        E_JSON_FILES_DOWNLOAD_ERROR=13,
+        // error downloading device-controller
+        E_DC_DOWNLOAD_ERROR=14,
+        // error rsyncing json/ini-files to local filesystem
+        E_RSYN_ERROR=15,
+        // HASH_VALUE_ERROR=14,
+        // HW_COMPATIBILITY_ERROR=15,
+        E_OPKG_COMMANDS_ERROR=16,
+        // CLEANUP_ERROR=18,
+        E_UPDATE_IN_ERROR_STATE=99
+    };
+
+//
+// Note:
+//    ! After U0002 immer ein CMD_SENDVERSION
+//    ! Only U0002 and U0003 finish the Update process.
+//    ! U0001: Update finished but not activated
+//    ! U0002: Update finished and activated
+//    ! U0003: Update finished but FAILed.
+//
+// #define _ISMAS_DONE                 "U0001" // 100%, Check: 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_CONTINUE             "U0010" // %-values: update running, result codes according running step
+// #define _ISMAS_RESET_WAIT           "ISMAS" // reset WAIT-button to "WAIT"
+// #define _ISMAS_TEST_TRIGGER         "U0099" // check the WAIT-button
+
+    static constexpr const char *DONE               {"U0001"};
+    static constexpr const char *SET_WAIT_OK        {"U0002"};
+    static constexpr const char *NO_UPDATE_NECESSARY{"M0100"};
+    static constexpr const char *FAILURE            {"U0003"};
+    static constexpr const char *CONTINUE           {"U0010"};
+    static constexpr const char *RESET_WAIT         {"ISMAS"};
+    static constexpr const char *TEST_TRIGGER       {"U0099"};
+
+    struct EventData : public QJsonObject {
+        struct : public QJsonObject {
+            QJsonValue reason;
+            QJsonValue timestamp;
+            QJsonValue eventID;
+            QJsonValue event;
+            QJsonValue eventState;
+            struct : public QJsonObject {
+                QJsonValue percent;
+                QJsonValue resultCode;
+                QJsonValue step;
+                QJsonValue stepResult;
+                QJsonValue version;
+            } parameter;
+        } newsToIsmas;
+
+        explicit EventData(QString const &event,
+                           int percent,
+                           int resultCode,
+                           QString const &step,
+                           QString const &stepResult,
+                           QString const &version = "",
+                           QString const &reason = "SW_UP") {
+            newsToIsmas.reason = reason;
+            newsToIsmas.timestamp = computeTimeStamp();
+            newsToIsmas.eventID = QString{"0"};
+            newsToIsmas.event = event;
+            newsToIsmas.eventState = 1;
+            newsToIsmas.parameter.percent = percent;
+            newsToIsmas.parameter.resultCode = resultCode;
+            newsToIsmas.parameter.step = step;
+            newsToIsmas.parameter.stepResult = stepResult;
+            newsToIsmas.parameter.version = version;
+        }
+    };
+
+    struct StateData : public QJsonObject {
+        QJsonValue Timestamp;
+        QJsonArray HW_States;
+        struct : public QJsonObject {
+            QJsonValue name;
+            QJsonValue value;
+            QJsonValue unit;
+        } machineState;                  //
+    };
+
+
+    enum class REQUEST : quint8 {
+        NO_REQUEST,
+        PING,
+        SELF,
+        PARAMETER
+    };
+}
+
+
+
+#endif // ISMASDATA_H

common/src/command.cpp

@@ -7,11 +7,12 @@
 #include <QDateTime>
 
 Command::Command(QString command, QStringList args, QString workingDirectory,
-                 int start_timeout, int finish_timeout)
+                 bool verbose, int start_timeout, int finish_timeout)
     : m_command(command.trimmed())
     , m_commandResult("")
     , m_waitForStartTimeout(start_timeout)
     , m_waitForFinishTimeout(finish_timeout)
+    , m_verbose(verbose)
     , m_exitCode(-1)
     , m_workingDirectory(workingDirectory)
     , m_args(args) {
@@ -28,14 +29,20 @@ Command::Command(QString command, QStringList args, QString workingDirectory,
 void Command::readyReadStandardOutput() {
     QProcess *p = (QProcess *)sender();
     if (p) {
-        qCritical().noquote() << p->readAllStandardOutput();
+        QString s = p->readAllStandardOutput();
+        if (m_verbose) {
+//            qCritical().noquote() << s;
+            m_commandResult += s;
+        }
     }
 }
 
 void Command::readyReadStandardError() {
     QProcess *p = (QProcess *)sender();
     if (p) {
-        qCritical().noquote() << p->readAllStandardError();
+        QString s = p->readAllStandardError();
+//        qCritical().noquote() << s;
+        m_commandResult += s;
     }
 }
 

common/src/utils_internal.cpp

@@ -1,8 +1,12 @@
-#include "utils.h"
+#include "utils_internal.h"
 
 #include <QFile>
 #include <QDir>
 #include <QTextStream>
+#include <QSettings>
+#include <QDebug>
+#include <QCryptographicHash>
+#include <QFileInfoList>
 
 namespace internal {
 
@@ -35,6 +39,11 @@ QString customerRepoDir() {
     return !n.isEmpty() ? QDir::cleanPath(r + QDir::separator() + n) : "";
 }
 
+QString customerRepoDcDir() {
+    QString const &r = customerRepoDir();
+    return QDir::cleanPath(r + QDir::separator() + "etc/dc/");
+}
+
 bool customerRepoExists() {
     QString const repoDir{customerRepoDir()};
     return !repoDir.isEmpty() ? QDir(repoDir).exists() : false;
@@ -52,4 +61,107 @@ QString branchName() {
     return "";
 }
 
+std::unique_ptr<QSettings> readSettings(QString const &optionalDirName) {
+    std::unique_ptr<QSettings> settings{std::make_unique<QSettings>()};
+
+    //QString const fileName{settings->applicationName() + ".ini"};
+    QString const fileName{"ATBUpdateTool.ini"};
+    QDir d;
+
+    if (!optionalDirName.isEmpty()) {
+        d = QDir{optionalDirName};
+        if (d.exists()) { // try to find ini-file under optionalDirname
+            QFileInfo fi{d, optionalDirName};
+            if (fi.exists()) {
+                settings.reset(new QSettings(fi.absoluteFilePath(), QSettings::IniFormat));
+                return settings;
+            } else {
+                qCritical() << fi.absoluteFilePath() << "not found."
+                            << "Try" << internal::DEFAULT_INI_DIR;
+            }
+        } else {
+            qCritical() << optionalDirName << "not found."
+                        << "Try" << internal::DEFAULT_INSTALL_DIR;
+        }
+    }
+    d = internal::DEFAULT_INI_DIR;
+    if (d.exists()) { // try to find ini-file under /etc/tools/atbupdate
+        QFileInfo fi{d, fileName};
+        if (fi.exists()) {
+            settings.reset(new QSettings(fi.absoluteFilePath(), QSettings::IniFormat));
+            return settings;
+        } else {
+            qCritical() << fi.absoluteFilePath() << "not found."
+                        << "Try" << internal::DEFAULT_INSTALL_DIR;
+        }
+    } else {
+        qCritical() << internal::DEFAULT_INI_DIR << "not found."
+                    << "Try" << internal::DEFAULT_INSTALL_DIR;
+    }
+    d = QDir{internal::DEFAULT_INSTALL_DIR};
+    if (d.exists()) { // try to find ini-file under /opt/app/tools/atbupdate
+        QFileInfo fi{d, fileName};
+        if (fi.exists()) {
+            settings.reset(new QSettings(fi.absoluteFilePath(), QSettings::IniFormat));
+            return settings;
+        } else {
+            qCritical() << fi.absoluteFilePath() << "not found.";
+        }
+    } else {
+        qCritical() << internal::DEFAULT_INSTALL_DIR << "not found.";
+    }
+
+    return settings;
+}
+
+std::unique_ptr<QString> dcCandidateToInstall(QString const &dcDirectory) {
+    std::unique_ptr<QString> dcCandidate{nullptr};
+
+    qCritical() << __func__ << __LINE__ << dcDirectory;
+
+    QDir dcDir{dcDirectory.isEmpty() ? customerRepoDcDir() : dcDirectory};
+    if (dcDir.exists()) {
+
+        QFileInfoList fileInfoList =
+            dcDir.entryInfoList(QStringList("*.bin"),
+                                QDir::Files | QDir::NoDotAndDotDot | QDir::NoSymLinks);
+
+        QFileInfo dc2cbin{dcDir.absoluteFilePath("dc2c.bin")};
+
+
+        if (dc2cbin.exists()) {
+
+            QCryptographicHash md5gen(QCryptographicHash::Md5);
+            QByteArray ba_dc2cbin{};
+            {
+                QFile f{dc2cbin.absoluteFilePath()};
+                if (f.open(QIODevice::ReadOnly)) {
+                    md5gen.addData(f.readAll());
+                    ba_dc2cbin = md5gen.result();
+                    md5gen.reset();
+                }
+            }
+
+            if (ba_dc2cbin.size() > 0) {
+                QFileInfoList::const_iterator it;
+                for (it = fileInfoList.cbegin(); it != fileInfoList.cend(); ++it) {
+                    if (it->absoluteFilePath() != dc2cbin.absoluteFilePath()) {
+                        QFile f{it->absoluteFilePath()};
+                        if (f.open(QIODevice::ReadOnly)) {
+                            md5gen.addData(f.readAll());
+                            if (ba_dc2cbin == md5gen.result()) {
+                                dcCandidate.reset(new QString(f.fileName()));
+                                break;
+                            }
+                            md5gen.reset();
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    return dcCandidate;
+}
+
 } // namespace internal

documentation/atb-update-tool.tex

@@ -0,0 +1,138 @@
+\documentclass[fontsize=11
+pt,a4paper,draft]{scrartcl}[2003/01/01]
+\usepackage[english]{babel}
+\usepackage[T1]{fontenc}
+\usepackage[utf8]{inputenc}
+\usepackage{textcomp}
+\usepackage{blindtext}
+\usepackage{mathpazo}
+\usepackage{amsmath}
+\usepackage{listings}
+\usepackage{minted}
+\usepackage{setspace}
+\usepackage[acronym]{glossaries}
+\usepackage{euler}
+\usepackage[]{mdframed}
+\usepackage{tabularx}
+\usepackage{hyperref}
+\usepackage{pifont}
+\usepackage{float}
+\usepackage{multirow}
+\usepackage{uml}
+\usepackage{tikz,pgfplots}
+\usetikzlibrary{math}
+
+
+\global\mdfdefinestyle{default}{%
+linecolor=black,linewidth=1pt,%
+innertopmargin=20,innerbottommargin=20
+}
+
+\lstset{emph={any-of,all-off},emphstyle=\textbf}
+
+\title{ATB Update Tool(s)}
+
+%\author{Gerhard Hoffmann}
+\date{\today\\\normalsize Version 0.1.0}
+
+% \newacronym{pnd}{PND}{\textbf{p}ay \textbf{and} \textbf{d}isplay machine}
+% \newacronym{psa}{PSA}{pay and display machine}
+
+\newglossaryentry{ISMAS}{%
+    name=ISMAS,
+    description={\textbf{I}ntelligentes \textbf{S}ervice
+ 	\textbf{M}anagement und \textbf{A}bbrechnungs\textbf{S}ystem}
+}%
+
+\newglossaryentry{ATBUpdateCheck}{%
+    name=ATBUpdateCheck,
+    description={Tool for checking ISMAS connectivity and for checking
+	if an update-request has been scheduled.}%
+}%
+
+\newglossaryentry{ATBUpdateGit}{%
+    name=ATBUpdateGit,
+    description={}
+}%
+
+\newglossaryentry{ATBUpdateOpkg}{%
+    name=ATBUpdateOpkg,
+    description={}
+}%
+
+\newglossaryentry{ATBUpdateSync}{%
+    name=ATBUpdateSync,
+    description={}
+}%
+
+\newglossaryentry{ATBUpdateShow}{%
+    name=ATBUpdateShow,
+    description={}
+}%
+
+\newglossaryentry{ATBUpdateDC}{%
+    name=ATBUpdateDC,
+    description={}
+}%
+
+\newglossaryentry{ATBUpdateDCConfig}{%
+    name=ATBUpdateDCConfig,
+    description={}
+}%
+
+\makeglossaries
+
+\begin{document}
+\maketitle
+\tableofcontents
+
+
+\section*{History}
+\begin{table}[htbp]
+    \centering
+
+\begin{tabularx}{\textwidth}{|>{\hsize=.15\hsize}c|>{\hsize=.25\hsize}X|>{\hsize
+=.6\hsize}X|}
+        \hline
+        \textbf{Version}     & \textbf{Date}     & \textbf{Comment}     \\
+\hline
+        0.1.0     & \today        &          \\ \hline
+    \end{tabularx}
+\end{table}
+
+\pagebreak
+
+\section{Introduction}
+  
+\section{ATBUpdateCheck}
+\gls{ATBUpdateCheck} is used for two purposes: 
+\begin{enumerate}
+    \item Check \gls{ISMAS} can be reached (network).
+    \item Check if an update has been scheduled.
+\end{enumerate}
+
+\section{ATBUpdateGit}
+\gls{ATBUpdateGit}
+
+\section{ATBUpdateOpkg}
+\gls{ATBUpdateOpkg}
+
+\section{ATBUpdateSync}
+\gls{ATBUpdateSync}
+
+\section{ATBUpdateDCConfig}
+\gls{ATBUpdateDCConfig}
+
+\section{ATBUpdateDC}
+\gls{ATBUpdateDC}
+
+\section{ATBUpdateShow}
+\gls{ATBUpdateShow}
+
+\section{Known issues}
+
+\pagebreak
+% Print the glossary 
+\printglossaries 
+  
+\end{document}