Set version to 1.4.8

of JSON-file.

DownloadDCFirmware/DownloadDCFirmware.pro

@@ -1,5 +1,5 @@
-QT += core
-QT += serialport network
+QT += core gui
+QT += widgets serialport network
 
 TARGET = ATBDownloadDCFirmware
 
@@ -66,14 +66,27 @@ contains( CONFIG, DesktopLinux ) {
 }
 
 SOURCES += \
-        main.cpp
+        main.cpp \
+        mainwindow.cpp \
+        sender_thread.cpp \
+        receiver_thread.cpp \
+        worker_thread.cpp \
+        ../common/src/message_handler.cpp
 
-# HEADERS +=
+HEADERS += \
+        mainwindow.h \
+        sender_thread.h \
+        receiver_thread.h \
+        worker_thread.h \
+        ../common/include/message_handler.h
 
 OTHER_FILES += \
     ATBDownloadDCFirmware.ini
 
 
+FORMS += \
+    mainwindow.ui
+
 ##########################################################################################
 # for running program on target through QtCreator
 contains( CONFIG, PTU5 ) {

DownloadDCFirmware/main.cpp

@@ -1,8 +1,53 @@
 #include <QtGlobal>
+#include <QCoreApplication>
+#include <QApplication>
+#include <QDebug>
+#include <QTimer>
+#include <QFileInfo>
+#include <QThread>
+
+#include "../common/include/message_handler.h"
+#include "mainwindow.h"
+
+#ifdef __linux__
+#include <sys/sysinfo.h>
+#endif
+
+#ifdef PTU5
+#define SERIAL_PORT "ttymxc2"
+#else
+#define SERIAL_PORT "ttyUSB0"
+#endif
 
 int main(int argc, char **argv) {
-    Q_UNUSED(argc);
-    Q_UNUSED(argv);
+    QByteArray const value = qgetenv("LC_ALL");
+    if (value != "C") {
+        qputenv("LC_ALL", "C");
+    }
+    // qputenv("XDG_RUNTIME_DIR", "/var/run/user/0");
 
-    return 0;
+    openlog("ATB-UPDATE-DC-FIRMWARE", LOG_PERROR | LOG_PID | LOG_CONS, LOG_USER);
+
+    QApplication a(argc, argv);
+    QApplication::setApplicationName("ATBUpdateTool");
+    QApplication::setApplicationVersion(APP_VERSION);
+
+    if (!messageHandlerInstalled()) { // change internal qt-QDebug-handling
+        atbInstallMessageHandler(atbDebugOutput);
+        setDebugLevel(LOG_NOTICE);
+    }
+
+    QThread::currentThread()->setObjectName("main thread");
+    qInfo() << "Main thread" << QThread::currentThreadId();
+
+    MainWindow mw;
+
+    mw.setWindowFlags(Qt::Window | Qt::FramelessWindowHint);
+    //mw.showFullScreen();
+
+    qCritical() << "SHOW";
+
+    mw.show();
+
+    return a.exec();
 }

DownloadDCFirmware/mainwindow.cpp

@@ -0,0 +1,347 @@
+#include "mainwindow.h"
+#include "ui_mainwindow.h"
+
+#include <QDateTime>
+#include <QMessageBox>
+#include <QDebug>
+#include <QScrollBar>
+#include <QEvent>
+
+
+MainWindow::MainWindow(QWidget *parent)
+    : QMainWindow(parent)
+    , ui(new Ui::MainWindow)
+    , m_serial(new QSerialPort(this))
+    , m_width(70) {
+
+    this->setStatusBar(new QStatusBar(this));
+    QFont f;
+    f.setStyleHint(QFont::Monospace);
+    f.setWeight(QFont::Bold);
+    f.setFamily("Misc Fixed");
+    f.setPixelSize(12);
+    this->statusBar()->setFont(f);
+
+    ui->setupUi(this);
+
+    openSerialPort();
+
+    //ui->updateProgress->setRange(0, 100);
+    //ui->updateProgress->reset();
+
+#if 0
+    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("Update tool version: %1 - %2 %3").arg(APP_VERSION).arg(APP_BUILD_DATE).arg(APP_BUILD_TIME).leftJustified(m_width-3);
+    lst << QString("Machine number     : %1 ").arg(m_worker->machineNr()).leftJustified(m_width-3);
+    lst << QString("Customer number    : %1 ").arg(m_worker->customerNr()).leftJustified(m_width-3);
+    lst << QString("Zone number        : %1 (%2)").arg(m_worker->zoneNr()).arg(Utils::zoneName(m_worker->zoneNr())).leftJustified(m_width-3);
+    lst << QString("APISM version      : %1").arg(m_worker->apismVersion()).leftJustified(m_width-3);
+    lst << QString("").leftJustified(m_width-3, '=');
+
+    ui->updateStatus->setText(lst.join('\n'));
+    ui->updateStatus->setEnabled(true);
+    // ui->updateStatus->installEventFilter(this);
+
+    m_startTimer = new QTimer(this);
+    connect(m_startTimer, SIGNAL(timeout()), m_worker, SLOT(start()));
+    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(showStatusMessage(QString,QString)),this, SLOT(onShowStatusMessage(QString,QString)));
+    connect(m_worker, SIGNAL(showErrorMessage(QStringList)),this, SLOT(onShowErrorMessage(QStringList)));
+    connect(m_worker, SIGNAL(showStatusMessage(QString,QString)),this, SLOT(onShowStatusMessage(QString,QString)));
+    connect(m_worker, SIGNAL(replaceLast(QString,QString)),this,SLOT(onReplaceLast(QString,QString)));
+    connect(m_worker, SIGNAL(replaceLast(QStringList,QString)),this, SLOT(onReplaceLast(QStringList,QString)));
+#endif
+}
+
+MainWindow::~MainWindow() {
+    //delete m_startTimer;
+    //delete m_exitTimer;
+    closeSerialPort();
+    delete ui;
+}
+
+bool MainWindow::openSerialPort() {
+   // const SettingsDialog::Settings p = m_settings->settings();
+   m_serial->setPortName("");
+   m_serial->setBaudRate(QSerialPort::Baud115200);
+   m_serial->setDataBits(QSerialPort::DataBits::Data8);
+   m_serial->setParity(QSerialPort::Parity::NoParity);
+   m_serial->setStopBits(QSerialPort::StopBits::OneStop);
+   m_serial->setFlowControl(QSerialPort::FlowControl::NoFlowControl);
+   if (m_serial->open(QIODevice::ReadWrite)) {
+       //m_console->setEnabled(true);
+       //m_console->setLocalEchoEnabled(p.localEchoEnabled);
+       //m_ui->actionConnect->setEnabled(false);
+       //m_ui->actionDisconnect->setEnabled(true);
+       //m_ui->actionConfigure->setEnabled(false);
+       //showStatusMessage(tr("Connected to %1 : %2, %3, %4, %5, %6")
+       //                  .arg(p.name, p.stringBaudRate, p.stringDataBits,
+       //                       p.stringParity, p.stringStopBits, p.stringFlowControl));
+       return true;
+   } else {
+       //QMessageBox::critical(this, tr("Error"), m_serial->errorString());
+
+       //showStatusMessage(tr("Open error"));
+   }
+   return false;
+}
+
+bool MainWindow::closeSerialPort() {
+    if (m_serial->isOpen()) {
+        m_serial->close();
+        return true;
+    }
+    return false;
+    //m_console->setEnabled(false);
+    //m_ui->actionConnect->setEnabled(true);
+    //m_ui->actionDisconnect->setEnabled(false);
+    //m_ui->actionConfigure->setEnabled(true);
+    //showStatusMessage(tr("Disconnected"));
+}
+
+#if 0
+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, 1));
+            } 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);
+                    // ueberpruefen: hauptfenster schickt sich selber ein event
+                    // QApplication::postEvent(this, new ProgressEvent(this, progress));
+                    // 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(5 * 1000);
+
+    scrollDownTextEdit();
+    ui->updateStatus->setEnabled(false);
+}
+
+void MainWindow::onQuit() {
+    m_exitTimer->stop();
+    int errorCode = 0;
+
+    qCritical()
+        << QString("ON QUIT: CURRENT STEP %1")
+            .arg(m_worker->getSmap()[m_worker->currentStep()]);
+
+    // TODO: replace SEND_LAST_VERSION with UPDATE_SUCCEEDED
+    if (m_worker->currentStep() != Worker::UPDATE_STEP::SEND_LAST_VERSION) {
+        errorCode = -1;
+    }
+    qCritical() << QString("ON QUIT: EXIT CODE %1").arg(errorCode);
+    qApp->exit(errorCode);
+}
+
+void MainWindow::scrollDownTextEdit() {
+    // Utils::printInfoMsg(QString("SCROLL-DOWN-TEXT_EDIT CALLED AT ")
+    //    + QDateTime::currentDateTime().toString(Qt::ISODateWithMs));
+
+    ui->updateStatus->setEnabled(true);
+
+    QTextCursor tmpCursor = ui->updateStatus->textCursor();
+    tmpCursor.movePosition(QTextCursor::End);
+    ui->updateStatus->setTextCursor(tmpCursor);
+    ui->updateStatus->ensureCursorVisible();
+}
+
+void MainWindow::onAppendText(QString text, QString suffix) {
+    // Utils::printInfoMsg(QString("ON APPEND CALLED AT ")
+    //    + QDateTime::currentDateTime().toString(Qt::ISODateWithMs));
+
+    QString editText = ui->updateStatus->toPlainText();
+    scrollDownTextEdit();
+
+    if (!suffix.isNull() && suffix.size() > 0) {
+        //qInfo() << "TEXT" << text << "SUFFIX" << suffix;
+        if (suffix == Worker::UPDATE_STEP_SUCCESS || suffix == Worker::UPDATE_STEP_FAIL) {
+            ui->updateStatus->insertPlainText(QString("\n").leftJustified(m_width-3, '=') + " ");
+            // editText += QString("\n").leftJustified(m_width-3, '=');
+            // editText += " ";
+        }
+        QString const &add = (QString("\n") + text).leftJustified(m_width - (2 + suffix.size())) + suffix;
+        ui->updateStatus->insertPlainText(add);
+        // editText += add;
+    } else {
+        QString const &add = text.leftJustified(m_width-9);
+        ui->updateStatus->insertPlainText(add);
+        //editText += add;
+    }
+
+    // debug
+    // QString editText = ui->updateStatus->toPlainText();
+    // Utils::printLineEditInfo(editText.split('\n', QString::SplitBehavior::SkipEmptyParts));
+    // ui->updateStatus->setText(editText.trimmed());
+
+    scrollDownTextEdit();
+}
+
+void MainWindow::onReplaceLast(QStringList newTextLines, QString suffix) {
+    // Utils::printInfoMsg(QString("ON REPLACE LAST (LIST) CALLED AT ")
+    //    + QDateTime::currentDateTime().toString(Qt::ISODateWithMs));
+    int const s = newTextLines.size();
+    if (s > 0) {
+        QString editText = ui->updateStatus->toPlainText();
+        QStringList lines = editText.split('\n', QString::SplitBehavior::SkipEmptyParts);
+        QString newText;
+        if (lines.size() >= s) {
+            for (int i = 0; i < s; ++i) {
+                lines.removeLast();
+            }
+            if (lines.size() > 0) {
+                newText = lines.join('\n');
+                newText += '\n';
+            }
+            QStringList newLines;
+            for (int i = 0; i < s; ++i) {
+                if (i == 0 && !suffix.isNull() && suffix.size() > 0 && suffix != "\n") {
+                    newLines += Utils::rstrip(newTextLines.at(i).leftJustified(m_width-10) + suffix);
+                } else {
+                    newLines += Utils::rstrip(newTextLines.at(i).leftJustified(m_width-10));
+                }
+            }
+            lines += newLines;
+            newText += newLines.join(' ');
+        }
+
+        ui->updateStatus->setText(newText);
+        Utils::printLineEditInfo(lines);
+        scrollDownTextEdit();
+    }
+}
+
+void MainWindow::onReplaceLast(QString text, QString suffix) {
+    // Utils::printInfoMsg(QString("ON REPLACE LAST (TEXT) CALLED AT ")
+    //    + QDateTime::currentDateTime().toString(Qt::ISODateWithMs));
+    QString editText = ui->updateStatus->toPlainText();
+    QStringList lines = editText.split('\n', QString::SplitBehavior::SkipEmptyParts);
+    if (lines.size() > 0) {
+        // removing the last line is really meant for refreshing the last line
+        // with a string very similar than the original one, typically only
+        // followed by a suffix.
+        if (lines.last().contains(text)) {
+            lines.removeLast();
+        }
+        if (!suffix.isNull() && suffix.size() > 0 && suffix != "\n") {
+            QString const add = text.leftJustified(m_width-10) + suffix;
+            if (!add.isEmpty()) {
+                lines += text.leftJustified(m_width-10) + suffix;
+            }
+        } else {
+            QString const add = text.leftJustified(m_width-10);
+            if (!add.isEmpty()) {
+                lines += text.leftJustified(m_width-10);
+            }
+        }
+    }
+
+    Utils::printLineEditInfo(lines);
+    ui->updateStatus->setText(lines.join('\n').trimmed());
+    scrollDownTextEdit();
+}
+
+void MainWindow::onShowMessage(QString title, QString text) {
+    this->statusBar()->clearMessage();
+    this->statusBar()->showMessage( // timeout: 10000
+        QString(title + " " + text).leftJustified(80, ' '), 10000);
+}
+
+void MainWindow::onShowErrorMessage(QString title, QString text) {
+    onShowMessage(title, text);
+}
+
+void MainWindow::onShowStatusMessage(QString title, QString text) {
+    onShowMessage(title, text);
+}
+
+void MainWindow::onShowErrorMessage(QStringList lst) {
+    if (lst.size() >= 2) {
+        onShowMessage(lst.at(0), lst.at(1));
+    }
+    if (lst.size() == 1) {
+        onShowMessage(lst.at(0), "");
+    }
+}
+
+void MainWindow::onShowStatusMessage(QStringList lst) {
+    if (lst.size() >= 2) {
+        onShowMessage(lst.at(0), lst.at(1));
+    }
+    if (lst.size() == 1) {
+        onShowMessage(lst.at(0), "");
+    }
+}
+#endif

DownloadDCFirmware/mainwindow.h

@@ -0,0 +1,58 @@
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+#include <QTimer>
+#include <QStatusBar>
+#include <QWidget>
+#include <QSerialPort>
+#include <QSerialPortInfo>
+
+QT_BEGIN_NAMESPACE
+namespace Ui { class MainWindow; }
+QT_END_NAMESPACE
+
+
+class MainWindow : public QMainWindow {
+    Q_OBJECT
+
+public:
+    MainWindow(QWidget *parent = nullptr);
+    ~MainWindow();
+
+public slots:
+    //void onAppendText(QString, QString suffix = "");
+    //void onReplaceLast(QStringList, QString suffix = "");
+    //void onReplaceLast(QString, QString suffix = "");
+    //void onShowErrorMessage(QString, QString);
+    //void onShowStatusMessage(QString, QString);
+    //void onShowErrorMessage(QStringList);
+    //void onShowStatusMessage(QStringList);
+    //void onStopStartTimer();
+    //void onRestartExitTimer();
+    //void onEnableExit();
+    //void onDisableExit();
+
+signals:
+
+private slots:
+//    void onQuit();
+
+private:
+//    void scrollDownTextEdit();
+//    void onShowMessage(QString, QString);
+
+    bool openSerialPort();
+    bool closeSerialPort();
+
+    Ui::MainWindow *ui;
+    QSerialPort *m_serial;
+//    Worker *m_worker;
+    int const m_width;
+//    QTimer *m_startTimer;
+//    QTimer *m_exitTimer;
+//    bool m_progressRunning;
+    //int m_progressValue;
+//    UpdateDcEvent::UpdateStep m_updateStep;
+};
+#endif // MAINWINDOW_H

DownloadDCFirmware/mainwindow.ui

@@ -0,0 +1,62 @@
+<?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>441</height>
+     </rect>
+    </property>
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="0" column="0" rowspan="3" colspan="2">
+      <widget class="QTextEdit" name="updateStatus">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="font">
+        <font>
+         <family>Misc Fixed</family>
+         <pointsize>11</pointsize>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="verticalScrollBarPolicy">
+        <enum>Qt::ScrollBarAsNeeded</enum>
+       </property>
+       <property name="horizontalScrollBarPolicy">
+        <enum>Qt::ScrollBarAsNeeded</enum>
+       </property>
+       <property name="sizeAdjustPolicy">
+        <enum>QAbstractScrollArea::AdjustToContents</enum>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

DownloadDCFirmware/worker_thread.cpp

@@ -0,0 +1,13 @@
+#include "worker_thread.h"
+
+WorkerThread::WorkerThread(QObject *parent)
+  : QThread(parent) {
+}
+
+WorkerThread::~WorkerThread() {
+
+}
+
+void WorkerThread::run() {
+
+}

DownloadDCFirmware/worker_thread.h

@@ -0,0 +1,20 @@
+#ifndef WORKER_THREAD_H_INCLUDED
+#define WORKER_THREAD_H_INCLUDED
+
+#include <QThread>
+
+class WorkerThread : public QThread {
+    Q_OBJECT
+
+public:
+    explicit WorkerThread(QObject *parent = nullptr);
+    ~WorkerThread();
+
+
+private:
+    void run() override;
+
+    bool m_quit = false;
+};
+
+#endif // WORKER_THREAD_H_INCLUDED

DownloadDCJsonFiles/DownloadDCJsonFiles.pro

@@ -24,7 +24,7 @@ INCLUDEPATH += \
     plugins \
     $${INCLUDEINTERFACES} \
     $${_PRO_FILE_PWD_}/../UpdatePTUDevCtrl \
-    $${_PRO_FILE_PWD_}/../../ATBUpdateTool/common/include
+    $${_PRO_FILE_PWD_}/../common/include
 
 CONFIG += c++17
 
@@ -81,13 +81,13 @@ SOURCES += \
         ../UpdatePTUDevCtrl/message_handler.cpp \
         ../UpdatePTUDevCtrl/commandline_parser.cpp \
         update.cpp \
-        ../../ATBUpdateTool/common/src/System.cpp
+        ../common/src/System.cpp
 
 HEADERS += \
         ../UpdatePTUDevCtrl/message_handler.h \
         ../UpdatePTUDevCtrl/commandline_parser.h \
         update.h \
-        ../../ATBUpdateTool/common/include/System.h
+        ../common/include/System.h
 
 OTHER_FILES += \
     ATBDownloadDCJsonFiles.ini

DownloadDCJsonFiles/main.cpp

@@ -138,7 +138,9 @@ int main(int argc, char **argv) {
                   plugInName,
                   workingDir);
 
+    //update.checkJsonVersions();
     update.doUpdate(filesToUpdate);
+    update.checkJsonVersions(filesToUpdate);
 
     //return a.exec();
     return 0;

DownloadDCJsonFiles/update.cpp

@@ -46,7 +46,7 @@ hwinf *Update::loadDCPlugin(QDir const &plugInDir, QString const &fname) {
                 qCritical() << "in directory" << plugInDir.absolutePath();
                 qCritical() << "cannot load plugin" << pluginLoader.fileName();
                 qCritical() << pluginLoader.errorString();
-                exit(-1);
+                return nullptr;
             }
 
             qCritical() << "loadDCPlugin() plugin directory:" << plugInDir.absolutePath();
@@ -54,25 +54,25 @@ hwinf *Update::loadDCPlugin(QDir const &plugInDir, QString const &fname) {
 
             if (!pluginLoader.isLoaded()) {
                 qCritical() << pluginLoader.errorString();
-                exit(-2);
+                return nullptr;
             }
             QObject *plugin = pluginLoader.instance();
             if (!plugin) {
                 qCritical() << "cannot start instance";
-                exit(-3);
+                return nullptr;
             }
             if (! (hw = qobject_cast<hwinf *>(plugin))) {
                 qCritical() << "cannot cast plugin" << plugin << "to hwinf";
-                exit(-4);
+                return nullptr;
             }
         } else {
             qCritical() << pluginLibName << "does not exist";
-            exit(-5);
+            return nullptr;
         }
     } else {
         qCritical() << "plugins directory" << plugInDir.absolutePath()
                     << "does not exist";
-        exit(-6);
+        return nullptr;
     }
     return hw;
 }
@@ -131,45 +131,20 @@ Update::Update(QString customerRepository,
 
         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
     }
 }
 
 Update::~Update() {
-    // unloadDCPlugin();
+    unloadDCPlugin();
 }
 
 bool Update::doUpdate(QStringList const &filesToWorkOn) {
 
+    if (!m_hw) {
+        qCritical() << "ERROR!!! m_hw == nullptr";
+        return false;
+    }
+
     int tries = 20;
     while ((m_sys_areDCdataValid = m_hw->sys_areDCdataValid()) == false) {
         // must deliver 'true', only then are all data from hwapi valid
@@ -205,19 +180,16 @@ bool Update::doUpdate(QStringList const &filesToWorkOn) {
             }
         } else if (fToWorkOn.contains("DC2C_cash", Qt::CaseInsensitive)
                 && fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
-            res = true;
             if ((res = updateCashConf(fToWorkOn))) {
                 qCritical() << QString("DOWNLOADED CASH TEMPLATE %1").arg(fToWorkOn);
             }
         } else if (fToWorkOn.contains("DC2C_conf", Qt::CaseInsensitive)
                 && fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
-            res = true;
-            if ((res= updateConfig(fToWorkOn))) {
+            if ((res = updateConfig(fToWorkOn))) {
                 qCritical() << QString("DOWNLOADED CONFIG TEMPLATE %1").arg(fToWorkOn);
             }
         } else if (fToWorkOn.contains("DC2C_device", Qt::CaseInsensitive)
                 && fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
-            res = true;
             if ((res = updateDeviceConf(fToWorkOn))) {
                 qCritical() << QString("DOWNLOADED DEVICE TEMPLATE %1").arg(fToWorkOn);
             }
@@ -230,13 +202,18 @@ bool Update::doUpdate(QStringList const &filesToWorkOn) {
     return res;
 }
 
-bool Update::checkDownloadedJsonVersions(QStringList const& jsonFileNames) {
+bool Update::checkJsonVersions(QStringList const& jsonFileNames) {
+
     for (QStringList::size_type i=0; i < jsonFileNames.size(); ++i) {
 
         uint8_t jsonNr = 0;
 
         QString const &fName = jsonFileNames[i];
 
+        // send one request for every single version
+        // jsonNr=1...36, 1=config file (cust.Nr) 2=devices  3=cash  4=res.
+        //      6=printer template 1 ..... 36= template 32
+
         if (fName.endsWith("conf.json")) {
             jsonNr = 1;
         } else
@@ -254,31 +231,45 @@ bool Update::checkDownloadedJsonVersions(QStringList const& jsonFileNames) {
                 bool ok = false;
                 int n = captured.toInt(&ok);
                 if (ok) {
-                    jsonNr = n + 4;
+                    jsonNr = n + 5;
                 }
             }
         }
 
         if (jsonNr != 0) {
-#if 0
+            // send one request for every single version
+            // jsonNr=1...36, 1=config file (cust.Nr) 2=devices  3=cash  4=res.
+            //      5=printer template 1 ..... 36= template 32
+
             m_hw->sys_requestJsonVersions(jsonNr);
             QThread::msleep(500);
 
             char buf[64];
             memset(buf, 0x00, sizeof(buf));
             m_hw->sys_getJsonVersions(jsonNr, buf);
-            buf[sizeof(buf)-1] = '\0';
+            buf[16] = '\0'; // the DC only handles 16 bytes
 
-            QString const installedVersion(buf);
+            static const QByteArray cb(16, (char)0xff);
+
+            QString const installedVersion(QString::fromStdString(buf));
             QString const fileVersion = getFileVersion(jsonFileNames[i]);
 
-            qCritical() << "installed version:" << installedVersion;
-            qCritical() << "     file version:" << fileVersion;
+            QFileInfo fi(jsonFileNames[i]);
+
+            qCritical() << endl;
+            qCritical() << "                json request nr:" << jsonNr;
 
             if (installedVersion == fileVersion) {
-
+                qCritical() << "                      json file:" << fi.fileName();
+                qCritical() << "        installed version in DC:" << installedVersion;
+            } else
+            if (cb == QByteArray(buf) && fileVersion == "") {
+                qCritical() << "unknown json file (repo and DC):" << fi.fileName();
+            } else {
+                qCritical() << "                      json file:" << fi.fileName();
+                qCritical() << "        installed version in DC:" << installedVersion;
+                qCritical() << "     file version in repository:" << fileVersion;
             }
-#endif
 
         } else {
             qCritical() << "CANNOT FIND JSON-NR FOR" << fName;
@@ -288,6 +279,39 @@ bool Update::checkDownloadedJsonVersions(QStringList const& jsonFileNames) {
     return false;
 }
 
+
+QString Update::getFileVersion(QString const& jsonFileName) {
+    // "version":"15.10.2023 14:55 02.00.06",
+    static const QRegularExpression re("^.*(\\\"[Vv]ersion\\\":)([\\s\\\"]{0,})([^,\\\"]{0,}).*$");
+
+    QString fileVersion("");
+    QFile inputFile(QDir::cleanPath(m_customerRepository + QDir::separator() + jsonFileName));
+
+    if (inputFile.exists()) {
+        if (inputFile.open(QIODevice::ReadOnly)) {
+           QTextStream in(&inputFile);
+           while (!in.atEnd()) {
+              QString line = in.readLine();
+
+              QRegularExpressionMatch match;
+              int idx = line.indexOf(re, 0, &match);
+              if (idx != -1) {
+                  int const lastCaptured = match.lastCapturedIndex();
+                  // the dc only sends 16 Byte
+                  fileVersion = match.captured(lastCaptured);
+                  fileVersion.truncate(16);
+                  break;
+              }
+           }
+           inputFile.close();
+        }
+    } else {
+        // qCritical() << "ERROR" << inputFile.fileName() << "does not exist";
+    }
+
+    return fileVersion;
+}
+
 bool Update::downloadJson(enum FileTypeJson type,
                           int templateIdx,
                           QString jsFileToSendToDC) const {

DownloadDCJsonFiles/update.h

@@ -9,6 +9,8 @@
 #include <QProcess>
 #include <QPluginLoader>
 
+#include <initializer_list>
+
 #include <DeviceController/interfaces.h>
 
 #ifdef PTU5
@@ -67,7 +69,46 @@ public:
                       QString jsFileToSendToDC) const;
 
 
-    bool checkDownloadedJsonVersions(QStringList const& jsonFileNames);
+    QString getFileVersion(QString const& jsonFileName);
+    bool checkJsonVersions(QStringList const& jsonFileNames =
+                            QStringList(
+                                QList(
+                                    std::initializer_list<QString>{
+                                        QString("etc/psa_config/DC2C_conf.json"),
+                                        QString("etc/psa_config/DC2C_cash.json"),
+                                        QString("etc/psa_config/DC2C_device.json"),
+                                        QString("etc/psa_config/DC2C_print01.json"),
+                                        QString("etc/psa_config/DC2C_print02.json"),
+                                        QString("etc/psa_config/DC2C_print03.json"),
+                                        QString("etc/psa_config/DC2C_print04.json"),
+                                        QString("etc/psa_config/DC2C_print05.json"),
+                                        QString("etc/psa_config/DC2C_print06.json"),
+                                        QString("etc/psa_config/DC2C_print07.json"),
+                                        QString("etc/psa_config/DC2C_print08.json"),
+                                        QString("etc/psa_config/DC2C_print09.json"),
+                                        QString("etc/psa_config/DC2C_print10.json"),
+                                        QString("etc/psa_config/DC2C_print11.json"),
+                                        QString("etc/psa_config/DC2C_print12.json"),
+                                        QString("etc/psa_config/DC2C_print13.json"),
+                                        QString("etc/psa_config/DC2C_print14.json"),
+                                        QString("etc/psa_config/DC2C_print15.json"),
+                                        QString("etc/psa_config/DC2C_print16.json"),
+                                        QString("etc/psa_config/DC2C_print17.json"),
+                                        QString("etc/psa_config/DC2C_print18.json"),
+                                        QString("etc/psa_config/DC2C_print19.json"),
+                                        QString("etc/psa_config/DC2C_print20.json"),
+                                        QString("etc/psa_config/DC2C_print21.json"),
+                                        QString("etc/psa_config/DC2C_print22.json"),
+                                        QString("etc/psa_config/DC2C_print23.json"),
+                                        QString("etc/psa_config/DC2C_print24.json"),
+                                        QString("etc/psa_config/DC2C_print25.json"),
+                                        QString("etc/psa_config/DC2C_print26.json"),
+                                        QString("etc/psa_config/DC2C_print27.json"),
+                                        QString("etc/psa_config/DC2C_print28.json"),
+                                        QString("etc/psa_config/DC2C_print29.json"),
+                                        QString("etc/psa_config/DC2C_print30.json"),
+                                        QString("etc/psa_config/DC2C_print31.json"),
+                                        QString("etc/psa_config/DC2C_print32.json")})));
 /*
     bool checkDownloadedJsonVersions(QStringList const& jsonFileNames);
 

UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro

@@ -117,7 +117,14 @@ DEFINES += QT_DEPRECATED_WARNINGS
 #           customer-repository (e.g. origin/zg1/zone101), then fetch/pull
 #           this branch before switching to this now locally existen branch.
 #         : Improve output of GUI/Console and messages sent to ISMAS.
-VERSION="1.4.6"
+#         : Fix: do not send the json-files to dc in any case. Bug introduced
+#           when pulling new branch, but branch already existed locally.
+# 1.4.6   : No exit()-call if loading CA-plugin fails.
+#           Check m_hw (pointer to CA-(Slave)Plugin) before its use.
+#           Only exit() if firmware is configured to be possibly updated, but
+#           loading the CA-plugin failed.
+# 1.4.7   : Read Json-file versions of Json-files actually loaded into DC.
+VERSION="1.4.8"
 # PLANNED TODOS:
 #   1:  Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
 #   2:  Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu

UpdatePTUDevCtrl/git/git_client.cpp

@@ -193,7 +193,7 @@ QStringList GitClient::gitShowReason(QString branchName) {
             int const m = s.indexOf("m=");
             int const d = s.indexOf("d=");
 
-            QString msg = IsmasClient::getReasonForLastSendVersion();
+            QString msg{""}; // IsmasClient::getReasonForLastSendVersion();
             QString commit{""}, date{""};
 
             if (c != -1) {
@@ -205,9 +205,9 @@ QStringList GitClient::gitShowReason(QString branchName) {
                     start = m + 2;
                     if (d >= start) {
                         length = d - start;
-                        msg += " (";
+                        // msg = " (";
                         msg = s.mid(start, length).trimmed();
-                        msg += ")";
+                        // msg += ")";
 
                         start = d + 2;
                         date = s.mid(start);

UpdatePTUDevCtrl/main.cpp

@@ -130,7 +130,9 @@ int main(int argc, char *argv[]) {
     if (!QDir(plugInDir).exists()) {
         qCritical() << plugInDir
                     << "does not exists, but has to contain dc-library";
-        exit(-1);
+        if (noUpdatePsaHardware == false) {
+            exit(-1);
+        }
     }
 
     // before loading the library, delete all possible shared memory segments

UpdatePTUDevCtrl/update.cpp

@@ -52,7 +52,6 @@ hwinf *Update::loadDCPlugin(QDir const &plugInDir, QString const &fname) {
                 qCritical() << "in directory" << plugInDir.absolutePath();
                 qCritical() << "cannot load plugin" << pluginLoader.fileName();
                 qCritical() << pluginLoader.errorString();
-                exit(-1);
             }
 
             qCritical() << "loadDCPlugin() plugin directory:" << plugInDir.absolutePath();
@@ -60,25 +59,20 @@ hwinf *Update::loadDCPlugin(QDir const &plugInDir, QString const &fname) {
 
             if (!pluginLoader.isLoaded()) {
                 qCritical() << pluginLoader.errorString();
-                exit(-2);
             }
             QObject *plugin = pluginLoader.instance();
             if (!plugin) {
                 qCritical() << "cannot start instance";
-                exit(-3);
             }
             if (! (hw = qobject_cast<hwinf *>(plugin))) {
                 qCritical() << "cannot cast plugin" << plugin << "to hwinf";
-                exit(-4);
             }
         } else {
             qCritical() << pluginLibName << "does not exist";
-            exit(-5);
         }
     } else {
         qCritical() << "plugins directory" << plugInDir.absolutePath()
                     << "does not exist";
-        exit(-6);
     }
     return hw;
 }
@@ -124,7 +118,7 @@ Update::Update(Worker *worker,
     , m_sys_areDCdataValid(false) {
 
     if (!m_hw) {
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_hw == nullptr -> ca-slave plugin loaded ???";
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_hw == nullptr -> ca-slave plugin not loaded";
     } else {
         int tries = 20;
         while ((m_sys_areDCdataValid = m_hw->sys_areDCdataValid()) == false) {
@@ -191,33 +185,37 @@ void Update::onReportDCDownloadFailure(QString const &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 << "...";
-    if (m_hw->dc_openSerial(br, baudrate, comPort, 1) == true) { // 1 for connect
-        Utils::printInfoMsg(
+    if (m_hw) {
+        qDebug() << "opening serial" << br << baudrate << comPort << "...";
+        if (m_hw->dc_openSerial(br, baudrate, comPort, 1) == true) { // 1 for connect
+            Utils::printInfoMsg(
+                QString("OPENING SERIAL %1").arg(br)
+                      + " " + baudrate + " " + comPort + "...OK");
+
+            // m_hw->dc_autoRequest(true);
+            m_hw->dc_autoRequest(false);
+            QThread::sleep(1);
+
+            Utils::printInfoMsg(QString("IS PORT OPEN %1").arg(m_hw->dc_isPortOpen()));
+            return true;
+        }
+
+        Utils::printCriticalErrorMsg(
             QString("OPENING SERIAL %1").arg(br)
-                  + " " + baudrate + " " + comPort + "...OK");
-
-        // m_hw->dc_autoRequest(true);
-        m_hw->dc_autoRequest(false);
-        QThread::sleep(1);
-
-        Utils::printInfoMsg(QString("IS PORT OPEN %1").arg(m_hw->dc_isPortOpen()));
-        return true;
+                  + " " + baudrate + " " + comPort + "...FAILED");
     }
-
-    Utils::printCriticalErrorMsg(
-        QString("OPENING SERIAL %1").arg(br)
-              + " " + baudrate + " " + comPort + "...FAILED");
     return false;
 }
 
 void Update::closeSerial() const {
     qInfo() << "CLOSED SERIAL" << m_baudrate << m_serialInterface;
-    m_hw->dc_closeSerial();
+    if (m_hw) {
+        m_hw->dc_closeSerial();
+    }
 }
 
 bool Update::isSerialOpen() const {
-    return m_hw->dc_isPortOpen();
+    return m_hw ? m_hw->dc_isPortOpen() : false;
 }
 
 /*
@@ -396,78 +394,88 @@ bool Update::downloadJson(enum FileTypeJson type,
                           int templateIdx,
                           QString jsFileToSendToDC) const {
 
-    m_hw->dc_autoRequest(true); // downloading Json needs the AutoEmission flag
-    qDebug() << "SET AUTO-REQUEST=TRUE";
-    QThread::sleep(1);  // make sure the auto-request flag is acknowledged
-
-    QStringList lst;
-    bool ready = false;
-    int nTry = 25;
-    while ((ready = m_hw->sys_ready4sending()) == false) {
-        QThread::msleep(200);
-        if (--nTry <= 0) {
-            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() > 0 && fi.size() <= 800) {
-                    QByteArray ba = file.readAll();
-                    // kindOfFile: 1=config, 2=device, 3=cash, 4=serial, 5=time, 6=printer
-                    //      nrOfTemplate=1...32 if kindOfFile==6
-                    //      content = content of the Json file, max 800byte ascii signs
-                    if (m_hw->sys_sendJsonFileToDc((uint8_t)(type),
-                                                   templateIdx,
-                                                   (uint8_t *)ba.data())) {
+    if (m_hw) {
+        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
 
-                        /*
-                         *  Note: the machine id is contained in DC2C_conf.json.
-                         *  The idea was to use this to check if the download of
-                         *  the json-file was correct. It did not work, as the
-                         *  update of the PSA (to reflect a change in the
-                         *  machine id) did not happen immediately.
-                         *
-                            m_hw->dc_autoRequest(true);
-                            QThread::msleep(500);
+        QStringList lst;
+        bool ready = false;
+        int nTry = 25;
+        while ((ready = m_hw->sys_ready4sending()) == false) {
+            QThread::msleep(200);
+            if (--nTry <= 0) {
+                QString msg("SYS NOT READY FOR SENDING AFTER 5 SECONDS");
+                Utils::printCriticalErrorMsg(msg);
+                lst << msg;
 
-                            // testing
-                            m_hw->request_ReadbackMachineID();
-                            QThread::msleep(500);
+                if (m_worker) {
+                    m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
+                }
+                break;
+            }
+        }
 
-                            uint8_t data[64];
-                            memset(data, 0x00, sizeof(data));
-                            uint8_t length = 0;
+        QString msg;
+        lst.clear();
+        if (ready) {
+            QFile file(jsFileToSendToDC);
+            QFileInfo fi(jsFileToSendToDC); // max. size of template file is 800 bytes
+            if (file.exists()) {
+                if (file.open(QIODevice::ReadOnly)) {
+                    if (fi.size() > 0 && fi.size() <= 800) {
+                        QByteArray ba = file.readAll();
+                        // kindOfFile: 1=config, 2=device, 3=cash, 4=serial, 5=time, 6=printer
+                        //      nrOfTemplate=1...32 if kindOfFile==6
+                        //      content = content of the Json file, max 800byte ascii signs
+                        if (m_hw->sys_sendJsonFileToDc((uint8_t)(type),
+                                                       templateIdx,
+                                                       (uint8_t *)ba.data())) {
 
-                            m_hw->readback_machineIDdata(&length, data);
+                            /*
+                             *  Note: the machine id is contained in DC2C_conf.json.
+                             *  The idea was to use this to check if the download of
+                             *  the json-file was correct. It did not work, as the
+                             *  update of the PSA (to reflect a change in the
+                             *  machine id) did not happen immediately.
+                             *
+                                m_hw->dc_autoRequest(true);
+                                QThread::msleep(500);
 
-                            QThread::msleep(500);
+                                // testing
+                                m_hw->request_ReadbackMachineID();
+                                QThread::msleep(500);
 
-                            QByteArray ba((const char*)data, length);
+                                uint8_t data[64];
+                                memset(data, 0x00, sizeof(data));
+                                uint8_t length = 0;
 
-                            qCritical() << length << "MACHINE ID =" << ba.toHex(':');
-                        */
+                                m_hw->readback_machineIDdata(&length, data);
 
-                        if (m_worker) {
-                            m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
+                                QThread::msleep(500);
+
+                                QByteArray ba((const char*)data, length);
+
+                                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));
+                            }
                         }
-
-                        ret = true;
                     } else {
-                        msg = QString("ERROR SEND JSON-FILE %1 TO DC").arg(file.fileName());
+                        msg = QString("SIZE OF %1 TOO BIG (%2 BYTES)").arg(jsFileToSendToDC).arg(fi.size());
                         Utils::printCriticalErrorMsg(msg);
                         lst << msg;
                         if (m_worker) {
@@ -476,16 +484,17 @@ bool Update::downloadJson(enum FileTypeJson type,
                         }
                     }
                 } else {
-                    msg = QString("SIZE OF %1 TOO BIG (%2 BYTES)").arg(jsFileToSendToDC).arg(fi.size());
+                    msg = 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 {
-                msg = QString("CAN NOT OPEN ") + jsFileToSendToDC + " FOR READING";
+                msg = QString(jsFileToSendToDC) + " DOES NOT EXIST";
                 Utils::printCriticalErrorMsg(msg);
                 lst << msg;
 
@@ -494,21 +503,12 @@ bool Update::downloadJson(enum FileTypeJson type,
                                          << Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
                 }
             }
-        } else {
-            msg = 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));
-            }
         }
-    }
 
-    m_hw->dc_autoRequest(false);
-    qDebug() << "SET AUTO-REQUEST=FALSE";
-    QThread::sleep(1);  // make sure the auto-request flag is acknowledged
+        m_hw->dc_autoRequest(false);
+        qDebug() << "SET AUTO-REQUEST=FALSE";
+        QThread::sleep(1);  // make sure the auto-request flag is acknowledged
+    }
 
     return ret;
 }
@@ -564,24 +564,26 @@ void Update::finished(int /*exitCode*/, QProcess::ExitStatus /*exitStatus*/) {
 }
 
 QStringList Update::getDcSoftAndHardWareVersion() {
-    m_hw->dc_autoRequest(true);
-    QThread::sleep(1); // make sure the timer-slots are active
+    if (m_hw) {
+        m_hw->dc_autoRequest(true);
+        QThread::sleep(1); // make sure the timer-slots are active
 
-    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);
-    }
+        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().trimmed();
-    QString const &swVersion = m_hw->dc_getSWversion().toLower().trimmed();
+        QString const &hwVersion = m_hw->dc_getHWversion().toLower().trimmed();
+        QString const &swVersion = m_hw->dc_getSWversion().toLower().trimmed();
 
-    m_hw->dc_autoRequest(false);
-    QThread::sleep(1); // make sure the timer-slots are inactive
+        m_hw->dc_autoRequest(false);
+        QThread::sleep(1); // make sure the timer-slots are inactive
 
-    if (!hwVersion.isEmpty() && !swVersion.isEmpty()) {
-        return QStringList() << hwVersion << swVersion;
+        if (!hwVersion.isEmpty() && !swVersion.isEmpty()) {
+            return QStringList() << hwVersion << swVersion;
+        }
     }
 
     return QStringList() << "DC HW-version not available"
@@ -590,23 +592,31 @@ QStringList Update::getDcSoftAndHardWareVersion() {
 
 QString Update::getFileVersion(QString const& jsonFileName) {
     // "version":"15.10.2023 14:55 02.00.06",
-    static const QRegularExpression re("^.*(\\\"version\\\":)(.*)$");
+    static const QRegularExpression re("^.*(\\\"[Vv]ersion\\\":)([\\s\\\"]{0,})([^,\\\"]{0,}).*$");
 
-    QString fileVersion;
-    QFile inputFile(jsonFileName);
-    if (inputFile.open(QIODevice::ReadOnly)) {
-       QTextStream in(&inputFile);
-       while (!in.atEnd()) {
-          QString line = in.readLine();
+    QString fileVersion("");
+    QFile inputFile(QDir::cleanPath(m_customerRepository + QDir::separator() + jsonFileName));
 
-          QRegularExpressionMatch match;
-          int idx = line.indexOf(re, 0, &match);
-          if (idx != -1) {
-              fileVersion = match.captured(match.lastCapturedIndex());
-              break;
-          }
-       }
-       inputFile.close();
+    if (inputFile.exists()) {
+        if (inputFile.open(QIODevice::ReadOnly)) {
+           QTextStream in(&inputFile);
+           while (!in.atEnd()) {
+              QString line = in.readLine();
+
+              QRegularExpressionMatch match;
+              int idx = line.indexOf(re, 0, &match);
+              if (idx != -1) {
+                  int const lastCaptured = match.lastCapturedIndex();
+                  // the dc only sends 16 Byte
+                  fileVersion = match.captured(lastCaptured);
+                  fileVersion.truncate(16);
+                  break;
+              }
+           }
+           inputFile.close();
+        }
+    } else {
+        // qCritical() << "ERROR" << inputFile.fileName() << "does not exist";
     }
 
     return fileVersion;
@@ -617,60 +627,85 @@ bool Update::checkDownloadedJsonVersions(QStringList const& jsonFileNames) {
     for (QStringList::size_type i=0; i < jsonFileNames.size(); ++i) {
 
         uint8_t jsonNr = 0;
-        QFileInfo fInfo(jsonFileNames[i]);
 
-        if (fInfo.fileName().endsWith("conf.json")) {
+        QString const &fName = jsonFileNames[i];
+
+        // send one request for every single version
+        // jsonNr=1...36, 1=config file (cust.Nr) 2=devices  3=cash  4=res.
+        //      6=printer template 1 ..... 36= template 32
+
+        if (fName.endsWith("conf.json")) {
             jsonNr = 1;
         } else
-        if (fInfo.fileName().endsWith("device.json")) {
+        if (fName.endsWith("device.json")) {
             jsonNr = 2;
         } else
-        if (fInfo.fileName().endsWith("cash.json")) {
+        if (fName.endsWith("cash.json")) {
             jsonNr = 3;
         } else {
             QRegularExpressionMatch match;
             static const QRegularExpression re("^(.*print)([0-3][0-9])\\.json\\s*$");
-            int idx = fInfo.fileName().indexOf(re, 0, &match);
+            int idx = fName.indexOf(re, 0, &match);
             if (idx != -1) {
                 QString captured = match.captured(match.lastCapturedIndex());
                 bool ok = false;
                 int n = captured.toInt(&ok);
                 if (ok) {
-                    jsonNr = n + 4;
+                    jsonNr = n + 5;
                 }
             }
         }
 
         if (jsonNr != 0) {
-#if 0
+            // send one request for every single version
+            // jsonNr=1...36, 1=config file (cust.Nr) 2=devices  3=cash  4=res.
+            //      5=printer template 1 ..... 36= template 32
+
             m_hw->sys_requestJsonVersions(jsonNr);
             QThread::msleep(500);
 
             char buf[64];
             memset(buf, 0x00, sizeof(buf));
             m_hw->sys_getJsonVersions(jsonNr, buf);
-            buf[sizeof(buf)-1] = '\0';
+            buf[16] = '\0'; // the DC only handles 16 bytes
 
-            QString const installedVersion(buf);
+            static const QByteArray cb(16, (char)0xff);
+
+            QString const installedVersion(QString::fromStdString(buf));
             QString const fileVersion = getFileVersion(jsonFileNames[i]);
 
-            qCritical() << "installed version:" << installedVersion;
-            qCritical() << "     file version:" << fileVersion;
+            QFileInfo fi(jsonFileNames[i]);
+
+            qCritical() << endl;
+            qCritical() << "                json request nr:" << jsonNr;
 
             if (installedVersion == fileVersion) {
-
+                qCritical() << "                      json file:" << fi.fileName();
+                qCritical() << "        installed version in DC:" << installedVersion;
+            } else
+            if (cb == QByteArray(buf) && fileVersion == "") {
+                qCritical() << "unknown json file (repo and DC):" << fi.fileName();
+            } else {
+                qCritical() << "                      json file:" << fi.fileName();
+                qCritical() << "        installed version in DC:" << installedVersion;
+                qCritical() << "     file version in repository:" << fileVersion;
             }
-#endif
 
         } else {
-            qCritical() << "CANNOT FIND JSON-NR FOR" << jsonFileNames[i];
+            qCritical() << "CANNOT FIND JSON-NR FOR" << fName;
         }
     }
 
     return false;
 }
+
 bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
 
+    if (!m_hw) {
+        Utils::printInfoMsg("CA-PLUGIN NOT LOADED");
+        return false;
+    }
+
     int tries = 20;
     while ((m_sys_areDCdataValid = m_hw->sys_areDCdataValid()) == false) {
         // must deliver 'true', only then are all data from hwapi valid

UpdatePTUDevCtrl/utils.cpp

@@ -44,6 +44,7 @@ QString Utils::getLocation(QString fileName) {
                     if (c != -1) {
                         location = line.mid(c+1);
                         if (!location.isEmpty()) {
+                            location = location.replace(QChar(','), QString(""));
                             return location.replace(QChar('"'), QString("")).trimmed();
                         }
                     }
@@ -69,6 +70,7 @@ QString Utils::getTariffVersion(QString fileName) {
                     if (c != -1) {
                         version = line.mid(c+1);
                         if (!version.isEmpty()) {
+                            version = version.replace(QChar(','), QString(""));
                             return version.replace(QChar('"'), QString("")).trimmed();
                         }
                     }
@@ -94,6 +96,7 @@ QString Utils::getTariffInfo(QString fileName) {
                     if (c != -1) {
                         info = line.mid(c+1);
                         if (!info.isEmpty()) {
+                            info = info.replace(QChar(','), QString(""));
                             return info.replace(QChar('"'), QString("")).trimmed();
                         }
                     }

UpdatePTUDevCtrl/worker.cpp

@@ -17,6 +17,7 @@
 #include <QJsonParseError>
 #include <Qt>
 #include <QScopedPointer>
+#include <QRegularExpression>
 
 #include "message_handler.h"
 #include <DeviceController/interfaces.h>
@@ -169,13 +170,16 @@ 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);
+
+    if (m_noUpdatePsaHardware == false) {
+        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);
@@ -300,13 +304,18 @@ void Worker::privateUpdate() {
                 m_updateNotNecessary = true;
                 m_ismasTriggerStatusMessage = QStringList(QString("NO UPDATE NECESSARY (%1)").arg(current.toString(Qt::ISODate)));
 
-                qCritical() << "privateUpdate m_ismasTriggerStatusMessage:" << QStringList(QString("NO UPDATE NECESSARY (%1)").arg(current.toString(Qt::ISODate)));
+                qCritical() << "privateUpdate m_ismasTriggerStatusMessage:"
+                            << QStringList(m_ismasTriggerStatusMessage);
                 qCritical() << "***";
 
-                // the customer-repository does exist, but the ISMAS-trigger is
+                // the customer-repository does exist, and the ISMAS-trigger is
                 // *NOT* "WAIT", but from 00:00:00 - 00:03:59 this counts as an
                 // automatic update
 
+                QStringList lst = m_ismasTriggerStatusMessage;
+                // trigger message to ISMAS and CONSOLE
+                ISMAS(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_SUCCESS));
+                // overwrite m_lastFailedUpdateStep
                 m_lastFailedUpdateStep = UPDATE_STEP::NONE;
                 return;
             }
@@ -730,29 +739,28 @@ bool Worker::customerEnvironment() {
     if (QDir(m_customerRepository).exists()) {
         if (m_clone == false) {
             if (m_gc.branchExistsRemotely()) {
-                QString msg("PULL NEW BRANCH " + m_branchName);
-                QStringList lst(msg);
-                ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::PULL_NEW_BRANCH));
+                QString msg;
+                QStringList lst;
                 if (!m_gc.branchExistsLocally()) {
+                    lst.clear();
                     msg = QString("PULLING OF NEW BRANCH " + m_branchName + " DOES NOT EXIST LOCALLY");
-                    QStringList lst(msg);
+                    lst << msg;
                     CONSOLE(lst) << UPDATE_STEP::PULL_NEW_BRANCH;
                     if (!m_gc.gitPullNewBranches()) {
-                        msg = QString("PULLING OF NEW BRANCH " + m_branchName + "FAILED");
-                        QStringList lst(msg);
+                        lst.clear();
+                        msg = QString("PULLING OF NEW BRANCH " + m_branchName + " FAILED");
+                        lst << msg;
                         ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::PULL_NEW_BRANCH_FAILURE)));
                         return false;
                     } else {
-                        msg = QString("PULLING OF NEW BRANCH " + m_branchName + "SUCCESS");
-                        QStringList lst(msg);
+                        lst.clear();
+                        msg = QString("PULLING OF NEW BRANCH " + m_branchName + " SUCCESS");
+                        lst << msg;
                         ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::PULL_NEW_BRANCH_SUCCESS)));
                         m_pulledNewBranch = true;
                     }
                 } else {
-                    msg = QString("PULLING ALREADY EXISTING LOCAL BRANCH " + m_branchName + "SUCCESS");
-                    QStringList lst(msg);
-                    ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::PULL_NEW_BRANCH_SUCCESS)));
-                    m_pulledNewBranch = true;
+                    m_pulledNewBranch = false;
                 }
             }
         }
@@ -1251,15 +1259,48 @@ PSAInstalled Worker::getPSAInstalled() {
     psaInstalled.versionInfo.created = "N/A";
 
     if (m_versionInfo.size() == 3) {
-        qCritical() << QString("***** %1:%2").arg(__func__).arg(__LINE__)
-                    << "m_versionInfo" << m_versionInfo << "*****";
-        psaInstalled.versionInfo.lastCommit = QString("%1-%2")
-                .arg(QCoreApplication::applicationPid())
-                .arg(m_versionInfo.at(0));
-        psaInstalled.versionInfo.reason = m_versionInfo.at(1);
+        QString const &lastCommit = m_versionInfo.at(0);
+        QString reason = m_versionInfo.at(1);
+        QDateTime const dt = QDateTime::fromString(m_versionInfo.at(2), Qt::ISODate);
+        QString version{""};
+        QString date{""};
+        if (dt.isValid()) {
+            date += " ";
+            date += dt.date().toString(Qt::ISODate);
+        }
+        static const QRegularExpression re("^\\s*(\\d+)\\.(\\d+)\\.(\\d+)(.*$)");
+        QRegularExpressionMatch match = re.match(reason);
+        if (match.hasMatch()) {
+            int const lastCapturedIndex = match.lastCapturedIndex();
+            if (lastCapturedIndex >= 1) {
+                version += " v";
+                version += match.captured(1);   // major
+            }
+            if (lastCapturedIndex >= 2) {
+                version += ".";
+                version += match.captured(2);   // minor
+            }
+            if (lastCapturedIndex >= 3) {
+                version += ".";
+                version += match.captured(3);   // patch
+            }
+            if (lastCapturedIndex >= 4) {       // rest after version
+                reason = match.captured(4);
+            }
+        }
+
+        psaInstalled.versionInfo.lastCommit = QString("%1%2").arg(lastCommit).arg(version);
+        psaInstalled.versionInfo.reason = reason;
         psaInstalled.versionInfo.created = m_versionInfo.at(2);
     }
 
+    //qCritical() << "";
+    //qCritical() << "VERSION-INFO";
+    //qCritical() << "LAST-COMMIT" << psaInstalled.versionInfo.lastCommit;
+    //qCritical() << "REASON" << psaInstalled.versionInfo.reason;
+    //qCritical() << "CREATED" << psaInstalled.versionInfo.created;
+    //qCritical() << "";
+
     if (m_zoneNr != 0) {
         QString const &n = QString("%1").arg(m_zoneNr).rightJustified(2, '0');
         psaInstalled.tariff.name = QString("tariff%1.json").arg(n);

UpdatePTUDevCtrl/worker.h

@@ -733,7 +733,7 @@ private:
         }
 
         Worker::instance->m_currentStep = step;
-        QStringList lst = QStringList(smap[step]);
+        // QStringList lst = QStringList(smap[step]);
 
         switch (step) {
         case UPDATE_STEP::NONE: {
@@ -756,7 +756,8 @@ private:
                         QString("REPOSITORY %1 AND BRANCH %2 OK")
                             .arg(instance->m_customerRepository)
                             .arg(instance->m_gc.branchName()).toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
+                        instance->m_versionInfo.size() >= 1
+                            ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
             ismasClient.sendRequestReceiveResponse(
                 IsmasClient::APISM::DB_PORT, ismasUpdateNews);
         } break;
@@ -772,7 +773,8 @@ private:
                         QString("REPOSITORY %1 and BRANCH %2 ***NOT OK***")
                             .arg(instance->m_customerRepository)
                             .arg(instance->m_gc.branchName()).toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
+                        instance->m_versionInfo.size() >= 1
+                            ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
             ismasClient.sendRequestReceiveResponse(
                 IsmasClient::APISM::DB_PORT, ismasUpdateNews);
         } break;
@@ -791,7 +793,8 @@ private:
                         QString("SANITY OF %1 (BRANCH %2) OK")
                             .arg(instance->m_customerRepository)
                             .arg(instance->m_gc.branchName()).toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
+                        instance->m_versionInfo.size() >= 1
+                            ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
             ismasClient.sendRequestReceiveResponse(
                 IsmasClient::APISM::DB_PORT, ismasUpdateNews);
         } break;
@@ -807,7 +810,8 @@ private:
                         QString("SANITY OF %1 and BRANCH %2 ***NOT*** OK")
                             .arg(instance->m_customerRepository)
                             .arg(instance->m_gc.branchName()).toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
+                        instance->m_versionInfo.size() >= 1
+                            ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
             ismasClient.sendRequestReceiveResponse(
                 IsmasClient::APISM::DB_PORT, ismasUpdateNews);
         } break;
@@ -832,7 +836,8 @@ private:
                         QString("CLONED REPOSITORY %1 AND CHECKED OUT BRANCH %2")
                             .arg(instance->m_customerRepository)
                             .arg(instance->m_gc.branchName()).toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
+                        instance->m_versionInfo.size() >= 1
+                            ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
             ismasClient.sendRequestReceiveResponse(IsmasClient::APISM::DB_PORT,
                                                    ismasUpdateNews);
         } break;
@@ -848,7 +853,8 @@ private:
                         QString("CLONING REPOSITORY %1 OR CHECKING OUT BRANCH %2 FAILED")
                             .arg(instance->m_customerRepository)
                             .arg(instance->m_gc.branchName()).toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
+                        instance->m_versionInfo.size() >= 1
+                            ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
             ismasClient.sendRequestReceiveResponse(
                 IsmasClient::APISM::DB_PORT, ismasUpdateNews);
         } break;
@@ -863,7 +869,8 @@ private:
                           QString("CHECKED OUT REPOSITORY %1 AND CHECKED OUT BRANCH %2")
                             .arg(instance->m_customerRepository)
                             .arg(instance->m_gc.branchName()),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A"));
+                        instance->m_versionInfo.size() >= 1
+                            ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A"));
         } break;
         case UPDATE_STEP::CHECKOUT_REPOSITORY_FAILURE: {
             ismasClient.setProgressInPercent(_CHECKOUT_REPOSITORY_FAILURE);
@@ -877,7 +884,8 @@ private:
                         QString("%1: CHECKING OUT BRANCH %2 FAILED")
                             .arg(instance->m_customerRepository)
                             .arg(instance->m_gc.branchName()).toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
+                        instance->m_versionInfo.size() >= 1
+                            ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
             ismasClient.sendRequestReceiveResponse(
                 IsmasClient::APISM::DB_PORT, ismasUpdateNews);
         } break;
@@ -886,10 +894,24 @@ private:
         } break;
         case UPDATE_STEP::CHECK_ISMAS_TRIGGER_SUCCESS: {
             ismasClient.setProgressInPercent(_CHECK_ISMAS_TRIGGER_SUCCESS);
-            ismasClient.sendRequestReceiveResponse(IsmasClient::APISM::DB_PORT,
+            QString const &ismasUpdateNews =
                 QString("#M=APISM#C=CMD_EVENT#J=") +
-                         ismasClient.updateTriggerSet("ISMAS TRIGGER SET",
-                            instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A"));
+                    ismasClient.updateNewsToIsmas(
+                        _ISMAS_CONTINUE, //
+                        _CHECK_ISMAS_TRIGGER_SUCCESS,
+                        (instance->m_updateNotNecessary)
+                            ? IsmasClient::RESULT_CODE::NO_UPDATE_NECESSARY
+                                : IsmasClient::RESULT_CODE::SUCCESS,
+                        smap[UPDATE_STEP::CHECK_ISMAS_TRIGGER_SUCCESS],
+                        instance->m_updateNotNecessary
+                            ? QString("NO-UPDATE-NECESSARY (%1:%2)")
+                                .arg(instance->m_customerRepository)
+                                .arg(instance->m_gc.branchName()).toStdString().c_str()
+                                : QString("ISMAS-TRIGGER ON WAIT").toStdString().c_str(),
+                        instance->m_versionInfo.size() >= 1
+                            ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
+            ismasClient.sendRequestReceiveResponse(
+                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
         } break;
         case UPDATE_STEP::CHECK_ISMAS_TRIGGER_WRONG_VALUE: {
             ismasClient.setProgressInPercent(_CHECK_ISMAS_TRIGGER_WRONG_VALUE);
@@ -901,7 +923,8 @@ private:
                         IsmasClient::RESULT_CODE::ISMAS_TRIGGER_ERROR,
                         smap[UPDATE_STEP::CHECK_ISMAS_TRIGGER],
                         instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
+                        instance->m_versionInfo.size() >= 1
+                            ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
             ismasClient.sendRequestReceiveResponse(
                 IsmasClient::APISM::DB_PORT, ismasUpdateNews);
         } break;
@@ -915,7 +938,8 @@ private:
                         IsmasClient::RESULT_CODE::ISMAS_TRIGGER_ERROR,
                         smap[UPDATE_STEP::CHECK_ISMAS_TRIGGER],
                         instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
+                        instance->m_versionInfo.size() >= 1
+                    ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
             ismasClient.sendRequestReceiveResponse(
                 IsmasClient::APISM::DB_PORT, ismasUpdateNews);
         } break;
@@ -929,7 +953,8 @@ private:
                         IsmasClient::RESULT_CODE::SUCCESS,
                         smap[UPDATE_STEP::INITIAL_CLONE_WITHOUT_ACTIVE_ISMAS_TRIGGER],
                         instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
+                        instance->m_versionInfo.size() >= 1
+                            ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
             ismasClient.sendRequestReceiveResponse(
                 IsmasClient::APISM::DB_PORT, ismasUpdateNews);
         } break;
@@ -943,7 +968,8 @@ private:
                         IsmasClient::RESULT_CODE::SUCCESS,
                         smap[UPDATE_STEP::INITIAL_CLONE_WITH_ACTIVE_ISMAS_TRIGGER],
                         instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
+                        instance->m_versionInfo.size() >= 1
+                            ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
             ismasClient.sendRequestReceiveResponse(
                 IsmasClient::APISM::DB_PORT, ismasUpdateNews);
         } break;
@@ -957,7 +983,8 @@ private:
                         IsmasClient::RESULT_CODE::SUCCESS,
                         smap[UPDATE_STEP::CHECKOUT_BRANCH],
                         instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
+                        instance->m_versionInfo.size() >= 1
+                            ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
             ismasClient.sendRequestReceiveResponse(
                 IsmasClient::APISM::DB_PORT, ismasUpdateNews);
         }
@@ -972,7 +999,8 @@ private:
                         IsmasClient::RESULT_CODE::GIT_PULL_ERROR,
                         smap[UPDATE_STEP::CHECKOUT_BRANCH],
                         instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
+                        instance->m_versionInfo.size() >= 1
+                            ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
             ismasClient.sendRequestReceiveResponse(
                 IsmasClient::APISM::DB_PORT, ismasUpdateNews);
         }
@@ -987,7 +1015,8 @@ private:
                         IsmasClient::RESULT_CODE::SUCCESS,
                         smap[UPDATE_STEP::CHECKOUT_BRANCH],
                         instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
+                        instance->m_versionInfo.size() >= 1
+                            ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
             ismasClient.sendRequestReceiveResponse(
                 IsmasClient::APISM::DB_PORT, ismasUpdateNews);
         }
@@ -1002,7 +1031,8 @@ private:
                         IsmasClient::RESULT_CODE::SUCCESS,
                         smap[UPDATE_STEP::CHECKOUT_BRANCH],
                         instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
+                        instance->m_versionInfo.size() >= 1
+                            ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
             ismasClient.sendRequestReceiveResponse(
                 IsmasClient::APISM::DB_PORT, ismasUpdateNews);
         } break;
@@ -1016,7 +1046,8 @@ private:
                         IsmasClient::RESULT_CODE::SUCCESS,
                         smap[UPDATE_STEP::CHECKOUT_BRANCH],
                         instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
+                        instance->m_versionInfo.size() >= 1
+                            ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
             ismasClient.sendRequestReceiveResponse(
                 IsmasClient::APISM::DB_PORT, ismasUpdateNews);
         } break;
@@ -1030,7 +1061,8 @@ private:
                         IsmasClient::RESULT_CODE::GIT_SWITCH_BRANCH_ERROR,
                         smap[UPDATE_STEP::CHECKOUT_BRANCH],
                         instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
+                        instance->m_versionInfo.size() >= 1
+                            ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
             ismasClient.sendRequestReceiveResponse(
                 IsmasClient::APISM::DB_PORT, ismasUpdateNews);
         } break;
@@ -1307,7 +1339,7 @@ private:
             QString const &ismasUpdateNews =
                 QString("#M=APISM#C=CMD_EVENT#J=") +
                     ismasClient.updateNewsToIsmas(
-                        _ISMAS_SET_WAIT_OK,
+                        _ISMAS_SET_WAIT_OK, // U0002
                         ismasClient.getProgressInPercent(),
                         IsmasClient::RESULT_CODE::SUCCESS,
                         smap[UPDATE_STEP::UPDATE_FINALIZE],
@@ -1321,9 +1353,9 @@ private:
             QString const &ismasUpdateNews =
                 QString("#M=APISM#C=CMD_EVENT#J=") +
                     ismasClient.updateNewsToIsmas(
-                        _ISMAS_SET_WAIT_OK,
+                        _ISMAS_SET_WAIT_OK, // U0002
                         ismasClient.getProgressInPercent(),
-                        IsmasClient::RESULT_CODE::SUCCESS,
+                        IsmasClient::RESULT_CODE::NO_UPDATE_NECESSARY,
                         smap[UPDATE_STEP::UPDATE_FINALIZE],
                         instance->m_ismasMsg.join(' ').toStdString().c_str(),
                         instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
@@ -1335,7 +1367,7 @@ private:
             QString const &ismasUpdateNews =
                 QString("#M=APISM#C=CMD_EVENT#J=") +
                     ismasClient.updateNewsToIsmas(
-                        _ISMAS_FAILURE,
+                        _ISMAS_FAILURE, // U0003 is sent only once
                         ismasClient.getProgressInPercent(),
                         IsmasClient::RESULT_CODE::UPDATE_IN_ERROR_STATE,
                         smap[UPDATE_STEP::UPDATE_FINALIZE],

common/include/message_handler.h

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

common/src/message_handler.cpp

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