Minor: add doxygen comments

remove corresponding run() method, i.e. privateTupdate().

.gitignore

@@ -1,3 +1,4 @@
 tags
 *.tags
 *.user
+documentation/

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

@@ -16,6 +16,7 @@
 #include <QFile>
 #include <QTextStream>
 #include <QDateTime>
+#include <QThread>
 
 #include <optional>
 
@@ -54,109 +55,125 @@ int main(int argc, char **argv) {
 
     QString connectionStatus{internal::ISMAS_NOT_CONNECTED};
     QString updateRequestStatus{internal::UPDATE_NOT_REQUESTED};
-    QDebug debug = qCritical();
 
-    if (std::optional<QString> result
+    {
-            = IsmasClient::sendRequestReceiveResponse(
+        QDebug debug = qCritical();
-                IsmasClient::APISM::DIRECT_PORT,
-                "#M=APISM#C=REQ_SELF#J={}")) {
-        QJsonDocument d = QJsonDocument::fromJson(result.value().toUtf8());
-        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()) {
-                    // value for "Broker"
-                    QString const &v = it->toString();
-                    if (v.contains(internal::ISMAS_CONNECTED, Qt::CaseInsensitive)) {
-                        connectionStatus = internal::ISMAS_CONNECTED;
-                    } else
-                    if (v.contains(internal::ISMAS_NOT_CONNECTED, Qt::CaseInsensitive)) {
-                        connectionStatus = internal::ISMAS_NOT_CONNECTED;
-                    } else
-                    if (v.contains(internal::ISMAS_DISCONNECTED, Qt::CaseInsensitive)) {
-                        connectionStatus = internal::ISMAS_NOT_CONNECTED;
-                    } else
-                    if (v.contains(internal::ISMAS_CONNECTION_IN_PROGRESS, Qt::CaseInsensitive)) {
-                        connectionStatus = internal::ISMAS_NOT_CONNECTED;
-                    } else
-                    if (v.contains(internal::ISMAS_DISCONNECTING, Qt::CaseInsensitive)) {
-                        connectionStatus = internal::ISMAS_NOT_CONNECTED;
-                    }
-                    break;
-                }
-            }
-        }
-    }
 
-    if (connectionStatus != internal::ISMAS_CONNECTED) {
+        int tries = 10;
-        if (internal::customerRepoExists() == false) {
-            debug.noquote() << internal::NO_CUSTOMER_REPOSITORY;
-        }
-    }
 
-    if (parser.isSet(updateRequestedOption)) {
+        while (--tries > 0) {
-        if (internal::customerRepoExists() == false) {
+            if (std::optional<QString> result
-            // if the customer repository does not exists, it does not matter is
+                    = IsmasClient::sendRequestReceiveResponse(
-            // ISMAS is connected or how the setting for the WAIT-button is.
+                        IsmasClient::APISM::DIRECT_PORT,
-            updateRequestStatus = internal::NO_CUSTOMER_REPOSITORY;
+                        "#M=APISM#C=REQ_SELF#J={}")) {
-        } else {
+                QJsonDocument d = QJsonDocument::fromJson(result.value().toUtf8());
-            if (connectionStatus == internal::ISMAS_CONNECTED) {
+                for (QString const &k : d.object().keys()) {
-                if (std::optional<QString> result
+                    if (k.contains("CMD_GET_APISMSTATUS_RESPONSE")) {
-                        = IsmasClient::sendRequestReceiveResponse(
+                        QJsonObject o = d.object()[k].toObject();
-                            IsmasClient::APISM::DIRECT_PORT,
+                        QJsonObject::const_iterator bit = o.find("Broker");
-                            "#M=APISM#C=REQ_ISMASPARAMETER#J={}")) {
+                        QJsonObject::const_iterator ismit = o.find("ISMAS");
-
+                        if (bit != o.constEnd() && ismit != o.constEnd()) {
-                    QJsonDocument d = QJsonDocument::fromJson(result.value().toUtf8());
+                            // value for "Broker"
-                    for (QString const &k : d.object().keys()) {
+                            QString const &v = bit->toString();
-                        if (k.contains("REQ_ISMASPARAMETER")) {
+                            bool ismas = ismit->toBool();
-                            QJsonObject o = d.object()[k].toObject();
+                            if (ismas && v.contains(internal::BROKER_CONNECTED, Qt::CaseInsensitive)) {
-
+                                connectionStatus = internal::ISMAS_CONNECTED;
-                            QJsonObject::const_iterator it = o.find("Aknoledge");
-                            if (it == o.constEnd()) continue;
-
-                            QString const &v = it->toString();
-                            if (v != "OK") break;
-
-                            for (QString const &m : d.object().keys()) { // request ack
-                                if (!m.contains("FileUpload", Qt::CaseInsensitive)) continue;
-                                QJsonObject o2 = d.object()[m].toObject();
-
-                                QJsonObject::const_iterator it2 = o2.find("TRG");
-                                if (it2 == o2.constEnd()) break;
-
-                                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;
+                            } else
+                            if (v.contains(internal::BROKER_NOT_CONNECTED, Qt::CaseInsensitive)) {
+                                connectionStatus = internal::ISMAS_NOT_CONNECTED;
+                            } else
+                            if (v.contains(internal::BROKER_DISCONNECTED, Qt::CaseInsensitive)) {
+                                connectionStatus = internal::ISMAS_NOT_CONNECTED;
+                            } else
+                            if (v.contains(internal::BROKER_CONNECTION_IN_PROGRESS, Qt::CaseInsensitive)) {
+                                connectionStatus = internal::ISMAS_NOT_CONNECTED;
+                            } else
+                            if (v.contains(internal::BROKER_DISCONNECTING, Qt::CaseInsensitive)) {
+                                connectionStatus = internal::ISMAS_NOT_CONNECTED;
                             }
                             break;
                         }
                     }
                 }
-            } else {
+            }
-                // not connected (so its unknown if update has been requested),
+
-                // and customer repository exists. Assume 'not requested'.
+            if (connectionStatus == internal::ISMAS_CONNECTED) {
-                updateRequestStatus = internal::UPDATE_NOT_REQUESTED;
+                break;
-                exitCode = -1;
+            }
+
+            QThread::sleep(5);
+        }
+
+        if (connectionStatus != internal::ISMAS_CONNECTED) {
+            if (internal::customerRepoExists() == false) {
+                debug.noquote() << internal::NO_CUSTOMER_REPOSITORY;
             }
         }
-        debug.noquote() << updateRequestStatus;
+
-    } else
+        if (parser.isSet(updateRequestedOption)) {
-    if (parser.isSet(ismasConnectOption)) {
+            if (internal::customerRepoExists() == false) {
-        debug.noquote() << connectionStatus;
+                // 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::UPDATE_INITIAL;
+            } else {
+                if (connectionStatus == internal::ISMAS_CONNECTED) {
+                    if (std::optional<QString> result
+                            = IsmasClient::sendRequestReceiveResponse(
+                                IsmasClient::APISM::DIRECT_PORT,
+                                "#M=APISM#C=REQ_ISMASPARAMETER#J={}")) {
+
+                        QJsonDocument d = QJsonDocument::fromJson(result.value().toUtf8());
+                        for (QString const &k : d.object().keys()) {
+                            if (k.contains("REQ_ISMASPARAMETER")) {
+                                QJsonObject o = d.object()[k].toObject();
+
+                                QJsonObject::const_iterator it = o.find("Aknoledge");
+                                if (it == o.constEnd()) continue;
+
+                                QString const &v = it->toString();
+                                if (v != "OK") break;
+
+                                for (QString const &m : d.object().keys()) { // request ack
+                                    if (!m.contains("FileUpload", Qt::CaseInsensitive)) continue;
+                                    QJsonObject o2 = d.object()[m].toObject();
+
+                                    QJsonObject::const_iterator it2 = o2.find("TRG");
+                                    if (it2 == o2.constEnd()) break;
+
+                                    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;
+                                }
+                                break;
+                            }
+                        }
+                    }
+                } else {
+                    // not connected (so its unknown if update has been requested),
+                    // and customer repository exists. Assume 'not requested'.
+                    updateRequestStatus = internal::UPDATE_NOT_REQUESTED;
+                    exitCode = -1;
+                }
+            }
+            debug.noquote() << updateRequestStatus;
+        } else
+        if (parser.isSet(ismasConnectOption)) {
+            debug.noquote() << connectionStatus;
+        }
     }
 
     return exitCode;

DownloadDCFirmware/DownloadDCFirmware.pro

@@ -77,7 +77,7 @@ contains( CONFIG, DesktopLinux ) {
 SOURCES += \
         main.cpp \
         ../common/src/message_handler.cpp \
-        ../UpdatePTUDevCtrl/commandline_parser.cpp \
+        ../common/src/commandline_parser.cpp \
         update.cpp \
         ../common/src/System.cpp \
         ../common/src/utils_internal.cpp \
@@ -86,7 +86,7 @@ SOURCES += \
 
 HEADERS += \
         ../common/include/message_handler.h \
-        ../UpdatePTUDevCtrl/commandline_parser.h \
+        ../common/src/commandline_parser.h \
         update.h \
         ../common/include/System.h \
         ../common/include/utils_internal.h \

DownloadDCFirmware/main.cpp

@@ -65,7 +65,6 @@ int main(int argc, char **argv) {
         setDebugLevel(LOG_NOTICE);
     }
 
-
     //return 0;
 
 /*
@@ -146,14 +145,11 @@ int main(int argc, char **argv) {
     QString libca;
 
     std::unique_ptr<QSettings> settings = internal::readSettings();
-    if (settings) {
-        settings->beginGroup("COMMON");
-        debug = settings->value("debug", false).toBool();
-        settings->endGroup();
 
-        settings->beginGroup("RUNTIME");
+    if (settings) {
-        noaction = settings->value("noaction", true).toBool();
+        settings->beginGroup("ATBUpdateDC");
-        workingDir = settings->value("workingdir", "/tmp").toBool();
+        debug = settings->value("debug", false).toBool();
+        workingDir = settings->value("workingdir", "/tmp").toString();
         libca = settings->value("libca", "/usr/lib/libCAslave.so").toString();
         settings->endGroup();
     }
@@ -172,7 +168,7 @@ int main(int argc, char **argv) {
             qInfo() << "using customer repository" << psaRepoDir;
         }
 
-        std::unique_ptr<QString> c = internal::dcCandidateToInstall();
+        std::unique_ptr<QString> c = internal::dcCandidateToInstall("/etc/dc/");
         if (c) {
             fi.setFile(*c);
             if (fi.exists() == false) {

DownloadDCFirmware/update.cpp

@@ -26,10 +26,12 @@
 #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}
@@ -130,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
+                QThread::msleep(10); //from 100ms to 20ms
-            // DownloadResult const res = sendStatus(m_hw->bl_wasSendingAddOK());
+//###################################################################################
-
+                res = sendStatus(m_hw->bl_wasSendingAddOK());
-            DownloadResult const res = DownloadResult::OK;
+            }
 
             if (res != DownloadResult::NOP) {
                 if (res == DownloadResult::ERROR) {
@@ -153,7 +155,7 @@ Update::sendNextAddress(int bNum) const {
             } else {
                 noAnswerCount += 1; // no answer by now
             }
-        }
+        } // while
         // wait max. about 3 seconds
         return DownloadResult::TIMEOUT;
     }
@@ -178,20 +180,20 @@ Update::sendNextDataBlock(QByteArray const &binary, int bNum) const {
 
     qInfo() << s.toUtf8().constData();
 
-    QThread::msleep(200);
+    QThread::msleep(20); //reduce from 200 to 50 ms
-    return DownloadResult::OK;
+    //############################################################################
 
-    // QByteArray b((const char *)(&local[0]), 64);
+    QByteArray b((const char *)(&local[0]), 64);
-    // qCritical() << "SNDB" << bNum << b.size() << b.toHex();
+    qCritical() << "SNDB" << bNum << b.size() << b.toHex();
 
     while (noAnswerCount <= 250) {
-        // TODO
-        // m_hw->bl_sendDataBlock(64, local);
 
-        // TODO
+        DownloadResult res = DownloadResult::OK;
-        // DownloadResult const res = sendStatus(m_hw->bl_wasSendingDataOK());
 
-        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) {
@@ -213,56 +215,63 @@ Update::sendNextDataBlock(QByteArray const &binary, int bNum) const {
 }
 
 bool Update::startBootloader() const {
-    qInfo() << nextTimePoint().toUtf8().constData() << "start boot loader";
+    qDebug() << "starting bootloader...";
-    QThread::msleep(1000);
-    qInfo() << nextTimePoint().toUtf8().constData() << "start boot loader ...done";
-    return true;
 
-#if 0
+    if (!m_debug) {
-    int nTry = 5;
+        int nTry = 10;
-    while (--nTry >= 0) {
+        while (--nTry >= 0) {
-        m_hw->bl_startBL();
+            m_hw->bl_startBL();
-        QThread::msleep(5000);
+            QThread::msleep(1000);
-        m_hw->bl_checkBL();
+            m_hw->bl_checkBL();
-        if (m_hw->bl_isUp()) {
+            if (m_hw->bl_isUp()) {
-            qInfo() << "starting bootloader...OK";
+                qInfo() << "starting bootloader...OK";
-            QThread::msleep(5000);
+                QThread::msleep(5000);
-            return true;
+                return true;
-        } else {
+            } else {
-            qCritical() << "bootloader not up (" << nTry << ")";
+                qCritical() << "bootloader not up (" << nTry << ")";
+                qCritical() << "IS BOOTLOADER INSTALLED ???";
+            }
         }
+        qCritical() << "starting bootloader...FAILED";
+        return false;
+    } else {
+        QThread::msleep(1000);
+        qInfo() << "starting bootloader...OK";
     }
-    qCritical() << "starting bootloader...FAILED";
+
-    return false;
+    return true;
-#endif
 }
 
 bool Update::stopBootloader() const {
-    qInfo() << nextTimePoint().toUtf8().constData() << "stopping bootloader";
-    QThread::msleep(1000);
-    qInfo() << nextTimePoint().toUtf8().constData() << "stopping bootloader ...done";
-    return true;
-
-#if 0
     qDebug() << "stopping bootloader...";
-    int nTry = 5;
+
-    while (--nTry >= 0) {
+    if (!m_debug) {
-        m_hw->bl_stopBL();
+        int nTry = 5;
-        QThread::msleep(500);
+        while (--nTry >= 0) {
-        if (!m_hw->bl_isUp()) {
+            m_hw->bl_stopBL();
-            qInfo() << "stopping bootloader...OK";
+            QThread::msleep(1000);
-            return true;
+            if (!m_hw->bl_isUp()) {
+                qInfo() << "stopping bootloader...OK";
+                return true;
+            }
         }
+        qCritical() << "stopping bootloader...FAILED";
+        return false;
+
+    } else {
+        QThread::msleep(1000);
+        qInfo() << "stopping bootloader...OK";
     }
-    qCritical() << "stopping bootloader...FAILED";
+
-    return false;
+    return true;
-#endif
 }
 
 bool Update::resetDeviceController() const {
     qInfo() << nextTimePoint().toUtf8().constData() << "resetting device controller";
-    // TODO
+
-    // m_hw->bl_rebootDC();
+    if (!m_debug) {
+        m_hw->bl_rebootDC();
+    }
 
     // wait maximally 3 seconds, before starting bootloader
     QThread::sleep(1);
@@ -280,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()
@@ -388,10 +397,14 @@ int Update::run() {
         qInfo() << "<DC-VERSION>" << Update::dcVersion(m_dcFileName);
     }
 
-    m_hw->dc_autoRequest(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) {
         m_totalBlocks = (((ba.size())%64)==0) ? (ba.size()/64) : (ba.size()/64)+1;
@@ -401,18 +414,16 @@ int Update::run() {
         // fill last block of data to be sent with 0xFF
         ba = ba.leftJustified(m_totalBlocks*64, (char)(0xFF));
 
-        // TODO
         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;
                 }
@@ -439,13 +450,28 @@ int Update::run() {
             qCritical() << "DownloadThread::run(): last result" << (int)sendStatus(m_hw->bl_wasSendingDataOK());
 #endif
         }
-        // TODO
         stopBootloader();   // there is no harm in stopping the bootloader even
                             // if starting the bootloader failed
-        qInfo() << nextTimePoint().toUtf8().constData() << "<DC-UPDATE-SUCCESS>";
+
-        return -(int)Result::SUCCESS;
+        // 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>";
+                stopBootloader();
+                return -(int)Result::SUCCESS;
+            }
+        }
     }
 
     qInfo() << nextTimePoint().toUtf8().constData() << "<DC-UPDATE-FAILURE>";
+    //To Do Error handling if Dc doesnt start after download
     return false;
 }

DownloadDCFirmware/update.h

@@ -30,7 +30,7 @@ class Update : public QObject {
     QString m_dcFileName{};
     hwinf *m_hw = nullptr;
     bool m_sys_areDCdataValid{};
-    bool m_debug;
+    bool m_debug{false};
     bool m_noaction;
 
     static QPluginLoader pluginLoader;

DownloadDCJsonFiles/DownloadDCJsonFiles.pro

@@ -1,7 +1,7 @@
 QT += core
 QT += serialport network
 
-TARGET = ATBDownloadDCJsonFiles
+TARGET = ATBUpdateJsonFiles
 
 VERSION="0.1.0"
 win32 {
@@ -79,13 +79,13 @@ contains( CONFIG, DesktopLinux ) {
 SOURCES += \
         main.cpp \
         ../UpdatePTUDevCtrl/message_handler.cpp \
-        ../UpdatePTUDevCtrl/commandline_parser.cpp \
+        ../common/src/commandline_parser.cpp \
         update.cpp \
         ../common/src/System.cpp
 
 HEADERS += \
         ../UpdatePTUDevCtrl/message_handler.h \
-        ../UpdatePTUDevCtrl/commandline_parser.h \
+        ../common/include/commandline_parser.h \
         update.h \
         ../common/include/System.h
 

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();
+    if (!filesToUpdate.empty()) {
-    // update.doUpdate(filesToUpdate, mountPath.has_value());
+        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.pro

@@ -16,11 +16,12 @@ GIT_COMMIT=$$system("git log -1 --format=oneline | cut -d' ' -f1")
 EXTENDED_VERSION="$${VERSION}-$${GIT_COMMIT}"
 
 
-INCLUDEPATH += \
+INCLUDEPATH += plugins \
-    plugins \
+    $${INCLUDEINTERFACES}/ \
-    $${INCLUDEINTERFACES} \
+    $${_PRO_FILE_PWD_}/../common/ \
     $${_PRO_FILE_PWD_}/../common/include
 
+
 CONFIG += c++17
 
 DEFINES+=APP_VERSION=\\\"$$VERSION\\\"
@@ -67,12 +68,14 @@ SOURCES += \
         message_handler.cpp \
         ../common/src/utils_internal.cpp \
         ../common/src/command.cpp \
+        ../common/src/commandline_parser.cpp \
         git_command.cpp
 
 HEADERS += \
         message_handler.h \
         ../common/include/utils_internal.h \
         ../common/include/command.h \
+        ../common/include/commandline_parser.h \
         git_command.h
 
 ##########################################################################################

Git/git_command.cpp

@@ -64,11 +64,13 @@ bool GitCommand::exec(QStringList const &options, int start_timeout, int finish_
 }
 
 bool GitCommand::check(int start_timeout, int finish_timeout) {
+    m_workingDirectory = customerRepoDir();
     QStringList const lst{"fsck"};
     return exec(lst, start_timeout, finish_timeout);
 }
 
 bool GitCommand::checkout(int start_timeout, int finish_timeout) {
+    m_workingDirectory = customerRepoDir();
     int const zoneNr = read1stLineOfFile("/mnt/system_data/zone_nr");
     if (zoneNr != -1) {
         QStringList const lst{"checkout", QString("zg1/zone%1").arg(zoneNr)};
@@ -91,11 +93,13 @@ bool GitCommand::clone(int start_timeout, int finish_timeout) {
 }
 
 bool GitCommand::pull(int start_timeout, int finish_timeout) {
+    m_workingDirectory = customerRepoDir();
     QStringList const lst{"pull"};
     return exec(lst, start_timeout, finish_timeout);
 }
 
 bool GitCommand::status(int start_timeout, int finish_timeout) {
+    m_workingDirectory = customerRepoDir();
     QStringList const lst{"status"};
     return exec(lst, start_timeout, finish_timeout);
 }

Git/main.cpp

@@ -8,6 +8,7 @@
 #include <QSettings>
 #include <QDir>
 #include <QDebug>
+#include <QDateTime>
 
 #include <QJsonDocument>
 #include <QJsonObject>
@@ -22,6 +23,7 @@
 #include "message_handler.h"
 #include "utils_internal.h"
 #include "git_command.h"
+#include "commandline_parser.h"
 
 int main(int argc, char **argv) {
     QByteArray const value = qgetenv("LC_ALL");
@@ -41,7 +43,7 @@ int main(int argc, char **argv) {
         setDebugLevel(LOG_NOTICE);
     }
 
-    QCommandLineParser parser;
+    CommandLineParser parser;
     parser.setApplicationDescription("git-commands for the update-system");
 
     QCommandLineOption const checkCustomerRepositoryOption{"check"};
@@ -56,6 +58,54 @@ int main(int argc, char **argv) {
 
     QCommandLineOption verboseOption{parser.addVersionOption()};
     parser.process(a);
+    parser.readSettings();
+
+#if 0
+    // note: also used in initEnv().
+
+    QString repositoryUrl = parser.repositoryUrl();
+
+    if (repositoryUrl.endsWith('/')) {
+        repositoryUrl.chop(1);
+    }
+
+    if (!repositoryUrl.isEmpty()) {
+        qInfo() << "customer repository url" << repositoryUrl;
+    } else {
+        qCritical() << "ERROR customer repository url empty. git commands might fail.";
+    }
+
+    if (repositoryUrl.contains("ptu-config.atb-comm.de")) {
+        QString gitSSHCommand("");
+        QByteArray const v = qgetenv("GIT_SSH_COMMAND");
+        if (v.isEmpty()) {
+            QString sshKeyFile("/opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig");
+            if (QFileInfo(sshKeyFile).exists()) {
+                if (qgetenv("GIT_SSH_COMMAND").isNull()) {
+                    gitSSHCommand = "ssh -i /opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig";
+                    if (!qputenv("GIT_SSH_COMMAND", QByteArray(gitSSHCommand.toStdString().c_str()))) {
+                        qCritical() << "ERROR: GIT_SSH_COMMAND not put into env. Exiting...";
+                        return -1;
+                    }
+                }
+            } else {
+                qCritical() << "ERROR ssh-key-file" << sshKeyFile << "does not exists. Exiting...";
+                return -1;
+            }
+        } else {
+            gitSSHCommand = QString(v.toStdString().c_str());
+            qInfo() << "GIT_SSH_COMMAND already set in enviroment:" << gitSSHCommand;
+            if (gitSSHCommand != "ssh -i /opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig") {
+                qCritical() << "ERROR" << gitSSHCommand << "wrong. Exiting...";
+                return -1;
+            }
+        }
+
+        if (!gitSSHCommand.isEmpty()) {
+            qInfo() << "GIT_SSH_COMMAND .........." << gitSSHCommand;
+        }
+    }
+#endif
 
     if (parser.isSet(verboseOption)) {
         parser.showVersion();
@@ -108,12 +158,13 @@ int main(int argc, char **argv) {
             if (!gitCmd.clone()) {
                 return -3;
             }
+            if (!gitCmd.checkout()) {
+                return -2;
+            }
+            qCritical() << internal::GIT_CUSTOMER_REPO_CLONED;
+            return internal::GIT_CLONED_CODE;
         }
     }
 
-    //int const machineNr = read1stLineOfFile("/mnt/system_data/machine_nr");
-    //int const customerNr = read1stLineOfFile("/mnt/system_data/cust_nr");
-    //int const zoneNr = read1stLineOfFile("/mnt/system_data/zone_nr");
-
     return 0;
 }

UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro

@@ -294,9 +294,9 @@ SOURCES += \
         process/show_software_status_command.cpp \
         message_handler.cpp \
         worker.cpp \
-        commandline_parser.cpp \
         work_process_list.cpp \
         $${_PRO_FILE_PWD_}/../common/src/utils_internal.cpp \
+        $${_PRO_FILE_PWD_}/../common/src/commandline_parser.cpp \
         $${_PRO_FILE_PWD_}/../common/ismas/ApismClient.cpp \
         $${_PRO_FILE_PWD_}/../common/ismas/ApismTcpClient.cpp \
         $${_PRO_FILE_PWD_}/../common/ismas/ApismClientForUpdate.cpp
@@ -323,9 +323,10 @@ HEADERS += \
         process/show_software_status_command.h \
         message_handler.h \
         worker.h \
-        commandline_parser.h \
         work_process_list.h \
         $${_PRO_FILE_PWD_}/../common/include/utils_internal.h \
+        $${_PRO_FILE_PWD_}/../common/include/commandline_parser.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 \

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,6 +49,35 @@
 #define SERIAL_PORT "ttyUSB0"
 #endif
 
+/**
+ * @mainpage ATB-Update-Tool Documentation
+ * \section intro_sec Introduction
+ *  The ATB update tool consistes of several binaries, which are executed in
+ *  order:
+ *  * \ref ATBUpdateTool
+ *  * \ref ATBUpdateCheck
+ *  * \ref ATBUpdateGit
+ *  * \ref ATBUpdateSync
+ *  * \ref ATBUpdateOpkg
+ *  * \ref ATBUpdateDC
+ *  * \ref ATBUpdateJsonFiles
+ *  * \ref ATBUpdateShow
+ *
+ *  The binaries are started synchonously as child processes of \ref ATBUpdateTool:
+ *  each binary will finish before the next one is started.
+ *  The output for the child process is captured in \ref ATBUpdateTool, and
+ *  optionally shown in the GUI presemted to the user.
+ *
+ * - \page ATBUpdateTool
+ * - \page ATBUpdateCheck
+ * - \page ATBUpdateGit
+ * - \page ATBUpdateSync
+ * - \page ATBUpdateOpkg
+ * - \page ATBUpdateDC
+ * - \page ATBUpdateJsonFiles
+ * - \page ATBUpdateShow
+ */
+
 // argv[1]: file to send to dc
 int main(int argc, char *argv[]) {
     QByteArray const value = qgetenv("LC_ALL");

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"
@@ -21,10 +22,45 @@
 #define UPDATE_CUSTOMER_REPOSITORY  2
 #define INSTALL_SW_PACKETS_DRY_RUN  3
 #define INSTALL_SW_PACKETS          4
-#define INSTALL_DC_CONFIGURATION    5
+#define UPDATE_DC                   5
 #define SYNCHRONIZE_REPOSITORY      6
-#define UPDATE_DC                   7
+#define INSTALL_DC_CONFIGURATION    7
 
+#define CHECK_ISMAS_CONNECT_PERCENT_START   ( 1)
+#define CHECK_ISMAS_CONNECT_PERCENT_END     (10)
+
+#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)
@@ -32,19 +68,24 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
     , m_worker(worker)
     , 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[INSTALL_DC_CONFIGURATION] = "Install DC configuration ";
-    m_updateSteps[SYNCHRONIZE_REPOSITORY] = "Synchronize repository/filesystem ";
     m_updateSteps[UPDATE_DC] = "Update DC ";
+    m_updateSteps[SYNCHRONIZE_REPOSITORY] = "Synchronize repository/filesystem ";
+    m_updateSteps[INSTALL_DC_CONFIGURATION] = "Install DC configuration ";
 
     QString text{};
     for (int i = 0; i < m_updateSteps.size(); ++i) {
@@ -274,6 +315,7 @@ void MainWindow::onShowTariffUpdate(QString) {
 void MainWindow::onShowISMASConnectivity(QString status) {
     // qCritical() << __func__ << ":" << __LINE__ << "status" << status;
 
+    QString stepResult;
     QString s = m_updateSteps[CHECK_BACKEND_CONNECTION].trimmed();
 
     bool const custRepoExists = internal::customerRepoExists();
@@ -281,24 +323,46 @@ void MainWindow::onShowISMASConnectivity(QString status) {
     if (status.contains(UpdateCommand::ISMAS_CONNECTED, Qt::CaseInsensitive)) {
         if (custRepoExists) {
             s += " <font color='Green'>connected</font>";
+            stepResult = "ISMAS connected";
         } else {
             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 += " <font color='Blue'>NOT CONNECTED</font>";
+        stepResult = "ISMAS not connected";
     } else
     if (status.contains(UpdateCommand::ISMAS_CONNECTION_IN_PROGRESS, Qt::CaseInsensitive)) {
         s += " <font color='Green'>connecting</font>";
+        stepResult = "connecting ISMAS";
     } else
     if (status.contains(UpdateCommand::ISMAS_NOT_CONNECTED, Qt::CaseInsensitive)) {
         if (custRepoExists) {
             s += " <font color='Red'>NOT CONNECTED. STOP</font>";
+            stepResult = "ISMAS not connected";
         } else {
             s += " <font color='Red'>not connected.&nbsp;(initial configuration)</font>";
+            stepResult = "ISMAS not connected (initial configuration)";
         }
     } else {
         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;
@@ -307,6 +371,20 @@ void MainWindow::onShowISMASConnectivity(QString status) {
         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) {
@@ -458,6 +536,7 @@ void MainWindow::onShowUpdateDCFirmware(QString status) {
 void MainWindow::onShowUpdateRequest(QString status) {
     // qCritical() << __func__ << ":" << __LINE__ << "status" << status;
 
+    //ui->updateProgress->setValue(CHECK_UPDATE_REQUEST_PERCENT_START);
     QString s = m_updateSteps[CHECK_UPDATE_REQUEST].trimmed();
 
     bool const custRepoExists = internal::customerRepoExists();
@@ -469,17 +548,20 @@ void MainWindow::onShowUpdateRequest(QString status) {
             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 += " <font color='Green'>requested</font>";
         } else {
             s += " <font color='Blue'>requested&nbsp;(initial configuration)</font>";
         }
     } else
-    if (status.contains(UpdateCommand::UPDATE_NOT_NECESSARY, Qt::CaseInsensitive)) {
+    if (status.contains(internal::UPDATE_INITIAL, Qt::CaseInsensitive)) {
+        s += " <font color='Green'>requested&nbsp;(initial configuration)</font>";
+    } else
+    if (status.contains(internal::UPDATE_NOT_NECESSARY, Qt::CaseInsensitive)) {
         s += " <font color='Green'>not necessary</font>";
     } else
-    if (status.contains(UpdateCommand::NO_CUSTOMER_REPOSITORY, Qt::CaseInsensitive)) {
+    if (status.contains(internal::NO_CUSTOMER_REPOSITORY, Qt::CaseInsensitive)) {
         s += " <font color='Blue'>UNKNOWN (ISMAS not connected)</font>";
     } else {
         s += " <font color='Red'>UNKNOWN</font>";
@@ -491,6 +573,7 @@ void MainWindow::onShowUpdateRequest(QString status) {
         s += m_updateSteps[i] + "<br />";
     }
     ui->stepLabel->setText(s);
+    //ui->updateProgress->setValue(CHECK_UPDATE_REQUEST_PERCENT_END);
 }
 
 void MainWindow::onShowISMASChecks(QString) {

UpdatePTUDevCtrl/mainwindow.h

@@ -6,6 +6,7 @@
 #include <QStatusBar>
 #include <QVector>
 #include <QString>
+#include <QProgressBar>
 
 QT_BEGIN_NAMESPACE
 namespace Ui { class MainWindow; }
@@ -39,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 = "");
@@ -69,6 +71,7 @@ public slots:
     void onSetDcDownloadProgress(int);
     void onShowSummary(QString);
     void onSummary();
+    void onFileChanged(QString const&);
 #if EMERGENCY_LEAVE_BL==1
     void emergencyLeaveBL();
 #endif
@@ -103,5 +106,6 @@ private:
 
     QVector<QString> m_updateSteps{};
 
+    QFile m_updateLog;
 };
 #endif // MAINWINDOW_H

UpdatePTUDevCtrl/process/check_and_fetch_customer_repository_command.cpp

@@ -49,6 +49,9 @@ void CheckAndFetchCustomerRepositoryCommand::readyReadStandardOutput() {
             } else
             if (m_commandResult.contains(internal::GIT_CUSTOMER_REPO_UPDATED)) {
                 //emit w->showCustRepoStatus(internal::GIT_CUSTOMER_REPO_UPDATED);
+            } else
+            if (m_commandResult.contains(internal::GIT_CUSTOMER_REPO_CLONED)) {
+                //emit w->showCustRepoStatus(internal::GIT_CUSTOMER_REPO_CLONED);
             }
         }
     }

UpdatePTUDevCtrl/process/check_update_activation_command.cpp

@@ -34,6 +34,9 @@ void CheckUpdateActivationCommand::readyReadStandardOutput() {
             } else
             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/update_command.cpp

@@ -45,10 +45,6 @@ void UpdateCommand::finished(int exitCode, QProcess::ExitStatus exitStatus) {
         //static constexpr const int PERCENT_UPDATE_DC{80};
         //static constexpr const int PERCENT_SHOW_FINAL_STATUS{90};
 
-        qCritical() << __func__ << ":" << __LINE__ << m_command
-                    << "exitCode" << exitCode
-                    << "exitStatus" << exitStatus;
-
         if (exitCode == 0 && exitStatus == QProcess::ExitStatus::NormalExit) {
             if (m_command.contains("ATBUpdateCheck")) {
 
@@ -127,10 +123,19 @@ void UpdateCommand::finished(int exitCode, QProcess::ExitStatus exitStatus) {
 
             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 {
             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.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.cpp

@@ -4,12 +4,12 @@
 #include <limits>
 #include <QDebug>
 
-unsigned WorkList::nextExecIndex() const {
+//unsigned WorkList::nextExecIndex() const {
-    if (m_workList.size() > 0 && m_workListIndex < (m_workList.size() - 1)) {
+//    if (m_workList.size() > 0 && m_workListIndex < (m_workList.size() - 1)) {
-        return m_workListIndex + 1;
+//        return m_workListIndex + 1;
-    }
+//    }
-    return std::numeric_limits<unsigned>::max();
+//    return std::numeric_limits<unsigned>::max();
-}
+//}
 
 bool WorkList::nextExec() const {
     return m_workListIndex < m_workList.size();
@@ -17,12 +17,17 @@ bool WorkList::nextExec() const {
 
 bool WorkList::exec(bool last) {
     if (last == false) {
+        // if not the last entry in the worklist
         if (nextExec()) {
+            // and there is a next entry (a binary) to execute, start the
+            // binary if the specified working directory.
             m_workList[m_workListIndex]->start("/opt/app/tools/atbupdate");
+            // update to point to next entry
             m_workListIndex += 1;
             return true;
         }
     } else {
+        // start the last entry in the worklist
         m_workList.back()->start("/opt/app/tools/atbupdate");
         m_workListIndex = std::numeric_limits<unsigned>::max();
         return true;

UpdatePTUDevCtrl/work_process_list.h

@@ -5,18 +5,42 @@
 #include <memory>
 
 class UpdateCommand;
+
+
+/**
+ * @brief This class is responsible for calling the several binaries
+ * \ref ATBUpdateTool consists of.
+ *
+ * This class maintains a worklist, which conists of entries of type UpdateCommand.
+ *
+ * @see UpdateCommand
+ */
 class WorkList {
-public:
+    /**
+     * @brief Actual worklist of items to be eecuted.
+     */
     std::vector<std::unique_ptr<UpdateCommand>> m_workList;
+public:
     unsigned m_workListIndex{0};
 
     WorkList() = default;
 
+    /**
+     * \brief Put new work item into worklist.
+     *
+     * \tparam arg Work item to be added to worklist.
+     */
     template<typename T>
     void push_back(T&& arg) {
         m_workList.push_back(std::forward<T>(arg));
     }
 
+    /**
+     * \brief Check if worklist is empty.
+     *
+     * \retval true if worklist is empty.
+     * \retval false otherwise.
+     */
     bool empty() const { return m_workList.empty(); }
 
     // move constructor: pass in classes derived from UpdateCommand
@@ -28,9 +52,31 @@ public:
     //  , m_workListIndex(0) {
     //}
 
-    unsigned nextExecIndex() const;
+    ///**
+    // * \brief Put new work item into worklist.
+    // *
+    // */
+    //unsigned nextExecIndex() const;
+
+    /**
+     * \brief Put new work item into worklist.
+     *
+     */
     bool nextExec() const;
+
+    /**
+     * \brief Put new work item into worklist.
+     *
+     * \param last
+     */
     bool exec(bool last=false);
+
+    /**
+     * \brief Get current size of worklist.
+     *
+     * \retval Current size of worklist.
+     */
+    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"
@@ -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,8 +225,8 @@ Worker::Worker(int customerNr,
     int next = 1;
     m_workList.push_back(
                 std::make_unique<CheckIsmasConnectivityCommand>(
-                    QString("echo ATBUpdateCheck --ismas-connected")
+                    //QString("echo ATBUpdateCheck --ismas-connected")
-                    //QString("/opt/app/tools/atbupdate/ATBUpdateCheck --ismas-connected")
+                    QString("/opt/app/tools/atbupdate/ATBUpdateCheck --ismas-connected")
                     , this, ++next));
 
     // *** check if update activated in ISMAS ***
@@ -211,8 +234,8 @@ Worker::Worker(int customerNr,
     // if the update has been activated via ISMAS.
     m_workList.push_back(
                 std::make_unique<CheckUpdateActivationCommand>(
-                    QString("echo ATBUpdateCheck --update-requested")
+                    // QString("echo ATBUpdateCheck --update-requested")
-                    //QString("/opt/app/tools/atbupdate/ATBUpdateCheck --update-requested")
+                    QString("/opt/app/tools/atbupdate/ATBUpdateCheck --update-requested")
                     , this, ++next));
 
     // *** check and fetch git-customer repository ***
@@ -221,16 +244,16 @@ Worker::Worker(int customerNr,
     //      the corresponding branch, and check the integrity of the repository.
     m_workList.push_back(
                 std::make_unique<CheckAndFetchCustomerRepositoryCommand>(
-                    QString("echo ATBUpdateGit")
+                    // QString("echo ATBUpdateGit")
-                    // QString("/opt/app/tools/atbupdate/ATBUpdateGit")
+                    QString("/opt/app/tools/atbupdate/ATBUpdateGit")
                     , this, ++next));
 
     // *** exec opkg-commands (noaction) ***
     // NOTE: first run the opkg commands with no action -> dry-run
     m_workList.push_back(
                 std::make_unique<ExecOpkgCommand>(
-                    QString("echo ATBUpdateOpkg --noaction")
+                    // QString("echo ATBUpdateOpkg --noaction")
-                    // QString("/opt/app/tools/atbupdate/ATBUpdateOpkg --noaction")
+                    QString("/opt/app/tools/atbupdate/ATBUpdateOpkg --noaction")
                     , this, ++next, true));
 
     // *** exec opkg-commands ***
@@ -241,12 +264,12 @@ Worker::Worker(int customerNr,
                     // QString("/opt/app/tools/atbupdate/ATBUpdateOpkg")
                     , this, ++next, false));
 
-    // *** send json files down to device controller ***
+    // send device-controller firmware down to device-controller-hardware
     m_workList.push_back(
-                std::make_unique<UpdateJsonCommand>(
+                std::make_unique<UpdateDCCommand>(
-                    QString("echo ATBDownloadDCJsonFiles")
+                    // QString("echo ATBUpdateDC")
-                    //QString("/opt/app/tools/atbupdate/ATBDownloadDCJsonFiles --set-ppid %1").arg(QCoreApplication::applicationPid())
+                    QString("/opt/app/tools/atbupdate/ATBUpdateDC")
-                    , this, ++next, false));
+                    , this, ++next));
 
     // sync json files in repo etc-directory with /etc fs-directory
     m_workList.push_back(
@@ -254,12 +277,15 @@ Worker::Worker(int customerNr,
                     QString("echo ATBUpdateSync")
                     , this, ++next));
 
-    // send device-controller firmware down to device-controller-hardware
+    // *** send json files down to device controller ***
     m_workList.push_back(
-                std::make_unique<UpdateDCCommand>(
+                std::make_unique<UpdateJsonCommand>(
-                    // QString("echo ATBUpdateDC")
+                    //QString("echo ATBUpdateJsonFiles")
-                    QString("/opt/app/tools/atbupdate/ATBUpdateDC")
+                    //QString("/opt/app/tools/atbupdate/ATBUpdateJsonFiles --set-ppid %1").arg(QCoreApplication::applicationPid())
-                    , this, ++next));
+
+                    // use customer repo
+                    QString("/opt/app/tools/atbupdate/ATBUpdateJsonFiles").arg(QCoreApplication::applicationPid())
+                    , this, ++next, false));
 
     // show/send software-status
     m_workList.push_back(
@@ -301,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,
+        QProgressBar *progressBar = m_mainWindow->progressBar();
-            new ProgressEvent(this, progress));
+        if (progressBar) {
+            progressBar->setValue(progress);
+        }
+        //QApplication::postEvent(m_mainWindow,
+        //    new ProgressEvent(this, progress));
     }
 }
 
@@ -322,11 +429,11 @@ void Worker::stopProgressLoop() {
     displayProgressInMainWindow(MainWindow::STOP_PROGRESS_LOOP);
 }
 
-static std::once_flag once;
+//static std::once_flag once;
-void Worker::run() {
+//void Worker::run() {
     // user should not start the update process several times
-    std::call_once(once, &Worker::privateUpdate, this);
+//    std::call_once(once, &Worker::privateUpdate, this);
-}
+//}
 
 bool Worker::isRepositoryCorrupted() {
     QDir customerRepository(m_customerRepository);
@@ -373,6 +480,7 @@ bool Worker::repairCorruptedRepository() {
     return true;
 }
 
+#if 0
 void Worker::privateUpdate() {
     if (!m_mainWindow) {
         Utils::printCriticalErrorMsg("m_mainWindow NOT SET");
@@ -650,6 +758,7 @@ void Worker::privateUpdate() {
     // final messages: see destructor of UpdateProcessRunning subclass
     m_lastFailedUpdateStep = UPDATE_STEP::NONE;
 }
+#endif
 
 bool Worker::updateTriggerSet() {
     // repository is existent and not corrupted. check now if the ISMAS-trigger

UpdatePTUDevCtrl/worker.h

@@ -13,6 +13,7 @@
 #include <QThread>
 #include <QByteArray>
 #include <QScopedPointer>
+#include <QFileSystemWatcher>
 
 #include <optional>
 #include <initializer_list>
@@ -142,7 +143,21 @@ class Command;
 class Update;
 class MainWindow;
 class hwinf;
-class Worker : public QThread{
+
+/*!
+    \class Worker
+    \brief The worker class ties together the parts the update tool consists of:
+         * ATBUpdateTool
+         * ATBUpdateCheck
+         * ATBUpdateGit
+         * ATBUpdateSync
+         * ATBUpdateOpkg
+         * ATBUpdateDC
+         * ATBUpdateJsonFiles
+         * ATBUpdateShow
+         *
+*/
+class Worker : public QObject {
     Q_OBJECT
 
     int const m_customerNr;
@@ -230,6 +245,7 @@ class Worker : public QThread{
     int sendUpdateSucceededAndActivated();
     int sendFinalResult();
 
+public:
     struct UpdateProcessRunning {
         Worker *m_worker;
 
@@ -394,6 +410,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);
@@ -428,6 +452,29 @@ public:
     static const QString UPDATE_STEP_WRONG;
     static const QString UPDATE_STEP_SUCCESS;
 
+    /**
+     * Create a new Worker object to be used as the controlling instance of the
+     * update process.
+     *
+     * @brief Constructor
+     * @param customerNr
+     * @param machineNr
+     * @param zoneNr
+     * @param repositoryUrl
+     * @param branchName
+     * @param pluginDir
+     * @param pluginName
+     * @param workingDir
+     * @param noUpdatePsaHardware
+     * @param alwaysDownloadConfig
+     * @param alwaysDownloadDC
+     * @param dryRun
+     * @param parent
+     * @param serialInterface
+     * @param baudrate
+     *
+     * @todo einige parameter werden wohl ueberfluessig
+     */
     explicit Worker(int customerNr, // 281
                     int machineNr,
                     int zoneNr,
@@ -522,6 +569,7 @@ private slots:
     bool syncCustomerRepositoryAndFS();
     // bool sendIsmasLastVersionNotification(int progress);
     bool saveLogFile();
+    void onFileChanged(QString const&);
 
 public slots:
     void readyReadStandardOutput();
@@ -535,6 +583,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;
 
@@ -1636,8 +1687,12 @@ private:
                         smap[UPDATE_STEP::UPDATE_FINALIZE],
                         instance->m_ismasMsg.join(' ').toStdString().c_str(),
                         instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
-            ismasClient.sendRequestReceiveResponse(
+            // send ACTIVATE message 3x -> reorder should be impossible now
-                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
+            for (int i = 0; i < 3; ++i) {
+                ismasClient.sendRequestReceiveResponse(
+                    IsmasClient::APISM::DB_PORT, ismasUpdateNews);
+                QThread::msleep(1000);
+            }
         } break;
         case UPDATE_STEP::UPDATE_NOT_NECESSARY: {
             ismasClient.setProgressInPercent(_UPDATE_NOT_NECESSARY + _UPDATE_NOT_NECESSARY_CORRECTION);

common/include/commandline_parser.h

@@ -56,6 +56,9 @@ public:
     QCommandLineParser &parser() { return m_parser; }
     QCommandLineParser const &parser() const { return m_parser; }
     void process(const QCoreApplication &app) { m_parser.process(app); }
+    bool isSet(QCommandLineOption const &o) { return m_parser.isSet(o); }
+    bool isSet(QString const& s) {return m_parser.isSet(s); }
+    bool addOption(QCommandLineOption const &o) { return m_parser.addOption(o); }
     QString const &iniFileName() const { return m_iniFileName; }
     void readSettings();
     QString repositoryUrl();

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

@@ -9,6 +9,7 @@ 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"};
@@ -24,10 +25,17 @@ namespace internal {
     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 int GIT_CLONED_CODE{3};
 
     static constexpr const char *GIT_CUSTOMER_REPO_CHECKOUT_ERROR{"checkout error"};
     static constexpr const char *GIT_CUSTOMER_REPO_PULL_ERROR{"pull error"};
@@ -35,6 +43,7 @@ namespace internal {
     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_CUSTOMER_REPO_CLONED{"repository cloned"};
     static constexpr const char *GIT_UPDATED{"updated"};
 
     static constexpr const char *EXEC_OPKG_COMMANDS_SUCCESS{"success"};

common/src/commandline_parser.cpp

@@ -6,7 +6,7 @@
 #include <QFile>
 
 CommandLineParser::CommandLineParser()
-  : m_repositoryUrl("https://git.mimbach49.de/GerhardHoffmann")
+  : m_repositoryUrl("gitea@ptu-config.atb-comm.de:ATB")
   , m_plugInDir("/usr/lib/")
   , m_plugInName("libCAslave.so")
   , m_workingDir("/opt/app/tools/atbupdate/")

common/src/utils_internal.cpp

@@ -64,7 +64,8 @@ QString branchName() {
 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{settings->applicationName() + ".ini"};
+    QString const fileName{"ATBUpdateTool.ini"};
     QDir d;
 
     if (!optionalDirName.isEmpty()) {
@@ -116,6 +117,8 @@ std::unique_ptr<QSettings> readSettings(QString const &optionalDirName) {
 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()) {
 

documentation/atb-update-tool.tex

@@ -1,135 +0,0 @@
-\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
-	the customer repository}%
-}%
-
-\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}
-\gls{ISMAS}
-
-\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}

misc/atbupdatetool.service

@@ -0,0 +1,19 @@
+[Unit]
+Description=ATB update tool
+
+[Service]
+Environment=XDG_RUNTIME_DIR=/var/run/user/0
+# get START_DATE of service. Use '-' to ensure that file exists
+EnvironmentFile=-/tmp/start_date.env
+# EnvironmentFile=-/tmp/stop_date.env
+ExecStartPre=/bin/bash -c 'printf "%%s\n" START_DATE=$(date +"%%Y-%%m-%%d%%H:%%M:%%S") > /tmp/start_date.env'
+
+ExecStart=/opt/app/tools/atbupdate/ATBUpdateTool --platform wayland
+
+ExecStartPre=dbus-send --system --type=method_call --dest='eu.atb.ptu.systemcontrol' '/systemcontrol' eu.atb.ptu.systemcontrol.startBackgroundTask string:UPDATE_TOOL
+ExecStopPost=dbus-send --system --type=method_call --dest='eu.atb.ptu.systemcontrol' '/systemcontrol' eu.atb.ptu.systemcontrol.finishedBackgroundTask string:UPDATE_TOOL
+# execute script to check if update-tool contains errors not sent to ISMAS.
+# ExecStopPost=/bin/bash -c 'printf "%%s\n" STOP_DATE=$(date +"%%Y-%%m-%%d%%H:%%M:%%S") > /tmp/stop_date.env'
+ExecStopPost=/bin/bash -c '[ -f /opt/app/tools/atbupdate/on_update_failure.sh ] && /opt/app/tools/atbupdate/on_update_failure.sh ${START_DATE}'
+
+#StandardOutput=????

misc/on_update_failure.sh

@@ -0,0 +1,184 @@
+#!/bin/bash
+
+# set -x
+
+#
+#############################################################################
+# Check if the ATBUpdateTool(.service) did not send U0001 (sucess),
+# U0002 (activated) or U0003 (error) to ISMAS, including the case that the
+# tool did not crash or was not killed under other circumstances.
+#
+# This script will be called in the associated atbupdatetool.service (see
+# /lib/systemd/system/atbupdatetool.service).
+#
+###############################################################################
+
+readonly OUT_FILE=/tmp/out.txt
+readonly SCRIPT_NAME=$(basename $0)
+
+if [ -z "$START_DATE" ]
+then
+    START_DATE=$(date +"%Y-%m-%d00:00:00")
+fi
+
+if [ -z "$STOP_DATE" ]
+then
+    STOP_DATE=$(date +"%Y-%m-%d%H:%M:%S")
+fi
+
+echo "EXIT_CODE=$EXIT_CODE"
+echo "SERVICE_RESULT=$SERVICE_RESULT"
+echo "EXIT_STATUS=$EXIT_STATUS"
+echo "START_DATE=$START_DATE"
+echo "STOP_DATE=$STOP_DATE"
+
+
+last_cmd_event () {
+    # output json; look for start of CMD_EVENT; look for }}; extract everything between; finally re-add }}.
+    # could also look for ">>>", but this might change in the future.
+    local json=$(\
+	    journalctl -u atbupdatetool --since="$START_DATE" --until="$STOP_DATE" --output=json-pretty |\
+	    grep "#M=APISM#C=CMD_EVENT#J="                                                              |\
+	    awk '{split($0, a, "#M=APISM#C=CMD_EVENT#J="); print a[2]}'                                 |\
+	    awk '{split($0, a, /\}[\s]*\}/); print a[1]}'                                               |\
+	    tr -d '\\'                                                                                  |\
+	    tail -1)
+    json+="}}"
+    echo "$json"
+}
+
+last_percent_value () {
+    echo $(cat $OUT_FILE | sed -n "s/\(^.*\)\(\"PERCENT\"\\s*:\)\(\\s*[0-9]\+\)\(.*$\)/\3/p" | xargs | awk '{print $NF}')
+}
+
+last_step () {
+    echo $(cat $OUT_FILE | sed -n "s/\(^.*\)\(\"PERCENT\"\\s*:\)\(\\s*[0-9]\+\)\(.*$\)/\1\2\3\4/p" | tail -1 | awk '{split($0, a, ","); print a[8]}' | awk '{split($0, b, " : "); print b[2]}' | tr -d '"\\')
+}
+
+last_step_result () {
+    echo $(cat $OUT_FILE | sed -n "s/\(^.*\)\(\"PERCENT\"\\s*:\)\(\\s*[0-9]\+\)\(.*$\)/\1\2\3\4/p" | tail -1 | awk '{split($0, a, ","); print a[9]}' | awk '{split($0, b, " : "); print b[2]}' | tr -d '"\\')
+}
+
+pid_atbupdatetool () {
+    echo $(cat $OUT_FILE | sed -n "s/\(^.*\)\(ATBUpdateTool\[\)\(\\s*[0-9]\+\)\(\].*$\)/\3/p" | uniq)
+}
+
+last_event () {
+    echo $(cat $OUT_FILE | sed -n "s/\(^.*\)\(\"PERCENT\"\\s*:\)\(\\s*[0-9]\+\)\(.*$\)/\1\2\3\4/p" | tail -1 | awk '{split($0, a, ","); print a[4]}' | awk '{split($0, b, ":"); print b[2]}' | tr -d ' ' | tr -d '"\\') 
+}
+
+sendU0003 () {
+    LAST_CMD_EVENT=$(last_cmd_event)
+    echo "LAST=$LAST_CMD_EVENT"
+    
+    local json_detected=0
+    local temp
+    local x
+
+    if [[ ! -z "$LAST_CMD_EVENT" ]]
+    then
+       temp=$(mktemp -p /tmp)
+       echo "$LAST_CMD_EVENT" > "$temp"
+       x=$(jq .EVENT $temp)
+       if [ $? -eq 0 ]; then
+           json_detected=1
+       fi
+    fi
+
+    if [ $json_detected -eq 1 ]
+    then
+        # local pid=$(jq .EVENT_ID $temp)
+
+	# if json has been detected, use "jq".
+
+        x=$(jq .PARAMETER.PERCENT $temp | tr -d '"')
+        [[ -z "$x" ]] && PERCENT=0 || PERCENT=$x
+
+        x=$(jq .PARAMETER.STEP $temp | tr -d '"')
+        [[ -z "$x" ]] && STEP="unknown" || STEP="$x"
+       
+        x=$(jq .PARAMETER.STEP_RESULT $temp | tr -d '"')
+        [[ -z "$x" ]] && STEP_RESULT="unknown" || STEP_RESULT="$x"
+    
+        x=$(pid_atbupdatetool)
+        [[ -z "$x" ]] && PID=99999 || PID=$x
+    
+        x=$(last_event)
+        [[ -z "$x" ]] && EVENT="unknown" || EVENT="$x"
+    
+    else 
+        # cannot parse valid json. try original journal text file.
+
+        x=$(last_percent_value)
+        [[ -z "$x" ]] && PERCENT=0 || PERCENT=$x
+
+        x=$(last_step)
+        [[ -z "$x" ]] && STEP="unknown" || STEP="$x"
+    
+        x=$(last_step_result)
+        [[ -z "$x" ]] && STEP_RESULT="unknown" || STEP_RESULT="$x"
+    
+        x=$(pid_atbupdatetool)
+        [[ -z "$x" ]] && PID=99999 || PID=$x
+
+        x=$(last_event)
+        [[ -z "$x" ]] && EVENT="unknown" || EVENT="$x"
+    fi
+
+    echo "PERCENT=$PERCENT"
+    echo "STEP=$STEP"
+    echo "STEP_RESULT=$STEP_RESULT"
+    echo "PID=$PID"
+    echo "EVENT=$EVENT"
+
+    # build json to be sent to ISMAS with "U0003"
+
+    CURRENT_DATE=$(date +"%Y-%m-%d %H:%M:%S.000%z")
+    U0003Msg="{\
+        \"REASON\":\"SW_UP\",\
+        \"TIMESTAMP\":\"$CURRENT_DATE\",\
+        \"EVENT_ID\":\"$PID\",\
+        \"EVENT\":\"U0003\",\
+        \"EVENTSTATE\":1,\
+        \"PARAMETER\": {\
+            \"PERCENT\" : $PERCENT,\
+            \"RESULTCODE\" : 99,\
+                    \"STEP\" : \"$1 -> monitored last step: $STEP\",\
+                    \"STEP_RESULT\" : \"$1 -> monitored last step result: $STEP_RESULT\",\
+            \"VERSION\" : \"\"\
+        }\
+    }"
+
+    echo -e "U0003Msg=$U0003Msg"
+
+    (echo "#M=APISM#C=CMD_EVENT#J=$U0003Msg"; sleep 5) | nc localhost 7777
+}
+
+# save journal for the last run of atbupdatetool in $OUT_FILE
+echo $(journalctl -u atbupdatetool --since="$START_DATE" --until=$STOP_DATE) > $OUT_FILE
+
+if [[ "$EXIT_CODE" = "exited" && "$SERVICE_RESULT" = "success" && "$EXIT_STATUS" = "0" ]]
+then
+    # almost normal run; at least there was no crash.	
+    if cat $OUT_FILE | grep -o "U0003" | wc -l; then
+        echo "$SCRIPT_NAME: Failure code U0003 already sent to ISMAS"
+        exit 0
+    fi
+
+    if cat $OUT_FILE | grep -o "U0002" | wc -l; then
+        echo "$SCRIPT_NAME: Success code U0002 already sent to ISMAS"
+        exit 0
+    else
+        sendU0003 "$SCRIPT_NAME: Success code U0002 not sent to ISMAS"
+    fi
+
+    if cat $OUT_FILE | grep -o "U0001" | wc -l; then
+        echo "$SCRIPT_NAME: Success code U0001 already sent to ISMAS"
+        exit 0
+    else
+        sendU0003 "$SCRIPT_NAME: Success code U0001 not sent to ISMAS"
+    fi
+else
+    # something unexpected has happened.
+    sendU0003 "$SCRIPT_NAME: EXIT_CODE=$EXIT_CODE;SERVICE_RESULT=$SERVICE_RESULT;EXIT_STATUS=$EXIT_STATUS"
+fi