Use head -n 1 in gitLastCommit().

Yield thread to give worker thread its share of CPU time.

OnDemandUpdatePTU.pro

@@ -1,17 +1,30 @@
-# QT -= gui
-QT += core
-QT += widgets serialport
-QT += network
+QT += core gui
+QT += widgets serialport network
+
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 TARGET = ATBUpdateTool
 
+# The following define makes your compiler emit warnings if you use
+# any Qt feature that has been marked deprecated (the exact warnings
+# depend on your compiler). Please consult the documentation of the
+# deprecated API in order to know how to port your code away from it.
+DEFINES += QT_DEPRECATED_WARNINGS
+
+# You can also make your code fail to compile if it uses deprecated APIs.
+# In order to do so, uncomment the following line.
+# You can also select to disable deprecated APIs only up to a certain version of Qt.
+#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
+VERSION=1.0.0
+
 INCLUDEPATH += plugins
 
-CONFIG += c++17
+CONFIG += c++17 console
 # CONFIG -= app_bundle
 
-# DEFINES+=LinuxDesktop
+DEFINES+=APP_VERSION=\\\"$$VERSION\\\"
 
+QMAKE_CXXFLAGS += -g
 QMAKE_CXXFLAGS += -Wno-deprecated-copy
 
 # custom target for 'git subtree'
@@ -34,17 +47,28 @@ contains( CONFIG, PTU5 ) {
     greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
     CONFIG += link_pkgconfig
     lessThan(QT_MAJOR_VERSION, 5):   PKGCONFIG += qextserialport
-    QMAKE_CXXFLAGS += -std=c++11   # for GCC >= 4.7
+    QMAKE_CXXFLAGS += -std=c++17   # for GCC >= 4.7
     QMAKE_CXXFLAGS += -Wno-deprecated-copy
     ARCH = PTU5
     DEFINES+=PTU5
 }
+contains( CONFIG, PTU5_YOCTO ) {
+    greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
+    QMAKE_CXXFLAGS += -std=c++17   # for GCC >= 4.7
+    QMAKE_CXXFLAGS += -Wno-deprecated-copy
+    PTU5BASEPATH = /opt/devel/ptu5
+    ARCH = PTU5
+    DEFINES+=PTU5
+
+    # add qmqtt lib
+    #LIBS += -lQt5Qmqtt
+}
 contains( CONFIG, DesktopLinux ) {
     greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
     lessThan(QT_MAJOR_VERSION, 5):    CONFIG += extserialport
     # QMAKE_CC = ccache $$QMAKE_CC
     # QMAKE_CXX = ccache $$QMAKE_CXX
-    QMAKE_CXXFLAGS += -std=c++11
+    QMAKE_CXXFLAGS += -std=c++17
     QMAKE_CXXFLAGS += -Wno-deprecated-copy
     linux-clang {  QMAKE_CXXFLAGS += -Qunused-arguments   }
     ARCH = DesktopLinux
@@ -53,18 +77,34 @@ contains( CONFIG, DesktopLinux ) {
 
 SOURCES += \
         main.cpp \
+        progress_event.cpp \
+        mainwindow.cpp \
+        utils.cpp \
         update.cpp \
+        git/git_client.cpp \
+        ismas/ismas_client.cpp \
+        process/command.cpp \
         message_handler.cpp \
         worker.cpp \
         worker_thread.cpp
 
 HEADERS += \
         update.h \
+        progress_event.h \
+        utils.h \
+        mainwindow.h \
+        git/git_client.h \
+        apism/ismas_data.h \
+        ismas/ismas_client.h \
+        process/command.h \
         message_handler.h \
         worker.h \
         worker_thread.h \
         plugins/interfaces.h
 
+FORMS += \
+    mainwindow.ui
+
 OTHER_FILES += \
     /opt/app/tools/atbupdate/update_log.csv \
     main.cpp.bck \
@@ -76,7 +116,12 @@ OTHER_FILES += \
 # git subtree pull --prefix DCPlugin https://git.mimbach49.de/GerhardHoffmann/DCPlugin.git master --squash
 # include(./DCPlugin/DCPlugin.pri)
 
-# Default rules for deployment.
-qnx: target.path = /tmp/$${TARGET}/bin
-else: unix:!android: target.path = /opt/$${TARGET}/bin
-!isEmpty(target.path): INSTALLS += target
+
+
+##########################################################################################
+# for running program on target through QtCreator
+contains( CONFIG, PTU5 ) {
+   qnx: target.path = /tmp/$${TARGET}/bin
+   else: unix:!android: target.path = /opt/app/tools/atbupdate/
+   !isEmpty(target.path): INSTALLS += target
+}

allgemein.txt

@@ -0,0 +1,126 @@
+0:
+    Zunaechst wir immer nachgesehen, ob das Repository bereits geklont wurde.
+    Wenn nein, dann wird geklont. Im Master-Branch befinden sich Dateinen, die
+    in allen anderen Branches gemeinsam genutzt werden. Das sollte wohl auf
+    jeden Fall fuer den DeviceController gelten.
+1:
+    Anfrage bei ISMAS ob neue Daten da sind. Hier faengt die ganze Sache an.
+    Da man nicht weiss, on ISMAS ueberhaupt antworten wird braucht es einen
+    Timer. Man kann die Sache dann auch gleich mehrfach versuchen.
+
+    Die Anfrage geht also per Signal an den Apism-Client. Im Signal wird der
+    Zustand mitgegeben:
+
+        ISMAS_UPDATE_REQUEST_PENDING
+
+    und im Slot dann entsprechend uebernommen. Der Timer sollte nicht im Worker
+    stehen, sondern im Apism-Client. Der Worker sollte damit nicht belastet
+    sein. Der wird dann vom Apism-Client entsprechend benachrichtigt.
+
+        ISMAS_UPDATE_REQUEST_FAILURE
+            ISMAS_UPDATE_REQUEST_TIMEOUT
+        ISMAS_UPDATE_REQUEST_SUCCESS
+
+    Im 1./2.Fall wird dann ein Fehlerhandling durchgefuehrt. Insbesondere
+    wird Apism ueber den DB-Kanal darueber informiert (U0003). Am Ende wie
+    dann wie immer SendCmdVersion und beenden der Applikation.
+
+    Im Erfolgsfall muss in der Antwort der Branch enthalten sein, fuer den das
+    Update durchgefuhrt werden soll. Das ist auch bereits so (Location).
+
+    Ein Sonderfall waere der -m-Modus, da hier niemand auf der ISMAS-Seite
+    aktiv eingreift. Hier braucht es dann einen Ubergabeparameter an 
+    ATBUpdateTool: --branch-name
+
+    Normalfall ist aber die Aktivierung via ISMAS. Dann muss der in der Antwort
+    enthaltene Branch zunaechst ausgecheckt werden.
+2: 
+    Dazu wird ein entsprechendes Signal an den GitClient gesandet.
+        
+        GIT_CHECKOUT_BRANCH_REQUEST
+
+    Der GitClient sieht jetzt erstmal nach, ob es diesen Branch ueberhaupt
+    gibt.
+
+        Falls nein:    
+
+        GIT_CHECKOUT_BRANCH_REQUEST_FAILURE
+            BRANCH_NOT_EXIST
+ 
+        Falls ja:
+            der GitClient versucht nun den Branch auszuchecken. 
+            Geht das gut?
+            Falls nein:
+
+                GIT_CHECKOUT_BRANCH_REQUEST_FAILURE
+                    BRANCH_CHECKOUT_ERROR
+
+            Falls ja:
+                GIT_CHECKOUT_BRANCH_REQUEST_SUCCESS
+                    -> eventl. koennte man den Namen des Branches mitgeben
+
+
+        Signal an den Worker. Im entsprechenden Slot wird jetzt der eigentliche
+        UpdateProzess angeworfen.
+ 3:
+    Mittels git fetch werden jetzt die Aenderungen ermittelt.
+
+        GIT_FETCH_UPDATES_REQUEST
+        
+        GIT_FETCH_UPDATES_REQUEST_FAILURE
+            -> Worker informieren damit Fehlerbehandlung aktiviert wird
+        GIT_FETCH_UPDATES_REQUEST_SUCCESS
+
+        GIT_DIFF_UPDATES
+
+        Die Liste der geaenderten Dateien geht an den Worker. Der kann jetzt
+        noch Test machen, ob das Sinn macht. Evtl. eine Statusmeldung ausgeben
+        drueber was gleich passieren wird.
+4:
+    Mittels git merge/pull werden nun die Dateien tatsaechlich im Branch 
+    aktualisiert.
+
+        GIT_PULL_UPDATES_REQUEST
+        GIT_PULL_UPDATES_REQUEST_FAILURE
+            -> Worker informieren damit Fehlerbehandlung aktiviert wird
+        GIT_PULL_UPDATES_REQUEST_SUCCESS
+            -> Worker informieren
+
+    Sind die Daten vorhanden, dann werden sie mittels rsync ins Dateisystem
+    kopiert.
+
+        RSYNC_UPDATES 
+        RSYNC_UPDATES_FAILURE
+        RSYNC_UPDATES_SUCCESS
+
+    Fuer jede kopierte Datei geht eine Nachricht raus ans ISMAS.
+5:
+    Sind die Daten dann kopiert, so werden sie auf den DC kopiert (falls
+    notwendig): hier gehen dann wieder Nachrichten an ISMAS raus:
+
+        DC_UPDATE 
+        DC_UPDATE_FAILURE
+        DC_UPDATE_SUCCESS
+
+        JSON_UPDATE
+        JSON_UPDATE_FAILURE
+        JSON_UPDATE_SUCCESS
+        
+        Hier fuer jedes Json-File.
+
+    Schliesslich noch eine Zusammenfasung an ISMAS:
+
+        ISMAS_UPDATE_INFO_CONFIRM
+        ISMAS_UPDATE_INFO_CONFIRM_FAILURE
+            -> Worker informieren damit Fehlerbehandlung aktiviert wird
+        ISMAS_UPDATE_INFO_CONFIRM_SUCCESS
+
+    und schliesslich der abschliessende Status an ISMAS zurueckgemeldet:
+
+        ISMAS_CURRENT_PSA_STATUS_CONFIRM
+        ISMAS_CURRENT_PSA_STATUS_CONFIRM_FAILURE
+        ISMAS_CURRENT_PSA_STATUS_CONFIRM_SUCCESS
+
+    
+
+

apism/ismas_data.h

@@ -0,0 +1,137 @@
+#ifndef ISMASDATA_H
+#define ISMASDATA_H
+
+#include <QJsonObject>
+#include <QJsonArray>
+
+
+
+
+namespace ISMAS {
+
+    struct TransferData : public QJsonObject {
+        struct : public QJsonObject {
+            QJsonValue tariffId;
+            QJsonValue group;
+            QJsonValue zone;
+        } device;
+
+        struct : public QJsonObject {
+            QJsonValue state;
+            QJsonValue uid;
+            QJsonValue seq_tick_number;
+            QJsonValue timestamp;
+            QJsonValue userText;
+            QJsonValue userTextType;
+        } transaction;
+
+        struct : public QJsonObject {
+            // TODO: check what is really used at the moment
+            QJsonValue id;          // unique article id
+            QJsonValue name;        // name
+            QJsonValue price;       // price in cent
+            QJsonValue currency;    //
+            QJsonValue startTime;   // start time
+            QJsonValue endTime;     // end time
+            QJsonValue userText;    // additional info
+            QJsonValue parkingTime;
+            QJsonValue printText;
+            // QJsonValue discount;
+        } item;
+
+        struct : public QJsonObject {
+            struct : public QJsonObject {
+                QJsonValue coins;     // total amount of coins value
+                // QJsonValue notes;     // total amount of notes value
+                QJsonValue overpaid;  // in cent
+                QJsonValue currency;
+                QJsonValue change;
+            } cash;
+
+            struct : public QJsonObject {
+                QJsonValue cardNumber;
+                QJsonValue value;           // buchungsbetrag
+                QJsonValue cardType;
+                QJsonValue currency;
+                QJsonValue tid;
+                QJsonValue tresult;
+            } card;
+
+            struct : public QJsonObject {
+                QJsonValue cardNumber;
+                QJsonValue cardType;
+                QJsonValue value;
+                QJsonValue valueOld;
+                QJsonValue valueNew;
+                QJsonValue time;
+                QJsonValue timeOld;
+                QJsonValue timeNew;
+            } prePaidCard;
+        } payment;
+
+        struct : public QJsonObject {
+            QJsonValue delivery;    // PRINT, OnlineTicket
+            QJsonValue result;      // SUCCESS, ERROR
+            QJsonValue errorCode;   // 0=OK, 1=...
+            QJsonValue errorMsg;
+        } result;
+    };
+
+
+    struct AccountData : public QJsonObject {
+        struct : public QJsonObject {
+            QJsonValue UID;
+            QJsonValue ChangeNumber;
+            QJsonValue Process;         // Vorgang
+            QJsonValue startDateTime;
+            QJsonValue endDateTime;
+            QJsonValue startHash;
+            QJsonValue endHash;
+
+            struct : public QJsonObject {
+                QJsonValue value;          // coin value
+                QJsonValue numberOfCoins;  // number of coins
+                QJsonValue currency;
+            } coin;
+
+        } coinBox;                  // Münzkasse
+    };
+
+
+    struct EventData : public QJsonObject {
+        struct : public QJsonObject {
+            QJsonValue eventID;
+            QJsonValue deviceName;
+            QJsonValue reason;
+            QJsonValue event;
+            QJsonValue eventState;
+            QJsonValue timeStamp;
+            QJsonValue parameter;
+            QJsonValue secondLevelInfo;
+        } machineEvent;                  //
+    };
+
+    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,
+        START,
+        STOP,
+        PING,
+        SELF,
+        ISMAS_PARAMETER
+    };
+}
+
+
+
+#endif // ISMASDATA_H

git/git_client.cpp

@@ -0,0 +1,327 @@
+#include "git_client.h"
+#include "update.h"
+#include "worker.h"
+#include "utils.h"
+
+#include <QRegularExpression>
+#include <QDebug>
+#include <QDir>
+
+
+GitClient::GitClient(QString const &customerNrStr,
+                     QString const &customerRepository,
+                     QString const &workingDirectory,
+                     QString const &branchName,
+                     QObject *parent)
+  : QObject(parent)
+  , m_worker(qobject_cast<Worker *>(parent))
+  , m_repositoryPath(QString("https://git.mimbach49.de/GerhardHoffmann/%1.git").arg(customerNrStr))
+  , m_customerNr(customerNrStr)
+  , m_workingDirectory(workingDirectory)
+  , m_branchName(branchName)
+  , m_customerRepository(customerRepository) {
+    if (!m_worker) {
+        qCritical() << "ERROR CASTING PARENT TO WORKER FAILED";
+    }
+}
+
+bool GitClient::gitCloneCustomerRepository() {
+    QString gitCommand("git clone ");
+    gitCommand += m_repositoryPath;
+    Command c(gitCommand);
+
+    qInfo() << "IN CURRENT WD" << m_workingDirectory
+            << "CLONE" << m_repositoryPath << "...";
+
+    if (c.execute(m_workingDirectory)) { // execute the command in wd
+        QString const result = c.getCommandResult();
+        if (!result.isEmpty()) {
+            // Cloning into 'customer_281'...\n
+            static QRegularExpression re("(^\\s*Cloning\\s+into\\s+[']\\s*)(.*)(\\s*['].*$)");
+            QRegularExpressionMatch match = re.match(result);
+            if (match.hasMatch()) {
+                if (re.captureCount() == 3) { // start with full match (0), then the other 3 matches
+                    if (match.captured(2).trimmed() == m_customerNr) {
+                        qInfo() << "CLONING" << m_repositoryPath << "OK";
+                        return true;
+                    }
+                }
+            }
+        }
+        Utils::printCriticalErrorMsg(QString("ERROR CLONE RESULT HAS WRONG FORMAT. CLONE_RESULT=") + result);
+    }
+    return false;
+}
+
+bool GitClient::copyGitConfigFromMaster() { // only allowed when called in
+                                            // master branch (???)
+    if (QDir(m_customerRepository).exists()) {
+        QString const cp = QString("cp .gitconfig .git/config");
+        Command c("bash");
+        if (c.execute(m_customerRepository, QStringList() << "-c" << cp)) {
+            qInfo() << "cp .gitconfig .git/config OK";
+            return true;
+        }
+        qCritical() << "ERROR cp .gitconfig .git/config";
+    }
+    return false;
+}
+
+QStringList GitClient::gitBranchNames() {
+    // git config --global pager.branch false
+    QStringList bNames;
+    if (QDir(m_customerRepository).exists()) {
+        QString gitCommand("git branch -a");
+        Command c(gitCommand);
+        if (c.execute(m_customerRepository)) {
+            QString const result = c.getCommandResult();
+            return result.split('\n');
+        }
+    }
+    return bNames;
+}
+
+bool GitClient::gitCheckoutBranch() {
+    // TODO: nachsehen, ob der Branch ueberhaupt existiert
+
+    if (QDir(m_customerRepository).exists()) {
+        int zoneNr = Utils::read1stLineOfFile("/mnt/system_data/zone_nr");
+        m_branchName = (zoneNr != 0)
+            ? QString("zg1/zone%1").arg(zoneNr) : "master";
+
+        QString gitCommand("git checkout ");
+        gitCommand += m_branchName;
+
+        Command c(gitCommand);
+        return c.execute(m_customerRepository); // execute command in customerRepo
+    }
+    Utils::printCriticalErrorMsg(QString("ERROR ") + m_customerRepository + " DOES NOT EXIST");
+    return false;
+}
+
+bool GitClient::gitCloneAndCheckoutBranch() {
+    qInfo() << "CLONE" << m_repositoryPath << "AND CHECKOUT" << m_branchName;
+    if (gitCloneCustomerRepository()) {
+        //if (copyGitConfigFromMaster()) {
+            if (gitCheckoutBranch()) {
+                return true;
+            } else {
+                // TODO
+            }
+        //}
+    }
+    Utils::printCriticalErrorMsg(QString("CLONE ") + m_repositoryPath + " AND CHECKOUT FAILED");
+    return false;
+}
+
+/*
+ Zu beachten: wird eine datei neu hinzugefuegt (git add/commit) dann aber gleich
+ wieder geloscht, so wird sie im diff nicht angezeigt.
+ */
+std::optional<QStringList> GitClient::gitDiff(QString const &commits) {
+    if (QDir(m_customerRepository).exists()) {
+        // 409f198..6c22726
+        QString gitCommand("git diff --compact-summary ");
+        gitCommand += commits;
+
+        Command c(gitCommand);
+        if (c.execute(m_customerRepository)) { // execute command in local customerRepo
+            QString s = c.getCommandResult().trimmed();
+            Utils::printInfoMsg("GIT DIFF RESULT " + s);
+
+            QStringList lines = Update::split(s, '\n');
+            QStringList fileNames;
+            // each line has the format "etc/psa_config/DC2C_print01.json | 1 +
+            // or the format            "etc/psa_config/DC2C_print01.json (new) | 1 +
+            // the filenames are relativ to the repository
+            for (int i = 0; i < lines.size(); ++i) {
+                QString const &line = lines.at(i);
+                int newIndex = line.indexOf("(new");    // for new files
+                int goneIndex = line.indexOf("(gone");  // for removed files
+                int modeIndex = line.indexOf("(mode");
+                int pipeIndex = line.indexOf('|');
+                if (newIndex != -1) {
+                    QString file = line.left(newIndex).trimmed();
+                    qInfo() << "FILE (NEW)" << file;
+                    fileNames << file;
+                } else
+                if (modeIndex != -1) {
+                    QString const file = line.left(modeIndex).trimmed();
+                    qInfo() << "FILE (MODE)" << file;
+                    fileNames << file;
+                } else
+                if (goneIndex != -1) {
+                    QString const file = line.left(goneIndex).trimmed();
+                    qCritical() << "FILE (GONE)" << file;
+                } else
+                if (pipeIndex != -1) {
+                    QString const file = line.left(pipeIndex).trimmed();
+                    qInfo() << "FILE (PIPE)" << file;
+                    fileNames << file;
+                }
+            }
+            if (!fileNames.isEmpty()) {
+                return fileNames;
+            }
+        }
+    }
+    return std::nullopt;
+}
+
+/*
+ Hat sich nichts geaendert, so werden auch keine Commits <>..<> angezeigt
+ */
+std::optional<QString> GitClient::gitFetch() {
+    if (QDir(m_customerRepository).exists()) {
+        qInfo() << "BRANCH NAME" << m_branchName;
+
+        Command c("git fetch");
+        if (c.execute(m_customerRepository)) {
+            QString const s = c.getCommandResult().trimmed();
+            if (!s.isEmpty()) {
+                QStringList lines = Update::split(s, '\n');
+                if (!lines.empty()) {
+                    int zoneNr = Utils::read1stLineOfFile("/mnt/system_data/zone_nr");
+                    m_branchName = (zoneNr != 0) ? QString("zg1/zone%1").arg(zoneNr) : "master";
+                    // lines can look like this:
+                    // From https://git.mimbach49.de/GerhardHoffmann/customer_281
+                    //   41ec581..5d25ac3  master     -> origin/master
+                    //   ff10f57..43530a1  zg1/zone1  -> origin/zg1/zone1
+                    //   6ed893f..5d9882c  zg1/zone2  -> origin/zg1/zone2
+                    //   4384d17..77045d8  zg1/zone3  -> origin/zg1/zone3
+                    //   89d2812..36a0d74  zg1/zone5  -> origin/zg1/zone5
+                    bool found = false;
+                    for (int i=0; i < lines.size(); ++i) {
+                        if (lines.at(i).contains(m_branchName)) {
+                            found = true;
+                            // 409f198..6c22726  zg1/zone1  -> origin/zg1/zone1
+                            static QRegularExpression re("(^\\s*)([0-9A-Fa-f]+..[0-9A-Fa-f]+)(.*$)");
+                            QRegularExpressionMatch match = re.match(lines.at(i));
+                            if (match.hasMatch()) {
+                                if (re.captureCount() == 3) { // start with full match (0), then the other 3 matches
+                                    return match.captured(2);
+                                } else {
+                                    emit m_worker->showErrorMessage("git fetch",
+                                        QString("(wrong cap-count (%1)").arg(re.captureCount()));
+                                }
+                            } else {
+                                emit m_worker->showErrorMessage("git fetch",
+                                    "no regex-match for commits");
+                                Utils::printCriticalErrorMsg("NO REGEX MATCH FOR COMMITS");
+                            }
+                        }
+                    }
+                    if (!found) {
+                        emit m_worker->showErrorMessage("git fetch",
+                            QString("unkown branch name ") + m_branchName);
+                        Utils::printCriticalErrorMsg("UNKNOWN BRANCH NAME " + m_branchName);
+                    }
+                } else {
+                    emit m_worker->showErrorMessage("git fetch",
+                        QString("wrong format for result of 'git fetch' ") + s);
+                    Utils::printCriticalErrorMsg(QString("WRONG FORMAT FOR RESULT OF 'GIT FETCH' ") + s);
+                }
+            } else {
+                emit m_worker->showErrorMessage("git fetch", "empty result for 'git fetch'");
+                Utils::printCriticalErrorMsg("EMPTY RESULT FOR 'GIT FETCH'");
+            }
+        }
+    } else {
+        emit m_worker->showErrorMessage("git fetch", QString("repository ") + m_customerRepository + " does not exist");
+        Utils::printCriticalErrorMsg(QString("REPOSITORY ") + m_customerRepository + " DOES NOT EXIST");
+    }
+    return std::nullopt;
+}
+
+bool GitClient::gitFetchAndDiff() {
+    if (gitFetch()) {
+        QString gitCommand("git diff --compact-summary HEAD..FETCH_HEAD");
+        Command c(gitCommand);
+        return c.execute(m_workingDirectory);
+    }
+    return false;
+}
+
+bool GitClient::gitPull() {
+    if (QDir(m_customerRepository).exists()) {
+        Command c("git pull");
+        if (c.execute(m_customerRepository)) {
+            qInfo() << "PULLED INTO" << m_customerRepository;
+            return true;
+        }
+        Utils::printCriticalErrorMsg(QString("PULL INTO " + m_customerRepository + " FAILED"));
+    }
+    return false;
+}
+
+std::optional<QStringList> GitClient::gitMerge() {
+    Command c("git merge");
+    if (c.execute(m_workingDirectory)) {
+        QString s = c.getCommandResult();
+        QStringList lst = Update::split(s, '\n');
+        return lst;
+    }
+    return std::nullopt;
+}
+
+QString GitClient::gitLastCommit(QString fileName) {
+    if (QDir(m_customerRepository).exists()) {
+        QString const filePath
+            = QDir::cleanPath(m_customerRepository + QDir::separator() + fileName);
+        if (QFile(filePath).exists()) {
+            QString const gitCommand = QString("git log %1 | head -n 1").arg(fileName);
+            Command c("bash");
+            if (c.execute(m_customerRepository, QStringList() << "-c" << gitCommand)) {
+                QString const r = c.getCommandResult();
+                int const idx = r.indexOf("commit ");
+                if (idx != -1) {
+                    return r.mid(idx + 8).trimmed();
+                }
+            }
+        }
+    }
+    return "";
+}
+
+// fileName has to an absolute path
+QString GitClient::gitBlob(QString fileName) {
+    QFileInfo fi(fileName);
+    if (fi.exists()) {
+        QString const gitCommand = QString("git hash-object %1").arg(fileName);
+        Command c(gitCommand);
+        if (c.execute(m_workingDirectory)) {
+            return c.getCommandResult().trimmed();
+        }
+    }
+    return "N/A";
+}
+
+QString GitClient::gitCommitForBlob(QString blob) {
+    if (QDir(m_customerRepository).exists()) {
+        QString const gitCommand
+            = QString("git whatchanged --all --find-object=%1 | head -n 1").arg(blob);
+        Command c(gitCommand);
+        if (c.execute(m_customerRepository)) {
+            return c.getCommandResult();
+        }
+    }
+    return "";
+}
+
+bool GitClient::gitIsFileTracked(QString fName) {
+    if (QDir(m_customerRepository).exists()) {
+        QString const gitCommand
+            = QString("git ls-files --error-unmatch %1").arg(fName);
+        Command c(gitCommand);
+        return c.execute(m_customerRepository);
+    }
+    return false;
+}
+
+
+//get_commit_for_blob () {
+//    # search for the blob in all commits for the file(name) $1
+//    echo $(git log --all --pretty=format:%H -- $2   |
+//           xargs -I{} bash -c "git ls-tree {} -- $2 |
+//           grep -q $1 && echo -n {} && head -n 1")
+//}

git/git_client.h

@@ -0,0 +1,58 @@
+#ifndef GIT_CLIENT_H_INCLUDED
+#define GIT_CLIENT_H_INCLUDED
+
+#include <QObject>
+#include <QStringList>
+#include <optional>
+
+#include "process/command.h"
+#include "ismas/ismas_client.h"
+
+class Worker;
+class GitClient : public QObject {
+    Q_OBJECT
+
+    Worker *m_worker;
+    QString const m_repositoryPath;
+    QString const m_customerNr;
+    QString const m_workingDirectory;
+    QString m_branchName;
+    QString const m_customerRepository;
+
+    bool copyGitConfigFromMaster();
+
+  public:
+    explicit GitClient(QString const &customerNrStr,
+                       QString const &repositoryPath,
+                       QString const &workingDirectory = QCoreApplication::applicationDirPath(),
+                       QString const &branchName = "master",
+                       QObject *parent = 0);
+
+    bool gitCloneCustomerRepository();
+    bool gitCheckoutBranch();
+    QStringList gitBranchNames();
+
+    QString const workingDirectory() const { return m_workingDirectory; }
+    QString workingDirectory() { return m_workingDirectory; }
+
+    QString const branchName() const { return m_branchName; }
+    QString branchName() { return m_branchName; }
+
+    QString repositoryPath() { return m_repositoryPath; }
+    QString const repositoryPath() const { return m_repositoryPath; }
+
+    bool gitCloneAndCheckoutBranch();
+
+    std::optional<QString> gitFetch();
+    bool gitFetchAndDiff();
+    bool gitPull();
+    std::optional<QStringList> gitDiff(QString const &commit);
+    std::optional<QStringList> gitMerge();
+
+    QString gitLastCommit(QString fileName);
+    QString gitBlob(QString fileName);
+    QString gitCommitForBlob(QString blob);
+    bool gitIsFileTracked(QString file2name);
+};
+
+#endif // GIT_CLIENT_H_INCLUDED

ismas/ismas_client.cpp

@@ -0,0 +1,773 @@
+#include "ismas/ismas_client.h"
+
+#include <cstring>
+#include <cstdio>
+
+#include <errno.h>
+#include <arpa/inet.h> // inet_addr()
+#include <netdb.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <string.h>
+#include <strings.h> // bzero()
+#include <sys/socket.h>
+#include <unistd.h> // read(), write(), close()
+#include <fcntl.h>
+
+
+#include <QThread>
+#include <QJsonDocument>
+#include <QJsonObject>
+
+#if 0
+# $1: EVENT: U0001 update finished: 100%
+#            U0002 reset TRG
+#            U0003 error
+#            U0010 for update process
+# $2: PERCENT : "only for ISMAS: 0-100%",
+# $3: RESULTCODE : "only for ISMAS",
+#   0: Success
+#   1: no Update nessesary
+#   2: Backup failed
+#   3: Package error/ Wrong package
+#   4: Install Error
+# $4: STEP : "running step (only for us): update_psa...",
+# $5: STEP_RESULT : "error and result text",
+# $6: VERSION : "opkg and conf info; what will be updated"
+#
+#endif
+
+#include <QDateTime>
+#include <QDebug>
+
+void IsmasClient::printDebugMessage(int port,
+                                    QString const &clientIP,
+                                    int clientPort,
+                                    QString const &message) {
+    qDebug().noquote()
+        << "\n"
+        << "SEND-REQUEST-RECEIVE-RESPONSE ..." << "\n"
+        << "hostname ........" << "127.0.0.1"  << "\n"
+        << "port ............" << port << "\n"
+        << "local address ..." << clientIP << "\n"
+        << "local port ......" << clientPort << "\n"
+        << message;
+}
+
+void IsmasClient::printInfoMessage(int port,
+                                   QString const &clientIP,
+                                   int clientPort,
+                                   QString const &message) {
+    qInfo().noquote()
+        << "\n"
+        << "SEND-REQUEST-RECEIVE-RESPONSE ..." << "\n"
+        << "hostname ........" << "127.0.0.1"  << "\n"
+        << "port ............" << port << "\n"
+        << "local address ..." << clientIP << "\n"
+        << "local port ......" << clientPort << "\n"
+        << message;
+}
+
+void IsmasClient::printErrorMessage(int port,
+                                    QString const &clientIP,
+                                    int clientPort,
+                                    QString const &message) {
+    qCritical().noquote()
+        << "\n"
+        << "SEND-REQUEST-RECEIVE-RESPONSE ..." << "\n"
+        << "hostname ........" << "127.0.0.1"  << "\n"
+        << "port ............" << port << "\n"
+        << "local address ..." << clientIP << "\n"
+        << "local port ......" << clientPort << "\n"
+        << message;
+}
+
+std::optional<QString>
+IsmasClient::sendRequestReceiveResponse(int port, QString const &request) {
+
+    qInfo() << "REQUEST" << request;
+
+    int sockfd;
+    int r;
+    errno = 0;
+    // socket create and verification
+    if ((sockfd = ::socket(AF_INET, SOCK_STREAM, 0)) == -1) {
+        qCritical().noquote()
+            << "\n"
+            << "SEND-REQUEST-RECEIVE-RESPONSE ..." << "\n"
+            << "SOCKET CREATION FAILED (" << strerror(errno) << ")";
+        return std::nullopt;
+    }
+
+    struct sockaddr_in servAddr;
+    bzero(&servAddr, sizeof(servAddr));
+    // assign IP, PORT
+    servAddr.sin_family = AF_INET;
+    servAddr.sin_addr.s_addr = inet_addr("127.0.0.1");
+
+    servAddr.sin_port = htons(port);
+    // connect the client socket to server socket
+    if ((r = ::connect(sockfd, (struct sockaddr *)(&servAddr), sizeof(servAddr))) != 0) {
+        qCritical().noquote()
+            << "\n"
+            << "SEND-REQUEST-RECEIVE-RESPONSE ..." << "\n"
+            << "CONNECTION WITH SERVER FAILED (" << strerror(r) << ")";
+        ::close(sockfd);
+        return std::nullopt;
+    }
+
+    struct sockaddr_in clientAddr;
+    bzero(&clientAddr, sizeof(clientAddr));
+    socklen_t sockLen = sizeof(clientAddr);
+
+    char clientIP[16];
+    bzero(&clientIP, sizeof(clientIP));
+    getsockname(sockfd, (struct sockaddr *)(&clientAddr), &sockLen);
+    inet_ntop(AF_INET, &clientAddr.sin_addr, clientIP, sizeof(clientIP));
+    unsigned int clientPort = ntohs(clientAddr.sin_port);
+
+    printDebugMessage(port, clientIP, clientPort, QString("CONNECTED TO SERVER"));
+
+    struct timeval tv;
+    tv.tv_sec = 10;  /* 10 secs timeout for read and write */
+
+    struct linger so_linger;
+    so_linger.l_onoff = 1;
+    so_linger.l_linger = 0;
+
+    setsockopt(sockfd, SOL_SOCKET, SO_LINGER, &so_linger, sizeof(so_linger));
+    setsockopt(sockfd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
+    setsockopt(sockfd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
+    int flag = 1;
+    setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, (char *) &flag, sizeof(int));
+
+    static char buf[1024*8];
+    bzero(buf, sizeof(buf));
+    int const bytesToWrite = strlen(request.toStdString().c_str());
+    strncpy(buf, request.toStdString().c_str(), sizeof(buf)-1);
+
+    int loop = 0;
+    int bytesWritten = 0;
+    while (bytesWritten < bytesToWrite) {
+        int n = ::sendto(sockfd, buf+bytesWritten, bytesToWrite-bytesWritten, 0, NULL, 0);
+        if (n >= 0) {
+            bytesWritten += n;
+        } else {
+            if (errno == EWOULDBLOCK) {
+                if (++loop < 10) {
+                    QThread::msleep(500);
+                    continue;
+                }
+                printErrorMessage(port, clientIP, clientPort,
+                    QString("WRITE TIMEOUT %1(").arg(loop) + strerror(errno) + ")");
+                ::close(sockfd);
+                return std::nullopt;
+            } else
+            if (errno == EINTR) {
+                printErrorMessage(port, clientIP, clientPort,
+                    QString("WRITE INTERRUPTED BY SIGNAL (1) (") + strerror(errno) + ")");
+                continue;
+            }
+        }
+    }
+
+    // DO NOT USE SHUTDOWN! APISM CAN NOT COPE WITH IT
+    // errno = 0;
+    // if (shutdown(sockfd, SHUT_WR) < 0) {
+    //     printErrorMessage(port, clientIP, clientPort,
+    //        QString("CANNOT CLOSE WRITING END (") + strerror(errno) + ")");
+    // }
+
+    printInfoMessage(port, clientIP, clientPort, QString("MESSAGE SENT ") + buf);
+
+    loop = 0;
+    bzero(buf, sizeof(buf));
+    int bytesToRead = sizeof(buf)-1;
+    int bytesRead = 0;
+    while (bytesRead < bytesToRead) {
+        errno = 0;
+        int n = ::recvfrom(sockfd, buf+bytesRead, bytesToRead-bytesRead,
+                           0, NULL, NULL);
+        if (n > 0) { //
+            bytesRead += n;
+        } else
+        if (n == 0) {
+            // The return value will be 0 when the peer has performed an orderly shutdown.
+            printErrorMessage(port, clientIP, clientPort,
+                QString("PEER CLOSED CONNECTION (") + strerror(errno) + ")");
+            ::close(sockfd);
+            return std::nullopt;
+        } else
+        if (n < 0) {
+            if (errno == EWOULDBLOCK) {
+                if (++loop < 10) {
+                    QThread::msleep(500);
+                    continue;
+                }
+                printErrorMessage(port, clientIP, clientPort,
+                        QString("READ TIMEOUT %1(").arg(loop) + strerror(errno) + ")");
+                ::close(sockfd);
+                return std::nullopt;
+            }
+            if (errno == EINTR) {
+                printErrorMessage(port, clientIP, clientPort,
+                    QString("INTERRUPTED BY SIGNAL (2) (") + strerror(errno) + ")");
+                continue;
+            }
+        }
+
+        printInfoMessage(port, clientIP, clientPort, QString("MESSAGE RECEIVED ") + buf);
+        QString response(buf);
+
+        if (int idx = response.indexOf("{\"error\":\"ISMAS is offline\"}")) {
+            response = response.mid(0, idx);
+        } else
+        if (response.contains("RECORD")) { // RECORD SAVED or RECORD WRITE ABORTED
+            printInfoMessage(port, clientIP, clientPort, QString("IGNORED '") + response + "' RESPONSE");
+            ::close(sockfd);
+            return std::nullopt;
+        }
+
+        QJsonParseError parseError;
+        QJsonDocument document(QJsonDocument::fromJson(response.toUtf8(), &parseError));
+        if (parseError.error == QJsonParseError::NoError) {
+            if (document.isObject()) { // done: received valid APISM response
+                printInfoMessage(port, clientIP, clientPort,
+                   QString("VALID APISM RESPONSE .. \n") + response);
+                ::close(sockfd);
+                return response;
+            } else {
+                printInfoMessage(port, clientIP, clientPort,
+                   QString("CORRUPTED RESPONSE ") + response);
+                ::close(sockfd);
+                return std::nullopt;
+            }
+        } else {
+            printDebugMessage(port, clientIP, clientPort,
+                QString("PARSE ERROR ") + response + " " + parseError.errorString());
+            ::close(sockfd);
+            return std::nullopt;
+        }
+    }
+    return std::nullopt;
+}
+
+QString IsmasClient::updateNewsToIsmas(char const *event,
+                                       int percent,
+                                       int resultCode,
+                                       char const *step,
+                                       char const *step_result,
+                                       char const *version) {
+    char buf[1024];
+    memset(buf, 0, sizeof(buf));
+
+    QString const ts = QDateTime::currentDateTime().toString(Qt::ISODateWithMs);
+    snprintf(buf, sizeof(buf)-1,
+        "{"
+            "\"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.toStdString().c_str(), event, percent, resultCode,
+             step, step_result, version);
+    return buf;
+}
+
+QString IsmasClient::errorBackendNotConnected(QString const &info,
+                                              QString const &version) {
+    return updateNewsToIsmas("U0003",
+                             m_progressInPercent,
+                             RESULT_CODE::INSTALL_ERROR,
+                             "CHECK BACKEND CONNECTIVITY",
+                             info.toStdString().c_str(),
+                             version.toStdString().c_str());
+}
+
+QString IsmasClient::errorGitClone(int percent, QString const &info, QString const &version) {
+    return updateNewsToIsmas("U0003",
+                             percent,
+                             RESULT_CODE::INSTALL_ERROR,
+                             "CLONE CUSTOMER REPOSITORY FAILED",
+                             info.toStdString().c_str(),
+                             version.toStdString().c_str());
+}
+
+QString IsmasClient::backendConnected(QString const &info, QString const &version) {
+    return updateNewsToIsmas("U0010",
+                             m_progressInPercent,
+                             RESULT_CODE::SUCCESS,
+                             "CHECK BACKEND CONNECTIVITY",
+                             info.toStdString().c_str(),
+                             version.toStdString().c_str());
+}
+
+QString IsmasClient::execOpkgCommand(QString const &info, QString const &version) {
+    return updateNewsToIsmas("U0010",
+                             m_progressInPercent,
+                             RESULT_CODE::SUCCESS,
+                             "EXECUTE OPKG COMMAND",
+                             info.toStdString().c_str(),
+                             version.toStdString().c_str());
+}
+
+QString IsmasClient::updateTriggerSet(QString const &info, QString const &version) {
+    return updateNewsToIsmas("U0010",
+                             m_progressInPercent,
+                             RESULT_CODE::SUCCESS,
+                             "CHECK UPDATE TRIGGER",
+                             info.toStdString().c_str(),
+                             version.toStdString().c_str());
+
+}
+
+QString IsmasClient::errorUpdateTrigger(QString const &info, QString const &version) {
+    return updateNewsToIsmas("U0003",
+                             m_progressInPercent,
+                             RESULT_CODE::INSTALL_ERROR,
+                             "CHECK UPDATE TRIGGER",
+                             info.toStdString().c_str(),
+                             version.toStdString().c_str());
+
+}
+
+QString IsmasClient::updateOfPSASendVersion(PSAInstalled const &psa) {
+    //static int const constexpr SIZE = 4096*8;
+    static char buf[4096*2];
+    memset(buf, 0, sizeof(buf));
+
+    QString const ts = QDateTime::currentDateTime().toString(Qt::ISODateWithMs);
+    QString sendVersionHash = "N/A";
+
+    // local data="#M=APISM#C=CMD_SENDVERSION#J=
+    snprintf(buf, sizeof(buf)-1,
+        "{"
+            "\"VERSION_INFO\" : {"
+                "\"CREATED\":\"%s\","
+                "\"HASH\":\"%s\""
+            "},"
+            "\"TARIFF\" : {"
+                "\"VERSION\" : \"%s\","
+                "\"PROJECT\" : \"%s\","
+                "\"ZONE\" : %d,"
+                "\"INFO\" : \"%s\","
+                "\"BLOB\" : \"%s\","
+                "\"SIZE\" : %d,"
+                "\"LOADED\" : \"%s\""
+            "},"
+            "\"JSON\" : {"
+                "\"DC2C_CASH\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_CONF\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_DEVICE\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_PRINT_01\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_PRINT_02\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_PRINT_03\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_PRINT_04\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_PRINT_05\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_PRINT_06\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_PRINT_07\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_PRINT_08\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_PRINT_09\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_PRINT_10\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_PRINT_11\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_PRINT_12\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_PRINT_13\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_PRINT_14\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_PRINT_15\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_PRINT_16\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_PRINT_17\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_PRINT_18\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_PRINT_19\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_PRINT_20\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_PRINT_21\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_PRINT_22\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_PRINT_23\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_PRINT_24\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_PRINT_25\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_PRINT_26\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_PRINT_27\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_PRINT_28\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_PRINT_29\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_PRINT_30\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_PRINT_31\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "},"
+                "\"DC2C_PRINT_32\" : {"
+                    "\"BLOB\" : \"%s\","
+                    "\"SIZE\" : %d"
+                "}"
+            "},"
+            "\"HARDWARE\" : {"
+                "\"DEVICES\" : [\"PTU5\", \"DC\", \"PRINTER\", \"BNA\"]"
+            "},"
+            "\"OS\" : {"
+                "\"Linux\": \"%s\""
+            "},"
+            "\"CONFIG\" : {"
+                "\"PTU5\" : {"
+                    "\"CPU_SERIAL\" : \"%s\""
+                "},"
+                "\"DC\" : {"
+                    "\"HW-VERSION\" : \"%s\","
+                    "\"SW-VERSION\" : \"%s\","
+                    "\"SIZE\" : %d,"
+                    "\"GITBLOB\" : \"%s\","
+                    "\"GITLASTCOMMIT\" : \"%s\""
+                "},"
+                "\"PRINTER\" : {"
+                "},"
+                "\"BNA\" : {"
+                "}"
+            "},"
+            "\"SOFTWARE\": {"
+                "\"RAUC\" : \"%s\","
+                "\"OPKG\" : \"%s\","
+                "\"ATBQT\" : {"
+                    "\"VERSION\" : \"%s\""
+                "}"
+            "},"
+            "\"PLUGINS\" : {"
+                "\"libATBDeviceControllerPlugin.so\" : {"
+                    "\"VERSION\" : \"%s\""
+                "},"
+                "\"libIngenicoISelf_CCPlugin.so\" : {"
+                    "\"VERSION\" : \"%s\""
+                "},"
+                "\"libMOBILISIS_CalculatePricePlugin.so\" : {"
+                    "\"VERSION\" : \"%s\""
+                "},"
+                "\"libMOBILISIS_CalculatePricePlugin_ConfigUi.so\" : {"
+                    "\"VERSION\" : \"%s\""
+                "},"
+                "\"libPRM_CalculatePricePlugin.so\" : {"
+                    "\"VERSION\" : \"%s\""
+                "},"
+                "\"libPRM_CalculatePricePlugin_ConfigUi.so\" : {"
+                    "\"VERSION\" : \"%s\""
+                "},"
+                "\"libTCP_ZVT_CCPlugin.so\" : {"
+                    "\"VERSION\" : \"%s\""
+                "}"
+            "}"
+        "}",
+        ts.toStdString().c_str(),
+        sendVersionHash.toStdString().c_str(),
+
+        psa.tariff.version.toStdString().c_str(),
+        psa.tariff.project.toStdString().c_str(),
+        psa.tariff.zone,
+        psa.tariff.info.toStdString().c_str(),
+        psa.tariff.blob.toStdString().c_str(),
+        psa.tariff.size,
+        psa.tariff.loadTime.toStdString().c_str(),
+
+        psa.cash.blob.toStdString().c_str(),
+        psa.cash.size,
+        psa.conf.blob.toStdString().c_str(),
+        psa.conf.size,
+        psa.device.blob.toStdString().c_str(),
+        psa.device.size,
+
+        psa.print[0].blob.toStdString().c_str(),
+        psa.print[0].size,
+        psa.print[1].blob.toStdString().c_str(),
+        psa.print[1].size,
+        psa.print[2].blob.toStdString().c_str(),
+        psa.print[2].size,
+        psa.print[3].blob.toStdString().c_str(),
+        psa.print[3].size,
+        psa.print[4].blob.toStdString().c_str(),
+        psa.print[4].size,
+        psa.print[5].blob.toStdString().c_str(),
+        psa.print[5].size,
+        psa.print[6].blob.toStdString().c_str(),
+        psa.print[6].size,
+        psa.print[7].blob.toStdString().c_str(),
+        psa.print[7].size,
+        psa.print[8].blob.toStdString().c_str(),
+        psa.print[8].size,
+        psa.print[9].blob.toStdString().c_str(),
+        psa.print[9].size,
+        psa.print[10].blob.toStdString().c_str(),
+        psa.print[10].size,
+        psa.print[11].blob.toStdString().c_str(),
+        psa.print[11].size,
+        psa.print[12].blob.toStdString().c_str(),
+        psa.print[12].size,
+        psa.print[13].blob.toStdString().c_str(),
+        psa.print[13].size,
+        psa.print[14].blob.toStdString().c_str(),
+        psa.print[14].size,
+        psa.print[15].blob.toStdString().c_str(),
+        psa.print[15].size,
+        psa.print[16].blob.toStdString().c_str(),
+        psa.print[16].size,
+        psa.print[17].blob.toStdString().c_str(),
+        psa.print[17].size,
+        psa.print[18].blob.toStdString().c_str(),
+        psa.print[18].size,
+        psa.print[19].blob.toStdString().c_str(),
+        psa.print[19].size,
+        psa.print[20].blob.toStdString().c_str(),
+        psa.print[20].size,
+        psa.print[21].blob.toStdString().c_str(),
+        psa.print[21].size,
+        psa.print[22].blob.toStdString().c_str(),
+        psa.print[22].size,
+        psa.print[23].blob.toStdString().c_str(),
+        psa.print[23].size,
+        psa.print[24].blob.toStdString().c_str(),
+        psa.print[24].size,
+        psa.print[25].blob.toStdString().c_str(),
+        psa.print[25].size,
+        psa.print[26].blob.toStdString().c_str(),
+        psa.print[26].size,
+        psa.print[27].blob.toStdString().c_str(),
+        psa.print[27].size,
+        psa.print[28].blob.toStdString().c_str(),
+        psa.print[28].size,
+        psa.print[29].blob.toStdString().c_str(),
+        psa.print[29].size,
+        psa.print[30].blob.toStdString().c_str(),
+        psa.print[30].size,
+        psa.print[31].blob.toStdString().c_str(),
+        psa.print[31].size,
+
+        psa.hw.linuxVersion.toStdString().c_str(),
+        psa.hw.cpuSerial.toStdString().c_str(),
+
+        psa.dc.versionHW.toStdString().c_str(),
+        psa.dc.versionSW.toStdString().c_str(),
+        psa.dc.size,
+        psa.dc.gitBlob.toStdString().c_str(),
+        psa.dc.gitLastCommit.toStdString().c_str(),
+
+        psa.sw.raucVersion.toStdString().c_str(),
+        psa.sw.opkgVersion.toStdString().c_str(),
+        psa.sw.atbQTVersion.toStdString().c_str(),
+
+        psa.pluginVersion.deviceController.toStdString().c_str(),
+        psa.pluginVersion.ingenicoISelfCC.toStdString().c_str(),
+        psa.pluginVersion.mobilisisCalculatePrice.toStdString().c_str(),
+        psa.pluginVersion.mobilisisCalculatePriceConfigUi.toStdString().c_str(),
+        psa.pluginVersion.prmCalculatePrice.toStdString().c_str(),
+        psa.pluginVersion.prmCalculatePriceConfigUi.toStdString().c_str(),
+        psa.pluginVersion.tcpZVT.toStdString().c_str());
+
+    qInfo() << buf;
+
+    return buf;
+}
+
+QString IsmasClient::updateOfPSAContinues(QString currentStage,
+                                          QString currentStageInfo,
+                                          QString const &version) {
+    return updateNewsToIsmas("U0010",
+                             m_progressInPercent,
+                             RESULT_CODE::SUCCESS,
+                             currentStage.toStdString().c_str(),
+                             currentStageInfo.toStdString().c_str(),
+                             version.toStdString().c_str());
+}
+
+QString IsmasClient::updateOfPSAStarted(QString const &version) {
+    return updateNewsToIsmas("U0010",
+                             m_progressInPercent,
+                             RESULT_CODE::SUCCESS,
+                             "START",
+                             "detected WAIT state: start update process",
+                             version.toStdString().c_str());
+}
+
+QString IsmasClient::checkoutBranch(QString const &info, QString const &version) {
+    return updateNewsToIsmas("U0010",
+                             m_progressInPercent,
+                             RESULT_CODE::SUCCESS,
+                             "BRANCH-CHECKOUT",
+                             info.toStdString().c_str(),
+                             version.toStdString().c_str());
+}
+
+QString IsmasClient::cloneAndCheckoutCustomerRepository(QString const &info, QString const &version) { // clone and checkout customer repository
+    return updateNewsToIsmas("U0010",
+                             m_progressInPercent,
+                             RESULT_CODE::SUCCESS,
+                             "CLONE-CHECKOUT",
+                             info.toStdString().c_str(),
+                             version.toStdString().c_str());
+}
+
+QString IsmasClient::gitFetch(QString const &info, QString const &version) {
+    return updateNewsToIsmas("U0010",
+                             m_progressInPercent,
+                             RESULT_CODE::SUCCESS,
+                             "GIT-FETCH",
+                             info.toStdString().c_str(),
+                             version.toStdString().c_str());
+}
+
+QString IsmasClient::errorGitFetch(int resultCode, QString const &info, QString const &version) {
+    return updateNewsToIsmas("U0003",
+                             m_progressInPercent,
+                             resultCode,
+                             "GIT-FETCH-FAILED",
+                             info.toStdString().c_str(),
+                             version.toStdString().c_str());
+}
+
+QString IsmasClient::updateOfPSAActivated(QString const &version) {   // sent even after success
+    m_progressInPercent = 0;
+    return updateNewsToIsmas("U0002",
+                             m_progressInPercent,
+                             RESULT_CODE::SUCCESS,
+                             "UPDATE ACTIVATED",
+                             "reset WAIT state",
+                             version.toStdString().c_str());
+}
+
+QString IsmasClient::updateOfPSASucceeded(QString const &version) {
+    m_progressInPercent = 0;
+    return updateNewsToIsmas("U0001",
+                             m_progressInPercent,
+                             RESULT_CODE::SUCCESS,
+                             "UPDATE SUCCESS",
+                             "update process succeeded",
+                             version.toStdString().c_str());
+}
+
+QString IsmasClient::sanityCheckFailed(int resultCode, QString reason, QString const &version) {
+    return updateNewsToIsmas("U0003",
+                             m_progressInPercent,
+                             resultCode,
+                             "SANITY-CHECK-FAILED",
+                             reason.toStdString().c_str(),
+                             version.toStdString().c_str());
+}
+
+QString IsmasClient::jsonParseFailed(int resultCode, QString reason, QString const &version) {
+    return updateNewsToIsmas("U0003",
+                             m_progressInPercent,
+                             resultCode,
+                             "JSON-PARSE-ERROR",
+                             reason.toStdString().c_str(),
+                             version.toStdString().c_str());
+}
+
+QString IsmasClient::updateOfPSAFailed(int resultCode, QString step,
+                                       QString reason, QString const &version) {
+    return updateNewsToIsmas("U0003",
+                             m_progressInPercent,
+                             resultCode,
+                             step.toStdString().c_str(),
+                             reason.toStdString().c_str(),
+                             version.toStdString().c_str());
+}

ismas/ismas_client.h

@@ -0,0 +1,174 @@
+#ifndef ISMAS_CLIENT_H_INCLUDED
+#define ISMAS_CLIENT_H_INCLUDED
+
+#include <QObject>
+#include <QString>
+
+struct PSAInstalled {
+    struct Tariff {
+        QString name;
+        QString version;
+        QString project;
+        int zone;
+        int size;
+        QString blob;
+        QString lastCommit;
+        QString info;
+        QString loadTime;
+    } tariff;
+
+    struct HardWare {
+        QString linuxVersion;
+        QString cpuSerial;
+    } hw;
+
+    struct DC {
+        QString versionHW;
+        QString versionSW;
+        QString gitBlob;
+        QString gitLastCommit;
+        int size;
+    } dc;
+
+    struct SoftWare {
+        QString raucVersion;
+        QString opkgVersion;
+        QString atbQTVersion;
+    } sw;
+
+    struct PluginVersion {
+        QString deviceController;
+        QString ingenicoISelfCC;
+        QString mobilisisCalculatePrice;
+        QString mobilisisCalculatePriceConfigUi;
+        QString prmCalculatePrice;
+        QString prmCalculatePriceConfigUi;
+        QString tcpZVT;
+    } pluginVersion;
+
+    struct DC2C {
+        QString name;
+        QString blob;
+        int size;
+    };
+
+    DC2C cash;
+    DC2C conf;
+    DC2C device;
+
+    DC2C print[32];
+
+    explicit PSAInstalled() {
+        tariff.name = "N/A";
+        tariff.version = "N/A";
+        tariff.project = "N/A";
+        tariff.zone = -1;
+        tariff.size = -1;
+        tariff.blob = "N/A";
+        tariff.info = "N/A";
+        tariff.loadTime = "N/A";
+
+        hw.linuxVersion = "N/A";
+        hw.cpuSerial = "N/A";
+
+        dc.versionHW = "N/A";
+        dc.versionSW = "N/A";
+        dc.gitBlob = "N/A";
+        dc.gitLastCommit = "N/A";
+        dc.size = -1;
+
+        sw.raucVersion = "N/A";
+        sw.opkgVersion = "N/A";
+        sw.atbQTVersion = "N/A";
+
+        pluginVersion.deviceController = "N/A";
+        pluginVersion.ingenicoISelfCC = "N/A";
+        pluginVersion.mobilisisCalculatePrice = "N/A";
+        pluginVersion.mobilisisCalculatePriceConfigUi = "N/A";
+        pluginVersion.prmCalculatePrice = "N/A";
+        pluginVersion.prmCalculatePriceConfigUi = "N/A";
+        pluginVersion.tcpZVT = "N/A";
+
+        cash.name = "N/A";
+        cash.blob = "N/A";
+        cash.size = -1;
+
+        conf.name = "N/A";
+        conf.blob = "N/A";
+        conf.size = -1;
+
+        device.size = -1;
+        device.blob = "N/A";
+        device.size = -1;
+
+        for (int i=0; i < 32; ++i) {
+            print[i].size = -1;
+            print[i].blob = "N/A";
+            print[i].size = -1;
+        }
+    }
+};
+
+class IsmasClient : public QObject {
+    Q_OBJECT
+
+    int m_progressInPercent;
+public:
+    explicit IsmasClient() : m_progressInPercent(1) {}
+
+    enum APISM {
+        DB_PORT = 7777,
+        DIRECT_PORT = 7778
+    };
+
+    enum RESULT_CODE {
+        SUCCESS=0,
+        NO_UPDATE_NECESSARY=1,
+        BACKUP_FAILED=2,
+        WRONG_PACKAGE=3,
+        INSTALL_ERROR=4};
+
+    static std::optional<QString>
+        sendRequestReceiveResponse(int port, QString const &request);
+
+    int getProgressInPercent() const {return m_progressInPercent; }
+    void setProgressInPercent(int procent) { m_progressInPercent = procent; }
+
+    QString updateNewsToIsmas(char const *event,
+                              int percent,
+                              int resultCode,
+                              char const *step,
+                              char const *step_result,
+                              char const *version);
+
+    QString updateOfPSAStarted(QString const &version = QString());   // start of update process
+    QString cloneAndCheckoutCustomerRepository(QString const &info, QString const &version = QString());   // clone and checkout customer repository
+    QString checkoutBranch(QString const &info, QString const &version = QString());   // checkout branch
+    QString errorBackendNotConnected(QString const &info, QString const &version = QString());   // checkout branch
+    QString errorGitClone(int percent, QString const &info, QString const &version = QString());
+    QString backendConnected(QString const &info, QString const &version = QString());
+    QString updateTriggerSet(QString const &info, QString const &version = QString());
+    QString errorUpdateTrigger(QString const &info, QString const &version = QString());
+    QString gitFetch(QString const &info, QString const &version = QString());
+    QString execOpkgCommand(QString const &info, QString const &version = QString());
+    QString errorGitFetch(int resultCode, QString const &info, QString const &version = QString());
+    QString updateOfPSAActivated(QString const &version = QString());
+                                    // and update accepted
+    QString updateOfPSASucceeded(QString const &version = QString()); // update process succeeded
+    QString updateOfPSAContinues(QString currentStage, QString currentStageInfo, QString const &version = QString());
+    QString updateOfPSAFailed(int resultCode, QString step, QString reason, QString const &version = QString());
+    QString sanityCheckFailed(int resultCode, QString reason, QString const &version = QString());
+    QString jsonParseFailed(int resultCode, QString reason, QString const &version = QString());
+
+    QString updateOfPSASendVersion(PSAInstalled const &psa);
+
+  private:
+    static void printDebugMessage(int port, QString const &clientIP, int clientPort,
+                                  QString const &message);
+    static void printInfoMessage(int port, QString const &clientIP, int clientPort,
+                                 QString const &message);
+    static void printErrorMessage(int port, QString const &clientIP, int clientPort,
+                                  QString const &message);
+};
+
+#endif // ISMAS_CLIENT_H_INCLUDED

main.cpp

@@ -12,7 +12,6 @@
 #include "plugins/interfaces.h"
 
 #include <unistd.h>
-#include <thread>
 #include <memory>
 #include <QSharedMemory>
 #include <QRunnable>
@@ -21,12 +20,17 @@
 #include <QProcess>
 #include <QCommandLineParser>
 #include <QStandardPaths>
+#include <QMainWindow>
 
 #include "update.h"
+#include "git/git_client.h"
+#include "ismas/ismas_client.h"
 #include "worker_thread.h"
 #include "worker.h"
+#include "mainwindow.h"
+#include "utils.h"
 
-#include <thread>
+#include <QThread>
 
 #ifdef PTU5
 #define SERIAL_PORT "ttymxc2"
@@ -34,31 +38,23 @@
 #define SERIAL_PORT "ttyUSB0"
 #endif
 
-class hwinf;
-static void doWork(hwinf *hw, QString update_ctrl_file, QString workingDir) {
-    std::this_thread::sleep_for(std::chrono::milliseconds(2000));
-    Update update(hw, update_ctrl_file, workingDir);
-    update.doUpdate();
-    std::this_thread::sleep_for(std::chrono::milliseconds(2000));
-    QCoreApplication::quit();
-}
-
 // argv[1]: file to send to dc
 int main(int argc, char *argv[]) {
-
-    QByteArray const value = qgetenv("XDG_RUNTIME_DIR");
-    if (value.size() == 0) {
-        qputenv("XDG_RUNTIME_DIR", "/run/user/0");
+    QByteArray const value = qgetenv("LC_ALL");
+    if (value != "C") {
+        qputenv("LC_ALL", "C");
     }
+    // qputenv("XDG_RUNTIME_DIR", "/run/user/0");
+
+    openlog("ATB-UPDATE", LOG_PERROR | LOG_PID | LOG_CONS, LOG_USER);
 
     QApplication a(argc, argv);
     QApplication::setApplicationName("ATBUpdateTool");
-    QApplication::setApplicationVersion("1.0");
+    QApplication::setApplicationVersion(APP_VERSION);
 
     if (!messageHandlerInstalled()) { // change internal qt-QDebug-handling
         atbInstallMessageHandler(atbDebugOutput);
-        setDebugLevel(QtMsgType::QtDebugMsg);
-        //setDebugLevel(QtMsgType::QtDebugMsg);
+        setDebugLevel(LOG_NOTICE);
     }
 
     QCommandLineParser parser;
@@ -87,11 +83,24 @@ int main(int argc, char *argv[]) {
     workingDirectoryOption.setDefaultValue(workingDirectoryDefault);
     parser.addOption(workingDirectoryOption);
 
+    QCommandLineOption dryRunOption(QStringList() << "d" << "dry-run",
+        QCoreApplication::translate("main", "Start ATBUpdateTool in dry-run-mode. No actual actions."));
+    parser.addOption(dryRunOption);
+
+    // TODO:
+    // add some additional parameters
+    // --dry-run
+    // -d: only update device-controller firmware
+    // -j: only update json-files
+    // -o: only execute opkg-commnds
+    // -f: force. update_psa shall always perform a 'git pull'
+
     // Process the actual command line arguments given by the user
     parser.process(a);
     QString plugInDir = parser.value(pluginDirectoryOption);
     QString plugInName = parser.value(pluginNameOption);
     QString workingDir = parser.value(workingDirectoryOption);
+    bool dryRun = parser.isSet(dryRunOption);
     QString const rtPath = QCoreApplication::applicationDirPath();
 
     if (plugInDir == pluginDefault) {
@@ -102,10 +111,12 @@ int main(int argc, char *argv[]) {
                     << "does not exists, but has to contain dc-library";
         exit(-1);
     }
-    qInfo() << "pwd" << "=" << rtPath;
-    qInfo() << "plugInDir" << "=" << plugInDir;
-    qInfo() << "plugInName" << "=" << plugInName;
-    qInfo() << "workingDir" << "=" << workingDir;
+
+    qInfo() << "pwd ..............." << rtPath;
+    qInfo() << "plugInDir ........." << plugInDir;
+    qInfo() << "plugInName ........" << plugInName;
+    qInfo() << "workingDir ........" << workingDir;
+    qInfo() << "dryRun ............" << dryRun;
 
     // before loading the library, delete all possible shared memory segments
 #if defined Q_OS_LINUX || defined Q_OS_UNIX
@@ -115,13 +126,31 @@ int main(int argc, char *argv[]) {
 #endif
 
     hwinf *hw = Update::loadDCPlugin(QDir(plugInDir), plugInName);
-    hw->dc_autoRequest(false);
+    // hw->dc_autoRequest(false);
 
-    QString const update_ctrl_file = "/opt/app/tools/atbupdate/update_log.csv";
-    std::thread t(doWork, hw, update_ctrl_file, workingDir);
+    int machineNr = Utils::read1stLineOfFile("/etc/machine_nr");
+    int customerNr = Utils::read1stLineOfFile("/etc/cust_nr");
+    int zoneNr = Utils::read1stLineOfFile("/etc/zone_nr");
+    QString const branchName = (zoneNr != 0)
+            ? QString("zg1/zone%1").arg(zoneNr) : "master";
 
-    int ret = a.exec();
-    t.join();
+    QThread::currentThread()->setObjectName("main thread");
+    qInfo() << "Main thread" << QThread::currentThreadId();
 
-    return ret;
+    Worker worker(hw,
+                  customerNr,
+                  machineNr,
+                  zoneNr,
+                  branchName,
+                  workingDir,
+                  dryRun);
+
+    MainWindow mw(&worker);
+    worker.setMainWindow(&mw);
+
+    mw.setWindowFlags(Qt::Window | Qt::FramelessWindowHint);
+    mw.setWindowState(Qt::WindowFullScreen);
+    mw.show();
+
+    return a.exec();
 }

mainwindow.cpp

@@ -0,0 +1,197 @@
+#include "mainwindow.h"
+#include "ui_mainwindow.h"
+#include "worker.h"
+#include "utils.h"
+#include "progress_event.h"
+
+#include <QDateTime>
+#include <QMessageBox>
+#include <QDebug>
+
+MainWindow::MainWindow(Worker *worker, QWidget *parent)
+    : QMainWindow(parent)
+    , ui(new Ui::MainWindow)
+    , m_worker(worker)
+    , m_width(70)
+    , m_progressRunning(false)
+    , m_progressValue(0) {
+    ui->setupUi(this);
+
+    ui->updateProgress->setRange(0, 100);
+    ui->updateProgress->reset();
+
+    QStringList lst;
+    QString start = QDateTime::currentDateTime().toString(Qt::ISODate);
+    lst << QString("Start: ") + start.leftJustified(m_width-10);
+    lst << QString("").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("").leftJustified(m_width-3, '=');
+
+    ui->updateStatus->setText(lst.join('\n'));
+    ui->updateStatus->setEnabled(true);
+
+    m_startTimer = new QTimer(this);
+    connect(m_startTimer, SIGNAL(timeout()), m_worker, SLOT(update()));
+    m_startTimer->setSingleShot(true);
+    m_startTimer->start(1000);
+
+    m_exitTimer = new QTimer(this);
+    connect(m_exitTimer, SIGNAL(timeout()), ui->exit, SLOT(click()));
+    m_exitTimer->setSingleShot(true);
+    m_exitTimer->start(1800 * 1000);
+
+    connect(ui->exit, SIGNAL(clicked()), this, SLOT(onQuit()));
+    connect(m_worker, SIGNAL(disableExit()), this, SLOT(onDisableExit()));
+    connect(m_worker, SIGNAL(enableExit()), this, SLOT(onEnableExit()));
+    connect(m_worker, SIGNAL(stopStartTimer()), this, SLOT(onStopStartTimer()));
+    connect(m_worker, SIGNAL(restartExitTimer()), this, SLOT(onRestartExitTimer()));
+    connect(m_worker, SIGNAL(appendText(QString, QString)), this, SLOT(onAppendText(QString, QString)));
+    connect(m_worker, SIGNAL(showErrorMessage(QString,QString)), this, SLOT(onShowErrorMessage(QString,QString)));
+    connect(m_worker, SIGNAL(replaceLast(QString, QString)), this, SLOT(onReplaceLast(QString,QString)));
+
+    ui->updateStatus->setText(lst.join('\n'));
+    ui->updateStatus->setEnabled(true);
+}
+
+MainWindow::~MainWindow() {
+    delete m_startTimer;
+    delete m_exitTimer;
+    delete ui;
+}
+
+void MainWindow::customEvent(QEvent *event) {
+    if (event->type() == ProgressEvent::type()) {
+        ProgressEvent *pevent = (ProgressEvent *)event;
+        int const progress = pevent->progressPercent();
+        QObject const *sender = pevent->sender();
+        if (sender == this) {
+            switch(progress) {
+            case 0: {
+                ui->updateProgress->reset();
+            } break;
+            case START_PROGRESS_LOOP: {
+                m_progressRunning = true;
+                ui->updateProgress->reset();
+                m_progressValue = 10;
+                QApplication::postEvent(this, new ProgressEvent(this, m_progressValue));
+            } break;
+            case STOP_PROGRESS_LOOP: {
+                m_progressRunning = false;
+                m_progressValue -= 10;
+                m_worker->setProgress(m_progressValue/10);
+            } break;
+            default: {
+                    if (m_progressRunning) {
+                        m_progressValue = progress;
+                        ui->updateProgress->setValue(progress/10);
+                        QApplication::postEvent(this, new ProgressEvent(this, progress+10));
+                        QThread::msleep(500);
+                    }
+                }
+            }
+        } else
+        if (sender == m_worker) {
+            switch(progress) {
+            case 0: {
+                ui->updateProgress->reset();
+            } break;
+            case START_PROGRESS_LOOP: {
+                QApplication::postEvent(this, new ProgressEvent(this, START_PROGRESS_LOOP));
+            } break;
+            case STOP_PROGRESS_LOOP: {
+                QApplication::postEvent(this, new ProgressEvent(this, STOP_PROGRESS_LOOP));
+            } break;
+            default:{
+                ui->updateProgress->setValue(progress);
+            }}
+        } else {
+            qCritical() << "!!! UNKNOWN SENDER !!!";
+        }
+    }
+
+    QThread::yieldCurrentThread();
+}
+
+void MainWindow::onStopStartTimer() {
+    m_startTimer->stop();
+}
+
+void MainWindow::onDisableExit() {
+   ui->exit->setEnabled(false);
+}
+
+void MainWindow::onEnableExit() {
+   ui->exit->setEnabled(true);
+}
+
+void MainWindow::onRestartExitTimer() {
+    m_exitTimer->stop();
+    m_exitTimer->start(60 * 1000);
+}
+
+void MainWindow::onQuit() {
+    m_exitTimer->stop();
+    qCritical() << QString("ON QUIT: EXIT CODE %1").arg(m_worker->returnCode());
+    qApp->exit(m_worker->returnCode());
+}
+
+void MainWindow::onAppendText(QString text, QString suffix) {
+    QString editText = ui->updateStatus->toPlainText();
+    if (!suffix.isNull() && suffix.size() > 0) {
+        qInfo() << "TEXT" << text << "SUFFIX" << suffix;
+        if (suffix == Worker::UPDATE_STEP_SUCCESS || suffix == Worker::UPDATE_STEP_FAIL) {
+            editText += QString("\n").leftJustified(m_width-3, '=');
+            editText += " ";
+        }
+        editText += (QString("\n") + text).leftJustified(m_width - (2 + suffix.size()) ) + suffix;
+    } else {
+        editText += text.leftJustified(m_width-9);
+    }
+
+    Utils::printLineEditInfo(editText.split('\n'));
+
+    ui->updateStatus->setPlainText(editText.trimmed());
+    ui->updateStatus->setEnabled(true);
+}
+
+void MainWindow::onReplaceLast(QString text, QString suffix) {
+        qInfo() << "REPL TEXT" << text << "SUFFIX" << suffix;
+
+    QString editText = ui->updateStatus->toPlainText();
+    QStringList lines = editText.split('\n');
+    if (lines.size() > 0) {
+        lines.removeLast();
+        if (!suffix.isNull() && suffix.size() > 0 && suffix != "\n") {
+            lines += text.leftJustified(m_width-10) + suffix;
+        } else {
+            lines += text.leftJustified(m_width-10);
+        }
+    }
+
+    Utils::printLineEditInfo(lines);
+
+    ui->updateStatus->setText(lines.join('\n').trimmed());
+    ui->updateStatus->setEnabled(true);
+}
+
+void MainWindow::onShowErrorMessage(QString title, QString text) {
+    text = text.leftJustified(50, ' ');
+    QMessageBox msgBox(QMessageBox::NoIcon, title,
+                       text, QMessageBox::Ok,
+                       nullptr, Qt::FramelessWindowHint);
+    msgBox.setDefaultButton(QMessageBox::Ok);
+    msgBox.defaultButton()->setVisible(false);
+
+    QTimer *t = new QTimer(this);
+    connect(t, SIGNAL(timeout()), msgBox.defaultButton(), SLOT(click()));
+    t->setSingleShot(true);
+    t->start(5 * 1000);
+
+    if(msgBox.exec() == QMessageBox::Ok) {
+      // do something
+    } else {
+      // do something else
+    }
+}

mainwindow.h

@@ -0,0 +1,49 @@
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+#include <QTimer>
+
+QT_BEGIN_NAMESPACE
+namespace Ui { class MainWindow; }
+QT_END_NAMESPACE
+
+#include "worker.h"
+
+class MainWindow : public QMainWindow {
+    Q_OBJECT
+
+protected:
+    void customEvent(QEvent *event) override;
+
+public:
+    MainWindow(Worker *worker, QWidget *parent = nullptr);
+    ~MainWindow();
+
+    static const int START_PROGRESS_LOOP = -1;
+    static const int STOP_PROGRESS_LOOP = -2;
+
+    int progressValue() const { return m_progressValue; }
+
+public slots:
+    void onAppendText(QString, QString suffix = "");
+    void onReplaceLast(QString, QString suffix = "");
+    void onShowErrorMessage(QString, QString);
+    void onStopStartTimer();
+    void onRestartExitTimer();
+    void onEnableExit();
+    void onDisableExit();
+
+private slots:
+    void onQuit();
+
+private:
+    Ui::MainWindow *ui;
+    Worker *m_worker;
+    int m_width;
+    QTimer *m_startTimer;
+    QTimer *m_exitTimer;
+    bool m_progressRunning;
+    int m_progressValue;
+};
+#endif // MAINWINDOW_H

mainwindow.ui

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>800</width>
+    <height>480</height>
+   </rect>
+  </property>
+  <property name="font">
+   <font>
+    <family>Source Code Pro</family>
+   </font>
+  </property>
+  <property name="windowTitle">
+   <string>MainWindow</string>
+  </property>
+  <widget class="QWidget" name="centralwidget">
+   <widget class="QWidget" name="layoutWidget">
+    <property name="geometry">
+     <rect>
+      <x>10</x>
+      <y>10</y>
+      <width>781</width>
+      <height>461</height>
+     </rect>
+    </property>
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="3" column="2">
+      <widget class="QPushButton" name="exit">
+       <property name="text">
+        <string>Exit</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QProgressBar" name="updateProgress">
+       <property name="value">
+        <number>1</number>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0" rowspan="3" colspan="3">
+      <widget class="QTextEdit" name="updateStatus">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="font">
+        <font>
+         <family>Misc Fixed</family>
+         <pointsize>11</pointsize>
+         <bold>true</bold>
+        </font>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

message_handler.cpp

@@ -2,14 +2,17 @@
 
 #include <QDateTime>
 #include <cstring>
+#include <QString>
+#include <QFileInfo>
+#include <QMessageLogContext>
 
-#define OUTPUT_LEN (512)
 
+static char const *DBG_NAME[] = { "DBG  ", "WARN ", "CRIT ", "FATAL", "INFO " };
 static bool installedMsgHandler = false;
-static QtMsgType debugLevel = QtInfoMsg;
+static int debugLevel = LOG_NOTICE;
 
-QtMsgType getDebugLevel() { return debugLevel; }
-void setDebugLevel(QtMsgType newDebugLevel) {
+int getDebugLevel() { return debugLevel; }
+void setDebugLevel(int newDebugLevel) {
     debugLevel = newDebugLevel;
 }
 
@@ -42,80 +45,53 @@ QtMessageHandler atbInstallMessageHandler(QtMessageHandler handler) {
 ///
 #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) {
-    static constexpr const char *format = "hh:mm:ss";
-    // static constexpr const char *format = "dd.MM.yyyy hh:mm:ss";
-    QByteArray localMsg = msg.toLocal8Bit();
-    const char *file = context.file ? context.file : "";
-    const char *function = context.function ? context.function : "";
-    const char *p = std::strstr(function, "::");
-    if (p) {
-        function = p + 2;
-    }
-    char const* output = std::strrchr(file, '/');
-    if (output) {
-        file = output + 1;
-    }
-    qint64 const currentMSecsSinceEpoch = QDateTime::currentMSecsSinceEpoch();
-    int const fractional_part = currentMSecsSinceEpoch % 1000;
-    char buf[OUTPUT_LEN]{};
-    memset(buf, 0x00, sizeof(buf));
-    QDateTime const datetime = QDateTime::fromMSecsSinceEpoch(currentMSecsSinceEpoch);
-    switch (type) {
-        case QtDebugMsg: {
-            if (debugLevel == QtDebugMsg) {
-                snprintf(buf, sizeof(buf)-1, "%30.30s (%20.20s:%04u) %s.%03d DEBG %s\n",
-                         function, file, context.line,
-                         datetime.time().toString(format).toStdString().c_str(),
-                         fractional_part,
-                         localMsg.constData());
+    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 QtInfoMsg: {
-            if (debugLevel == QtInfoMsg || debugLevel == QtDebugMsg) {
-                snprintf(buf, sizeof(buf)-1, "%30.30s (%20.20s:%04u) %s.%03d INFO %s\n",
-                         function, file, context.line,
-                         datetime.time().toString(format).toStdString().c_str(),
-                         fractional_part,
-                         localMsg.constData());
+        case LOG_NOTICE: { // normal, but significant, condition
+            if (type != QtDebugMsg) {
+                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
             }
         } break;
-        case QtWarningMsg: {
-            if (debugLevel == QtInfoMsg || debugLevel == QtDebugMsg || debugLevel == QtWarningMsg) {
-                snprintf(buf, sizeof(buf)-1, "%30.30s (%20.20s:%04u) %s.%03d WARN %s\n",
-                         function, file, context.line,
-                         datetime.time().toString(format).toStdString().c_str(),
-                         fractional_part,
-                         localMsg.constData());
+        case LOG_WARNING: { // warning conditions
+            if (type != QtInfoMsg && type != QtDebugMsg) {
+                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
             }
         } break;
-        case QtCriticalMsg: {
-            if (debugLevel == QtInfoMsg || debugLevel == QtDebugMsg
-             || debugLevel == QtWarningMsg || debugLevel == QtCriticalMsg) {
-                snprintf(buf, sizeof(buf)-1, "%30.30s (%20.20s:%04u) %s.%03d CRIT %s\n",
-                         function, file, context.line,
-                         datetime.time().toString(format).toStdString().c_str(),
-                         fractional_part,
-                         localMsg.constData());
+        case LOG_ERR: { // error conditions
+            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
+                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
             }
         } break;
-        case QtFatalMsg: {
-            if (debugLevel == QtInfoMsg || debugLevel == QtDebugMsg
-             || debugLevel == QtWarningMsg || debugLevel == QtCriticalMsg
-             || debugLevel == QtFatalMsg) {
-                snprintf(buf, sizeof(buf)-1, "%30.30s (%20.20s:%04u) %s.%03d FATAL %s\n",
-                         function, file, context.line,
-                         datetime.time().toString(format).toStdString().c_str(),
-                         fractional_part,
-                         localMsg.constData());
+        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.%03d No ErrorLevel defined! %s\n", OUTPUT_LEN, OUTPUT_LEN,
-                datetime.time().toString(format).toStdString().c_str(), fractional_part,
-                msg.toStdString().c_str());
+            //fprintf(stderr, "%s No ErrorLevel defined! %s\n",
+            //    datetime.toStdString().c_str(), msg.toStdString().c_str());
         }
     }
-    fprintf(stderr, "%s\n", buf);
 }
 #endif
 

message_handler.h

@@ -2,9 +2,12 @@
 #define MESSAGE_HANDLER_H_INCLUDED
 
 #include <QtGlobal>
+#ifdef __linux__
+#include <syslog.h>
+#endif
 
-QtMsgType getDebugLevel();
-void setDebugLevel(QtMsgType newDebugLevel);
+int getDebugLevel();
+void setDebugLevel(int newDebugLevel);
 
 bool messageHandlerInstalled();
 QtMessageHandler atbInstallMessageHandler(QtMessageHandler handler);

plugins/interfaces.h

@@ -4,9 +4,6 @@
 #include <QtPlugin>
 
 
-#define THIS_IS_CA_MASTER
-// undef for slvae
-
 
 struct T_emp
 {
@@ -131,28 +128,24 @@ struct T_vaultRecord
         uint32_t AbsReserve;
         uint32_t AbsNrOfCuts;
 
-//16
         char label3buffer[4];	// mw >
 
-        // Verkauf, Tür zu:
-        uint32_t VKcoinsInserted[16];		// nur für Wechsler, soviel wurde eingeworfen
-        uint32_t VKcoinsReturned[6];		// nur für Wechsler, Anzahl Münzen pro Typ, soviel wurde zurückgegeben
-//88
+        // Verkauf, Tuer zu:
+        uint32_t VKcoinsInserted[16];		// nur fuer Wechsler, soviel wurde eingeworfen
+        uint32_t VKcoinsReturned[6];		// nur fuer Wechsler, Anzahl Muenzen pro Typ, soviel wurde zurueckgegeben
 
-        // Service, Tür offen:
-        uint16_t ServCoinsInserted[16];		// nur für Wechsler, soviel wurde eingeworfen
-        uint16_t ServCoinsReturned[6];		// nur für Wechsler, Anzahl Münzen pro Typ, soviel wurde zurückgegeben
+        // Service, Tuer offen:
+        uint16_t ServCoinsInserted[16];		// nur fuer Wechsler, soviel wurde eingeworfen
+        uint16_t ServCoinsReturned[6];		// nur fuer Wechsler, Anzahl Muenzen pro Typ, soviel wurde zurueckgegeben
         uint16_t resint3;
         uint16_t resint4;
-        uint16_t currentTubeContent[6];		//  nur für Wechsler, aktueller Füllstand
+        uint16_t currentTubeContent[6];		//  nur fuer Wechsler, aktueller Fuellstand
         uint16_t resint5;
         uint16_t resint6;
-// 56
 
         char label4buffer[4];	// box>
         uint16_t coinsInVault[16];
         uint16_t billsInStacker[8];
-// 48
 
         char label5buffer[4];	// val>
         // actually constant unless exchange rate is changed
@@ -162,11 +155,17 @@ struct T_vaultRecord
         uint16_t exchangeRate;
         uint16_t resint9;
 
-// 64
+        // new from 1.8.23
+        uint32_t cutsSinceCBchange;
+        uint32_t CBcontent_cent;
+        uint32_t CBnrofCoins;
 
-        char endofblock[4];	// end>
+        char endofblock[4];	// end
+// 332 bytes
 
-// 316 byte Block im Speicher
+        uint16_t CRC16;     // Xmodem16 from startbuffer[0] to endofblock[3]
+        uint16_t resint11;
+        char  endofRecord[4];	// ----
 
 };
 
@@ -204,7 +203,7 @@ struct T_moduleCondition
         uint8_t   temper;
 
         uint8_t	poweronTest;
-        uint8_t   doorState;			// 1: alles zu  200: t?r offen + bit1(S) +bit2(CB) + bit3(CB)
+        uint8_t   doorState;			// 1: alles zu  200: tuer offen + bit1(S) +bit2(CB) + bit3(CB)
         uint8_t	doorWasOpened;		// 1: all doors are closed   200: any door was just opened
         uint8_t	changer;			// can only be tested by usage
 
@@ -318,9 +317,10 @@ struct T_devices
     // set by master, used(1) or notused (0) or type 2....20
 
     UCHAR   kindOfPrinter;			// 0:off   1:Gebe
-    UCHAR	kindOfCoinChecker;		// 0: without  1=EMP820   2=EMP900    3=currenza c²	(MW)
+    UCHAR	kindOfCoinChecker;		// 0: without  1=EMP820   2=EMP900    3=currenza Csquare  (MW)
     UCHAR	kindOfMifareReader;		// by now only stronglink SL025 =1
-    UCHAR   suppressSleepMode;		// 0:sleep allowed   1: no sleep
+    UCHAR   solarPower;             // 1:sleep allowed   0: no sleep
+    //UCHAR   suppressSleepMode;	// 0:sleep allowed   1: no sleep
 
     UCHAR	kindOfModem;			// 0:off    1:Sunlink
     UCHAR	kindOfCreditcard;		// 0:off    1:Feig NFC
@@ -339,6 +339,8 @@ struct T_devices
 
     UINT	VaultFullWarnLevel;
     UINT	VaultFullErrorLevel;
+    UINT    BattEmptyWarnLevel;
+    UINT    BattEmptyErrorLevel;
 
 };
 
@@ -360,7 +362,7 @@ public:
     //      Furthermore the Cashagent-Library answers with status strings about sending and reading result
     // $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
 
-#ifdef THIS_IS_CA_MASTER
+
     virtual bool dc_openSerial(int BaudNr, QString BaudStr, QString ComName, uint8_t connect)  const =0;
         // Command: open serial interface
         // BaudNr:  0:1200   1:9600   2:19200   3:38400   4:57600   5:115200
@@ -371,7 +373,7 @@ public:
     virtual void dc_closeSerial(void)  const =0;
         // Command: close serial interface in order to save power while power down
         // or if another port must be used
-#endif
+
 
     virtual bool dc_isPortOpen(void)  const =0;
         // returns true if port open (don't send unless open. Sending to closed port will crash program)                         
@@ -397,7 +399,7 @@ public:
         // get data back in "payLoad", max 64 byte, can be used for diagnosis
         // retval = nr of bytes received. If host buffer too small then
         // only plBufSiz bytes are copied to "payLoad"
-        // plBufSiz­z=size of host buffer
+        // plBufSiz = size of host buffer
 
     virtual void dc_setWakeFrequency(uint8_t period)  const =0;
         // RTC wakes DC2 (and PTU) by hardware signal every 32seconds
@@ -406,7 +408,7 @@ public:
     virtual void dc_OrderToReset(void)  const =0;
         // want DC2 to reset (in order to start Bootloader)
 
-#ifdef THIS_IS_CA_MASTER
+
     virtual QString dc_getSerialState(void)  const =0;
         // get result of opening-command like "ttyS0 opened with 115200 8N1!
         // or error messages like "comport not available..."
@@ -414,7 +416,7 @@ public:
 
     virtual void dc_clrSerialStateText(void)  const =0;
         // clear above text to avoid multiple repetive displaying
-#endif
+
 
     virtual void bl_sendDataDirectly(uint8_t length, uint8_t *buf)  const =0;
         // send without protocol frame, needed for the DC bootloader
@@ -499,10 +501,10 @@ public:
 
     // Analog values:
     virtual uint32_t dc_getTemperature(void)  const =0;
-        // in Sax-Format 0...400 (0=-50,0°C    100=0,0°C    141=20,5°C    400=150,0°C)
+        // in Sax-Format 0...400 (0=-50,0degC    100=0,0degC    141=20,5degC    400=150,0degC)
 
     virtual QString  dc_getTemperaturStr(void)  const =0;
-        // as string like "-12,5°C"
+        // as string like "-12,5degC"
 
     virtual uint32_t dc_getVoltage(void)  const =0;
         // as value in mV,  0...65,535V
@@ -763,7 +765,7 @@ public:
                             uint8_t kindOfModem,        uint8_t kindOfCredit        ) const =0;
     // enable hardware in device controller:
     // kindOfPrinter:       0:off 1: GPT4672 (only this one implemented)
-    // kindOfCoinChecker:   0:off 1:EMP820 2:EMP900 3: C²_changer
+    // kindOfCoinChecker:   0:off 1:EMP820 2:EMP900 3: Csquare_changer
     // kindOfMifareReader:  0:off 1: SL025   (only this one implemented)
     // suppressSleep:       0:sleep allowed 1: sleep surpressed for special reason
     // kindOfModem:         0:off 1: ATB_Sunlink_LTE        (not yet implemented)
@@ -889,7 +891,7 @@ public:
         // send 5 byte: byte 0,1: speed  5...250 mm/s
         //              byte2: density   0....(25)....50
         //              byte3: alignment    'l', 'c', 'r' = left, center, right
-        //              byte4: orientation  0, 90, 180    = 0°, 90°, 180° rotation (by now not supported!)
+        //              byte4: orientation  0, 90, 180    = 0deg, 90deg, 180deg rotation (by now not supported!)
         // not batched! don't use twice within 100ms
 
     virtual void prn_movePaper(uint8_t wayInMm, uint8_t direction) const =0;
@@ -1021,7 +1023,7 @@ public:
         // use for changer
 
 
-#ifdef THIS_IS_CA_MASTER
+
     virtual QString dc_getTxt4RsDiagWin(void) const =0;
     virtual void dc_clrTxt4RsDiagWin(void) const =0;
     virtual QString dc_get2ndTxt4RsDiagWin(void) const =0;
@@ -1036,7 +1038,6 @@ public:
     virtual void dc_clrTxt4dataStateLine(void) const =0;
     virtual QString dc_getdatifLine(void) const =0;
     virtual void dc_clrTxt4datifLine(void) const =0;
-#endif
 
 
 
@@ -1155,14 +1156,13 @@ public:
         // to be forwarded to Ismas
 
     virtual bool prn_printAccountReceipt(void) const =0;
+        // print all 8 backuped accounting receipts
         // return true if sending to DC OK, false if cmd-stack is full
 
     virtual bool prn_printTestTicket(void) const =0;
         // return true if sending to DC OK, false if cmd-stack is full
 
 
-
-
     virtual bool cash_startPayment(uint32_t amount) const =0;
         // 17.4.23TS: extended to 32bit
 
@@ -1181,7 +1181,7 @@ public:
     virtual uint16_t getLastInsertedCoin(void) const =0;
 
     virtual bool getAllInsertedCoins(uint16_t *types, uint16_t *values) const =0;
-        // alle bei diesem Verkauf eingeworfenen Münzen sind gespeichert, max 64
+        // alle bei diesem Verkauf eingeworfenen Muenzen sind gespeichert, max 64
 
 
     virtual bool cash_cancelPayment(void) const =0;
@@ -1235,6 +1235,8 @@ public:
 
     virtual uint8_t prn_getPrintResult() const =0;
 
+
+
     virtual uint8_t prn_getCurrentPrinterState() const =0;
         //        0: printer OK
         //          bit0: near paper end          bit1: no paper
@@ -1247,6 +1249,8 @@ public:
     virtual void sys_sendDeviceParameter(struct T_devices *deviceSettings) const =0;
 
     virtual void sys_restoreDeviceParameter(struct T_devices *deviceSettings) const =0;
+        // attention: only applies if function "sys_sendDeviceParameter()" was used to send this settings before
+        //          cannot be used to see settings programmed by JsonFile
 
     virtual bool sys_areDCdataValid(void) const =0;
 
@@ -1271,6 +1275,71 @@ public:
 
     virtual bool dc_isAutoRequestOn(void) const =0;
 
+    virtual uint16_t log_getLatestAccountNumber(void) const=0;
+    // new function 27.6.2023
+    // latest = highest of the backup's
+
+    virtual uint8_t log_getAvailableVaultBlocks(void) const=0;
+        // return 0x0011 1111 if all 6 blocks are loaded (one bit per block)
+
+    virtual uint8_t log_getAnswerToLastSlaveRequest(void) const =0;
+        // use only for ONE request/command
+        // return: 0xFF: result unknown by now as sending is ongoing
+        // 0=OK
+        // 1= wrong length    2=wrong start sign           5= wrong crc
+        // 6= slave: master cmd was wrong       7: slave: could not write/read data
+        // 8=timeout, got no response from slave
+
+
+    // use for important and extended commands (print several templates, print ticket...)
+    virtual void log_startSupervision(void) const =0;
+
+    virtual uint8_t log_getAnswerToLastCmdBatch(void) const =0;
+        // 0xFF: no command sent by now
+        // 0: started, in progress
+        // 1: done and OK
+        // 2: done and error
+
+    virtual bool log_getVaultData(uint8_t *data) const =0;
+        // get vault record in linear 8bit buffer with 384 byte
+
+
+
+    // new from 1.8.23
+    virtual bool prn_printOneAccountReceipt(uint16_t accountNr) const =0;
+        // print one out of eight stored last accounting receipts
+        // function log_getHoldAccountNumbers() gives a list of acc-Nr. of the stored receipts
+
+    virtual bool prn_printAllAvailAccountReceipts(void) const =0;
+        // same as: prn_printAccountReceipt() from line 1153
+        // return true if sending to DC OK, false if cmd-stack is full
+
+    virtual bool log_verifyVaultRecordByCrc(void) const =0;
+        // return true if CRC16 is correct, data are 100% OK. Security level 1:65536
+        // verification is strongly recommended before further processing
+        // in case of "false"-result please reload from DC
+
+
+    virtual uint16_t log_DC_getNextAccountNumber(void) const=0;
+        // the current cash box content will be backuped with this number on next cashbox-change
+
+    virtual void log_DC_setNextAccountNumber(uint16_t newAccountingNumber) const=0;
+        // the current cash box content will be backuped with this number on next cashbox-change
+        // use only in case of hardware replacements or errors which derailed the number
+
+    virtual void log_DC_deleteAllVaultrecordsInDc(void) const=0;
+        // use only in case of hardware replacements or errors which derailed the number
+
+    virtual void log_DC_deleteAllTotalCounters(void) const=0;
+        // use only in case of hardware replacements or errors which derailed the number
+
+    virtual void dc_setNewCustomerNumber(uint16_t newCustNr) const =0;
+
+    virtual void dc_setNewMachineNumber(uint16_t newMachNr) const =0;
+
+    virtual void dc_setNewBorough(uint16_t newBorough) const =0;
+
+    virtual void dc_setNewZone(uint16_t newZone) const =0;
 
 
 
@@ -1327,6 +1396,11 @@ signals:
 //                  getAllInsertedCoins() fixed, also in datif and storeINdata
 
 // 15.06.2023 V4.2  bring into same order as hwapi in order to set the THIS_IS_CA_MASTER correct
+// 19.06.2023 V4.3  added some qCriticals to see emits
+
+// 01.08.2023 V4.4  some new values at the end of struct T_vaultRecord
+//                  two more values in struct T_devices
+//                  7 new functions at the end of the file
 
 
 //#define HWINF_iid "Atb.Psa2020.software.HWapi/3.1"
@@ -1337,7 +1411,9 @@ signals:
 //#define HWINF_iid "Atb.Psa1256ptu5.software.HWapi/3.6"
 //#define HWINF_iid "Atb.Psa1256ptu5.software.HWapi/4.0"
 //#define HWINF_iid "Atb.Psa1256ptu5.software.HWapi/4.1"
-#define HWINF_iid "Atb.Psa1256ptu5.software.HWapi/4.2"
+//#define HWINF_iid "Atb.Psa1256ptu5.software.HWapi/4.2"
+//#define HWINF_iid "Atb.Psa1256ptu5.software.HWapi/4.3"
+#define HWINF_iid "Atb.Psa1256ptu5.software.HWapi/4.4"
 
 
 

process/command.cpp

@@ -0,0 +1,84 @@
+#include "command.h"
+
+#include <QProcess>
+#include <QDebug>
+#include <QRegularExpression>
+
+Command::Command(QString const &command, int start_timeout, int finish_timeout)
+    : m_command(command.trimmed())
+    , m_commandResult("")
+    , m_waitForStartTimeout(start_timeout)
+    , m_waitForFinishTimeout(finish_timeout) {
+}
+
+QString Command::getCommandResult() const {
+    return m_commandResult;
+}
+
+void Command::readyReadStandardOutput() {
+    QProcess *p = (QProcess *)sender();
+    m_commandResult += p->readAllStandardOutput();
+    // qCritical() << m_commandResult;
+}
+
+void Command::readyReadStandardError() {
+    QProcess *p = (QProcess *)sender();
+    QByteArray buf = p->readAllStandardError();
+    qCritical() << buf;
+}
+
+void Command::finished(int /*exitCode*/, QProcess::ExitStatus /*exitStatus*/) {
+    QProcess *p = (QProcess *)sender();
+    // read all remaining data sent to the process, just in case
+    QString d = p->readAllStandardOutput();
+    if (!d.isEmpty()) {
+        m_commandResult += d;
+    }
+    disconnect(p, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(readyReadStandardOutput()));
+    disconnect(p, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(readyReadStandardError()));
+}
+
+bool Command::execute(QString workingDirectory, QStringList args) {
+    QScopedPointer<QProcess> p(new QProcess(this));
+    p->setProcessChannelMode(QProcess::MergedChannels);
+
+    connect(&(*p), SIGNAL(readyReadStandardOutput()), this, SLOT(readyReadStandardOutput()));
+    connect(&(*p), SIGNAL(readyReadStandardError()), this, SLOT(readyReadStandardError()));
+
+    //qCritical() << "START COMMAND" << m_command << "WITH ARGS" << args
+    //            << "IN" << workingDirectory;
+
+    p->setWorkingDirectory(workingDirectory);
+    if (!args.isEmpty()) {
+        p->start(m_command, args);
+    } else {
+        p->start(m_command);
+    }
+
+    if (p->waitForStarted(m_waitForStartTimeout)) {
+        //qDebug() << "PROCESS" << m_command << "STARTED";
+        if (p->state() == QProcess::ProcessState::Running) {
+            //qDebug() << "PROCESS" << m_command << "RUNNING";
+            if (p->waitForFinished(m_waitForFinishTimeout)) {
+                //qDebug() << "PROCESS" << m_command << "FINISHED";
+                if (p->exitStatus() == QProcess::NormalExit) {
+                    if (p->exitCode() == 0) {
+                        return true;
+                    } else {
+                        qCritical() << "EXECUTED" << m_command << "with code" << p->exitCode();
+                    }
+                } else {
+                    qCritical() << "PROCESS" << m_command << "CRASHED with code"
+                                << p->exitCode();
+                }
+            } else {
+                qCritical() << "PROCESS" << m_command << "DID NOT FINISH";
+            }
+        } else {
+            qCritical() << "WRONG PROCESS STATE" << p->state();
+        }
+    } else {
+        qCritical() << "PROCESS" << m_command << "TIMEOUT AT START";
+    }
+    return false;
+}

process/command.h

@@ -0,0 +1,33 @@
+#ifndef COMMAND_H_INCLUDED
+#define COMMAND_H_INCLUDED
+#endif // COMMAND_H_INCLUDED
+
+#include <QObject>
+#include <QCoreApplication>
+#include <QString>
+#include <QStringList>
+#include <QProcess>
+
+
+class Command : public QObject {
+    Q_OBJECT
+
+    QString m_command;
+    QString m_commandResult;
+    int m_waitForStartTimeout;
+    int m_waitForFinishTimeout;
+
+public:
+    explicit Command(QString const &command,
+                     int start_timeout = 100000,
+                     int finish_timeout = 100000);
+
+    QString getCommandResult() const;
+
+    bool execute(QString workingDirectory, QStringList args = QStringList());
+
+private slots:
+    void readyReadStandardOutput();
+    void readyReadStandardError();
+    void finished(int exitCode, QProcess::ExitStatus exitStatus);
+};

progress_event.cpp

@@ -0,0 +1,20 @@
+#include "progress_event.h"
+
+QEvent::Type ProgressEvent::customEventType = QEvent::None;
+
+ProgressEvent::ProgressEvent(QObject const *sender, int progressPercent)
+    : QEvent(ProgressEvent::type())
+    , m_sender(sender)
+    , m_progressPercent(progressPercent) {
+}
+
+ProgressEvent::~ProgressEvent() {
+}
+
+QEvent::Type ProgressEvent::type() {
+    if (customEventType == QEvent::None) {
+        int generatedType = QEvent::registerEventType();
+        customEventType = static_cast<QEvent::Type>(generatedType);
+    }
+    return customEventType;
+}

progress_event.h

@@ -0,0 +1,26 @@
+#ifndef PROGRESS_EVENT_H_INCLUDED
+#define PROGRESS_EVENT_H_INCLUDED
+
+#include <QEvent>
+
+class ProgressEvent : public QEvent {
+
+    QObject const *m_sender;
+    int m_progressPercent;
+public:
+    explicit ProgressEvent(QObject const *sender, int progressPercent);
+    virtual ~ProgressEvent();
+    static QEvent::Type type();
+
+    QObject const *sender() { return m_sender; }
+    QObject const *sender() const { return m_sender; }
+
+    void setProgress(int progressPercent) { m_progressPercent = progressPercent; }
+    int progressPercent() { return m_progressPercent; }
+    int progressPercent() const { return m_progressPercent; }
+private:
+    static QEvent::Type customEventType;
+};
+
+
+#endif // PROGRESS_EVENT_H_INCLUDED

update.cpp

@@ -1,4 +1,5 @@
 #include "update.h"
+#include "worker.h"
 
 #include <QCoreApplication>
 #include <QApplication>
@@ -7,22 +8,28 @@
 #include <QDebug>
 #include <QTextStream>
 #include <QRegularExpression>
+#include <QRegExp>
+
+//#include <iostream>
+//#include <fstream>
+//#include <ctime>
 
 #include "plugins/interfaces.h"
 
 #include <QSharedMemory>
 #include <QScopedPointer>
-#include <QProcess>
 #include <QDir>
 #include <QThread>
 #include <QDateTime>
 #include <QPluginLoader>
 #include <QMap>
 
-#define COLUMN_REQUEST      (0)
-#define COLUMN_NAME         (1)
-#define COLUMN_DATE_TIME    (2)
-#define COLUMN_RESULT       (3)
+#define UPDATE_OPKG                 (1)
+#define UPDATE_DC                   (1)
+#define UPDATE_PRINTER_TEMPLATES    (1)
+#define UPDATE_CASH_TEMPLATE        (1)
+#define UPDATE_CONF_TEMPLATE        (1)
+#define UPDATE_DEVICE_TEMPLATE      (1)
 
 static const QMap<QString, int> baudrateMap = {
   {"1200"   ,   0}, {"9600"   ,   1}, {"19200"  ,   2}, {"38400"  ,   3},
@@ -70,85 +77,30 @@ hwinf *Update::loadDCPlugin(QDir const &plugInDir, QString const &fname) {
 }
 
 Update::Update(hwinf *hw,
-               QString update_ctrl_file,
+               Worker *worker,
+               QString customerRepository,
+               QString customerNrStr,
+               QString branchName,
                QString workingDir,
+               bool dryRun,
                QObject *parent,
                char const *serialInterface,
                char const *baudrate)
     : QObject(parent)
     , m_hw(hw)
+    , m_worker(worker)
     , m_serialInterface(serialInterface)
     , m_baudrate(baudrate)
-    , m_update_ctrl_file(update_ctrl_file)
-    , m_update_ctrl_file_copy(update_ctrl_file + ".copy")
+    , m_customerRepository(customerRepository)
+    , m_customerNrStr(customerNrStr)
+    , m_branchName(branchName)
     , m_workingDir(workingDir)
-    , m_init(true) {
-
-    execUpdateScript();
-
-    if (!m_update_ctrl_file.exists()) {
-        qCritical() << "Update-file" << m_update_ctrl_file.fileName()
-                    << "does not exist";
-        m_init = false;
-    }
-    if (!m_update_ctrl_file_copy.exists()) {
-        qCritical() << "Update-file-copy" << m_update_ctrl_file_copy.fileName()
-                    << "does not exist";
-        m_init = false;
-    }
-    if (!m_update_ctrl_file.open(QIODevice::ReadWrite | QIODevice::Text)) {
-        qCritical() << "can not open " << m_update_ctrl_file.fileName();
-        m_init = false;
-    }
-    qDebug() << "Opened" << m_update_ctrl_file.fileName();
-    if (!m_update_ctrl_file_copy.open(QIODevice::ReadWrite | QIODevice::Text)) {
-        qCritical() << "can not open " << m_update_ctrl_file_copy.fileName();
-        m_init = false;
-    }
-    qDebug() << "Opened" << m_update_ctrl_file_copy.fileName();
+    , m_dryRun(dryRun) {
 }
 
 Update::~Update() {
 }
 
-bool Update::execUpdateScript() {
-    // path of update-script 'update_psa'
-    QString update_psa("/opt/app/tools/atbupdate/update_psa -m --wdir ");
-    update_psa += m_workingDir;
-
-    qCritical() << "update_psa: " << update_psa;
-    //QApplication::processEvents();
-    //for (int i=0;i<10;++i) {
-    //    QThread::sleep(1);
-    //QApplication::processEvents();
-    //}
-
-    // debug
-    return true;
-
-    //QStringList const params(QStringList() << "-c" << update_psa);
-
-    QScopedPointer<QProcess> p(new QProcess(this));
-    p->setProcessChannelMode(QProcess::MergedChannels);
-
-    p->start(update_psa);
-    if (p->waitForStarted(1000)) {
-        if (p->state() == QProcess::ProcessState::Running) {
-            if (p->waitForFinished(60000)) {
-                QString output = p->readAllStandardOutput().toStdString().c_str();
-                QStringList lst = output.split('\n');
-                for (int i = 0; i < lst.size(); ++i) {
-                    qDebug() << lst[i];
-                }
-                qInfo() << "EXECUTED" << update_psa;
-                return ((p->exitStatus() == QProcess::NormalExit)
-                     && (p->exitCode() == 0));
-            }
-        }
-    }
-    return false;
-}
-
 Update::DownloadResult Update::sendStatus(int ret) const {
     switch (ret) {                      // return values of dc are:
     case 0:                             // 0: no answer by now
@@ -165,10 +117,10 @@ Update::DownloadResult Update::sendNextAddress(int bNum) const {
     int noAnswerCount = 0;
     int errorCount = 0;
     if ( bNum==0 || bNum==1024 || bNum==2048 || bNum==3072 || bNum==4096 ) {
-        qDebug() << "addr-block" << bNum << "...";
+        // qDebug() << "addr-block" << bNum << "...";
         while (noAnswerCount <= 250) {
             m_hw->bl_sendAddress(bNum);
-            std::this_thread::sleep_for(std::chrono::milliseconds(100));
+            QThread::msleep(100);
             DownloadResult const res = sendStatus(m_hw->bl_wasSendingAddOK());
             if (res != DownloadResult::NOP) {
                 if (res == DownloadResult::ERROR) {
@@ -177,7 +129,7 @@ Update::DownloadResult Update::sendNextAddress(int bNum) const {
                         return res;
                     }
                 } else { // res == DownloadResult::OK
-                    qInfo() << "addr-block" << bNum << "...OK";
+                    // qInfo() << "addr-block" << bNum << "...OK";
                     return res;
                 }
             } else {
@@ -201,16 +153,12 @@ Update::DownloadResult Update::sendNextDataBlock(QByteArray const &binary,
     memcpy(local, binary.constData() + bAddr, 64);
     local[64] = local[65] = 0x00;
 
-    //for (int i=0; i<4; ++i) {
-    //    printf("%04d ", bNum);
-    //    for (int j=0; j < 16; ++j) {
-    //        printf("%02x ", local[i*16 + j]);
-    //    } printf("\n");
-    //}
+    // QByteArray b((const char *)(&local[0]), 64);
+    // qCritical() << "SNDB" << bNum << b.size() << b.toHex();
 
     while (noAnswerCount <= 250) {
         m_hw->bl_sendDataBlock(64, local);
-        std::this_thread::sleep_for(std::chrono::milliseconds(10));
+        QThread::msleep(10);
         DownloadResult const res = sendStatus(m_hw->bl_wasSendingDataOK());
         if (res != DownloadResult::NOP) {
             if (res == DownloadResult::ERROR) {
@@ -219,7 +167,7 @@ Update::DownloadResult Update::sendNextDataBlock(QByteArray const &binary,
                     return res;
                 }
             } else {
-                qInfo() << "data for block" << bNum << "OK";
+                // qInfo() << "data for block" << bNum << "OK";
                 return res;
             }
         } else {
@@ -233,39 +181,41 @@ Update::DownloadResult Update::sendNextDataBlock(QByteArray const &binary,
 Update::DownloadResult Update::dc_downloadBinary(QByteArray const &b) const {
     int const nBlocks = (((b.size())%64)==0) ? (b.size()/64) : (b.size()/64)+1;
 
-    qInfo() << "total number of bytes to send to dc" << b.size();
+    // fill lst block of data to be sent with 0xFF
+    QByteArray ba = b.leftJustified(nBlocks*64, (char)(0xFF));
+
+    qInfo() << "total number of bytes to send to dc" << ba.size();
     qInfo() << "total number of blocks to send to dc" << nBlocks;
 
     int bNum = 0;
     DownloadResult res = DownloadResult::OK;
+    fprintf(stderr, "\n64-byte block %04d ", bNum);
     while (res != DownloadResult::ERROR &&  bNum < nBlocks) {
         if ((res = sendNextAddress(bNum)) != DownloadResult::ERROR) {
-            if ((res = sendNextDataBlock(b, bNum)) != DownloadResult::ERROR) {
+            if ((res = sendNextDataBlock(ba, bNum)) != DownloadResult::ERROR) {
                 bNum += 1;
+                fprintf(stderr, ".");
+                if ((bNum % 80) == 0) {
+                    fprintf(stderr, "\n64-byte block %04d ", bNum);
+                }
             }
         }
     }
-    qInfo() << "nBlocks" << nBlocks;
-    //if (res != DownloadResult::ERROR) {
-    // always send last block, even when there are no data !!!
-    int const rest = b.size() % 64;
-    int const offset = b.size() - rest;
-    char const *startAddress = b.constData() + offset;
+    fprintf(stderr, "\nlast 64-byte block %04d\n", bNum);
+
+    int const rest = ba.size() % 64;
+    int const offset = ba.size() - rest;
+    char const *startAddress = ba.constData() + offset;
 
-    uint8_t local[66];
-    memset(local, 0x00, sizeof(local));
     if (rest > 0) {
+        // SHOULD NEVER HAPPEN !!!
+        uint8_t local[66];
+        memset(local, 0xFF, sizeof(local));
         memcpy(local, startAddress, rest);
+        qCritical() << "ERROR SEND REMAINING" << rest << "BYTES";
+        m_hw->bl_sendDataBlock(64, local);
     }
 
-    //for (int i=0; i<4; ++i) {
-    //    printf("*** %04d ", bNum);
-    //    for (int j=0; j < 16; ++j) {
-    //        printf("%02x ", local[i*16 + j]);
-    //    } printf("\n");
-    //}
-
-    // bl_sendLastBlock(local);
     m_hw->bl_sendLastBlock();
     qInfo() << "last result" << (int)sendStatus(m_hw->bl_wasSendingDataOK());
     return res;
@@ -276,12 +226,14 @@ bool Update::startBootloader() const {
     int nTry = 5;
     while (--nTry >= 0) {
         m_hw->bl_startBL();
-        std::this_thread::sleep_for(std::chrono::milliseconds(500));
+        QThread::msleep(5000);
         m_hw->bl_checkBL();
         if (m_hw->bl_isUp()) {
             qInfo() << "starting bootloader...OK";
-            std::this_thread::sleep_for(std::chrono::milliseconds(500));
+            QThread::msleep(5000);
             return true;
+        } else {
+            qCritical() << "bootloader not up (" << nTry << ")";
         }
     }
     qCritical() << "starting bootloader...FAILED";
@@ -293,7 +245,7 @@ bool Update::stopBootloader() const {
     int nTry = 5;
     while (--nTry >= 0) {
         m_hw->bl_stopBL();
-        std::this_thread::sleep_for(std::chrono::milliseconds(500));
+        QThread::msleep(500);
         if (!m_hw->bl_isUp()) {
             qInfo() << "stopping bootloader...OK";
             return true;
@@ -315,21 +267,21 @@ bool Update::openSerial(int br, QString baudrate, QString comPort) const {
 }
 
 void Update::closeSerial() const {
+    qInfo() << "CLOSED SERIAL" << m_baudrate << m_serialInterface;
     m_hw->dc_closeSerial();
 }
 
+bool Update::isSerialOpen() const {
+    return m_hw->dc_isPortOpen();
+}
+
 bool Update::resetDeviceController() const {
     qDebug() << "resetting device controller...";
-    //if (stopBootloader()) { // first stop a (maybe) running bootloader
-    // std::this_thread::sleep_for(std::chrono::milliseconds(1000));
     m_hw->bl_rebootDC();
     // wait maximally 3 seconds, before starting bootloader
-    std::this_thread::sleep_for(std::chrono::milliseconds(1500));
+    QThread::sleep(1);
     qInfo() << "resetting device controller...OK";
     return true;
-    //}
-    //qCritical() << "stopping bootloader...FAILED";
-    //return false;
 }
 
 QByteArray Update::loadBinaryDCFile(QString filename) const {
@@ -366,137 +318,170 @@ bool Update::downloadBinaryToDC(QString const &bFile) const {
     return true;
 }
 
+/*
+ Using the DC bootloader:
+ 1  :   bl_reboot()      // send to application, want DC2 to reset (in order to start
+                        // the bootloader)
+ 2  :   bl_startBL():   // send within 4s after DC poewer-on, otherwise bl is left
+ 3  :   bl_check():     // send command to verify if bl is up
+ 4  :   bl_isUp():      // returns true if bl is up and running
+
+ 5  :   bl_sendAddress(blockNumber)
+                        // send start address, nr of 64-byte block, start with 0
+                        // will be sent only for following block-numbers:
+                        // 0, 1024, 2048, 3072 and 4096, so basically every 64kByte
+                        // for other addresses nothing happens
+
+ 6  :   bl_wasSendingAddOK()
+                        // return val:  0: no response by now
+                        //              1: error
+                        //             10: OK
+
+ 7  :   bl_sendDataBlock()
+                        // send 64 byte from bin file
+
+ 8  :   bl_sendLastBlock()
+                        // send this command after all data are transferred
+
+ 9  :   bl_wasSendingDataOK()
+                        // return val:  0: no response by now
+                        //              1: error
+                        //             10: OK
+
+ 10 :   bl_stopBL()     // leave bl and start (the new) application
+ */
 bool Update::updateBinary(char const *fileToSendToDC) {
+    qInfo() << "UPDATING DEVICE CONTROLLER BINARY" << fileToSendToDC;
     QFile fn(fileToSendToDC);
     bool r;
     if ((r = fn.exists()) == true) {
-        QString const linkTarget = fn.symLinkTarget();
-        qInfo() << "updating binary (dc)" << linkTarget << "...";
-        if ((r = updateDC(linkTarget, m_baudrate, m_serialInterface)) == true) {
-            qInfo() << "updating binary (dc)" << linkTarget << "... done";
+        QFileInfo fi(fn);
+        qInfo() << "      UPDATING BINARY" << fi.fileName() << "(size=" << fi.size() << ")";
+        if ((r = updateDC(fileToSendToDC)) == true) {
+            qCritical() << QString(80, '*');
+            qInfo() << "      UPDATING BINARY" << fi.fileName() << "(size=" << fi.size() << ") DONE";
+            qCritical() << QString(80, '*');
         } else {
-            qCritical() << "updating binary (dc)" << linkTarget << "... FAILED";
+            qCritical() << QString(80, '*');
+            qCritical() << "      UPDATING BINARY" << fi.fileName() << "(size=" << fi.size() << ") FAILED";
+            qCritical() << QString(80, '*');
         }
     } else {
-        qCritical() << "symlink" << fileToSendToDC << "does not exist";
+        qCritical() << QString(80, '*');
+        qCritical() << fileToSendToDC << "does not exist -> NO UPDATE OF DC FIRMWARE";
+        qCritical() << QString(80, '*');
     }
     return r;
 }
 
-bool Update::updateDC(QString bFile, QString br, QString serial) const {
-    if (!baudrateMap.contains(br)) { // sanity check
-        qCritical() << "passed wrong baudrate" << br;
-        return false;
-    }
-
-    m_hw->dc_autoRequest(false);
-    qDebug() << "updating dc: " << bFile << br << serial << "...";
-
-    return true;
-
-    if (!openSerial(baudrateMap.value(br), br, serial)) {
-        return false;
-    }
+bool Update::updateDC(QString bFile) const {
+    qDebug() << "updating dc...";
+    qDebug() << "updating dc: file to send" << bFile;
     if (!resetDeviceController()) {
-        closeSerial();
         return false;
     }
     if (!startBootloader()) {
-        closeSerial();
+        // even when start seems to fail, stopping the boot loader does not harm
+        stopBootloader();
         return false;
     }
+
     if (!downloadBinaryToDC(bFile)) {
         stopBootloader();
-        closeSerial();
-        qCritical() << "updating dc: " << bFile << br << serial << "...FAILED";
+        qCritical() << "updating dc: " << bFile << "...FAILED";
         return false;
     }
-
-    qInfo() << "updating dc: " << bFile << br << serial << "...OK";
+    qInfo() << "updating dc: " << bFile << "...OK";
 
     stopBootloader();
-    QThread::sleep(3);
+    //resetDeviceController();
 
-    closeSerial();
+    QThread::sleep(3);
     return true;
 }
 
-bool Update::updatePrinterTemplate(enum FileTypeJson type,
-                                   int templateIdx,
-                                   QString fname,
-                                   QString br,
-                                   QString serial) const {
-    // sanity checks
-    if (!baudrateMap.contains(br)) {
-        qCritical() << "passed wrong baudrate" << br;
-        return false;
+QString Update::jsonType(enum FileTypeJson type) {
+    switch (type) {
+    case FileTypeJson::CASH: return "CASH";
+    case FileTypeJson::CONFIG: return "CONFIG";
+    case FileTypeJson::PRINTER: return "PRINTER";
+    case FileTypeJson::SERIAL: return "SERIAL";
+    case FileTypeJson::DEVICE: return "DEVICE";
+    case FileTypeJson::TIME: return "TIME";
     }
-    if (type != FileTypeJson::PRINTER) {
-        qCritical() << "wrong file type" << (uint8_t)type;
-        return false;
-    }
-    qDebug() << "updating: " << fname << br << serial << "...";
-    if (!serial.isNull()) {
-        if (!openSerial(baudrateMap.value(br), br, serial)) {
-            return false;
-        }
-    }
-    int nTry = 50;
-    while (!m_hw->sys_ready4sending()) { // wait max. 5 seconds
-        std::this_thread::sleep_for(std::chrono::milliseconds(100));
+    return "N/A";
+}
+
+bool Update::downloadJson(enum FileTypeJson type,
+                          int templateIdx,
+                          QString jsFileToSendToDC) const {
+
+    qDebug() << "updating json-file:" << jsFileToSendToDC << "...";
+    qDebug() << "    template-index:" << templateIdx;
+    qDebug() << "         json-type:" << jsonType(type);
+
+    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
+
+    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";
-            if (!serial.isNull()) {
-                closeSerial();
-            }
-            return false;
+            qCritical() << "SYS NOT READY FOR SENDING AFTER 5 SECONDS";
+            break;
         }
     }
-    bool ret = true;
-    QFile file(fname);
-    if (file.exists() && file.open(QIODevice::ReadOnly)) {
-        QByteArray ba = file.readAll();
-        if (ba.size() <= 800) { // max. size is 800 bytes
-            if (m_hw->sys_sendJsonFileToDc((uint8_t)(type),
-                                           templateIdx,
-                                           (uint8_t *)ba.data())) {
-                std::this_thread::sleep_for(std::chrono::seconds(1));
-                qInfo() << "sent file" << fname << "to dc";
+
+    bool ret = false;
+    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() <= 800) {
+                    QByteArray ba = file.readAll();
+                    if (m_hw->sys_sendJsonFileToDc((uint8_t)(type),
+                                                   templateIdx,
+                                                   (uint8_t *)ba.data())) {
+                        QThread::sleep(1);
+                        qDebug() << "SENT" << jsFileToSendToDC;
+                        ret = true;
+                    }
+                } else {
+                    qCritical() << "SIZE OF" << jsFileToSendToDC
+                                << "TOO BIG (" << fi.size() << "BYTES)";
+                }
+            } else {
+                qCritical() << "CANNOT OPEN" << jsFileToSendToDC << "FOR READING";
             }
+        } else {
+            qCritical() << jsFileToSendToDC << "DOES NOT EXIST";
         }
-    } else {
-        qCritical() << fname << "!!! does not exist!!!";
-        ret = false;
-    }
-    if (!serial.isNull()) {
-        closeSerial();
     }
+
+    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::updatePrinterConf(int templateIdx, QString fileToSendToDC) {
-    qCritical() << "updating printer template: " << fileToSendToDC;
-    return updatePrinterTemplate(FileTypeJson::PRINTER,
-                                 templateIdx,
-                                 fileToSendToDC,
-                                 QString(m_baudrate),
-                                 QString(m_serialInterface));
+bool Update::updatePrinterTemplate(int templateIdx, QString jsFile) const {
+    return downloadJson(FileTypeJson::PRINTER, templateIdx, jsFile);
 }
 
-QStringList Update::getOpenLines() {
-    QStringList openLines;
+bool Update::updateConfig(QString jsFile) {
+    return downloadJson(FileTypeJson::CONFIG, 0, jsFile);
+}
 
-    QTextStream in(&m_update_ctrl_file);
-    while (!in.atEnd()) {
-        QString line = in.readLine().trimmed();
-        if (line.startsWith("DONE")) {
-            m_update_ctrl_file_copy.write(line.toUtf8().constData());
-            m_update_ctrl_file_copy.write("\n");
-        } else {
-            openLines << line;
-        }
-    }
-    return openLines;
+bool Update::updateCashConf(QString jsFile) {
+    return downloadJson(FileTypeJson::CASH, 0, jsFile);
+}
+
+bool Update::updateDeviceConf(QString jsFile) {
+    return downloadJson(FileTypeJson::DEVICE, 0, jsFile);
 }
 
 QStringList Update::split(QString line, QChar sep) {
@@ -515,135 +500,183 @@ QStringList Update::split(QString line, QChar sep) {
     return lst;
 }
 
-bool Update::doUpdate() {
-    /*
-        The file referred to by 'update_data' has the following structure for
-        each line:
+void Update::readyReadStandardOutput() {
+    QProcess *p = (QProcess *)sender();
+    QByteArray buf = p->readAllStandardOutput();
+    qCritical() << buf;
+}
 
-        # ======================================================================
-        # REQUEST    |  NAME  |   DATE  |  RESULT
-        # ======================================================================
-        # where
-        #
-        # STATUS: DOWNLOAD, EXECUTE or DONE
-        # NAME  : If starting with 'opkg' it is an opkg-command to be executed.
-        #         Otherwise its the name of a file which has to be updated.
-        # DATE  : 0000-00-00T00:00:00
-        # RESULT: SUCCESS or ERROR (possibly with description)
-        #
-     */
+void Update::readyReadStandardError() {
+    QProcess *p = (QProcess *)sender();
+    QByteArray buf = p->readAllStandardError();
+    qCritical() << buf;
+}
 
+void Update::finished(int /*exitCode*/, QProcess::ExitStatus /*exitStatus*/) {
+    QProcess *p = (QProcess *)sender();
+    disconnect(p, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(readyReadStandardOutput()));
+    disconnect(p, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(readyReadStandardError()));
+}
 
-    if (!m_init) {
-        return false;
-    }
+bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
+    //
+    // ACHTUNG !!!
+    //
+    return true;
 
-    QStringList openLines = getOpenLines();
-    if (openLines.size() == 0) {
-        qCritical() << "No lines to handle in" << m_update_ctrl_file.fileName();
-        return false;
-    }
+    bool serialOpened = false;
+    bool serialOpen = false;
 
-    qDebug() << "open lines...";
-    for (int i=0; i< openLines.size(); ++i) {
-        qDebug() << "line" << i << ":" << openLines.at(i).trimmed();
-    }
-
-    QList<QString>::const_iterator it;
-    for (it = openLines.cbegin(); it != openLines.cend(); ++it) {
-        bool res = false;
-        QString line = (*it).trimmed();
-        if (line.size() == 0 || line.startsWith(QChar('#'))) {
-            continue;
-        }
-        QStringList lst = split(line.trimmed());
-        if (lst.size() != 4) {
-            qCritical() << "Parsing error for" << m_update_ctrl_file.fileName();
-            return false;
-        }
-        QString const &request = lst[COLUMN_REQUEST];
-        QString const &name = lst[COLUMN_NAME];
-        // QString const &datetime = lst[COLUMN_DATE_TIME];
-        QString const &result = lst[COLUMN_RESULT];
-        if ((!request.contains("DOWNLOAD") && !request.contains("EXECUTE")) ||
-            !result.contains("N/A")) {
-            qCritical() << "parsing error for" << m_update_ctrl_file.fileName();
-            return false;
-        }
-        if (name.contains("dc2c") && name.endsWith(".bin")) {
-            qInfo() << "downloading" << name.trimmed() << "to DC";
-            if ((res = updateBinary(name.toStdString().c_str())) == true) {
-                qInfo() << "downloaded binary" << name;
+    if (!serialOpen) {
+        if (!isSerialOpen()) { // open serial only if not already open
+            if ((serialOpened = openSerial(baudrateMap.value(m_baudrate), m_baudrate, m_serialInterface)) == false) {
+                qCritical() << "CANNOT OPEN" << m_serialInterface << "(BAUDRATE="
+                            << m_baudrate << ")";
+                return false;
             }
-        } else
-        if (name.contains("DC2C_print") && name.endsWith(".json")) {
-            int i = name.indexOf("DC2C_print");
-            int templateIdx = name.mid(i).midRef(10, 2).toInt();
-            if ((templateIdx < 1) || (templateIdx > 32)) {
-                qCritical() << "wrong template index";
+        }
+        serialOpen = true;
+        qInfo() << "SERIAL OPEN" << m_serialInterface << "(BAUDRATE=" << m_baudrate << ")";
+    }
+
+    bool res = false;
+    QList<QString>::const_iterator it;
+    for (it = filesToWorkOn.cbegin(); it != filesToWorkOn.cend(); ++it) {
+        m_worker->startProgressLoop();
+        QString fToWorkOn = (*it).trimmed();
+        fToWorkOn = QDir::cleanPath(m_customerRepository + QDir::separator() + fToWorkOn);
+
+        static const QRegularExpression version("^.*dc2c[.][0-9][0-9][.][0-9][0-9][.]bin.*$");
+        if (fToWorkOn.contains(version)) {
+
+            qInfo() << QString(80, '*');
+            qInfo() << "DO-UPDATE FILE-TO-WORK-ON" << fToWorkOn;
+            qInfo() << QString(80, '*');
+
+            for (int i=0; i < 3; ++i) { // send explicit reuests to get
+                                        // current SW/HW-versions
+                m_hw->request_DC2_SWversion();
+                m_hw->request_DC2_HWversion();
+                QThread::sleep(1);
+            }
+
+            QString const hwVersion = m_hw->dc_getHWversion().toLower();
+            QString const fwVersion = m_hw->dc_getSWversion().toLower();
+
+            qInfo() << "current dc-hardware-version" << hwVersion;
+            qInfo() << "current dc-firmware-version" << fwVersion;
+
+            QFile fn(fToWorkOn);
+            QFileInfo finfo(fn);
+            if (!fn.exists()) { // check for broken link
+                qCritical() << QString(80, '*');
+                qCritical() << "FILE-TO-WORK-ON" << fn << "DOES NOT EXIST";
+                qCritical() << QString(80, '*');
                 res = false;
             } else {
-                if ((res = updatePrinterConf(templateIdx, name)) == true) {
-                    qInfo() << "downloaded printer template" << name;
-                }
-            }
-        } else
-        if (name.contains("opkg")) {
-            qInfo() << "starting" << name.trimmed();
-            QScopedPointer<QProcess> p(new QProcess(this));
-            p->setProcessChannelMode(QProcess::MergedChannels);
-            p->start(name.trimmed());
-            if (p->waitForStarted(1000)) {
-                if (p->state() == QProcess::ProcessState::Running) {
-                    if (p->waitForFinished(100000)) {
-                        QString output = p->readAllStandardOutput();
-                        QStringList outputLst = split(output, QChar('\n'));
-                        for (int line=0; line < outputLst.size(); ++line) {
-                            qDebug() << outputLst[line];
-                        }
-                        res = true;
-                        qInfo() << "EXECUTED" << name;
+                if (false) {
+                //if (fwVersion.startsWith(linkTarget.completeBaseName())) {
+                //    qCritical() << "current dc-firmware-version" << fwVersion
+                //                << "already installed";
+                //    res = false;
+                } else {
+                    res = true;
+
+                    qInfo() << "DOWNLOADING" << finfo.completeBaseName() << "TO DC";
+#if UPDATE_DC == 1
+                    m_hw->dc_autoRequest(false);// default: turn auto-request setting off
+                    QThread::sleep(1);          // wait to be sure that there are no more
+                                                // commands sent to dc-hardware
+                    qInfo() << "SET AUTO-REQUEST=FALSE";
+
+                    if ((res = updateBinary(fToWorkOn.toStdString().c_str())) == true) {
+                        qCritical() << "downloaded binary" << fToWorkOn;
+                        ++displayIndex;
+                        emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(2, ' ') + QString(")")
+                            + QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
+                            Worker::UPDATE_STEP_DONE);
                     }
+
+                    m_hw->dc_autoRequest(true); // turn auto-request setting on
+                    qInfo() << "SET AUTO-REQUEST=TRUE";
+                    qInfo() << "WAIT 10 SECS TO RECEIVE RESPONSES...";
+
+                    QThread::sleep(10); // wait to be sure that responses
+                                        // have been received
+                    qInfo() << "updated dc-hardware-version" << m_hw->dc_getHWversion();
+                    qInfo() << "updated dc-firmware-version" << m_hw->dc_getSWversion();
+#endif
                 }
             }
+        } else if (fToWorkOn.contains("DC2C_print", Qt::CaseInsensitive)
+                && fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
+            res = true;
+#if UPDATE_PRINTER_TEMPLATES == 1
+            int i = fToWorkOn.indexOf("DC2C_print", Qt::CaseInsensitive);
+            int const templateIdx = fToWorkOn.mid(i).midRef(10, 2).toInt();
+            if ((templateIdx < 1) || (templateIdx > 32)) {
+                qCritical() << "WRONG TEMPLATE INDEX" << templateIdx;
+                res = false;
+            } else {
+                if ((res = updatePrinterTemplate(templateIdx, fToWorkOn))) {
+                    qInfo() << "downloaded printer template"<< fToWorkOn;
+                    ++displayIndex;
+                    emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(2, ' ') + QString(")")
+                          + QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
+                            Worker::UPDATE_STEP_DONE);
+                }
+            }
+#endif
+        } else if (fToWorkOn.contains("DC2C_cash", Qt::CaseInsensitive)
+                && fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
+            res = true;
+#if UPDATE_CASH_TEMPLATE == 1
+            if ((res = updateCashConf(fToWorkOn))) {
+                qInfo() << "downloaded cash template"<< fToWorkOn;
+                ++displayIndex;
+                emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(2, ' ') + QString(")")
+                      + QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
+                        Worker::UPDATE_STEP_DONE);
+            }
+#endif
+        } else if (fToWorkOn.contains("DC2C_conf", Qt::CaseInsensitive)
+                && fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
+            res = true;
+#if UPDATE_CONF_TEMPLATE == 1
+            if ((res= updateConfig(fToWorkOn))) {
+                qInfo() << "downloaded config template"<< fToWorkOn;
+                ++displayIndex;
+                emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(2, ' ') + QString(")")
+                      + QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
+                        Worker::UPDATE_STEP_DONE);
+            }
+#endif
+        } else if (fToWorkOn.contains("DC2C_device", Qt::CaseInsensitive)
+                && fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
+            res = true;
+#if UPDATE_DEVICE_TEMPLATE == 1
+            if ((res = updateDeviceConf(fToWorkOn))) {
+                qInfo() << "downloaded device template"<< fToWorkOn;
+                ++displayIndex;
+                emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(2, ' ') + QString(")")
+                      + QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
+                        Worker::UPDATE_STEP_DONE);
+            }
+#endif
         } else {
-            // TODO
+            qCritical() << "UNKNOWN JSON FILE NAME" << fToWorkOn;
+            res = false;
         }
-        char buf[80];
-        int const bytesWritten =
-            snprintf(buf, sizeof(buf)-1, "DONE, %*.*s, %*.*s, %*.*s\n",
-                 35, 35, name.toStdString().c_str(),
-                 20, 20, QDateTime::currentDateTime().toString(Qt::ISODate).toStdString().c_str(),
-                 10, 10, (res == true) ? "SUCCESS" : "ERROR");
-        if (bytesWritten < 80) {
-            buf[bytesWritten] = '\0';
+        m_worker->stopProgressLoop();
+        m_worker->setProgress(100);
+
+        if (res == false) {
+            break;
         }
-        m_update_ctrl_file_copy.write(buf);
     } // for (it = openLines.cbegin(); it != openLines.end(); ++it) {
 
-    return finishUpdate(openLines.size() > 0);
-}
-
-bool Update::finishUpdate(bool swapCtrlFiles) {
-    if (swapCtrlFiles) {
-        m_update_ctrl_file.close();
-        m_update_ctrl_file_copy.close();
-
-        QString const &fn = m_update_ctrl_file.fileName();
-        QString const &fn_tmp = m_update_ctrl_file.fileName() + ".tmp";
-        QString const &fn_copy = m_update_ctrl_file_copy.fileName();
-        QFile tmp(fn_tmp);
-
-        if (tmp.exists()) {
-            tmp.remove();
-        }
-
-        if (m_update_ctrl_file.rename(fn_tmp)) {
-            if (m_update_ctrl_file_copy.rename(fn)) {
-                return m_update_ctrl_file.rename(fn_copy);
-            }
-        }
-        return false;
-    }
-    return true;
+    m_hw->dc_autoRequest(true);  // ALWAYS turn autoRequest ON
+    qDebug() << "SET AUTO-REQUEST=TRUE";
+
+    return res;
 }

update.h

@@ -6,6 +6,7 @@
 #include <QFile>
 #include <QDir>
 #include <QByteArray>
+#include <QProcess>
 
 #include "plugins/interfaces.h"
 
@@ -15,48 +16,54 @@
 #define SERIAL_PORT "ttyUSB0"
 #endif
 
-class Update;
-
-// TODO: check hardware compatibility
-// TODO: opkg commandos
-
+class Worker;
 class Update : public QObject {
     Q_OBJECT
 
     hwinf *m_hw;
+    Worker *m_worker;
     char const *m_serialInterface;
     char const *m_baudrate;
-    QFile m_update_ctrl_file;
-    QFile m_update_ctrl_file_copy;
+    QString m_customerRepository;
+    QString m_customerNrStr;
+    QString m_branchName;
     QString m_workingDir;
-
-    bool m_init;
-
-    bool updateBinary(char const *fileToSendToDC);
-    bool updatePrinterConf(int templateIdx, QString fileToSendToDC);
-    bool finishUpdate(bool finish);
-    QStringList getOpenLines();
-    QStringList split(QString line, QChar sep = ',');
-
-    bool execUpdateScript();
+    bool m_maintenanceMode;
+    bool m_dryRun;
 
 public:
     enum class DownloadResult {OK, ERROR, TIMEOUT, NOP};
-    enum class FileTypeJson {CONFIG=1, DEVICE, CASH, SERIAL, TIME, PRINTER};
+    enum class FileTypeJson {CONFIG=1, DEVICE=2, CASH=3, SERIAL=4, TIME=5, PRINTER=6};
 
     static hwinf *loadDCPlugin(QDir const &plugInDir, QString const &fn);
+    static QStringList split(QString line, QChar sep = ',');
 
 
     explicit Update(hwinf *hw,
-                    QString update_ctrl_file,
-                    QString workingDir = ".",
+                    Worker *worker,
+                    QString customerRepository,
+                    QString customerNrStr,
+                    QString branchName,
+                    QString workingDir,
+                    bool dryRun = false,
                     QObject *parent = nullptr,
                     char const *serialInterface = SERIAL_PORT,
                     char const *baudrate = "115200");
     virtual ~Update() override;
-    bool doUpdate();
+    bool doUpdate(int &displayIndex, QStringList const &linesToWorkOn);
+
+    //QString customerId() { return m_customerId; }
+    //QString const customerId() const { return m_customerId; }
+
+    QString branchName() { return m_branchName; }
+    QString const branchName() const { return m_branchName; }
+
+    //QString repositoryPath() { return m_repositoryPath; }
+    //QString const repositoryPath() const { return m_repositoryPath; }
 
 private:
+    static QString jsonType(enum FileTypeJson type);
+
     DownloadResult sendStatus(int ret) const;
     DownloadResult sendNextAddress(int bNum) const;
     DownloadResult sendNextDataBlock(QByteArray const &b, int bNum) const;
@@ -66,11 +73,23 @@ private:
     bool stopBootloader() const;
     bool openSerial(int br, QString baudrate, QString comPort) const;
     void closeSerial() const;
+    bool isSerialOpen() const;
     bool resetDeviceController() const;
     QByteArray loadBinaryDCFile(QString filename) const;
     bool downloadBinaryToDC(QString const &bFile) const;
-    bool updateDC(QString bFile, QString br, QString serial) const;
-    bool updatePrinterTemplate(enum FileTypeJson type, int templateIdx,
-                               QString fname, QString br, QString serial) const;
+    bool updateDC(QString bFile) const;
+    bool updatePrinterTemplate(int templateIdx, QString fname) const;
+    bool updateBinary(char const *fileToSendToDC);
+    bool updateConfig(QString jsFileToSendToDC);
+    bool updateCashConf(QString jsFileToSendToDC);
+    bool updateDeviceConf(QString jsFileToSendToDC);
+    bool downloadJson(enum FileTypeJson type, int templateIdx,
+                      QString jsFileToSendToDC) const;
+
+private slots:
+    void readyReadStandardOutput();
+    void readyReadStandardError();
+    void finished(int exitCode, QProcess::ExitStatus exitStatus);
+
 };
 #endif // UPDATE_H_INCLUDED

utils.cpp

@@ -1,201 +1,79 @@
 #include "utils.h"
+#include "message_handler.h"
 
-#include <QCoreApplication>
-#include <QApplication>
 #include <QFile>
-#include <QTemporaryFile>
-#include <QDebug>
 #include <QTextStream>
+#include <QDebug>
 
-#include "interfaces.h"
-#include "DCPlugin/include/hwapi.h"
-
-//#include <unistd.h>
-#include <thread>
-#include <memory>
-#include <QSharedMemory>
-#include <QScopedPointer>
-#include <QProcess>
-
-#define COLUMN_STATUS       (0)
-#define COLUMN_NAME         (1)
-#define COLUMN_DATE_TIME    (2)
-#define COLUMN_RESULT       (3)
-
-Utils::Utils(QString update_ctrl_file,
-             QObject *parent,
-             char const *serialInterface,
-             char const *baudrate)
-    : QObject(parent)
-    , m_hw(new hwapi())
-    , m_serialInterface(serialInterface)
-    , m_baudrate(baudrate)
-    , m_update_ctrl_file(update_ctrl_file)
-    , m_update_ctrl_file_copy(update_ctrl_file + ".copy")
-    , m_in(&m_update_ctrl_file)
-    , m_out(&m_update_ctrl_file_copy)
-    , m_init(true) {
-
-    if (!m_update_ctrl_file.exists()) {
-        qCritical() << "Update-file" << m_update_ctrl_file.fileName()
-                    << "does not exist";
-        m_init = false;
-    }
-    if (!m_update_ctrl_file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-        qCritical() << "can not open " << m_update_ctrl_file.fileName()
-                    << "for reading";
-        m_init = false;
-    }
-    if (!m_update_ctrl_file_copy.open(QIODevice::WriteOnly | QIODevice::Text)) {
-        qCritical() << "can not open " << m_update_ctrl_file_copy.fileName()
-                    << "for writing";
-        m_init = false;
-    }
-}
-
-Utils::~Utils() {
-
-}
-
-void Utils::updateBinary(char const *fileToSendToDC) {
-    qDebug() << "file to send to DC ..." << fileToSendToDC;
-    qDebug() << "baudrate ............." << m_baudrate;
-    qDebug() << "serial interface ....." << m_serialInterface;
-    m_hw->dc_updateDC(fileToSendToDC, m_baudrate, m_serialInterface);
-    std::this_thread::sleep_for(std::chrono::milliseconds(3000));
-    QCoreApplication::quit();
-}
-
-void Utils::updatePrinterConf(int nrOfTemplate, char const *fileToSendToDC) {
-    QVector<int> printTemplates{ nrOfTemplate };
-    QVector<QString> filesToSend{ fileToSendToDC };
-
-    m_hw->dc_updatePrinterTemplate(hwapi::FileTypeJson::PRINTER,
-                                   printTemplates, filesToSend,
-                                   QString(m_baudrate),
-                                   QString(m_serialInterface));
-    std::this_thread::sleep_for(std::chrono::milliseconds(3000));
-    QCoreApplication::quit();
-}
-
-QStringList Utils::getOpenLines() {
-    QStringList openLines;
-
-    while (!m_in.atEnd()) {
-        QString line = m_in.readLine().trimmed();
-        // QString.split() is defined >= 5.14
-        if (!line.startsWith("OPEN")) {
-            m_out << line;
-        } else {
-            openLines << line;
-        }
-    }
-    return openLines;
-}
-
-bool Utils::doUpdate() {
-    /*
-        The file referred to by 'update_data' has the following structure for
-        each line:
-
-        # ======================================================================
-        # STATUS    |  NAME  |   DATE  |  RESULT
-        # ======================================================================
-        # where
-        #
-        # STATUS: OPEN or CLOSED
-        # NAME  : If starting with 'opkg' it is an opkg-command to be executed.
-        #         Otherwise its the name of a file which has to be updated.
-        # DATE  : 0000-00-00T00:00:00
-        # RESULT: SUCCESS or ERROR (possibly with description)
-        #
-     */
-    if (!m_init) {
-        return false;
-    }
-
-    QStringList openLines = getOpenLines();
-
-    bool res = false;
-    QList<QString>::const_iterator it;
-    for (it = openLines.cbegin(); it != openLines.cend(); ++it) {
-        int start = 0, end;
-        int column = 0;
-        QString status, name, datetime, result;
-        QString line = *it;
-        while ((end = line.indexOf(QChar(','), start)) != -1) {
-            QString next = line.mid(start, end).trimmed();
-            switch (column) {
-            case COLUMN_STATUS:
-                status = next;
-                break;
-            case COLUMN_NAME:
-                name = next;
-                break;
-            case COLUMN_DATE_TIME:
-                datetime = next;
-                break;
-            case COLUMN_RESULT:
-                result = next;
-                break;
+int Utils::read1stLineOfFile(QString fileName) {
+    QFile f(fileName);
+    if (f.exists()) {
+        if (f.open(QIODevice::ReadOnly | QIODevice::Text)) {
+            QTextStream in(&f);
+            in.setCodec("UTF-8");
+            while(!in.atEnd()) {
+                return in.readLine().toInt();
             }
-            ++column;
-            start = end + 1;
-        }
-
-        if (!status.contains("OPEN")) {
-            qCritical() << "Parsing error for" << m_update_ctrl_file.fileName();
-            return false;
-        }
-        if (name.contains("dc2c") && name.endsWith(".bin")) {
-            updateBinary(name.toStdString().c_str());
-            res = true;
-        } else
-        if (name.contains("DC2C_print") && name.endsWith(".json")) {
-            int i = name.indexOf("DC2C_print");
-            int templateIdx = name.mid(i).midRef(10, 2).toInt();
-            updatePrinterConf(templateIdx, name.toStdString().c_str());
-            res = true;
-        } else
-        if (name.contains("opkg")) {
-            int i = name.indexOf("opkg ");
-            QString rest = name.mid(i).trimmed();
-            QScopedPointer<QProcess> p(new QProcess(this));
-            p->setProcessChannelMode(QProcess::MergedChannels);
-            p->start("opkg", QStringList() << rest);
-            if (p->waitForStarted(1000)) {
-                if (p->state() == QProcess::ProcessState::Running) {
-                    if (p->waitForFinished(10000)) {
-                        QByteArray output = p->readAllStandardOutput();
-                        qCritical() << output;
-                        res = true;
-                    }
-                }
-            }
-        } else {
-            // TODO
-        }
-        QString resultLine = "CLOSED";
-        resultLine += ", " + name;
-        resultLine += ", " + QDateTime::currentDateTime().toString(Qt::ISODate);
-        resultLine += ", " + (res == true) ? "SUCCESS" : "ERROR";
-        m_out << resultLine;
-    } // for (it = openLines.cbegin(); it != openLines.end(); ++it) {
-
-    return finishUpdate(openLines.size() > 0);
-}
-
-bool Utils::finishUpdate(bool replaceCtrlFile) {
-    if (replaceCtrlFile) {
-        if (!m_update_ctrl_file_copy.exists()) {
-            return false;
-        }
-        if (!m_update_ctrl_file.remove()) {
-            return false;
-        }
-        if (!m_update_ctrl_file_copy.rename(m_update_ctrl_file.fileName())) {
-            return false;
         }
     }
-    return true;
+    return -1;
 }
+
+QString Utils::zoneName(quint8 i) {
+    static constexpr char const *zName[] = {
+        "",
+        "purple",
+        "blue",
+        "yellow",
+        "green",
+        "yellow (mars)",
+        "green (mars)"
+    };
+    if (i < (sizeof(zName)/sizeof(char const *))) {
+        return zName[i];
+    }
+    return "N/A";
+}
+
+void Utils::printCriticalErrorMsg(QString const &errorMsg) {
+    qCritical() << QString(80, '!');
+    qCritical() << errorMsg;
+    qCritical() << QString(80, '!');
+}
+
+void Utils::printInfoMsg(QString const &infoMsg) {
+    qCritical() << QString(80, '=');
+    qCritical() << infoMsg;
+    qCritical() << QString(80, '=');
+
+}
+
+void Utils::printLineEditInfo(QStringList const &lines) {
+    if (getDebugLevel() == LOG_DEBUG) {
+        for (int i=0; i<lines.size(); ++i) {
+            qInfo() << lines.at(i);
+        } qInfo() << ""; qInfo() << "";
+    }
+}
+
+QString Utils::getTariffLoadTime(QString fileName) {
+    QFileInfo fInfo(fileName);
+    if (fInfo.exists()) {
+        QDateTime lastModifiedTime = fInfo.lastModified();
+        if (lastModifiedTime.isValid()) {
+            return lastModifiedTime.toString(Qt::ISODateWithMs);
+        } else {
+            printCriticalErrorMsg(fileName + " HAS INVALID MODIFIED-TIME");
+            QDateTime birthTime = fInfo.birthTime();
+            if (birthTime.isValid()) {
+                return birthTime.toString(Qt::ISODateWithMs);
+            } else {
+                printCriticalErrorMsg(fileName + " HAS INVALID BIRTH-TIME");
+            }
+        }
+    } else {
+        printCriticalErrorMsg(fileName + " DOES NOT EXIST");
+    }
+    return "N/A";
+}
+

utils.h

@@ -3,44 +3,18 @@
 
 #include <QObject>
 #include <QString>
+#include <QStringList>
 #include <QFile>
+#include <QFileInfo>
+#include <QDateTime>
 
-#include <memory>
+namespace Utils {
+    int read1stLineOfFile(QString fileName);
+    QString zoneName(quint8 i);
+    void printCriticalErrorMsg(QString const &errorMsg);
+    void printInfoMsg(QString const &infoMsg);
+    void printLineEditInfo(QStringList const &lines);
+    QString getTariffLoadTime(QString fileName);
+}
 
-#include "interfaces.h"
-#include "DCPlugin/include/hwapi.h"
-
-#ifdef PTU5
-#define SERIAL_PORT "ttymxc2"
-#else
-#define SERIAL_PORT "ttyUSB0"
-#endif
-
-class Utils : public QObject {
-    Q_OBJECT
-
-    std::unique_ptr<hwinf> m_hw;
-    char const *m_serialInterface;
-    char const *m_baudrate;
-    QFile m_update_ctrl_file;
-    QFile m_update_ctrl_file_copy;
-    QTextStream m_in;
-    QTextStream m_out;
-
-    bool m_init;
-
-    void updateBinary(char const *fileToSendToDC);
-    void updatePrinterConf(int nrOfTemplate, char const *fileToSendToDC);
-    bool finishUpdate(bool finish);
-    QStringList getOpenLines();
-    static constexpr QChar SEPARATOR = QChar(',');
-
-public:
-    explicit Utils(QString update_ctrl_file,
-                   QObject *parent = nullptr,
-                   char const *serialInterface = SERIAL_PORT,
-                   char const *baudrate = "115200");
-    virtual ~Utils() override;
-    bool doUpdate();
-};
 #endif // UTILS_H_INCLUDED

worker.h

@@ -3,28 +3,221 @@
 
 #include <QObject>
 #include <QString>
+#include <QStringList>
 #include <QTimer>
+#include <QFile>
+#include <QJsonObject>
+#include <QHash>
 
 #include "worker_thread.h"
+#include "update.h"
+#include "git/git_client.h"
+#include "ismas/ismas_client.h"
 
+#ifdef PTU5
+#define SERIAL_PORT "ttymxc2"
+#else
+#define SERIAL_PORT "ttyUSB0"
+#endif
+
+
+enum class UPDATE_STATUS : quint8 {
+    NOT_DEFINED,
+    STEP_OK,
+    STEP_DONE,
+    STEP_FAIL,
+    ISMAS_WAIT_STATE_CHECK_PENDING,
+    ISMAS_WAIT_STATE_CHECK_FAILURE,
+    ISMAS_WAIT_STATE_CHECK_TIMEOUT,
+    ISMAS_WAIT_STATE_CHECK_SUCCESS,
+    ISMAS_RESPONSE_RECEIVED,
+    BACKEND_CONNECTED,
+    BACKEND_CHECK,
+    BACKEND_CHECK_FAILURE,
+    ISMAS_BACKEND_CHECK_FAILURE,
+    BACKEND_NOT_CONNECTED,
+    UPDATE_TRIGGER_SET,
+    UPDATE_TRIGGER_NOT_SET_OR_WRONG,
+    GIT_CLONE_AND_CHECKOUT_SUCCESS,
+    GIT_CLONE_AND_CHECKOUT_FAILURE,
+    GIT_CHECKOUT_BRANCH,
+    GIT_CHECKOUT_BRANCH_REQUEST_FAILURE,
+    GIT_CHECKOUT_BRANCH_NOT_EXISTS,
+    GIT_CHECKOUT_BRANCH_CHECKOUT_ERROR,
+    GIT_FETCH_UPDATES,
+    GIT_FETCH_UPDATES_REQUEST_FAILURE,
+    GIT_FETCH_UPDATES_REQUEST_SUCCESS,
+    GIT_PULL_UPDATES_SUCCESS,
+    GIT_PULL_UPDATES_FAILURE,
+    EXEC_OPKG_COMMAND,
+    EXEC_OPKG_COMMANDS,
+    EXEC_OPKG_COMMAND_FAILURE,
+    EXEC_OPKG_COMMAND_SUCCESS,
+    EXEC_OPKG_COMMANDS_SUCCESS,
+    RSYNC_UPDATES,
+    RSYNC_UPDATES_FAILURE,
+    RSYNC_UPDATES_SUCESS,
+    DEVICE_CONTROLLER_UPDATE,
+    DEVICE_CONTROLLER_UPDATE_FAILURE,
+    DEVICE_CONTROLLER_UPDATE_SUCCESS,
+    JSON_UPDATE,
+    JSON_UPDATE_FAILURE,
+    JSON_PARSE_FAILURE,
+    JSON_UPDATE_SUCCESS,
+    UPDATE_PROCESS_SUCCESS,
+    UPDATE_PROCESS_FAILURE,
+    ISMAS_UPDATE_INFO_CONFIRM,
+    ISMAS_UPDATE_INFO_CONFIRM_FAILURE,
+    ISMAS_UPDATE_INFO_CONFIRM_SUCCESS,
+    ISMAS_CURRENT_PSA_STATUS_CONFIRM,
+    ISMAS_CURRENT_PSA_STATUS_CONFIRM_FAILURE,
+    ISMAS_CURRENT_PSA_STATUS_CONFIRM_SUCCESS,
+    ISMAS_SANITY_CHECK_OK,
+    ISMAS_UPDATE_TRIGGER_SET_FAILURE,
+    PSA_UPDATE_FILES_FAILED,
+    GIT_CHECK_FILES_TO_UPDATE_SUCCESS,
+    ISMAS_SEND_LAST_VERSION_FAILED,
+    SAVE_LOG_FILES_FAILED
+};
+
+struct UpdateStatus {
+    UPDATE_STATUS m_updateStatus;
+    QString m_statusDescription;
+
+    explicit UpdateStatus(UPDATE_STATUS s = UPDATE_STATUS::NOT_DEFINED,
+                          QString const &d = QString(""))
+        : m_updateStatus(s), m_statusDescription(d) {}
+};
+
+QDebug operator<<(QDebug debug, UpdateStatus status);
+QString& operator<<(QString &str, UpdateStatus status);
+
+#define ISMAS_UPDATE_REQUESTS   (10)
+
+class MainWindow;
+class hwinf;
 class Worker : public QObject {
     Q_OBJECT
 
-    QString m_update_ctrl_file;
-    QString m_workingDir;
+    hwinf *m_hw;
     WorkerThread m_workerThread;
-    QTimer m_timer;
+    int const m_customerNr;
+    QString const m_customerNrStr;
+    int const m_machineNr;
+    int const m_zoneNr;
+    QString const m_workingDirectory;
+    QString const m_branchName;
+    QString const m_customerRepositoryPath;
+    QString const m_customerRepository;
+    Update *m_update;
+    IsmasClient m_ismasClient;
+    GitClient m_gc;
+    QString const m_osVersion;
+    QString const m_atbqtVersion;
+    QString const m_cpuSerial;
+    QString const m_raucVersion;
+    QString const m_opkgVersion;
+    QString const m_pluginVersionATBDeciceController;
+    QString const m_pluginVersionIngenicoISelf;
+    QString const m_pluginVersionMobilisisCalc;
+    QString const m_pluginVersionMobilisisCalcConfig;
+    QString const m_pluginVersionPrmCalc;
+    QString const m_pluginVersionPrmCalcConfig;
+    QString const m_pluginVersionTcpZvt;
+
+    int m_ismasUpdateRequests;
+    QTimer m_waitForNewUpdates;
+
+    UpdateStatus m_updateStatus;
+
+    QStringList m_filesToUpdate;
+    bool m_updateProcessRunning;
+    int m_displayIndex;
+    int m_returnCode;
+
+    MainWindow *m_mainWindow;
+    int m_progressValue;
+    bool m_withoutIsmasDirectPort;
+
+    bool executeOpkgCommand(QString opkgCommand);
+    QString getOsVersion() const;
+    QString getATBQTVersion() const;
+    QString getCPUSerial() const;
+    QString getRaucVersion() const;
+    QString getOpkgVersion() const;
+    QString getPluginVersion(QString const &pluginFileName) const;
+    QStringList getDCVersion() const;
+
+    qint64 getFileSize(QString const &fileName) const;
+
 public:
-    explicit Worker(QString update_ctrl_file, QString workingDir);
+    static const QString UPDATE_STEP_OK;
+    static const QString UPDATE_STEP_DONE;
+    static const QString UPDATE_STEP_FAIL;
+    static const QString UPDATE_STEP_SUCCESS;
+
+    explicit Worker(hwinf *hw,
+                    int customerNr, // 281
+                    int machineNr,
+                    int zoneNr,
+                    QString branchName,
+                    QString workingDir = ".",
+                    bool dryRun = false,
+                    QObject *parent = nullptr,
+                    char const *serialInterface = SERIAL_PORT,
+                    char const *baudrate = "115200");
     ~Worker();
-    void quit() { return m_workerThread.quit(); }
+
+    void setMainWindow(MainWindow *mainWindow) { m_mainWindow = mainWindow; }
+    void setProgress(int progress);
+    void startProgressLoop();
+    void stopProgressLoop();
+
+    IsmasClient &getIsmasClient() { return m_ismasClient; }
+    IsmasClient const &getIsmasClient() const { return m_ismasClient; }
+
+    bool updateProcessRunning() const { return m_updateProcessRunning; }
+    int returnCode() const { return m_returnCode; }
+
+    int machineNr() const { return m_machineNr; }
+    int customerNr() const { return m_customerNr; }
+    int zoneNr() const { return m_zoneNr; }
+
+    //friend QDebug operator<<(QDebug debug, Worker const &w) {
+    //    Q_UNUSED(w);
+    //    return debug;
+    //}
+    //friend QString& operator<<(QString &str, Worker const &w) {
+    //    Q_UNUSED(w);
+    //    return str;
+    //}
 
 signals:
-    void workNow();
+    void appendText(QString, QString suffix = "");
+    void replaceLast(QString, QString);
+    void showErrorMessage(QString title, QString description);
+    void stopStartTimer();
+    void restartExitTimer();
+    void enableExit();
+    void disableExit();
 
 public slots:
-    void work();
     void update();
+
+private slots:
+    bool backendConnected();
+    bool updateTriggerSet();
+    bool customerEnvironment();
+    bool filesToUpdate();
+    bool updateFiles(quint8 percent);
+    bool syncCustomerRepositoryAndFS();
+    bool sendIsmasLastVersionNotification();
+    bool saveLogFile();
+
+private:
+    PSAInstalled getPSAInstalled();
+    QString sendCmdSendVersionToIsmas();
+    void privateUpdate();
 };
 
 #endif // WORKER_H_INCLUDED