DownloadDCFirmware/DownloadDCFirmware.pro

@@ -16,16 +16,6 @@ GIT_COMMIT=$$system("git log -1 --format=oneline | cut -d' ' -f1")
 
 EXTENDED_VERSION="$${VERSION}-$${GIT_COMMIT}"
 
-!contains(CONFIG, INCLUDEINTERFACES) {
-    INCLUDEINTERFACES=/opt/ptu5/opt/DCLibraries/include
-}
-
-INCLUDEPATH += \
-    plugins \
-    $${INCLUDEINTERFACES} \
-    $${_PRO_FILE_PWD_}/../UpdatePTUDevCtrl \
-    $${_PRO_FILE_PWD_}/../common/include
-
 CONFIG += c++17
 
 DEFINES+=APP_VERSION=\\\"$$VERSION\\\"
@@ -78,25 +68,20 @@ contains( CONFIG, DesktopLinux ) {
 SOURCES += \
         main.cpp \
         mainwindow.cpp \
-        ../common/src/message_handler.cpp \
+        sender_thread.cpp \
-        ../UpdatePTUDevCtrl/commandline_parser.cpp \
+        receiver_thread.cpp \
-        update.cpp \
+        worker_thread.cpp \
-        dc_download.cpp \
+        ../common/src/message_handler.cpp
-        ../common/src/System.cpp
-
 
 HEADERS += \
         mainwindow.h \
-        ../common/include/message_handler.h \
+        sender_thread.h \
-        ../UpdatePTUDevCtrl/commandline_parser.h \
+        receiver_thread.h \
-        update.h \
+        worker_thread.h \
-        dc_download.h \
+        ../common/include/message_handler.h
-        ../common/include/System.h
-
 
 OTHER_FILES += \
-    ATBDownloadDCFirmware.ini \
+    ATBDownloadDCFirmware.ini
-    ../ATBUpdateTool.ini
 
 
 FORMS += \

DownloadDCFirmware/dc_download.cpp

@@ -1,443 +0,0 @@
-#include "dc_download.h"
-#include "hwapi.h"
-
-#include <QDebug>
-#include <QDateTime>
-#include <QThread>
-
-
-DcDownload::DcDownload(hwinf *hw)
-  : m_hw(hw)
-  , m_fileToDownload(m_hw->dcDownloadFileName()) {
-    // connect(this, &QThread::finished,
-    //        dynamic_cast<QObject const *>(m_hw), &QThread::deleteLater);
-}
-
-DcDownload::~DcDownload() {
-}
-
-/*
- ///////////////////////////////////////////////////////////////////////////////
- //
- //                        USING THE DC BOOTLOADER
- //
- ///////////////////////////////////////////////////////////////////////////////
-
- 1  :   bl_reboot()     // send to application, want DC2 to reset (in order to
-                        // start the bootloader)
-                        //
-                        // NOTE: this function is NOT reliable !!! Sometimes it
-                        // simply does not work, in which case bl_startBL,
-                        // bl_checkBL and bl_isUp do not work as well.
-                        // Alas, there is no feedback if bl_reboot worked!
-                        //
-                        // NOTE: this function can be called only once per
-                        // minute, because once called again, the controller
-                        // performs some self-checks consuming some time.
-                        //
-                        // NOTE: after a successful bl_reboot(), the device is
-                        // waiting about 4 seconds in the bootloader. To stay in
-                        // the bootloader, we have to send the command
-                        // bl_startBL(), which is kind of a misnomer, as it
-                        // should be bl_doNotLeaveBL().
-                        //
- 2  :   bl_startBL():   // send within 4s after DC power-on, otherwise
-                        // bootloader is left.
-                        //
-                        // NOTE: a running bootloader is a MUST for the download
-                        // process of a device controller firmware as it does
-                        // the actual writing of the memory (the bl_reboot()
-                        // from above erases the available memory).
-                        //
- 3  :   bl_check():     // send command to verify if bl is up
-                        //
-                        // NOTE: this command is kind of a request that we want
-                        // to check if the bootloader is up. The device
-                        // (actually the bootloader) responds with its version.
-                        //
- 4  :   bl_isUp():      // returns true if bl is up and running
-                        //
-                        // NOTE: we know what the bootloader version actually is
-                        // as the bootloader does not change. By comparing the
-                        // string received in the previous step with this known
-                        // version string we know if the bootloader is up.
-                        //
-                        // NOTE FOR ALL PREVIOUS STEPS: execute them in their
-                        // own slots each to be sure to receive any possible
-                        // responds from the device.
-                        //
- 5  :   bl_sendAddress(blockNumber)
-                        // send start address, nr of 64-byte block, start with 0
-                        // will be sent only for following block-numbers:
-                        // 0, 1024, 2048, 3072 and 4096, so basically every
-                        // 64kByte.
-                        // for other addresses nothing happens
-
- 6  :   bl_wasSendingAddOK()
-                        // return val:  0: no response by now
-                        //              1: error
-                        //             10: OK
-
- 7  :   bl_sendDataBlock()
-                        // send 64 byte from bin file
-
- 8  :   bl_sendLastBlock()
-                        // send this command after all data are transferred
-
- 9  :   bl_wasSendingDataOK()
-                        // return val:  0: no response by now
-                        //              1: error
-                        //             10: OK
-
- 10 :   bl_stopBL()     // leave bl and start (the new) application
-                        //
-                        // NOTE: this function MUST work under all conditions.
-                        // Alas, there is no direct result for this command, so
-                        // the only way of knowing it was successful is to ask
-                        // the device if the bootloader is still running.
-                        // There is no problem to repeat this command until the
-                        // bootloader is really not running anymore.
- */
-void DcDownload::doDownload() {
-#if 0
-void DcDownload::run() {
-    // download thread running in ca-master sends the dc-file down to firmware
-    // TODO: send the json files as well
-
-    m_hw->dcDownloadRequestAck();
-
-    qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                << "DcDownload::run(): DOWNLOAD THREAD STARTED:";
-    qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                << "               DcDownload::run(): Filename:" << m_hw->dcDownloadFileName();
-
-    QDateTime const start = QDateTime::currentDateTime();
-
-#if 1
-    QFile fn(m_hw->dcDownloadFileName());
-
-    if (!fn.exists()) {
-        // output via CONSOLE() etc
-        qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                    << "               DcDownload::run(): Filename:" << m_hw->dcDownloadFileName() << "DOES NOT EXIST";;
-    } else {
-
-        qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                    << "DcDownload::run(): DC-CONTROLLER SW-VERSION BEFORE"
-                    << m_hw->dc_getSWversion();
-
-        // load binary device controller file into memory
-        QByteArray ba = loadBinaryDCFile(m_hw->dcDownloadFileName());
-        if (ba.size() > 0) {
-            uint16_t const totalBlocks = (((ba.size())%64)==0) ? (ba.size()/64) : (ba.size()/64)+1;
-            m_hw->dcDownloadSetTotalBlockNumber(totalBlocks);
-
-            // fill last block of data to be sent with 0xFF
-            ba = ba.leftJustified(totalBlocks*64, (char)(0xFF));
-
-            qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                        << "DcDownload::run(): TOTAL NUMBER OF BYTES TO SEND TO DC" << ba.size();
-            qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                        << "DcDownload::run(): TOTAL NUMBER OF BLOCKS" << totalBlocks;
-
-            m_hw->dc_autoRequest(true); // turn auto-request setting on
-
-            m_hw->request_DC2_HWversion();
-            m_hw->request_DC2_SWversion();
-            QThread::sleep(1);
-
-            // m_hw->dc_autoRequest(false); // turn auto-request setting on
-
-            resetDeviceController();
-
-            qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                        << "DcDownload::run(): RESET DEVICE-CONTROLLER";
-
-            if (startBootloader()) {
-
-                qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                            << "DcDownload::run(): STARTED BOOT-LOADER";
-
-                m_hw->dc_autoRequest(false);// turn auto-request setting off for
-                                            // download of binary dc
-
-                qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                            << "DcDownload::run(): TOTAL NUMBER OF FIRMWARE BLOCKS" << totalBlocks;
-
-                int currentBlock = 0; // download of binary dc
-                DownloadResult res = DownloadResult::OK;
-
-                while (res != DownloadResult::ERROR &&  currentBlock < totalBlocks) {
-                    if ((res = sendNextAddress(currentBlock)) != DownloadResult::ERROR) {
-                        if ((res = sendNextDataBlock(ba, currentBlock)) != DownloadResult::ERROR) {
-                            m_hw->dcDownloadSetCurrentBlockNumber(currentBlock);
-
-                            qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                                        << "DcDownload::run(): currentBlockNumber ..." << currentBlock;
-
-                            currentBlock += 1;
-                        }
-                    }
-                }
-
-                qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                            << QString("DcDownload::run(): last 64-byte block %1").arg(currentBlock);
-
-                int const rest = ba.size() % 64;
-                int const offset = ba.size() - rest;
-                char const *startAddress = ba.constData() + offset;
-
-                if (rest > 0) {
-                    // SHOULD NEVER HAPPEN !!!
-                    uint8_t local[66];
-                    memset(local, 0xFF, sizeof(local));
-                    memcpy(local, startAddress, rest);
-                    qCritical() << "DcDownload::run(): ERROR SEND REMAINING" << rest << "BYTES";
-                    m_hw->bl_sendDataBlock(64, local);
-                } else {
-                    m_hw->bl_sendLastBlock();
-                    m_hw->dcDownloadSetCurrentBlockNumber(currentBlock);
-
-                    qCritical() << "DcDownload::run(): currentBlockNumber" << currentBlock;
-                    // QThread::msleep(250);
-                }
-                qCritical() << "DcDownload::run(): last result" << (int)sendStatus(m_hw->bl_wasSendingDataOK());
-
-                stopBootloader();   // stop bootloader several times: if it
-                QThread::sleep(1);  // is not stopped, then the PSA has to be
-            }
-            // restarted manually (!!!)
-            stopBootloader();
-            QThread::sleep(1);
-        }
-
-        qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                    << "DcDownload::run(): STOPPED BOOT-LOADER";
-
-        stopBootloader();   // there is no harm in stopping the bootloader even
-                            // if it was not started at all
-
-        m_hw->dc_autoRequest(true);
-    }
-
-#else // test
-    // load binary device controller file into memory
-    QByteArray ba = loadBinaryDCFile(m_hw->dcDownloadFileName());
-    if (ba.size() > 0) {
-        uint16_t const totalBlocks = (((ba.size())%64)==0) ? (ba.size()/64) : (ba.size()/64)+1;
-        m_hw->dcDownloadSetTotalBlockNumber(totalBlocks);
-
-        // fill last block of data to be sent with 0xFF
-        ba = ba.leftJustified(totalBlocks*64, (char)(0xFF));
-
-        qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                    << "DcDownload::run(): TOTAL NUMBER OF BYTES TO SEND TO DC" << ba.size();
-        qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                    << "DcDownload::run(): TOTAL NUMBER OF BLOCKS" << totalBlocks;
-
-        m_hw->dc_autoRequest(true); // turn auto-request setting on
-
-        m_hw->request_DC2_HWversion();
-        m_hw->request_DC2_SWversion();
-        QThread::sleep(1);
-
-        resetDeviceController();
-
-        qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                    << "DcDownload::run(): RESET DEVICE-CONTROLLER";
-        QThread::sleep(1);
-
-        if (startBootloader()) {
-            qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                        << "DcDownload::run(): STARTED BOOT-LOADER";
-
-            m_hw->dc_autoRequest(false);// turn auto-request setting off for
-                                        // download of binary dc
-            for (uint16_t currentBlock = 0; currentBlock <= totalBlocks; ++currentBlock) {
-                m_hw->dcDownloadSetCurrentBlockNumber(currentBlock);
-                qCritical() << "DcDownload::run(): currentBlockNumber" << currentBlock;
-                QThread::msleep(250);
-            }
-            m_hw->dc_autoRequest(true); // turn auto-request setting on again
-        }
-
-        stopBootloader();   // there is no harm in stopping the bootloader even
-                            // if it was not started at all
-        qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                    << "DcDownload::run(): STOPPED BOOT-LOADER";
-    }
-#endif
-
-    m_hw->dcDownloadSetRunning(false);
-    m_hw->dcDownloadSetFinished(true);
-
-    QDateTime const end = QDateTime::currentDateTime();
-    quint64 secs = start.secsTo(end);
-    QString runtime;
-    if (secs % 60) {
-        runtime = QString("%1min %2s").arg(secs / 60).arg(secs % 60);
-    } else {
-        runtime = QString("%1min").arg((secs / 60) + 1);
-    }
-
-    qCritical() << end.time().toString(Qt::ISODateWithMs)
-                << QString("DOWNLOAD THREAD FINISHED (RUNTIME %1)")
-                   .arg(runtime);
-
-    // the object deletes itself ! This is the last line in run().
-    // Never touch the object after this statement
-    // m_hw->dcDcDownloadFinalize(this);
-#endif
-}
-
-DcDownload::DownloadResult DcDownload::sendStatus(int ret) const {
-    switch (ret) {                  // return values of dc are:
-    case 0:                         // 0: no answer by now
-        return DownloadResult::NOP; // 1: error
-    case 10:                        // 10: success
-        return DownloadResult::OK;
-    default:;
-    }
-    return DownloadResult::ERROR;
-}
-
-DcDownload::DownloadResult
-DcDownload::sendNextAddress(int bNum) const {
-    // sends address only if blockNumber is one of 0, 1024, 2048, 3072, 4096
-    int noAnswerCount = 0;
-    int errorCount = 0;
-    if ( bNum==0 || bNum==1024 || bNum==2048 || bNum==3072 || bNum==4096 ) {
-        while (noAnswerCount <= 250) {
-            m_hw->bl_sendAddress(bNum);
-            QThread::msleep(100);
-            DownloadResult const res = sendStatus(m_hw->bl_wasSendingAddOK());
-            if (res != DownloadResult::NOP) {
-                if (res == DownloadResult::ERROR) {
-                    if (++errorCount >= 10) {
-                        qCritical() << "addr-block" << bNum << "...FAILED";
-                        return res;
-                    }
-                } else { // res == DownloadResult::OK
-                    // qInfo() << "addr-block" << bNum << "...OK";
-
-                        // TODO: hier ins shared-mem schreiben
-
-                    return res;
-                }
-            } else {
-                noAnswerCount += 1; // no answer by now
-            }
-        }
-        // wait max. about 3 seconds
-        return DownloadResult::TIMEOUT;
-    }
-    // blockNumber is not one of 0, 1024, 2048, 3072, 4096 -> do nothing
-    return DownloadResult::NOP;
-}
-
-DcDownload::DownloadResult
-DcDownload::sendNextDataBlock(QByteArray const &binary, int bNum) const {
-    uint8_t local[66];
-    int const bAddr = bNum * 64;
-    int noAnswerCount = 0;
-    int errorCount = 0;
-
-    memcpy(local, binary.constData() + bAddr, 64);
-    local[64] = local[65] = 0x00;
-
-    while (noAnswerCount <= 250) {
-        m_hw->bl_sendDataBlock(64, local);
-        QThread::msleep(10);
-        DownloadResult const res = sendStatus(m_hw->bl_wasSendingDataOK());
-        if (res != DownloadResult::NOP) {
-            if (res == DownloadResult::ERROR) {
-                if (++errorCount >= 10) {
-                    qCritical() << "data for block" << bNum << "...FAILED";
-                    return res;
-                }
-            } else {
-                // qInfo() << "data for block" << bNum << "OK";
-                // TODO: hier ins shared mem schreiben
-                return res;
-            }
-        } else {
-            noAnswerCount += 1; // no answer by now
-        }
-    }
-    // wait max. about 3 seconds
-    return DownloadResult::TIMEOUT;
-}
-
-bool DcDownload::startBootloader() const {
-    qDebug() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-             << "starting bootloader...";
-    int nTry = 5;
-    while (--nTry >= 0) {
-        m_hw->bl_startBL();
-        qDebug() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs) << "bl_startBL() ..." << nTry;
-        QThread::msleep(500);
-        m_hw->bl_checkBL();
-        qDebug() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs) << "bl_checkBL() ..." << nTry;
-        QThread::msleep(500);
-        if (m_hw->bl_isUp()) {
-            qInfo() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs) << "bootloader... isUP" << nTry;
-            return true;
-        } else {
-            qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                        << "bootloader not up (" << nTry << ")";
-        }
-    }
-    qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                << "starting bootloader FAILED";
-    return false;
-}
-
-bool DcDownload::stopBootloader() const {
-    qDebug() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-             << "stopping bootloader...";
-    int nTry = 5;
-    while (--nTry >= 0) {
-        m_hw->bl_stopBL();
-        qDebug() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                 << "bl_stopBL() ...";
-        QThread::msleep(500);
-        m_hw->bl_checkBL();
-        qDebug() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs) << "bl_checkBL() ..." << nTry;
-        if (!m_hw->bl_isUp()) {
-            qInfo() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                    << "stopping bootloader OK";
-            return true;
-        }
-    }
-    qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                << "stopping bootloader FAILED";
-    return false;
-}
-
-bool DcDownload::resetDeviceController() const {
-    qDebug() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-             << "resetting device controller...";
-    m_hw->bl_rebootDC();
-    // wait maximally 3 seconds, before starting bootloader
-    QThread::sleep(1);
-    qInfo() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-            << "resetting device controller...OK";
-    return true;
-}
-
-QByteArray DcDownload::loadBinaryDCFile(QString filename) const {
-    qInfo() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-            << "loading dc binary" << filename << "...";
-
-    QFile file(filename); // closed in destructor call
-    if (!file.exists()) {
-        qCritical() << file.fileName() << "does not exist";
-        return QByteArray();
-    }
-    if (!file.open(QIODevice::ReadOnly)) {
-        qCritical() << "cannot open file" << file.fileName();
-        return QByteArray();
-    }
-    qInfo() << "loading dc binary" << filename << "...OK";
-    return file.readAll();
-}

DownloadDCFirmware/dc_download.h

@@ -1,32 +0,0 @@
-#ifndef DC_DOWNLOAD_H_INCLUDED
-#define DC_DOWNLOAD_H_INCLUDED
-
-#include <QString>
-#include <QByteArray>
-
-class hwinf;
-class DcDownload {
-
-public:
-    enum class DownloadResult {OK, ERROR, TIMEOUT, NOP};
-
-    DcDownload(hwinf *hw);
-    ~DcDownload();
-
-    void doDownload();
-
-private:
-    DownloadResult sendStatus(int ret) const;
-    DownloadResult sendNextAddress(int bNum) const;
-    DownloadResult sendNextDataBlock(QByteArray const &binary, int bNum) const;
-    bool startBootloader() const;
-    bool stopBootloader() const;
-    QByteArray loadBinaryDCFile(QString dcFileName) const;
-    bool resetDeviceController() const;
-    DownloadResult dcDownloadBinary(QByteArray const &b) const;
-
-    hwinf *m_hw;
-    QString m_fileToDownload;
-};
-
-#endif // DOWNLOAD_THREAD_H_INCLUDED

DownloadDCFirmware/main.cpp

@@ -1,25 +1,13 @@
-
 #include <QtGlobal>
 #include <QCoreApplication>
 #include <QApplication>
-#include <QByteArray>
-
-#include <QProcess>
-#include <QCommandLineParser>
-#include <QStandardPaths>
-#include <QSettings>
-#include <QDir>
 #include <QDebug>
+#include <QTimer>
+#include <QFileInfo>
 #include <QThread>
 
-#include "message_handler.h"
+#include "../common/include/message_handler.h"
-#include "commandline_parser.h"
-#include "utils.h"
-#include "update.h"
 #include "mainwindow.h"
-#include "System.h"
-
-#include <DeviceController/interfaces.h>
 
 #ifdef __linux__
 #include <sys/sysinfo.h>
@@ -31,20 +19,6 @@
 #define SERIAL_PORT "ttyUSB0"
 #endif
 
-int read1stLineOfFile(QString fileName) {
-    QFile f(fileName);
-    if (f.exists()) {
-        if (f.open(QIODevice::ReadOnly | QIODevice::Text)) {
-            QTextStream in(&f);
-            in.setCodec("UTF-8");
-            while(!in.atEnd()) {
-                return in.readLine().toInt();
-            }
-        }
-    }
-    return -1;
-}
-
 int main(int argc, char **argv) {
     QByteArray const value = qgetenv("LC_ALL");
     if (value != "C") {
@@ -63,61 +37,6 @@ int main(int argc, char **argv) {
         setDebugLevel(LOG_NOTICE);
     }
 
-    CommandLineParser parser;
-    parser.process(a);
-    parser.readSettings();
-
-    QString repositoryUrl = parser.repositoryUrl();
-    QString plugInDir = parser.plugInDir();
-    QString plugInName = parser.plugInName();
-    QString workingDir = parser.workingDir();
-    QString psaConfigDir = parser.psaConfigDir();
-    QString psaTariffDir = parser.psaTariffDir();
-    QString iniFileName = parser.iniFileName();
-    bool const dryRun = parser.dryRun();
-    bool const noUpdatePsaHardware = parser.noUpdatePsaHardware();
-    bool const showYoctoVersion = parser.yoctoVersion();
-    bool const showYoctoInstallStatus = parser.yoctoInstallStatus();
-    bool const showExtendedVersion = parser.extendedVersion();
-    bool const alwaysDownloadConfig = parser.alwaysDownloadConfig();
-    bool const alwaysDownloadDC = parser.alwaysDownloadDC();
-
-    QString const rtPath = QCoreApplication::applicationDirPath();
-
-    int const machineNr = read1stLineOfFile("/mnt/system_data/machine_nr");
-    int const customerNr = read1stLineOfFile("/mnt/system_data/cust_nr");
-    int const zoneNr = read1stLineOfFile("/mnt/system_data/zone_nr");
-    QString const branchName = (zoneNr != 0)
-            ? QString("zg1/zone%1").arg(zoneNr) : "master";
-
-    qInfo() << "pwd ......................" << rtPath;
-    qInfo() << "repositoryUrl ............" << repositoryUrl;
-    qInfo() << "plugInDir ................" << plugInDir;
-    qInfo() << "plugInName ..............." << plugInName;
-    qInfo() << "workingDir ..............." << workingDir;
-    qInfo() << "psaConfigDir ............." << psaConfigDir;
-    qInfo() << "psaTariffDir ............." << psaTariffDir;
-    qInfo() << "dryRun ..................." << dryRun;
-    qInfo() << "noUpdatePsaHardware ......" << noUpdatePsaHardware;
-    qInfo() << "alwaysDownloadConfig ....." << alwaysDownloadConfig;
-    qInfo() << "alwaysDownloadDC ........." << alwaysDownloadDC;
-    qInfo() << "showYoctoVersion ........." << showYoctoVersion;
-    qInfo() << "showYoctoInstallStatus ..." << showYoctoInstallStatus;
-    qInfo() << "showExtendedVersion ......" << showExtendedVersion;
-    qInfo() << "iniFileName .............." << iniFileName;
-    qInfo() << "extended-version ........." << APP_EXTENDED_VERSION;
-    qInfo() << "machineNr ................" << machineNr;
-    qInfo() << "customerNr ..............." << customerNr;
-    qInfo() << "zoneNr ..................." << zoneNr;
-
-    if (showExtendedVersion) {
-        printf(APP_EXTENDED_VERSION"\n");
-        return 0;
-    }
-
-    QString const &customerRepo = QDir::cleanPath(workingDir + QDir::separator() + QString("customer_%1").arg(customerNr));
-    QStringList filesToUpdate;
-
     QThread::currentThread()->setObjectName("main thread");
     qInfo() << "Main thread" << QThread::currentThreadId();
 

DownloadDCFirmware/mainwindow.cpp

@@ -7,11 +7,6 @@
 #include <QScrollBar>
 #include <QEvent>
 
-#ifdef PTU5
-#define SERIAL_PORT "ttymxc2"
-#else
-#define SERIAL_PORT "ttyUSB0"
-#endif
 
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
@@ -84,7 +79,7 @@ MainWindow::~MainWindow() {
 
 bool MainWindow::openSerialPort() {
    // const SettingsDialog::Settings p = m_settings->settings();
-   m_serial->setPortName(SERIAL_PORT);
+   m_serial->setPortName("");
    m_serial->setBaudRate(QSerialPort::Baud115200);
    m_serial->setDataBits(QSerialPort::DataBits::Data8);
    m_serial->setParity(QSerialPort::Parity::NoParity);

DownloadDCFirmware/update.cpp

@@ -1,438 +0,0 @@
-#include "update.h"
-
-#include <QCoreApplication>
-#include <QFile>
-#include <QTemporaryFile>
-#include <QDebug>
-#include <QTextStream>
-#include <QRegularExpression>
-#include <QRegExp>
-
-#if defined (Q_OS_UNIX) || defined (Q_OS_LINUX)
-#include "unistd.h"
-#endif
-
-#include <DeviceController/interfaces.h>
-
-#include <QSharedMemory>
-#include <QScopedPointer>
-#include <QDir>
-#include <QThread>
-#include <QDateTime>
-#include <QPluginLoader>
-#include <QMap>
-
-#define UPDATE_OPKG                 (1)
-#define UPDATE_DC                   (0)
-
-static const QMap<QString, int> baudrateMap = {
-  {"1200"   ,   0}, {"9600"   ,   1}, {"19200"  ,   2}, {"38400"  ,   3},
-  {"57600"  ,   4}, {"115200" ,   5}
-};
-
-QPluginLoader Update::pluginLoader;
-
-hwinf *Update::loadDCPlugin(QDir const &plugInDir, QString const &fname) {
-    hwinf *hw = nullptr;
-    if (plugInDir.exists()) {
-        QString pluginLibName(fname);
-        pluginLibName = plugInDir.absoluteFilePath(pluginLibName);
-        QFileInfo info(pluginLibName);
-        if (info.exists()) {
-            pluginLibName = plugInDir.absoluteFilePath(pluginLibName);
-            pluginLoader.setFileName(pluginLibName);
-            // static QPluginLoader pluginLoader(pluginLibName);
-            if (!pluginLoader.load()) {
-                qCritical() << "in directory" << plugInDir.absolutePath();
-                qCritical() << "cannot load plugin" << pluginLoader.fileName();
-                qCritical() << pluginLoader.errorString();
-                return nullptr;
-            }
-
-            qCritical() << "loadDCPlugin() plugin directory:" << plugInDir.absolutePath();
-            qCritical() << "loadDCPlugin() plugin file name:" << pluginLoader.fileName();
-
-            if (!pluginLoader.isLoaded()) {
-                qCritical() << pluginLoader.errorString();
-                return nullptr;
-            }
-            QObject *plugin = pluginLoader.instance();
-            if (!plugin) {
-                qCritical() << "cannot start instance";
-                return nullptr;
-            }
-            if (! (hw = qobject_cast<hwinf *>(plugin))) {
-                qCritical() << "cannot cast plugin" << plugin << "to hwinf";
-                return nullptr;
-            }
-        } else {
-            qCritical() << pluginLibName << "does not exist";
-            return nullptr;
-        }
-    } else {
-        qCritical() << "plugins directory" << plugInDir.absolutePath()
-                    << "does not exist";
-        return nullptr;
-    }
-    return hw;
-}
-
-bool Update::unloadDCPlugin() {
-    if (pluginLoader.unload()) {
-        qCritical() << "unloaded plugin" << pluginLoader.fileName();
-        // Note: will re-instantiate the library !
-        // QObject *rootObject = pluginLoader.instance();
-        // if (rootObject) {
-        //    qCritical() << "reloaded plugin: root object again available";
-        //    return false;
-        // }
-        // qCritical()unloaded plugin: root object gone";
-        return true;
-    }
-    return false;
-}
-
-class hwapi;
-Update::Update(QString customerRepository,
-               QString customerNrStr,
-               QString branchName,
-               QString plugInDir,
-               QString pluginName,
-               QString workingDir,
-               bool dryRun,
-               QObject *parent,
-               char const *serialInterface,
-               char const *baudrate)
-    : QObject(parent)
-    , m_hw(loadDCPlugin(QDir(plugInDir), pluginName))
-    , m_serialInterface(serialInterface)
-    , m_baudrate(baudrate)
-    , m_customerRepository(customerRepository)
-    , m_customerNrStr(customerNrStr)
-    , m_branchName(branchName)
-    , m_pluginName(pluginName)
-    , m_workingDir(workingDir)
-    , m_dryRun(dryRun)
-    , m_sys_areDCdataValid(false) {
-
-    if (!m_hw) {
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_hw == nullptr -> ca-slave plugin loaded ???";
-    } else {
-        int tries = 20;
-        while ((m_sys_areDCdataValid = m_hw->sys_areDCdataValid()) == false) {
-            // must deliver 'true', only then are all data from hwapi valid
-            if (--tries < 0) {
-                qCritical() << "ERROR!!! DC DATA NOT VALID -> CA-MASTER-PLUGIN NOT CONNECTED";
-                break;
-            }
-            m_hw->dc_autoRequest(true);
-            QThread::msleep(500);
-        }
-
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_sys_areDCDataValid ..."
-                    << m_sys_areDCdataValid;
-    }
-}
-
-Update::~Update() {
-    unloadDCPlugin();
-}
-
-bool Update::doUpdate(QStringList const &filesToWorkOn, bool usbStickDetected) {
-
-    if (!m_hw) {
-        qCritical() << "(" << __func__ << ":" << __LINE__ << "):"
-                    << "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
-        if (--tries < 0) {
-            qCritical() << "(" << __func__ << ":" << __LINE__ << "):"
-                        << "ERROR!!! DC DATA NOT VALID -> CA-SLAVE-PLUGIN NOT CONNECTED";
-            return false;
-        }
-        qCritical() << "(" << __func__ << ":" << __LINE__ << "):"
-                    << "ERROR!!! DC DATA NOT VALID -> CA-SLAVE-PLUGIN NOT CONNECTED (" << tries << ")";
-        m_hw->dc_autoRequest(true);
-        QThread::msleep(500);
-    }
-
-    bool res = false;
-
-    QList<QString>::const_iterator it;
-    for (it = filesToWorkOn.cbegin(); it != filesToWorkOn.cend(); ++it) {
-        QString const &fToWorkOn = usbStickDetected ? QDir::cleanPath(it->trimmed())
-            : QDir::cleanPath(m_customerRepository + QDir::separator() + it->trimmed());
-        if (fToWorkOn.contains("DC2C_print", Qt::CaseInsensitive)
-         && fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
-            res = true;
-            int i = fToWorkOn.indexOf("DC2C_print", Qt::CaseInsensitive);
-            int const templateIdx = fToWorkOn.mid(i).midRef(10, 2).toInt();
-            if ((templateIdx < 1) || (templateIdx > 32)) {
-                qCritical() << "WRONG TEMPLATE INDEX" << templateIdx;
-                res = false;
-            } else {
-                if ((res = updatePrinterTemplate(templateIdx, fToWorkOn))) {
-                    qCritical() <<
-                        QString("DOWNLOADED PRINTER TEMPLATE %1 WITH INDEX=%2")
-                            .arg(fToWorkOn)
-                            .arg(templateIdx);
-                }
-            }
-        } else if (fToWorkOn.contains("DC2C_cash", Qt::CaseInsensitive)
-                && fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
-            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)) {
-            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)) {
-            if ((res = updateDeviceConf(fToWorkOn))) {
-                qCritical() << QString("DOWNLOADED DEVICE TEMPLATE %1").arg(fToWorkOn);
-            }
-        } else {
-            qCritical() << "UNKNOWN JSON FILE NAME" << fToWorkOn;
-            res = false;
-        }
-    }
-
-    return res;
-}
-
-bool Update::checkJsonVersions(QStringList const& jsonFileNames) {
-    if (!m_hw) {
-        qCritical() << "(" << __func__ << ":" << __LINE__ << "):"
-                    << "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
-        if (--tries < 0) {
-            qCritical() << "(" << __func__ << ":" << __LINE__ << "):"
-                        << "ERROR!!! DC DATA NOT VALID -> CA-SLAVE-PLUGIN NOT CONNECTED";
-            return false;
-        }
-        qCritical() << "(" << __func__ << ":" << __LINE__ << "):"
-                    << "ERROR!!! DC DATA NOT VALID -> CA-SLAVE-PLUGIN NOT CONNECTED (" << tries << ")";
-        m_hw->dc_autoRequest(true);
-        QThread::msleep(500);
-    }
-
-    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
-        if (fName.endsWith("device.json")) {
-            jsonNr = 2;
-        } else
-        if (fName.endsWith("cash.json")) {
-            jsonNr = 3;
-        } else {
-            QRegularExpressionMatch match;
-            static const QRegularExpression re("^(.*print)([0-3][0-9])\\.json\\s*$");
-            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) {
-                    // note: use 5 (instead of 4 -> index has been shifted)
-                    jsonNr = n + 5;
-                }
-            }
-        }
-
-        if (jsonNr != 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[16] = '\0'; // the DC only handles 16 bytes
-
-            static const QByteArray cb(16, (char)0xff);
-
-            QString const installedVersion(QString::fromStdString(buf));
-            QString const fileVersion = getFileVersion(jsonFileNames[i]);
-
-            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;
-            }
-
-        } else {
-            qCritical() << "CANNOT FIND JSON-NR FOR" << fName;
-        }
-    }
-
-    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 {
-
-    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) {
-            qCritical() << "SYS NOT READY FOR SENDING AFTER 5 SECONDS";
-            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())) {
-
-                        /*
-                         *  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);
-
-                            uint8_t data[64];
-                            memset(data, 0x00, sizeof(data));
-                            uint8_t length = 0;
-
-                            m_hw->readback_machineIDdata(&length, data);
-
-                            QThread::msleep(500);
-
-                            QByteArray ba((const char*)data, length);
-
-                            qCritical() << length << "MACHINE ID =" << ba.toHex(':');
-                        */
-
-                        ret = true;
-                    } else {
-                        qCritical() << QString("ERROR SEND JSON-FILE %1 TO DC").arg(file.fileName());
-                    }
-                } else {
-                    qCritical() << QString("SIZE OF %1 TOO BIG (%2 BYTES)").arg(jsFileToSendToDC).arg(fi.size());
-                }
-            } else {
-                qCritical() << QString("CAN NOT OPEN ") + jsFileToSendToDC + " FOR READING";
-            }
-        } else {
-            qCritical() << (QString(jsFileToSendToDC) + " DOES NOT EXIST");
-        }
-    }
-
-    m_hw->dc_autoRequest(false);
-    qDebug() << "SET AUTO-REQUEST=FALSE";
-    QThread::sleep(1);  // make sure the auto-request flag is acknowledged
-
-    return ret;
-}
-
-bool Update::updatePrinterTemplate(int templateIdx, QString jsFile) const {
-    return downloadJson(FileTypeJson::PRINTER, templateIdx, jsFile);
-}
-
-bool Update::updateConfig(QString jsFile) {
-    return downloadJson(FileTypeJson::CONFIG, 0, jsFile);
-}
-
-bool Update::updateCashConf(QString jsFile) {
-    return downloadJson(FileTypeJson::CASH, 0, jsFile);
-}
-
-bool Update::updateDeviceConf(QString jsFile) {
-    return downloadJson(FileTypeJson::DEVICE, 0, jsFile);
-}

DownloadDCFirmware/update.h

@@ -1,148 +0,0 @@
-#ifndef UPDATE_H_INCLUDED
-#define UPDATE_H_INCLUDED
-
-#include <QObject>
-#include <QString>
-#include <QFile>
-#include <QDir>
-#include <QByteArray>
-#include <QProcess>
-#include <QPluginLoader>
-
-#include <initializer_list>
-
-#include <DeviceController/interfaces.h>
-
-#ifdef PTU5
-#define SERIAL_PORT "ttymxc2"
-#else
-#define SERIAL_PORT "ttyUSB0"
-#endif
-
-class Update : public QObject {
-    Q_OBJECT
-
-    hwinf *m_hw = nullptr;
-    char const *m_serialInterface;
-    char const *m_baudrate;
-    QString m_customerRepository;
-    QString m_customerNrStr;
-    QString m_branchName;
-    QString m_pluginName;
-    QString m_workingDir;
-    bool m_maintenanceMode;
-    bool m_dryRun;
-    bool m_sys_areDCdataValid;
-
-    static QPluginLoader pluginLoader;
-
-public:
-    enum class DownloadResult {OK, ERROR, TIMEOUT, NOP};
-    enum class FileTypeJson {CONFIG=1, DEVICE=2, CASH=3, SERIAL=4, TIME=5, PRINTER=6};
-
-    static hwinf *loadDCPlugin(QDir const &plugInDir, QString const &fn);
-    static bool unloadDCPlugin();
-    static QStringList split(QString line, QChar sep = ',');
-
-
-    explicit Update(QString customerRepository,
-                    QString customerNrStr,
-                    QString branchName,
-                    QString plugInDir,
-                    QString pluginName,
-                    QString workingDir,
-                    bool dryRun = false,
-                    QObject *parent = nullptr,
-                    char const *serialInterface = SERIAL_PORT,
-                    char const *baudrate = "115200");
-
-    virtual ~Update() override;
-
-    bool doUpdate(QStringList const &jsonFilesToDownload, bool usbStickDetected = false);
-
-    bool updatePrinterTemplate(int templateIdx, QString fname) const;
-    bool updateConfig(QString jsFileToSendToDC);
-    bool updateCashConf(QString jsFileToSendToDC);
-    bool updateDeviceConf(QString jsFileToSendToDC);
-
-    bool downloadJson(enum FileTypeJson type, int templateIdx,
-                      QString jsFileToSendToDC) const;
-
-
-    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);
-
-    hwinf *hw() { return m_hw; }
-    hwinf const *hw() const { return m_hw; }
-
-    //QString customerId() { return m_customerId; }
-    //QString const customerId() const { return m_customerId; }
-
-    QString branchName() { return m_branchName; }
-    QString const branchName() const { return m_branchName; }
-
-    //QString repositoryPath() { return m_repositoryPath; }
-    //QString const repositoryPath() const { return m_repositoryPath; }
-
-private:
-    static QString jsonType(enum FileTypeJson type);
-    bool openSerial(int br, QString baudrate, QString comPort) const;
-    void closeSerial() const;
-    bool isSerialOpen() const;
-    bool resetDeviceController() const;
-    QByteArray loadBinaryDCFile(QString filename) const;
-    bool downloadBinaryToDC(QString const &bFile) const;
-    bool updateBinary(QString const &fileToSendToDC);
-    QStringList getDcSoftAndHardWareVersion();
-    QString getFileVersion(QString const& jsonFile);
-
-private slots:
-    void readyReadStandardOutput();
-    void readyReadStandardError();
-    void finished(int exitCode, QProcess::ExitStatus exitStatus);
-    void onReportDCDownloadStatus(QString const &status);
-    void onReportDCDownloadSuccess(QString const &msg);
-    void onReportDCDownloadFailure(QString const &errorMsg);
-*/
-};
-#endif // UPDATE_H_INCLUDED

UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro

@@ -124,10 +124,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
 #           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.
-# 1.4.8   : Improve reading Json-file versions of Json-files actually loaded
+VERSION="1.4.8"
-#           in DC. If available, show version info instead of blob-info of
-#           Json file.
-VERSION="1.4.9"
 # 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/ismas/ismas_client.cpp

@@ -342,11 +342,8 @@ IsmasClient::sendRequestReceiveResponse(int port, QString const &request) {
                 return std::nullopt;
             }
         } else {
-            if (!response.contains("RECORD")) {
+            printDebugMessage(port, clientIP, clientPort,
-                // maybe APISM does not send valid JSON: "RECORD SAVED" etc.
+                QString("PARSE ERROR ") + response + " " + parseError.errorString());
-                printDebugMessage(port, clientIP, clientPort,
-                    QString("PARSE ERROR ") + response + " " + parseError.errorString());
-            }
             ::close(sockfd);
             return std::nullopt;
         }

UpdatePTUDevCtrl/main.cpp

@@ -62,8 +62,7 @@ int main(int argc, char *argv[]) {
     QApplication::setApplicationVersion(APP_VERSION);
 
     if (!messageHandlerInstalled()) { // change internal qt-QDebug-handling
-        atbInstallMessageHandler(nullptr);
+        atbInstallMessageHandler(atbDebugOutput);
-        //atbInstallMessageHandler(atbDebugOutput);
         setDebugLevel(LOG_NOTICE);
     }
 

UpdatePTUDevCtrl/process/command.cpp

@@ -57,21 +57,21 @@ bool Command::execute(QString workingDirectory, QStringList args) {
     connect(&(*p), SIGNAL(readyReadStandardError()), this, SLOT(readyReadStandardError()));
 
     if (!args.isEmpty()) {
-        //qDebug() << "START COMMAND" << m_command << "WITH ARGS" << args
+        qDebug() << "START COMMAND" << m_command << "WITH ARGS" << args
-        //         << "IN" << p->workingDirectory();
+                 << "IN" << p->workingDirectory();
         p->start(m_command, args);
     } else {
-        //qDebug() << "START COMMAND" << m_command
+        qDebug() << "START COMMAND" << m_command
-        //         << "IN" << p->workingDirectory();
+                 << "IN" << p->workingDirectory();
         p->start(m_command);
     }
 
     qint64 const start = QDateTime::currentDateTime().toMSecsSinceEpoch();
 
     if (p->waitForStarted(m_waitForStartTimeout)) {
-        // qDebug() << "PROCESS" << m_command << "STARTED IN" << p->workingDirectory();
+        qDebug() << "PROCESS" << m_command << "STARTED IN" << p->workingDirectory();
         if (p->state() == QProcess::ProcessState::Running) {
-            // qDebug() << "PROCESS" << m_command << "RUNNING IN" << p->workingDirectory();
+            qDebug() << "PROCESS" << m_command << "RUNNING IN" << p->workingDirectory();
             // wait forever for git/opkg-commands to finish
             int wait = m_waitForFinishTimeout;
             if (m_command.trimmed().startsWith("git", Qt::CaseInsensitive) ||
@@ -80,7 +80,7 @@ bool Command::execute(QString workingDirectory, QStringList args) {
             }
             bool const no_timeout = p->waitForFinished(wait);
             if (no_timeout) {
-                // qDebug() << "PROCESS" << m_command << "FINISHED IN" << p->workingDirectory();
+                qDebug() << "PROCESS" << m_command << "FINISHED IN" << p->workingDirectory();
                 if (p->exitStatus() == QProcess::NormalExit) {
                     if ((m_exitCode = p->exitCode()) == 0) {
                         qint64 const end = QDateTime::currentDateTime().toMSecsSinceEpoch();

UpdatePTUDevCtrl/update.cpp

@@ -394,6 +394,7 @@ 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";
@@ -416,21 +417,18 @@ bool Update::downloadJson(enum FileTypeJson type,
             }
         }
 
+        QString msg;
         lst.clear();
         if (ready) {
-            QString msg;
             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
-
-                        // type == kindOfFile
                         if (m_hw->sys_sendJsonFileToDc((uint8_t)(type),
                                                        templateIdx,
                                                        (uint8_t *)ba.data())) {
@@ -463,15 +461,10 @@ bool Update::downloadJson(enum FileTypeJson type,
                             */
 
                             if (m_worker) {
-                                if (templateIdx >= 1 && templateIdx <= 32) {
-                                    msg = QString("SUCCESSFULLY LOADED %1 (INDEX=%2) TO DC").arg(file.fileName()).arg(templateIdx);
-                                } else {
-                                    msg = QString("SUCCESSFULLY LOADED %1 (KIND=%2) TO DC").arg(file.fileName()).arg((uint8_t)type);
-                                }
-                                lst.clear();
-                                lst << msg;
                                 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);
@@ -517,7 +510,7 @@ bool Update::downloadJson(enum FileTypeJson type,
         QThread::sleep(1);  // make sure the auto-request flag is acknowledged
     }
 
-    return true;
+    return ret;
 }
 
 bool Update::updatePrinterTemplate(int templateIdx, QString jsFile) const {
@@ -525,18 +518,14 @@ bool Update::updatePrinterTemplate(int templateIdx, QString jsFile) const {
 }
 
 bool Update::updateConfig(QString jsFile) {
-    // IMPORTANT: the JSON-file has a 'title'-line: the value MUST be 'DC2C_config'
     return downloadJson(FileTypeJson::CONFIG, 0, jsFile);
 }
 
 bool Update::updateCashConf(QString jsFile) {
-    // IMPORTANT: the JSON-file has a 'title'-line: the value MUST be 'DC2C_cash  '
-    // Note the twp spaces after DC2C_cash !!
     return downloadJson(FileTypeJson::CASH, 0, jsFile);
 }
 
 bool Update::updateDeviceConf(QString jsFile) {
-    // IMPORTANT: the JSON-file has a 'title'-line: the value MUST be 'DC2C_device'
     return downloadJson(FileTypeJson::DEVICE, 0, jsFile);
 }
 
@@ -711,112 +700,6 @@ bool Update::checkDownloadedJsonVersions(QStringList const& jsonFileNames) {
     return false;
 }
 
-QMap<QString, QString>
-Update::getInstalledJsonVersions(QStringList const& jsonFileNames) {
-    QMap<QString, QString> map;
-
-    if (!m_hw) {
-        qCritical() << "(" << __func__ << ":" << __LINE__ << "):"
-                    << "ERROR!!! m_hw == nullptr";
-        return map;
-    }
-
-    int tries = 20;
-    while ((m_sys_areDCdataValid = m_hw->sys_areDCdataValid()) == false) {
-        // must deliver 'true', only then are all data from hwapi valid
-        if (--tries < 0) {
-            qCritical() << "(" << __func__ << ":" << __LINE__ << "):"
-                        << "ERROR!!! DC DATA NOT VALID -> CA-SLAVE-PLUGIN NOT CONNECTED";
-            return map;
-        }
-        qCritical() << "(" << __func__ << ":" << __LINE__ << "):"
-                    << "ERROR!!! DC DATA NOT VALID -> CA-SLAVE-PLUGIN NOT CONNECTED (" << tries << ")";
-        m_hw->dc_autoRequest(true);
-        QThread::msleep(500);
-    }
-
-    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
-        if (fName.endsWith("device.json")) {
-            jsonNr = 2;
-        } else
-        if (fName.endsWith("cash.json")) {
-            jsonNr = 3;
-        } else {
-            QRegularExpressionMatch match;
-            static const QRegularExpression re("^(.*print)([0-3][0-9])\\.json\\s*$");
-            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) {
-                    // note: use 5 (instead of 4 -> index has been shifted)
-                    jsonNr = n + 5;
-                }
-            }
-        }
-
-        if (jsonNr != 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[16] = '\0'; // the DC only handles 16 bytes
-
-            static const QByteArray cb(16, (char)0xff);
-
-            QString const installedVersion(QString::fromStdString(buf));
-            QString const fileVersion = getFileVersion(jsonFileNames[i]);
-
-            QFileInfo fi(jsonFileNames[i]);
-
-            if (cb == QByteArray(buf)) {
-                map.insert(fi.fileName(), "inst.vers.not.avail");
-            } else {
-                map.insert(fi.fileName(), installedVersion);
-            }
-
-            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;
-            }
-
-        } else {
-            qCritical() << "CANNOT FIND JSON-NR FOR" << fName;
-        }
-    }
-
-    return map;
-}
-
 bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
 
     if (!m_hw) {

UpdatePTUDevCtrl/update.h

@@ -8,7 +8,6 @@
 #include <QByteArray>
 #include <QProcess>
 #include <QPluginLoader>
-#include <QMap>
 
 #include <DeviceController/interfaces.h>
 
@@ -61,47 +60,6 @@ public:
     bool doUpdate(int &displayIndex, QStringList const &linesToWorkOn);
     bool checkDownloadedJsonVersions(QStringList const& jsonFileNames);
 
-    QMap<QString, QString>
-        getInstalledJsonVersions(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")})));
-
     hwinf *hw() { return m_hw; }
     hwinf const *hw() const { return m_hw; }
 

UpdatePTUDevCtrl/worker.cpp

@@ -32,8 +32,6 @@ QString const Worker::UPDATE_STEP_WRONG   (  "[WRONG]");
 QString const Worker::UPDATE_STEP_FAIL   (   " [FAIL]");
 QString const Worker::UPDATE_STEP_SUCCESS(" [SUCCESS]");
 
-bool Worker::sendLastVersionOnce = false;
-
 using UPDATE_STEP = Worker::UPDATE_STEP;
 const QMap<UPDATE_STEP, const char*> Worker::smap (
     std::initializer_list<std::pair<UPDATE_STEP, const char*>>{
@@ -1345,36 +1343,20 @@ PSAInstalled Worker::getPSAInstalled() {
     psaInstalled.pluginVersion.prmCalculatePriceConfigUi = m_pluginVersionPrmCalcConfig;
     psaInstalled.pluginVersion.tcpZVT = m_pluginVersionTcpZvt;
 
-    // key: conf-json-filename; value: installed version on DC
-    QMap<QString, QString> map;
-    if (m_update) {
-        map = m_update->getInstalledJsonVersions();
-    }
-
     psaInstalled.cash.name = "DC2C_cash.json";
     absPathName = QDir::cleanPath(printSysDir + QDir::separator() + psaInstalled.cash.name);
-
     psaInstalled.cash.blob = m_gc.gitBlob(absPathName);
     psaInstalled.cash.size = getFileSize(absPathName);
-    if (map.contains("DC2C_cash.json")) {
-        psaInstalled.cash.blob = map.value("DC2C_cash.json", "inst.vers.not.avail");
-    }
 
     psaInstalled.conf.name = "DC2C_conf.json";
     absPathName = QDir::cleanPath(printSysDir + QDir::separator() + psaInstalled.conf.name);
     psaInstalled.conf.blob = m_gc.gitBlob(absPathName);
     psaInstalled.conf.size = getFileSize(absPathName);
-    if (map.contains("DC2C_conf.json")) {
-        psaInstalled.conf.blob = map.value("DC2C_conf.json", "inst.vers.not.avail");
-    }
 
     psaInstalled.device.name = "DC2C_device.json";
     absPathName = QDir::cleanPath(printSysDir + QDir::separator() + psaInstalled.device.name);
     psaInstalled.device.blob = m_gc.gitBlob(absPathName);
     psaInstalled.device.size = getFileSize(absPathName);
-    if (map.contains("DC2C_device.json")) {
-        psaInstalled.device.blob = map.value("DC2C_device.json", "inst.vers.not.avail");
-    }
 
     for (int i=0; i < 32; ++i) {
         QString const &n = QString("%1").arg(i+1).rightJustified(2, '0');
@@ -1382,9 +1364,6 @@ PSAInstalled Worker::getPSAInstalled() {
         absPathName = QDir::cleanPath(printSysDir + QDir::separator() + psaInstalled.print[i].name);
         psaInstalled.print[i].blob = m_gc.gitBlob(absPathName);
         psaInstalled.print[i].size = getFileSize(absPathName);
-        if (map.contains(psaInstalled.print[i].name)) {
-            psaInstalled.print[i].blob = map.value(psaInstalled.print[i].name, "inst.vers.not.avail");
-        }
     }
 
     return psaInstalled;

UpdatePTUDevCtrl/worker.h

@@ -462,7 +462,6 @@ private slots:
 
 private:
     PSAInstalled getPSAInstalled();
-    static bool sendLastVersionOnce;
     void privateUpdate();
     bool computeFilesToDownload();
     bool execOpkgCommands();
@@ -1316,13 +1315,10 @@ private:
             ismasClient.setProgressInPercent(_SAVE_LOGS_FAILURE);
         break;
         case UPDATE_STEP::SEND_LAST_VERSION: {
-            if (Worker::sendLastVersionOnce == false) {
+            ismasClient.setProgressInPercent(_SEND_LAST_VERSION + _SEND_LAST_VERSION_CORRECTION);
-                ismasClient.setProgressInPercent(_SEND_LAST_VERSION + _SEND_LAST_VERSION_CORRECTION);
+            ismasClient.sendRequestReceiveResponse(IsmasClient::APISM::DB_PORT,
-                ismasClient.sendRequestReceiveResponse(IsmasClient::APISM::DB_PORT,
+                QString("#M=APISM#C=CMD_SENDVERSION#J=") +
-                    QString("#M=APISM#C=CMD_SENDVERSION#J=") +
+                    ismasClient.updateOfPSASendVersion(instance->getPSAInstalled()));
-                        ismasClient.updateOfPSASendVersion(instance->getPSAInstalled()));
-                Worker::sendLastVersionOnce = true;
-            }
         } break;
         case UPDATE_STEP::UPDATE_SUCCEEDED: {
             ismasClient.setProgressInPercent(_UPDATE_SUCCEEDED + _UPDATE_SUCCEEDED_CORRECTION);