Move rsyncing the customer-repository after filesToUpdate(), as

the repository is pulled in filesToUpdate().

.gitignore

@@ -1,2 +1,3 @@
 tags
 *.tags
+*.user

ATBUpdateTool.ini

@@ -6,7 +6,7 @@ plugin-directory="/usr/lib/"
 working-directory="/opt/app/tools/atbupdate/"
 
 [PLUGINS]
-plugin-name="libCAmaster.so"
+plugin-name="libCAslave.so"
 
 [FLAGS]
 no-psa-hardware-update=false

ATBUpdateTool.pro

@@ -1,4 +1,3 @@
 TEMPLATE = subdirs
 CONFIG += ordered
-SUBDIRS = DownloadDCFirmware DownloadDCJsonFiles
+SUBDIRS = DownloadDCFirmware DownloadDCJsonFiles UpdatePTUDevCtrl
-

DownloadDCFirmware/DownloadDCFirmware.pro

@@ -34,6 +34,11 @@ contains( CONFIG, PTU5 ) {
     lessThan(QT_MAJOR_VERSION, 5):   PKGCONFIG += qextserialport
     QMAKE_CXXFLAGS += -O2 -std=c++17   # for GCC >= 4.7
     # QMAKE_CXXFLAGS += -Wno-deprecated-copy
+    PTU5BASEPATH = /opt/devel/ptu5
+
+    INCLUDEPATH += $$PTU5BASEPATH/qt/libs/devicecontroller/include
+    LIBS += -L$$PTU5BASEPATH/qt/libs/devicecontroller/library
+
     ARCH = PTU5
     DEFINES+=PTU5
 }

DownloadDCJsonFiles/DownloadDCJsonFiles.pro

@@ -39,6 +39,12 @@ contains( CONFIG, PTU5 ) {
     lessThan(QT_MAJOR_VERSION, 5):   PKGCONFIG += qextserialport
     QMAKE_CXXFLAGS += -O2 -std=c++17   # for GCC >= 4.7
     # QMAKE_CXXFLAGS += -Wno-deprecated-copy
+
+    PTU5BASEPATH = /opt/devel/ptu5
+
+    INCLUDEPATH += $$PTU5BASEPATH/qt/libs/devicecontroller/include
+    LIBS += -L$$PTU5BASEPATH/qt/libs/devicecontroller/library
+
     ARCH = PTU5
     DEFINES+=PTU5
 }
@@ -72,7 +78,6 @@ SOURCES += \
 
 HEADERS += \
         message_handler.h \
-        plugins/interfaces.h \
         process/command.h
 
 OTHER_FILES += \

DownloadDCJsonFiles/main.cpp

@@ -4,7 +4,7 @@
 #include <QByteArray>
 
 #include "message_handler.h"
-#include "plugins/interfaces.h"
+#include <DeviceController/interfaces.h>
 
 
 //#include <unistd.h>
@@ -34,7 +34,7 @@ int main(int argc, char **argv) {
         setDebugLevel(LOG_NOTICE);
     }
 
-    int r = std::system("ls -l /proc/[0-9]*/fd/* 2>/dev/null | grep /dev/ttymxc2 > /tmp/slave-or-master.txt");
+    // int r = std::system("ls -l /proc/[0-9]*/fd/* 2>/dev/null | grep /dev/ttymxc2 > /tmp/slave-or-master.txt");
     // lrwx------    1 root     root            64 Oct 31 14:55 /proc/884/fd/18 -> /dev/ttymxc2
 
     //std::ifstream ifs("/tmp/slave-or-master.txt");

UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro

@@ -0,0 +1,275 @@
+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
+
+# 1.3.6 :   Do not update device-controller/json files, but have the library
+#           (in a later step) do that.
+#           Fixed sending messages to ISMAS.
+#           Always execute contents of opkg_commands-file (even if there are no
+#           changes).
+# 1.3.7 :   Wait forever for git-commands to finish in QProcess executing such
+#           a command.
+# 1.3.8 :   Remove accessing opkg_commands under file-system-path /etc/psa_update.
+#           Activate download of json-configuration files.
+# 1.3.9 :   Fix sendLastVersion: use configured branch and not master branch in
+#               git show origin/master -s --format="c=%h m=%s d=%cI"    ==>
+#               git show origin/zg1/zone1 -s --format="c=%h m=%s d=%cI"
+#           Use dynamic values for os-release and apism-version when sending
+#           last version info.
+# 1.3.10:   Fix premature killing opkg-commands: detected timeout of 100s was
+#           too small when updating apism.
+#           Fix display of UPDATE_SUCCESS when opkg_command fails. Detected when
+#           updating apsim failed.
+# 1.3.11:   Integrate version of ATBUpdateTool in SendLastVersion-ISMAS-message.
+# 1.3.12:   Add command parameters for output of yocto-infos about ATBUpdateTool.
+#           Use 'git pull' instead of 'git fetch'.
+#           Use 'git clone --filter=blob:none' instead of 'git clone' to speed
+#           up cloning of customer repository.
+# 1.3.13:   Fix: if the customer repository is corrupted, remove it and re-clone
+#           the repository (without checking the ISMAS-trigger (WAIT-)button.
+# 1.3.14:   Add additional check for sanity of customer repository using
+#           "git fsck".
+#           Stream-lined code of update process: massive refactoring.
+#           Added functionality: If WAIT button is not active, then an existing
+#           customer repository will be repaired, or a not existing repository
+#           will be cloned. The process stops then.
+#           However, if the WAIT button is active, the at least the commands in
+#           opkg_commands will be executed. Changed files in the customer
+#           repository will be worked on: tariff-files will be synced with the
+#           local filesystem, json-files will be downloaded to firmware.
+#           The device-controller firmware will be handled in a later version.
+# 1.3.15:   Bug fixes found during testing.
+#           Do not disable Exit-button during update-process.
+#           Removed worker-thread with an own event-loop: only the GUI thread
+#           has an event loop. Tested JSON-downloads several times successfully
+#           (using the slave lib where the CA helper tool was active as master).
+#           Turned previous worker-object into its own thread, but without any
+#           own event-loop (so it cannot block anything inside the CA-plugin).
+# 1.3.16:   Bug fixes found during testing.
+# 1.3.17:   Add ATBUpdateTool.ini and custom command line parser. Settings
+#           given in ATBUpdateTool.ini can be overwritten on the command-line.
+# 1.3.18:   Bug fixes found during testing.
+# 1.3.19:   Bug fixes found during testing.
+# 1.3.20:   Bug fixes found during testing.
+# 1.3.21:   Bug fixes found during testing:
+#           Fix directory of ATBUpdateTool.ini to be the working directory of
+#           the application rather than just ".".
+#           Check existance of etc-directory inside customer repository.
+#           Check for valid ISMAS trigger (button) 15x (=90s).
+#           NOTE: if the customer repository is cloned (or repaired and cloned
+#           again), and if the settings always-download-config=true and
+#           always-download-dc=true in the ATBUpdateTool.ini file, the download
+#           the printer-json files and the device controller file, even without
+#           an activated ISMAS trigger (button). The tariff-files are rsynced to
+#           the local filesystem for such clone.
+#           Set new filename for device controller: dc2c.bin.
+# 1.3.22:   Bug fixes found during testing:
+#           Fix the path-names of the json-files and the device-controller.
+#           Set automatic download of json-file in ATBUpdateTool.ini file for
+#           a fresh clone of the repository.
+# 1.3.23:   Added a 'break' to prevent a possible endless loop when checking if
+#           the device is alive.
+#
+# NOTE:     The versioning info has to be shifted up by one version, i.e. what
+#           happened for 1.3.23 was actually done in 1.3.24.
+# 1.3.24
+#
+# 1.3._24_: Special version for szeged using a old dc-controller (4.42):
+#           Changes:
+#               (1) the ini-File now uses the libCAmaster.so.
+# 1.3._25_: Again special version for szeged, using interface.h, version 4.4.
+# 1.4.0   : Start with version at 1.4.0 (mainly to see a difference with Szeged)
+#           Set hash-value in EVENT-objects. Set location (project), version
+#           and info in send-last-version.
+#           If the customer repository does not exist, then do not check the
+#           ISMAS trigger, but proceed with the update procedure. Otherwise,
+#           check the ISMAS update-trigger as first step.
+#           If the current time is between 0.00 - 4.00 o'clock, then a wrong
+#           trigger-value will result in an UPDATE_STEP_NOT_NECESSARY.
+#           Move final processing to subclass UpdateProcessRunning.
+#           Disable EXIT-button for the whole update-process, except for the
+#           checking of the ISMAS-trigger-button (aka WAIT-button).
+# 1.4.1   : Sync files in the customer repository (under ./etc) as the very
+#           first step
+# 1.4.2   : Do not check if <repo_dir>/etc/psa_tariff and /etc/psa_tariff are
+#           the same after an rsync. They might be noy after a change of the
+#           customer-number.
+# 1.4.3   : Use global directory for device-controller interfaces.h-file.
+VERSION="1.4.3"
+# PLANNED TODOS:
+#   1:  Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
+#   2:  Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu
+#       geklont), aber zusaetzlich werden alle verfuegbaren Dateien als neu
+#       angesehen und die entsprechenden Aktionen durchgefuehrt: tariff-files
+#       spiegeln, json-files laden und dc laden. Also VORSICHT: das repository
+#       muss in diesem fall wirklich in ordnung sein.
+#   3:  Wurde keine Datei geaendert, kein initiales Clone und der WAIT-button
+#       nicht aktiv, so (passiert natuerlich nichts) kann man davon ausgehen,
+#       dass es sich um ein automatisches Update handelt. Dann koennte man im
+#       ISMAS eine entsprechende Meldung anzeigen als Teil von SEND-LAST-VERSION.
+#       Wenn der WAIT-button aktiv ist, dann werden zumindest die opkg-commands
+#       ausgefuehrt.
+#   5:  Falls das Tool mal abstuerzt, dann einen Signal-Handler (fuer TERM)
+#       installieren, sodass zumnidest SEND-LAST-VERSION mit rausgeht.
+#   6:  rsync: explizites Binary, nicht das in busybox enthaltene.
+#   7:  Versionen der Json-Files lassen sich auslesen.
+#       Problem: Einstellungen in den Json-Files lassen sich auch mittels
+#       Funktionen in der CD-Library ueberschreiben. Damit ist dann wieder nicht
+#       mehr so klar, was jetzt eigentlich aktiv ist.
+#   8:  m_alwaysDownloadConfig und m_alwaysDownloadDC: vorbereitet: man koennte
+#       es so arrangieren, dass der DC plus die Json-files im Repository immer
+#       runtergeladen werden, obwohl sich im Repository gar nicts veraendert
+#       hat. Eeventuell nuetzlich beim initialen Setuo eines PSA.
+#   9:  Das Kunden-Repository sollte immer gezogen werden, unabhaengig von der
+#       Stellung des WAIT-Button. Grund: es koennte sein, dass andernfalls ein
+#       PSA weit hiter anderen steht, und dann ploetzlich einmal alle vorher-
+#       gehenden Aenderungen anzieht, die gar nicht fuer ihn gemeint waren.
+#  11:  Das Edit-Fenster teilen um die Anzeige zu verbessern.
+#  12:  Bei einem Update muss immer ersichtlich sein, warum es ueberhaupt
+#       angestossen wurde. Steht kein "WAIT" im ISMAS-Trigger, dann kann man
+#       davon ausgehen, dass es sich um ein automatisches Update handelt.
+#       In jedem Fall wird bei einem automatischen Update, bei dem der WAIT-
+#       Button nicht gesetzt war, ein "OK" gesendet, falls sonst nichts weiter
+#       zu tun ist. Beachte aber: wir haben auch noch den Fall, dass eine SD-
+#       Karte gesteckt wird. In diesem Fall wird ein komplettes Update gefahren,
+#       und zwar explizit auch ohne WAIT-Button.
+#       Am Ende eines Updates steht im ISMAS entweder ein "OK" oder ein "FAIL".
+# 13:   SendLastVersion: fuer jedes erfolgreich installierte Paket eine
+#       Send-Last-Version-Nachricht an ISMAS. Dadurch entsteht im ISMAS eine
+#       History (Christian darueber informieren).
+# 14:   Installiert werden nur Dateien, die neu sind oder geaendert wurden.
+#       Nicht etwas Dateien, die geloescht wurden: sicherstellen, dass man hier
+#       immer direkt im repository arbeitet, nicht auf dem Filesystem.
+#       Ferner: der DeviceController heisst dc2c.bin, auch fuer die Jsons
+#       sind Dtandard-Namen vergeben. Alternativ: alle vorhandenen Jsons
+#       werden runtergeladen: Thomas ist eh fuer deren Inhalte verantworlich.
+#       WICHTIG: immer ueberpruefen, ob die Dateien im Customer-Repository
+#       wirklich die richtigen Dateien sind.
+# 15:   Der WAIT-Button laesst sich auf WAIT zuruecksetzen (etwa wenn git
+#       selber Probleme hatte).
+# 16:   Der Download-Thread sollte sowohl die auto-Variable auf false setzen
+#       als auch den cycle-Timer stoppen, damit sichergestellt ist, dass der
+#       Download des DC nicht gestoert wird.
+
+
+win32 {
+    BUILD_DATE=$$system("date /t")
+    BUILD_TIME=$$system("time /t")
+} else {
+    BUILD_DATE=$$system("date +%d-%m-%y")
+    BUILD_TIME=$$system("date +%H:%M:%S")
+}
+
+GIT_COMMIT=$$system("git log -1 --format=oneline | cut -d' ' -f1")
+
+EXTENDED_VERSION="$${VERSION}-$${GIT_COMMIT}"
+
+INCLUDEPATH += plugins
+
+CONFIG += c++17
+# CONFIG -= app_bundle
+
+DEFINES+=APP_VERSION=\\\"$$VERSION\\\"
+DEFINES+=APP_BUILD_DATE=\\\"$$BUILD_DATE\\\"
+DEFINES+=APP_BUILD_TIME=\\\"$$BUILD_TIME\\\"
+DEFINES+=APP_EXTENDED_VERSION=\\\"$$EXTENDED_VERSION\\\"
+
+# keep comments, as /* fall through */
+QMAKE_CXXFLAGS += -C
+QMAKE_CXXFLAGS += -g
+QMAKE_CXXFLAGS += -Wno-deprecated-copy -O
+
+contains( CONFIG, PTU5 ) {
+    greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
+    CONFIG += link_pkgconfig
+    lessThan(QT_MAJOR_VERSION, 5):   PKGCONFIG += qextserialport
+    QMAKE_CXXFLAGS += -O2 -std=c++17   # for GCC >= 4.7
+
+    PTU5BASEPATH = /opt/devel/ptu5
+
+    INCLUDEPATH += $$PTU5BASEPATH/qt/libs/devicecontroller/include
+    LIBS += -L$$PTU5BASEPATH/qt/libs/devicecontroller/library
+
+    # 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
+
+    LIBS += -lCAslave
+    LIBS += -lCAmaster
+}
+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++17
+    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
+    linux-clang {  QMAKE_CXXFLAGS += -Qunused-arguments   }
+    ARCH = DesktopLinux
+    DEFINES+=DesktopLinux
+}
+
+SOURCES += \
+        main.cpp \
+        progress_event.cpp \
+        update_dc_event.cpp \
+        mainwindow.cpp \
+        utils.cpp \
+        update.cpp \
+        git/git_client.cpp \
+        ismas/ismas_client.cpp \
+        process/command.cpp \
+        message_handler.cpp \
+        worker.cpp \
+        commandline_parser.cpp
+
+HEADERS += \
+        update.h \
+        progress_event.h \
+        update_dc_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 \
+        commandline_parser.h
+
+OTHER_FILES += \
+    ATBUpdateTool.ini
+
+FORMS += \
+    mainwindow.ui
+
+
+##########################################################################################
+# 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
+}

UpdatePTUDevCtrl/git/git_client.cpp

@@ -316,6 +316,31 @@ std::optional<QString> GitClient::gitPull() {
                         //   6ed893f..5d9882c  zg1/zone2  -> origin/zg1/zone2
                         //   4384d17..77045d8  zg1/zone3  -> origin/zg1/zone3
                         //   89d2812..36a0d74  zg1/zone5  -> origin/zg1/zone5
+                        //
+                        // More exactly:
+                        // remote: Counting objects: 382, done.
+                        // remote: Compressing objects: 100% (203/203), done.
+                        // remote: Total 278 (delta 177), reused 103 (delta 59)
+                        // Receiving objects: 100% (278/278), 4.89 MiB | 539 KiB/s, done.
+                        // Resolving deltas: 100% (177/177), completed with 40 local objects.
+                        // From ssh://longair@pacific.mpi-cbg.de/srv/git/fiji
+                        // 3036acc..9eb5e40  debian-release-20081030 -> origin/debian-release-20081030
+                        // * [new branch]      debian-release-20081112 -> origin/debian-release-20081112
+                        // * [new branch]      debian-release-20081112.1 -> origin/debian-release-20081112.1
+                        // 3d619e7..6260626  master     -> origin/master
+                        //
+                        // The most important bits here are the lines like these:
+                        //
+                        //     3036acc..9eb5e40  debian-release-20081030 -> origin/debian-release-20081030
+                        //   * [new branch]      debian-release-20081112 -> origin/debian-release-20081112
+                        //
+                        // The first line of these two shows that your remote-tracking branch
+                        // origin/debian-release-20081030 has been advanced from the commit 3036acc to 9eb5e40.
+                        // The bit before the arrow is the name of the branch in the remote repository.
+                        // The second line similarly show that since we last did this, a new remote tracking
+                        // branch has been created. (git fetch may also fetch new tags if they have appeared
+                        // in the remote repository.)
+
                         bool found = false;
                         for (int i=0; i < lines.size(); ++i) {
                             if (lines.at(i).contains(m_branchName)) {

UpdatePTUDevCtrl/main.cpp

@@ -9,7 +9,7 @@
 #endif
 
 #include "message_handler.h"
-#include "plugins/interfaces.h"
+#include <DeviceController/interfaces.h>
 #include "commandline_parser.h"
 
 #include <unistd.h>

UpdatePTUDevCtrl/mainwindow.cpp

@@ -4,7 +4,7 @@
 #include "utils.h"
 #include "progress_event.h"
 #include "update_dc_event.h"
-#include "plugins/interfaces.h"
+#include <DeviceController/interfaces.h>
 
 #include <QDateTime>
 #include <QMessageBox>

UpdatePTUDevCtrl/update.cpp

@@ -18,7 +18,7 @@
 #include "unistd.h"
 #endif
 
-#include "plugins/interfaces.h"
+#include <DeviceController/interfaces.h>
 
 #include <QSharedMemory>
 #include <QScopedPointer>
@@ -98,6 +98,7 @@ bool Update::unloadDCPlugin() {
     return false;
 }
 
+class hwapi;
 Update::Update(Worker *worker,
                QString customerRepository,
                QString customerNrStr,
@@ -122,31 +123,72 @@ Update::Update(Worker *worker,
     , m_dryRun(dryRun)
     , m_sys_areDCdataValid(false) {
 
-    int tries = 20;
+    if (!m_hw) {
-    while ((m_sys_areDCdataValid = m_hw->sys_areDCdataValid()) == false) {
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_hw == nullptr -> ca-slave plugin loaded ???";
-        // must deliver 'true', only then are all data from hwapi valid
+    } else {
-        if (--tries < 0) {
+        int tries = 20;
-            qCritical() << "ERROR!!! DC DATA NOT VALID -> CA-MASTER-PLUGIN NOT CONNECTED";
+        while ((m_sys_areDCdataValid = m_hw->sys_areDCdataValid()) == false) {
-            break;
+            // must deliver 'true', only then are all data from hwapi valid
+            if (--tries < 0) {
+                qCritical() << "ERROR!!! DC DATA NOT VALID -> CA-MASTER-PLUGIN NOT CONNECTED";
+                break;
+            }
+            m_hw->dc_autoRequest(true);
+            QThread::msleep(500);
         }
-        m_hw->dc_autoRequest(true);
+
-        QThread::msleep(500);
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_sys_areDCDataValid ..."
+                    << m_sys_areDCdataValid;
+
+#if 0
+        QObject const *obj = m_hw->getAPI();
+        Q_ASSERT(obj != nullptr);
+
+        QDebug critical = qCritical();
+        critical << "connect() to onReportDCDownloadStatus() ...";
+        if (!connect(obj,
+                     SIGNAL(hwapi_reportDCDownloadStatus(QString const&)),
+                     this,
+                     SLOT(onReportDCDownloadStatus(QString const &)))) {
+            critical << "FAILED";
+        } else critical << "DONE";
+
+        critical = qCritical();
+        critical << "connect() to onReportDCDownloadSuccess() ...";
+        if (!connect(obj,
+            SIGNAL(hwapi_reportDCDownloadSuccess(QString const&)), this,
+            SLOT(onReportDCDownloadSuccess(QString const &)))) {
+            critical << "FAILED";
+        } else critical << "DONE";
+
+        critical = qCritical();
+        critical << "connect() to onReportDCDownloadFailure() ...";
+        if (!connect(obj,
+            SIGNAL(hwapi_reportDCDownloadFailure(QString const &)), this,
+            SLOT(onReportDCDownloadFailure(QString const &)))) {
+            critical << "FAILED";
+        } else critical << "DONE";
+#endif
     }
-
-    qCritical() << __PRETTY_FUNCTION__ << "m_sys_areDCDataValid ..." << m_sys_areDCdataValid;
-
-    //qInfo() << "UPDATE: m_serialInterface    ..." << m_serialInterface;
-    //qInfo() << "UPDATE: m_baudrate           ..." << m_baudrate;
-    //qInfo() << "UPDATE: m_customerRepository ..." << m_customerRepository;
-    //qInfo() << "UPDATE: m_customerNr ..........." << m_customerNrStr;
-    //qInfo() << "UPDATE: m_branchName ..........." << m_branchName;
-    //qInfo() << "UPDATE: m_pluginName ..........." << m_pluginName;
-    //qInfo() << "UPDATE: m_workingDirectory ....." << m_workingDir;
 }
 
 Update::~Update() {
 }
 
+void Update::onReportDCDownloadStatus(QString const &status) {
+    emit m_worker->showStatusMessage("DL", status);
+}
+
+void Update::onReportDCDownloadSuccess(QString const &msg) {
+    qCritical() << "msg" << msg;
+}
+
+void Update::onReportDCDownloadFailure(QString const &errorMsg) {
+    qCritical() << "msg" << errorMsg;
+}
+
+
+
 // br is a index into a table, used for historical reasons.
 bool Update::openSerial(int br, QString baudrate, QString comPort) const {
     qDebug() << "opening serial" << br << baudrate << comPort << "...";
@@ -358,23 +400,32 @@ bool Update::downloadJson(enum FileTypeJson type,
     qDebug() << "SET AUTO-REQUEST=TRUE";
     QThread::sleep(1);  // make sure the auto-request flag is acknowledged
 
+    QStringList lst;
     bool ready = false;
     int nTry = 25;
     while ((ready = m_hw->sys_ready4sending()) == false) {
         QThread::msleep(200);
         if (--nTry <= 0) {
-            Utils::printCriticalErrorMsg("SYS NOT READY FOR SENDING AFTER 5 SECONDS");
+            QString msg("SYS NOT READY FOR SENDING AFTER 5 SECONDS");
+            Utils::printCriticalErrorMsg(msg);
+            lst << msg;
+
+            if (m_worker) {
+                m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
+            }
             break;
         }
     }
 
     bool ret = false;
+    QString msg;
+    lst.clear();
     if (ready) {
         QFile file(jsFileToSendToDC);
         QFileInfo fi(jsFileToSendToDC); // max. size of template file is 800 bytes
         if (file.exists()) {
             if (file.open(QIODevice::ReadOnly)) {
-                if (fi.size() <= 800) {
+                if (fi.size() > 0 && fi.size() <= 800) {
                     QByteArray ba = file.readAll();
                     // kindOfFile: 1=config, 2=device, 3=cash, 4=serial, 5=time, 6=printer
                     //      nrOfTemplate=1...32 if kindOfFile==6
@@ -410,20 +461,48 @@ bool Update::downloadJson(enum FileTypeJson type,
                             qCritical() << length << "MACHINE ID =" << ba.toHex(':');
                         */
 
+                        if (m_worker) {
+                            m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
+                        }
+
                         ret = true;
+                    } else {
+                        msg = QString("ERROR SEND JSON-FILE %1 TO DC").arg(file.fileName());
+                        Utils::printCriticalErrorMsg(msg);
+                        lst << msg;
+                        if (m_worker) {
+                            m_worker->ISMAS(lst) <<  (m_worker->GUI(lst) << (m_worker->CONSOLE(lst)
+                                                 << Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
+                        }
                     }
                 } else {
-                    Utils::printCriticalErrorMsg(
+                    msg = QString("SIZE OF %1 TOO BIG (%2 BYTES)").arg(jsFileToSendToDC).arg(fi.size());
-                        QString("SIZE OF %1 TOO BIG (%2 BYTES)")
+                    Utils::printCriticalErrorMsg(msg);
-                            .arg(jsFileToSendToDC).arg(fi.size()));
+                    lst << msg;
+                    if (m_worker) {
+                        m_worker->ISMAS(lst) <<  (m_worker->GUI(lst) << (m_worker->CONSOLE(lst)
+                                             << Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
+                    }
                 }
             } else {
-                Utils::printCriticalErrorMsg(
+                msg = QString("CAN NOT OPEN ") + jsFileToSendToDC + " FOR READING";
-                    QString("CAN NOT OPEN ") + jsFileToSendToDC + " FOR READING");
+                Utils::printCriticalErrorMsg(msg);
+                lst << msg;
+
+                if (m_worker) {
+                    m_worker->ISMAS(lst) <<  (m_worker->GUI(lst) << (m_worker->CONSOLE(lst)
+                                         << Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
+                }
             }
         } else {
-            Utils::printCriticalErrorMsg(
+            msg = QString(jsFileToSendToDC) + " DOES NOT EXIST";
-                QString(jsFileToSendToDC) + " DOES NOT EXIST");
+            Utils::printCriticalErrorMsg(msg);
+            lst << msg;
+
+            if (m_worker) {
+                m_worker->ISMAS(lst) <<  (m_worker->GUI(lst) << (m_worker->CONSOLE(lst)
+                                     << Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
+            }
         }
     }
 
@@ -590,7 +669,6 @@ bool Update::checkDownloadedJsonVersions(QStringList const& jsonFileNames) {
 
     return false;
 }
-
 bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
     if (m_sys_areDCdataValid == false) {
         qCritical() << "ERROR!!! DC DATA NOT VALID -> CA-MASTER-PLUGIN NOT CONNECTED";
@@ -598,30 +676,97 @@ bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
     }
 
     bool res = false;
+    bool dcDownloadPossible = true;
+
     QList<QString>::const_iterator it;
     for (it = filesToWorkOn.cbegin(); it != filesToWorkOn.cend(); ++it) {
         m_worker->startProgressLoop();
-
         QString const &fToWorkOn = QDir::cleanPath(m_customerRepository + QDir::separator() + it->trimmed());
+        if (fToWorkOn.endsWith("/dc2c.bin") && dcDownloadPossible) {
+#if 0
+            // download for dc possible only once
+            // download of device-controller should always be the last step
+            dcDownloadPossible = false;
 
-        if (fToWorkOn.contains("dc2c.bin")) {
+            if (!m_hw->dcDownloadRequest(fToWorkOn)) {  // initiate download process
+                qCritical() << "DOWNLOAD-REQUEST-ERROR FOR" << fToWorkOn;
+                continue;
+            }
+
+            QThread::sleep(2);
+
+            int tries = 5;
+            while (!m_hw->dcDownloadRunning()) { // may take some time
+                if (--tries < 0) {
+                    qCritical() << QDateTime::currentDateTime().toString(Qt::ISODate)
+                                << "(" << __func__ << ":" << __LINE__ << ") DOWNLOAD NOT RUNNING";
+                    break;
+                }
+                QThread::sleep(1);
+                continue;
+            }
+
+            qCritical() << QDateTime::currentDateTime().toString(Qt::ISODate)
+                        << "(" << __func__ << ":" << __LINE__ << ") DOWNLOAD RUNNING";
+
+            QThread::sleep(2);
+
+            tries = 5;
+            while (!m_hw->dcDownloadReportThreadStart()) { // may take some time
+                if (--tries < 0) {
+                    qCritical() << QDateTime::currentDateTime().toString(Qt::ISODate)
+                                << "(" << __func__ << ":" << __LINE__ << ") REPORT THREAD NOT STARTED";
+                    break;
+                }
+                continue;
+            }
+
+            qCritical() << QDateTime::currentDateTime().toString(Qt::ISODate)
+                        << "(" << __func__ << ":" << __LINE__ << ") REPORT THREAD STARTED";
+
+            QThread::sleep(2);
+
+            tries = 5;
+            while (!m_hw->dcDownloadReportRunning()) {     // may take some time
+                if (--tries < 0) {
+                    qCritical() << QDateTime::currentDateTime().toString(Qt::ISODate)
+                                << "(" << __func__ << ":" << __LINE__ << ") DOWNLOAD REPORT NOT RUNNING";
+                    break;
+                }
+                continue;
+            }
+
+            qCritical() << QDateTime::currentDateTime().toString(Qt::ISODate)
+                        << "(" << __func__ << ":" << __LINE__ << ") DOWNLOAD REPORT RUNNING";
+
+            tries = 1200;
+            while (m_hw->dcDownloadReportRunning()) {
+                QThread::msleep(1000);
+                if (--tries < 0) {
+                    qCritical() << QDateTime::currentDateTime().toString(Qt::ISODate)
+                                << "(" << __func__ << ":" << __LINE__
+                                << ") DOWNLOAD REPORT STILL RUNNING AFTER 20mins";
+                    break;
+                }
+            }
+#endif
             bool updateBinaryRes = true;
 
             // CONSOLE()
+#if 0
+            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
 
-            // m_hw->dc_autoRequest(false);// default: turn auto-request setting off
+            if ((updateBinaryRes = updateBinary(fToWorkOn)) == true) {
-            // QThread::sleep(1);          // wait to be sure that there are no more
-            //                            // commands sent to dc-hardware
 
-            // if ((updateBinaryRes = updateBinary(fToWorkOn)) == true) {
-            //
                 // qCritical() << "downloaded binary" << fToWorkOn;
 
-            //    ++displayIndex;
+                ++displayIndex;
-            //    emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(2, ' ') + QString(")")
+                emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(2, ' ') + QString(")")
-            //        + QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
+                    + QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
-            //        Worker::UPDATE_STEP_DONE);
+                    Worker::UPDATE_STEP_DONE);
-            //}
+            }
 
             m_hw->dc_autoRequest(true); // turn auto-request setting on
 
@@ -637,65 +782,65 @@ bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
                     qInfo() << "dc-firmware-version (NOT UPDATED)" << versions[1];
                 }
             }
-
+#endif
             res = updateBinaryRes;
 
-        } else {
+        } else if (fToWorkOn.contains("DC2C_print", Qt::CaseInsensitive)
-            if (fToWorkOn.contains("DC2C_print", Qt::CaseInsensitive)
                 && fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
-                res = true;
+            res = true;
-                int i = fToWorkOn.indexOf("DC2C_print", Qt::CaseInsensitive);
+            int i = fToWorkOn.indexOf("DC2C_print", Qt::CaseInsensitive);
-                int const templateIdx = fToWorkOn.mid(i).midRef(10, 2).toInt();
+            int const templateIdx = fToWorkOn.mid(i).midRef(10, 2).toInt();
-                if ((templateIdx < 1) || (templateIdx > 32)) {
+            if ((templateIdx < 1) || (templateIdx > 32)) {
-                    qCritical() << "WRONG TEMPLATE INDEX" << templateIdx;
+                qCritical() << "WRONG TEMPLATE INDEX" << templateIdx;
-                    res = false;
-                } else {
-                    if ((res = updatePrinterTemplate(templateIdx, fToWorkOn))) {
-                        Utils::printInfoMsg(
-                            QString("DOWNLOADED PRINTER TEMPLATE %1 WITH INDEX=%2")
-                                .arg(fToWorkOn)
-                                .arg(templateIdx));
-                        ++displayIndex;
-                        emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
-                              + QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
-                                Worker::UPDATE_STEP_DONE);
-                    }
-                }
-            } else if (fToWorkOn.contains("DC2C_cash", Qt::CaseInsensitive)
-                    && fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
-                res = true;
-                if ((res = updateCashConf(fToWorkOn))) {
-                    Utils::printInfoMsg(QString("DOWNLOADED CASH TEMPLATE %1").arg(fToWorkOn));
-                    ++displayIndex;
-                    emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
-                          + QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
-                            Worker::UPDATE_STEP_DONE);
-                }
-            } else if (fToWorkOn.contains("DC2C_conf", Qt::CaseInsensitive)
-                    && fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
-                res = true;
-                if ((res= updateConfig(fToWorkOn))) {
-                    Utils::printInfoMsg(QString("DOWNLOADED CONFIG TEMPLATE %1").arg(fToWorkOn));
-                    ++displayIndex;
-                    emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
-                          + QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
-                            Worker::UPDATE_STEP_DONE);
-                }
-            } else if (fToWorkOn.contains("DC2C_device", Qt::CaseInsensitive)
-                    && fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
-                res = true;
-                if ((res = updateDeviceConf(fToWorkOn))) {
-                    Utils::printInfoMsg(QString("DOWNLOADED DEVICE TEMPLATE %1").arg(fToWorkOn));
-                    ++displayIndex;
-                    emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
-                          + QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
-                            Worker::UPDATE_STEP_DONE);
-                }
-            } else {
-                qCritical() << "UNKNOWN JSON FILE NAME" << fToWorkOn;
                 res = false;
+            } else {
+                if ((res = updatePrinterTemplate(templateIdx, fToWorkOn))) {
+                    Utils::printInfoMsg(
+                        QString("DOWNLOADED PRINTER TEMPLATE %1 WITH INDEX=%2")
+                            .arg(fToWorkOn)
+                            .arg(templateIdx));
+                    ++displayIndex;
+                    emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
+                          + QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
+                            Worker::UPDATE_STEP_DONE);
+                }
             }
+        } else if (fToWorkOn.contains("DC2C_cash", Qt::CaseInsensitive)
+                && fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
+            res = true;
+            if ((res = updateCashConf(fToWorkOn))) {
+                Utils::printInfoMsg(QString("DOWNLOADED CASH TEMPLATE %1").arg(fToWorkOn));
+                ++displayIndex;
+                emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
+                      + QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
+                        Worker::UPDATE_STEP_DONE);
+            }
+        } else if (fToWorkOn.contains("DC2C_conf", Qt::CaseInsensitive)
+                && fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
+            res = true;
+            if ((res= updateConfig(fToWorkOn))) {
+                Utils::printInfoMsg(QString("DOWNLOADED CONFIG TEMPLATE %1").arg(fToWorkOn));
+                ++displayIndex;
+                emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
+                      + QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
+                        Worker::UPDATE_STEP_DONE);
+            }
+        } else if (fToWorkOn.contains("DC2C_device", Qt::CaseInsensitive)
+                && fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
+            res = true;
+            if ((res = updateDeviceConf(fToWorkOn))) {
+                Utils::printInfoMsg(QString("DOWNLOADED DEVICE TEMPLATE %1").arg(fToWorkOn));
+                ++displayIndex;
+                emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
+                      + QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
+                        Worker::UPDATE_STEP_DONE);
+            }
+        } else {
+            qCritical() << "UNKNOWN JSON FILE NAME" << fToWorkOn;
+            res = false;
         }
+        // m_worker->stopProgressLoop();
+        // m_worker->setProgress(100);
 
         if (res == false) {
             break;

UpdatePTUDevCtrl/update.h

@@ -9,7 +9,7 @@
 #include <QProcess>
 #include <QPluginLoader>
 
-#include "plugins/interfaces.h"
+#include <DeviceController/interfaces.h>
 
 #ifdef PTU5
 #define SERIAL_PORT "ttymxc2"
@@ -94,6 +94,8 @@ private slots:
     void readyReadStandardOutput();
     void readyReadStandardError();
     void finished(int exitCode, QProcess::ExitStatus exitStatus);
-
+    void onReportDCDownloadStatus(QString const &status);
+    void onReportDCDownloadSuccess(QString const &msg);
+    void onReportDCDownloadFailure(QString const &errorMsg);
 };
 #endif // UPDATE_H_INCLUDED

UpdatePTUDevCtrl/utils.cpp

@@ -277,21 +277,24 @@ bool Utils::sameFilesInDirs(QDir const &dir1, QDir const &dir2,
         fileNameLst2 << i2.next().fileName();
     }
 
+    QString dirPath1 = dir1.absolutePath();
+    QString dirPath2 = dir2.absolutePath();
+
     if (fileNameLst1.isEmpty()) {
-        qCritical() << "DIR1" << dir1.dirName() << " DOES NOT CONTAIN EXPECTED FILES";
+        qCritical() << "DIR1" << dirPath1 << " DOES NOT CONTAIN EXPECTED FILES";
         return false;
     }
     if (fileNameLst2.isEmpty())  {
-        qCritical() << "DIR1" << dir2.dirName() << " DOES NOT CONTAIN EXPECTED FILES";
+        qCritical() << "DIR1" << dirPath2 << " DOES NOT CONTAIN EXPECTED FILES";
         return false;
     }
     if (fileNameLst1 != fileNameLst2) {
-        printCriticalErrorMsg(dir1.dirName() + " AND " + dir2.dirName()
+        printCriticalErrorMsg(dirPath1 + " AND " + dirPath2
                             + " DIFFER: [" + fileNameLst1.join(',') + "],["
                             + fileNameLst2.join(',') + "]");
         return false;
     } else {
-        printInfoMsg(dir1.dirName() + " AND " + dir2.dirName()
+        printInfoMsg(dirPath1 + " AND " + dirPath2
                     + " ARE EQUAL: [" + fileNameLst1.join(',') + "]");
     }
 
@@ -307,21 +310,21 @@ bool Utils::sameFilesInDirs(QDir const &dir1, QDir const &dir2,
     }
 
     if (gitBlobLst1.isEmpty()) {
-        qCritical() << "DIR1" << dir1.dirName() << " DOES NOT CONTAIN EXPECTED FILES";
+        qCritical() << "DIR1" << dirPath1 << " DOES NOT CONTAIN EXPECTED FILES";
         return false;
     }
     if (gitBlobLst2.isEmpty())  {
-        qCritical() << "DIR1" << dir2.dirName() << " DOES NOT CONTAIN EXPECTED FILES";
+        qCritical() << "DIR1" << dirPath2 << " DOES NOT CONTAIN EXPECTED FILES";
         return false;
     }
 
     if (gitBlobLst1 != gitBlobLst2) {
-        printCriticalErrorMsg(dir1.dirName() + " AND " + dir2.dirName()
+        printCriticalErrorMsg(dirPath1 + " AND " + dirPath2
                             + " DIFFER: [" + gitBlobLst1.join(',') + "],["
                             + gitBlobLst2.join(',') + "]");
         return false;
     } else {
-        printInfoMsg(dir1.dirName() + " AND " + dir2.dirName()
+        printInfoMsg(dirPath1 + " AND " + dirPath2
                     + " CONTAIN SAME GIT-BLOBS FOR FILES: [" + fileNameLst1.join(',') + "]");
 
     }

UpdatePTUDevCtrl/worker.cpp

@@ -19,7 +19,7 @@
 #include <QScopedPointer>
 
 #include "message_handler.h"
-#include "plugins/interfaces.h"
+#include <DeviceController/interfaces.h>
 #include "ismas/ismas_client.h"
 #include "progress_event.h"
 #include "mainwindow.h"
@@ -165,8 +165,14 @@ Worker::Worker(int customerNr,
 
     // TODO: turn object into singleton
     instance = this;
-
     m_lastFailedUpdateStep = UPDATE_STEP::NONE;
+    m_update = new Update(this,
+                          QDir::cleanPath(m_workingDirectory + QDir::separator() + m_customerNrStr),
+                          m_customerNrStr,
+                          m_branchName,
+                          m_pluginDir,
+                          m_pluginName,
+                          m_workingDirectory);
 
     this->setObjectName("worker-object");
     QDir::setCurrent(m_workingDirectory);
@@ -175,6 +181,10 @@ Worker::Worker(int customerNr,
 }
 
 Worker::~Worker() {
+    if (m_update != nullptr) {
+        delete m_update;
+        m_update = nullptr;
+    }
 }
 
 void Worker::displayProgressInMainWindow(int progress) {
@@ -429,17 +439,6 @@ void Worker::privateUpdate() {
     ISMAS(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECKOUT_BRANCH);
     setProgress(_CHECKOUT_BRANCH_SUCCESS);
 
-    ////////////////////////////////////////////////////////////////////////////
-    //
-    //             (R)SYNC THE REPOSITORY WITH THE LOCAL FILEYSTEM
-    //
-    ////////////////////////////////////////////////////////////////////////////
-    if ((continueUpdate = syncCustomerRepositoryAndFS()) == false) {
-        return;
-    }
-    lst = QStringList(QString(smap[UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS]));
-    ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS));
-    setProgress(_SYNC_CUSTOMER_REPOSITORY_SUCCESS);
 
     ////////////////////////////////////////////////////////////////////////////
     //
@@ -454,6 +453,18 @@ void Worker::privateUpdate() {
     ISMAS() << (GUI() << (CONSOLE() << UPDATE_STEP::UPDATE_REPOSITORY));
     setProgress(_UPDATE_REPOSITORY_SUCCESS);
 
+    ////////////////////////////////////////////////////////////////////////////
+    //
+    //             (R)SYNC THE REPOSITORY WITH THE LOCAL FILEYSTEM
+    //
+    ////////////////////////////////////////////////////////////////////////////
+    if ((continueUpdate = syncCustomerRepositoryAndFS()) == false) {
+        return;
+    }
+    lst = QStringList(QString(smap[UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS]));
+    ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS));
+    setProgress(_SYNC_CUSTOMER_REPOSITORY_SUCCESS);
+
 
     ////////////////////////////////////////////////////////////////////////////
     //
@@ -508,6 +519,8 @@ bool Worker::updateTriggerSet() {
 
     GUI() << (CONSOLE() << UPDATE_STEP::CHECK_ISMAS_TRIGGER);
 
+    bool const automaticUpdate = (QDateTime::currentDateTime().time().hour() < 4);
+
     QString triggerValue("NOT CHECKED YET");
     static constexpr int const repeats = 15;
     for (int repeat = 1; repeat <= repeats; ++repeat) {
@@ -629,9 +642,17 @@ bool Worker::updateTriggerSet() {
                                 ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_WRONG_VALUE)));
                                                     // if the customer repository has just been cloned
                                 return false;       // it is OK the ISMAS trigger might not be 'WAIT'
-                            } else {
-                                CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
                             }
+                            // not a clone and empty update-trigger
+                            if (automaticUpdate) {
+                                // do not inform ISMAS in case of automatic update, because the
+                                // update is not necessary as the trigger-button is not set to WAIT.
+                                GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_WRONG_VALUE));
+                                return false;
+                            }
+
+                            CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
+
                             QThread::sleep(6);
                             continue;
                         } else {
@@ -639,11 +660,21 @@ bool Worker::updateTriggerSet() {
                             if (m_clone) {
                                 m_ismasTriggerStatusMessage = QStringList(QString("TRIGGER-VALUE='%1' != 'WAIT'").arg(triggerValue));
                                 QStringList lst = m_ismasTriggerStatusMessage;
-                                ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_WRONG_VALUE)));
+                                if (automaticUpdate) {
+                                    // do not inform ISMAS in case of automatic update
+                                    GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_WRONG_VALUE));
+                                } else {
+                                    ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_WRONG_VALUE)));
+                                }
                             } else {
                                 m_ismasTriggerStatusMessage = QStringList(QString("TRIGGER-VALUE='%1' != 'WAIT'").arg(triggerValue));
                                 QStringList lst = m_ismasTriggerStatusMessage;
-                                ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE)));
+                                if (automaticUpdate) {
+                                    // do not inform ISMAS in case of automatic update
+                                    GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_WRONG_VALUE));
+                                } else {
+                                    ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE)));
+                                }
                             }
                             return false;
                         }
@@ -751,7 +782,7 @@ bool Worker::filesToUpdate() {
         }
         m_filesToUpdate.removeDuplicates();
 
-        qCritical() << __PRETTY_FUNCTION__ << "FILES-TO-UPDATE" << m_filesToUpdate;
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ") FILES-TO-UPDATE" << m_filesToUpdate;
 
         GUI(m_filesToUpdate) << (CONSOLE(m_filesToUpdate) << UPDATE_STEP::FILES_TO_UPDATE);
         setProgress(_FILES_TO_UPDATE);
@@ -888,15 +919,7 @@ bool Worker::downloadFilesToPSAHardware() {
             QStringList lst = m_filesToDownload;
             ISMAS(lst) << (CONSOLE(lst) << UPDATE_STEP::FILES_TO_DOWNLOAD);
 
-            Update update(this,
+            if (m_update && m_update->doUpdate(m_displayIndex, m_filesToDownload)) {
-                          QDir::cleanPath(m_workingDirectory + QDir::separator() + m_customerNrStr),
-                          m_customerNrStr,
-                          m_branchName,
-                          m_pluginDir,
-                          m_pluginName,
-                          m_workingDirectory);
-
-            if (update.doUpdate(m_displayIndex, m_filesToDownload)) {
                 // prepared for use: at the moment, the dc-library does not work
                 // as expected.
 
@@ -906,7 +929,7 @@ bool Worker::downloadFilesToPSAHardware() {
                 return true;
             }
 
-            CONSOLE(QStringList("NO FILES TO DOWNLOAD TO PSA-HW")) << (m_lastFailedUpdateStep = UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE);
+            CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE);
             setProgress(_DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE);
 
             return false;
@@ -989,10 +1012,12 @@ bool Worker::syncCustomerRepositoryAndFS() {
                 QDir dir1(QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/psa_tariff"));
                 QDir dir2("/etc/psa_tariff");
                 if (Utils::sameFilesInDirs(dir1, dir2)) {
-                    CONSOLE() << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS;
+                    CONSOLE() <<  QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/psa_tariff")
-                    setProgress(_SYNC_CUSTOMER_REPOSITORY_SUCCESS);
+                              << "AND /etc/psa_tariff ARE DIFFERENT: CHANGED CUSTOMER-NUMBER?";
-                    return true;
                 }
+                CONSOLE() << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS;
+                setProgress(_SYNC_CUSTOMER_REPOSITORY_SUCCESS);
+                return true;
             }
         }
     }
@@ -1060,6 +1085,17 @@ QString Worker::getAPISMYoctoInstallationStatus()  {
     return "N/A";
 }
 
+QString Worker::getDCVersionPreparedForDownload(QString const &filename) {
+    if (QFile::exists(filename)) {  // <customer-repo/etc/dc/dc2c.bin>
+        QString const cmd = QString("strings %1 | grep -e DC2[Cc]\\. | head -n1").arg(filename);
+        Command c("bash");
+        if (c.execute("/tmp", QStringList() << "-c" << cmd)) {
+            return c.getCommandResult(); // DC2c.04.42  14.09.2023
+        }
+    }
+    return "N/A";
+}
+
 
 QString Worker::getATBQTVersion() const {
     QString const cmd = QString("echo -n $(/opt/app/ATBAPP/ATBQT -v | head -n 2 | cut -d':' -f2)");
@@ -1184,7 +1220,9 @@ PSAInstalled Worker::getPSAInstalled() {
     if (m_versionInfo.size() == 3) {
         qCritical() << QString("***** %1:%2").arg(__func__).arg(__LINE__)
                     << "m_versionInfo" << m_versionInfo << "*****";
-        psaInstalled.versionInfo.lastCommit = m_versionInfo.at(0);
+        psaInstalled.versionInfo.lastCommit = QString("%1-%2")
+                .arg(QCoreApplication::applicationPid())
+                .arg(m_versionInfo.at(0));
         psaInstalled.versionInfo.reason = m_versionInfo.at(1);
         psaInstalled.versionInfo.created = m_versionInfo.at(2);
     }

UpdatePTUDevCtrl/worker.h

@@ -225,7 +225,8 @@ class Worker : public QThread{
                     m_worker->setProgress(_FINISHED);
                 }
             } else {
-                QStringList lst = m_worker->m_ismasTriggerStatusMessage;
+                // QStringList lst = m_worker->m_ismasTriggerStatusMessage;
+                QStringList lst;
                 UPDATE_STEP last = m_worker->m_lastFailedUpdateStep;
                 if (m_worker->smap.contains(last)) {
                     lst << QString(" (last failed step: %1)").arg(m_worker->smap[last]);
@@ -249,7 +250,6 @@ class Worker : public QThread{
                                      << UPDATE_STEP::SEND_LAST_VERSION));
             }
             m_worker->stopProgressLoop();
-
             m_worker->m_updateProcessRunning = false;
             emit m_worker->enableExit();
             emit m_worker->restartExitTimer();
@@ -370,6 +370,7 @@ public:
     static QString getATBUpdateToolYoctoInstallationStatus();
     static QString getAPISMYoctoVersion();
     static QString getAPISMYoctoInstallationStatus();
+    static QString getDCVersionPreparedForDownload(QString const &filename);
 
     static const QString UPDATE_STEP_OK;
     static const QString UPDATE_STEP_DONE;