Make compile with yocto/bitbake

DownloadDCFirmware/DownloadDCFirmware.pro

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

DownloadDCFirmware/main.cpp

@@ -1,53 +1,8 @@
 #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) {
-    QByteArray const value = qgetenv("LC_ALL");
-    if (value != "C") {
-        qputenv("LC_ALL", "C");
-    }
-    // qputenv("XDG_RUNTIME_DIR", "/var/run/user/0");
+    Q_UNUSED(argc);
+    Q_UNUSED(argv);
 
-    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();
+    return 0;
 }

DownloadDCFirmware/mainwindow.cpp

@@ -1,347 +0,0 @@
-#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

@@ -1,58 +0,0 @@
-#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

@@ -1,62 +0,0 @@
-<?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

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

DownloadDCFirmware/worker_thread.h

@@ -1,20 +0,0 @@
-#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

UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro

@@ -119,11 +119,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
 #         : Improve output of GUI/Console and messages sent to ISMAS.
 #         : 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.
-VERSION="1.4.7"
+VERSION="1.4.6"
 # 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/main.cpp

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

UpdatePTUDevCtrl/update.cpp

@@ -52,6 +52,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);
             }
 
             qCritical() << "loadDCPlugin() plugin directory:" << plugInDir.absolutePath();
@@ -59,20 +60,25 @@ 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;
 }
@@ -118,7 +124,7 @@ Update::Update(Worker *worker,
     , m_sys_areDCdataValid(false) {
 
     if (!m_hw) {
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_hw == nullptr -> ca-slave plugin not loaded";
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_hw == nullptr -> ca-slave plugin loaded ???";
     } else {
         int tries = 20;
         while ((m_sys_areDCdataValid = m_hw->sys_areDCdataValid()) == false) {
@@ -185,37 +191,33 @@ 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 {
-    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(
+    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 + "...FAILED");
+                  + " " + 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 + "...FAILED");
     return false;
 }
 
 void Update::closeSerial() const {
     qInfo() << "CLOSED SERIAL" << m_baudrate << m_serialInterface;
-    if (m_hw) {
-        m_hw->dc_closeSerial();
-    }
+    m_hw->dc_closeSerial();
 }
 
 bool Update::isSerialOpen() const {
-    return m_hw ? m_hw->dc_isPortOpen() : false;
+    return m_hw->dc_isPortOpen();
 }
 
 /*
@@ -394,88 +396,78 @@ bool Update::downloadJson(enum FileTypeJson type,
                           int templateIdx,
                           QString jsFileToSendToDC) const {
 
-    bool ret = false;
-    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
+    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;
+    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;
+            if (m_worker) {
+                m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
             }
+            break;
         }
+    }
 
-        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())) {
+    bool ret = false;
+    QString msg;
+    lst.clear();
+    if (ready) {
+        QFile file(jsFileToSendToDC);
+        QFileInfo fi(jsFileToSendToDC); // max. size of template file is 800 bytes
+        if (file.exists()) {
+            if (file.open(QIODevice::ReadOnly)) {
+                if (fi.size() > 0 && fi.size() <= 800) {
+                    QByteArray ba = file.readAll();
+                    // kindOfFile: 1=config, 2=device, 3=cash, 4=serial, 5=time, 6=printer
+                    //      nrOfTemplate=1...32 if kindOfFile==6
+                    //      content = content of the Json file, max 800byte ascii signs
+                    if (m_hw->sys_sendJsonFileToDc((uint8_t)(type),
+                                                   templateIdx,
+                                                   (uint8_t *)ba.data())) {
 
-                            /*
-                             *  Note: the machine id is contained in DC2C_conf.json.
-                             *  The idea was to use this to check if the download of
-                             *  the json-file was correct. It did not work, as the
-                             *  update of the PSA (to reflect a change in the
-                             *  machine id) did not happen immediately.
-                             *
-                                m_hw->dc_autoRequest(true);
-                                QThread::msleep(500);
+                        /*
+                         *  Note: the machine id is contained in DC2C_conf.json.
+                         *  The idea was to use this to check if the download of
+                         *  the json-file was correct. It did not work, as the
+                         *  update of the PSA (to reflect a change in the
+                         *  machine id) did not happen immediately.
+                         *
+                            m_hw->dc_autoRequest(true);
+                            QThread::msleep(500);
 
-                                // testing
-                                m_hw->request_ReadbackMachineID();
-                                QThread::msleep(500);
+                            // testing
+                            m_hw->request_ReadbackMachineID();
+                            QThread::msleep(500);
 
-                                uint8_t data[64];
-                                memset(data, 0x00, sizeof(data));
-                                uint8_t length = 0;
+                            uint8_t data[64];
+                            memset(data, 0x00, sizeof(data));
+                            uint8_t length = 0;
 
-                                m_hw->readback_machineIDdata(&length, data);
+                            m_hw->readback_machineIDdata(&length, data);
 
-                                QThread::msleep(500);
+                            QThread::msleep(500);
 
-                                QByteArray ba((const char*)data, length);
+                            QByteArray ba((const char*)data, length);
 
-                                qCritical() << length << "MACHINE ID =" << ba.toHex(':');
-                            */
+                            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));
-                            }
+                        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("SIZE OF %1 TOO BIG (%2 BYTES)").arg(jsFileToSendToDC).arg(fi.size());
+                        msg = QString("ERROR SEND JSON-FILE %1 TO DC").arg(file.fileName());
                         Utils::printCriticalErrorMsg(msg);
                         lst << msg;
                         if (m_worker) {
@@ -484,17 +476,16 @@ bool Update::downloadJson(enum FileTypeJson type,
                         }
                     }
                 } else {
-                    msg = QString("CAN NOT OPEN ") + jsFileToSendToDC + " FOR READING";
+                    msg = QString("SIZE OF %1 TOO BIG (%2 BYTES)").arg(jsFileToSendToDC).arg(fi.size());
                     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(jsFileToSendToDC) + " DOES NOT EXIST";
+                msg = QString("CAN NOT OPEN ") + jsFileToSendToDC + " FOR READING";
                 Utils::printCriticalErrorMsg(msg);
                 lst << msg;
 
@@ -503,13 +494,22 @@ 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;
 
-        m_hw->dc_autoRequest(false);
-        qDebug() << "SET AUTO-REQUEST=FALSE";
-        QThread::sleep(1);  // make sure the auto-request flag is acknowledged
+            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
+
     return ret;
 }
 
@@ -564,26 +564,24 @@ void Update::finished(int /*exitCode*/, QProcess::ExitStatus /*exitStatus*/) {
 }
 
 QStringList Update::getDcSoftAndHardWareVersion() {
-    if (m_hw) {
-        m_hw->dc_autoRequest(true);
-        QThread::sleep(1); // make sure the timer-slots are active
+    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"
@@ -673,11 +671,6 @@ bool Update::checkDownloadedJsonVersions(QStringList const& jsonFileNames) {
 }
 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/worker.cpp

@@ -170,16 +170,13 @@ Worker::Worker(int customerNr,
     // TODO: turn object into singleton
     instance = this;
     m_lastFailedUpdateStep = UPDATE_STEP::NONE;
-
-    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);
-    }
+    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);

common/include/message_handler.h

@@ -1,23 +0,0 @@
-#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

@@ -1,97 +0,0 @@
-#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
-