activate opkg with --noaction

to test the download without actual dc-controller on the PTU.

ATBUpdateTool.ini

@@ -1,5 +1,5 @@
 [REPOSITORY_URL]
-repository-url="gitea@ptu-config.atb-comm.de:ATB/"
+repository-url="gitea@ptu-config.atb-comm.de:ATB"
 
 [DIRECTORIES]
 plugin-directory="/usr/lib/"
@@ -19,3 +19,21 @@ yocto-version=false
 yocto-install=false
 always-download-config=true
 always-download-dc=false
+
+
+[ATBUpdateCheck]
+
+[ATBUpdateDC]
+debug=true
+workingDir=/tmp
+libca=/usr/lib/libCAslave.so
+
+[ATBUpdateGit]
+
+[ATBUpdateJsonFiles]
+
+[ATBUpdateOpkg]
+
+[ATBUpdateShow]
+
+[ATBUpdateSync]

Check/main.cpp

@@ -55,6 +55,8 @@ int main(int argc, char **argv) {
 
     QString connectionStatus{internal::ISMAS_NOT_CONNECTED};
     QString updateRequestStatus{internal::UPDATE_NOT_REQUESTED};
+
+    {
         QDebug debug = qCritical();
 
         int tries = 10;
@@ -113,7 +115,7 @@ int main(int argc, char **argv) {
             if (internal::customerRepoExists() == false) {
                 // if the customer repository does not exists, it does not matter is
                 // ISMAS is connected or how the setting for the WAIT-button is.
-            updateRequestStatus = internal::NO_CUSTOMER_REPOSITORY;
+                updateRequestStatus = internal::UPDATE_INITIAL;
             } else {
                 if (connectionStatus == internal::ISMAS_CONNECTED) {
                     if (std::optional<QString> result
@@ -172,6 +174,7 @@ int main(int argc, char **argv) {
         if (parser.isSet(ismasConnectOption)) {
             debug.noquote() << connectionStatus;
         }
+    }
 
     return exitCode;
 }

DownloadDCFirmware/main.cpp

@@ -65,7 +65,6 @@ int main(int argc, char **argv) {
         setDebugLevel(LOG_NOTICE);
     }
 
-
     //return 0;
 
 /*
@@ -146,14 +145,11 @@ int main(int argc, char **argv) {
     QString libca;
 
     std::unique_ptr<QSettings> settings = internal::readSettings();
-    if (settings) {
-        settings->beginGroup("COMMON");
-        debug = settings->value("debug", false).toBool();
-        settings->endGroup();
 
-        settings->beginGroup("RUNTIME");
+    if (settings) {
-        noaction = settings->value("noaction", true).toBool();
+        settings->beginGroup("ATBUpdateDC");
-        workingDir = settings->value("workingdir", "/tmp").toBool();
+        debug = settings->value("debug", false).toBool();
+        workingDir = settings->value("workingdir", "/tmp").toString();
         libca = settings->value("libca", "/usr/lib/libCAslave.so").toString();
         settings->endGroup();
     }
@@ -172,7 +168,7 @@ int main(int argc, char **argv) {
             qInfo() << "using customer repository" << psaRepoDir;
         }
 
-        std::unique_ptr<QString> c = internal::dcCandidateToInstall();
+        std::unique_ptr<QString> c = internal::dcCandidateToInstall("/etc/dc/");
         if (c) {
             fi.setFile(*c);
             if (fi.exists() == false) {

DownloadDCFirmware/update.cpp

@@ -26,10 +26,12 @@
 #include <QString>
 #include <QSerialPort>
 #include <QSerialPortInfo>
+#include <QSettings>
 
 #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}
@@ -130,15 +132,15 @@ Update::sendNextAddress(int bNum) const {
     if ( bNum==0 || bNum==1024 || bNum==2048 || bNum==3072 || bNum==4096 ) {
         // qDebug() << "addr-block" << bNum << "...";
         while (noAnswerCount <= 250) {
-            // TODO
-            // m_hw->bl_sendAddress(bNum);
 
-            QThread::msleep(100);
+            DownloadResult res = DownloadResult::OK;
+            if (!m_debug) {
+                m_hw->bl_sendAddress(bNum);
 
-            // TODO
+                QThread::msleep(10); //from 100ms to 20ms
-            // DownloadResult const res = sendStatus(m_hw->bl_wasSendingAddOK());
+//###################################################################################
-
+                res = sendStatus(m_hw->bl_wasSendingAddOK());
-            DownloadResult const res = DownloadResult::OK;
+            }
 
             if (res != DownloadResult::NOP) {
                 if (res == DownloadResult::ERROR) {
@@ -153,7 +155,7 @@ Update::sendNextAddress(int bNum) const {
             } else {
                 noAnswerCount += 1; // no answer by now
             }
-        }
+        } // while
         // wait max. about 3 seconds
         return DownloadResult::TIMEOUT;
     }
@@ -178,20 +180,20 @@ Update::sendNextDataBlock(QByteArray const &binary, int bNum) const {
 
     qInfo() << s.toUtf8().constData();
 
-    QThread::msleep(200);
+    QThread::msleep(20); //reduce from 200 to 50 ms
-    return DownloadResult::OK;
+    //############################################################################
 
-    // QByteArray b((const char *)(&local[0]), 64);
+    QByteArray b((const char *)(&local[0]), 64);
-    // qCritical() << "SNDB" << bNum << b.size() << b.toHex();
+    qCritical() << "SNDB" << bNum << b.size() << b.toHex();
 
     while (noAnswerCount <= 250) {
-        // TODO
-        // m_hw->bl_sendDataBlock(64, local);
 
-        // TODO
+        DownloadResult res = DownloadResult::OK;
-        // DownloadResult const res = sendStatus(m_hw->bl_wasSendingDataOK());
 
-        DownloadResult const res = DownloadResult::OK;
+        if (!m_debug) {
+            m_hw->bl_sendDataBlock(64, local);
+            res = sendStatus(m_hw->bl_wasSendingDataOK());
+        }
 
         if (res != DownloadResult::NOP) {
             if (res == DownloadResult::ERROR) {
@@ -213,16 +215,13 @@ Update::sendNextDataBlock(QByteArray const &binary, int bNum) const {
 }
 
 bool Update::startBootloader() const {
-    qInfo() << nextTimePoint().toUtf8().constData() << "start boot loader";
+    qDebug() << "starting bootloader...";
-    QThread::msleep(1000);
-    qInfo() << nextTimePoint().toUtf8().constData() << "start boot loader ...done";
-    return true;
 
-#if 0
+    if (!m_debug) {
-    int nTry = 5;
+        int nTry = 10;
         while (--nTry >= 0) {
             m_hw->bl_startBL();
-        QThread::msleep(5000);
+            QThread::msleep(1000);
             m_hw->bl_checkBL();
             if (m_hw->bl_isUp()) {
                 qInfo() << "starting bootloader...OK";
@@ -230,25 +229,27 @@ bool Update::startBootloader() const {
                 return true;
             } else {
                 qCritical() << "bootloader not up (" << nTry << ")";
+                qCritical() << "IS BOOTLOADER INSTALLED ???";
             }
         }
         qCritical() << "starting bootloader...FAILED";
         return false;
-#endif
+    } else {
+        QThread::msleep(1000);
+        qInfo() << "starting bootloader...OK";
+    }
+
+    return true;
 }
 
 bool Update::stopBootloader() const {
-    qInfo() << nextTimePoint().toUtf8().constData() << "stopping bootloader";
-    QThread::msleep(1000);
-    qInfo() << nextTimePoint().toUtf8().constData() << "stopping bootloader ...done";
-    return true;
-
-#if 0
     qDebug() << "stopping bootloader...";
+
+    if (!m_debug) {
         int nTry = 5;
         while (--nTry >= 0) {
             m_hw->bl_stopBL();
-        QThread::msleep(500);
+            QThread::msleep(1000);
             if (!m_hw->bl_isUp()) {
                 qInfo() << "stopping bootloader...OK";
                 return true;
@@ -256,13 +257,21 @@ bool Update::stopBootloader() const {
         }
         qCritical() << "stopping bootloader...FAILED";
         return false;
-#endif
+
+    } else {
+        QThread::msleep(1000);
+        qInfo() << "stopping bootloader...OK";
+    }
+
+    return true;
 }
 
 bool Update::resetDeviceController() const {
     qInfo() << nextTimePoint().toUtf8().constData() << "resetting device controller";
-    // TODO
+
-    // m_hw->bl_rebootDC();
+    if (!m_debug) {
+        m_hw->bl_rebootDC();
+    }
 
     // wait maximally 3 seconds, before starting bootloader
     QThread::sleep(1);
@@ -280,12 +289,12 @@ QByteArray Update::loadBinaryDCFile(QString const &filename) const {
     if (!file.exists()) {
         qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
                     << file.fileName() << "does not exist";
-        return QByteArray();
+        return QByteArray{};
     }
     if (!file.open(QIODevice::ReadOnly)) {
         qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
                     << "cannot open file" << file.fileName();
-        return QByteArray();
+        return QByteArray{};
     }
 
     qInfo() << nextTimePoint().toUtf8().constData()
@@ -388,10 +397,14 @@ int Update::run() {
         qInfo() << "<DC-VERSION>" << Update::dcVersion(m_dcFileName);
     }
 
+    if (!m_debug) {
         m_hw->dc_autoRequest(false);
+    }
 
     qInfo() << "DC auto request OFF";
 
+    qCritical() << "start dc-update for" << m_dcFileName << "at" << m_start.toString(Qt::ISODate);
+
     QByteArray ba = loadBinaryDCFile(m_dcFileName);
     if (ba.size() > 0) {
         m_totalBlocks = (((ba.size())%64)==0) ? (ba.size()/64) : (ba.size()/64)+1;
@@ -401,18 +414,16 @@ int Update::run() {
         // fill last block of data to be sent with 0xFF
         ba = ba.leftJustified(m_totalBlocks*64, (char)(0xFF));
 
-        // TODO
         resetDeviceController();
         if (startBootloader()) {
+
             int currentBlock = 0;
             DownloadResult res = DownloadResult::OK;
             qInfo() << nextTimePoint().toUtf8().constData() << "64-byte block" << currentBlock;
 
-            while (res != DownloadResult::ERROR && currentBlock < m_totalBlocks) {
+            while (res != DownloadResult::ERROR && currentBlock <= m_totalBlocks) {
                 if ((res = sendNextAddress(currentBlock)) != DownloadResult::ERROR) {
                     if ((res = sendNextDataBlock(ba, currentBlock)) != DownloadResult::ERROR) {
-                        // TODO
-                        // m_hw->dcDownloadSetCurrentBlockNumber(currentBlock);
                         currentBlock += 1;
                     } else break;
                 }
@@ -439,13 +450,28 @@ int Update::run() {
             qCritical() << "DownloadThread::run(): last result" << (int)sendStatus(m_hw->bl_wasSendingDataOK());
 #endif
         }
-        // TODO
         stopBootloader();   // there is no harm in stopping the bootloader even
                             // if starting the bootloader failed
+
+        // check if update was successful
+        if (!m_debug) {
+            m_hw->dc_autoRequest(true); //restart dc_autoRequest after download else E255!
+        }
+
+        for (int i = 0; i < 3; ++i) {
+            qInfo() << "waiting for device controller restart...(" << i << ")";
+            QThread::sleep(20);
+
+            resetDeviceController();
+            if (startBootloader()) {
                 qInfo() << nextTimePoint().toUtf8().constData() << "<DC-UPDATE-SUCCESS>";
+                stopBootloader();
                 return -(int)Result::SUCCESS;
             }
+        }
+    }
 
     qInfo() << nextTimePoint().toUtf8().constData() << "<DC-UPDATE-FAILURE>";
+    //To Do Error handling if Dc doesnt start after download
     return false;
 }

DownloadDCFirmware/update.h

@@ -30,7 +30,7 @@ class Update : public QObject {
     QString m_dcFileName{};
     hwinf *m_hw = nullptr;
     bool m_sys_areDCdataValid{};
-    bool m_debug;
+    bool m_debug{false};
     bool m_noaction;
 
     static QPluginLoader pluginLoader;

DownloadDCJsonFiles/DownloadDCJsonFiles.pro

@@ -1,7 +1,7 @@
 QT += core
 QT += serialport network
 
-TARGET = ATBDownloadDCJsonFiles
+TARGET = ATBUpdateJsonFiles
 
 VERSION="0.1.0"
 win32 {

DownloadDCJsonFiles/main.cpp

@@ -144,7 +144,7 @@ int main(int argc, char **argv) {
         }
     }
 
-    // qCritical() << "JSON FILES TO UPDATE" << filesToUpdate;
+    qCritical() << __LINE__ << "JSON FILES TO UPDATE" << filesToUpdate;
 
     Update update(customerRepo,
                   QString::number(customerNr),
@@ -153,8 +153,10 @@ int main(int argc, char **argv) {
                   plugInName,
                   workingDir);
 
-    update.doUpdate();
+    if (!filesToUpdate.empty()) {
-    // update.doUpdate(filesToUpdate, mountPath.has_value());
+        update.doUpdate(filesToUpdate, mountPath.has_value());
+    }
+
     // update.checkJsonVersions();
     //update.checkJsonVersions(filesToUpdate);
 

DownloadDCJsonFiles/update.cpp

@@ -107,7 +107,7 @@ Update::Update(QString customerRepository,
                char const *serialInterface,
                char const *baudrate)
     : QObject(parent)
-    // , m_hw(loadDCPlugin(QDir(plugInDir), pluginName))
+    , m_hw(loadDCPlugin(QDir(plugInDir), pluginName))
     , m_serialInterface(serialInterface)
     , m_baudrate(baudrate)
     , m_customerRepository(customerRepository)
@@ -145,7 +145,8 @@ Update::~Update() {
     // unloadDCPlugin();
 }
 
-bool Update::doUpdate() {
+#if 0
+bool Update::doUpdate() { // test function
 
     int numberOfFiles = 3;
 
@@ -178,6 +179,7 @@ bool Update::doUpdate() {
 
     return true;
 }
+#endif
 
 bool Update::doUpdate(QStringList const &filesToWorkOn, bool usbStickDetected) {
 

UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro

@@ -326,6 +326,7 @@ HEADERS += \
         commandline_parser.h \
         work_process_list.h \
         $${_PRO_FILE_PWD_}/../common/include/utils_internal.h \
+        $${_PRO_FILE_PWD_}/../common/include/log_line_entry.h \
         $${_PRO_FILE_PWD_}/../common/ismas/ApismClient.h \
         $${_PRO_FILE_PWD_}/../common/ismas/ApismTcpClient.h \
         $${_PRO_FILE_PWD_}/../common/ismas/ISMASData.h \

UpdatePTUDevCtrl/ismas/ismas_client.cpp

@@ -21,6 +21,7 @@
 #include <QThread>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QCoreApplication>
 
 #if 0
 ########################
@@ -380,7 +381,7 @@ QString IsmasClient::updateNewsToIsmas(char const *event,
         "{"
             "\"REASON\":\"SW_UP\","
             "\"TIMESTAMP\":\"%s\","
-            "\"EVENT_ID\":\"0\","
+            "\"EVENT_ID\":\"%d\","
             "\"EVENT\":\"%s\","
             "\"EVENTSTATE\":1,"
             "\"PARAMETER\": {"
@@ -390,7 +391,7 @@ QString IsmasClient::updateNewsToIsmas(char const *event,
                 "\"STEP_RESULT\" : \"%s\","
                 "\"VERSION\" : \"%s\""
             "}"
-        "}", ts.toStdString().c_str(), event, percent, resultCode,
+        "}", ts.toStdString().c_str(), static_cast<int>(QCoreApplication::applicationPid()), event, percent, resultCode,
              step, step_result, version);
     return buf;
 }

UpdatePTUDevCtrl/mainwindow.cpp

@@ -3,6 +3,7 @@
 #include "worker.h"
 #include "utils.h"
 #include "utils_internal.h"
+#include "log_line_entry.h"
 #include "progress_event.h"
 #include "update_dc_event.h"
 #include "process/update_command.h"
@@ -21,10 +22,45 @@
 #define UPDATE_CUSTOMER_REPOSITORY  2
 #define INSTALL_SW_PACKETS_DRY_RUN  3
 #define INSTALL_SW_PACKETS          4
-#define INSTALL_DC_CONFIGURATION    5
+#define UPDATE_DC                   5
 #define SYNCHRONIZE_REPOSITORY      6
-#define UPDATE_DC                   7
+#define INSTALL_DC_CONFIGURATION    7
 
+#define CHECK_ISMAS_CONNECT_PERCENT_START   ( 1)
+#define CHECK_ISMAS_CONNECT_PERCENT_END     (10)
+
+#define CHECK_UPDATE_REQUEST_PERCENT_START  (10)
+#define CHECK_UPDATE_REQUEST_PERCENT_END    (20)
+
+#define UPDATE_GIT_PERCENT_START            (20)
+#define UPDATE_GIT_PERCENT_END              (21)
+
+#define UPDATE_OPKG_NOACTION_PERCENT_START  (21)
+#define UPDATE_OPKG_NOACTION_PERCENT_END    (25)
+
+#define UPDATE_OPKG_PERCENT_START           (25)
+#define UPDATE_OPKG_PERCENT_END             (40)
+
+#define UPDATE_DOWNLOAD_DC_START            (41)
+#define UPDATE_DOWNLOAD_DC_END              (80)
+
+#define UPDATE_SYNC_START                   (81)
+#define UPDATE_SYNC_END                     (90)
+
+#define UPDATE_DOWNLOAD_JSON_START          (91)
+#define UPDATE_DOWNLOAD_JSON_END            (100)
+
+
+void MainWindow::onFileChanged(QString const& /*f*/) {
+    static int i = 30;
+    ui->updateProgress->setValue(++i);
+
+    // TODO: daten an ISMAS senden
+}
+
+QProgressBar *MainWindow::progressBar() {
+    return ui ? ui->updateProgress : nullptr;
+}
 
 MainWindow::MainWindow(Worker *worker, QWidget *parent)
     : QMainWindow(parent)
@@ -32,19 +68,24 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
     , m_worker(worker)
     , m_width(60)
     , m_progressRunning(false)
-    , m_updateStep(UpdateDcEvent::UpdateStep::NONE) {
+    , m_updateStep(UpdateDcEvent::UpdateStep::NONE)
+    , m_updateLog("/opt/app/tools/atbupdate/update.log") { // TODO: in ini-file eintragen
 
     ui->setupUi(this);
 
+    if (!m_updateLog.open(QIODevice::ReadWrite | QIODevice::Unbuffered)) {
+        qCritical() << "ERROR can not open" << m_updateLog.fileName();
+    }
+
     m_updateSteps.resize(8);
     m_updateSteps[CHECK_BACKEND_CONNECTION] = "Check backend connection (ISMAS) ";
     m_updateSteps[CHECK_UPDATE_REQUEST] = "Check update request ";
     m_updateSteps[UPDATE_CUSTOMER_REPOSITORY] = "Update customer repository ";
     m_updateSteps[INSTALL_SW_PACKETS_DRY_RUN] = "Install SW packets (dry run) ";
     m_updateSteps[INSTALL_SW_PACKETS] = "Install SW packets ";
-    m_updateSteps[INSTALL_DC_CONFIGURATION] = "Install DC configuration ";
-    m_updateSteps[SYNCHRONIZE_REPOSITORY] = "Synchronize repository/filesystem ";
     m_updateSteps[UPDATE_DC] = "Update DC ";
+    m_updateSteps[SYNCHRONIZE_REPOSITORY] = "Synchronize repository/filesystem ";
+    m_updateSteps[INSTALL_DC_CONFIGURATION] = "Install DC configuration ";
 
     QString text{};
     for (int i = 0; i < m_updateSteps.size(); ++i) {
@@ -274,6 +315,7 @@ void MainWindow::onShowTariffUpdate(QString) {
 void MainWindow::onShowISMASConnectivity(QString status) {
     // qCritical() << __func__ << ":" << __LINE__ << "status" << status;
 
+    QString stepResult;
     QString s = m_updateSteps[CHECK_BACKEND_CONNECTION].trimmed();
 
     bool const custRepoExists = internal::customerRepoExists();
@@ -281,24 +323,46 @@ void MainWindow::onShowISMASConnectivity(QString status) {
     if (status.contains(UpdateCommand::ISMAS_CONNECTED, Qt::CaseInsensitive)) {
         if (custRepoExists) {
             s += " <font color='Green'>connected</font>";
+            stepResult = "ISMAS connected";
         } else {
             s += " <font color='Green'>connected&nbsp;(initial configuration)</font>";
+            stepResult = "ISMAS connected (initial configuration)";
         }
     } else
     if (status.contains(UpdateCommand::NO_CUSTOMER_REPOSITORY, Qt::CaseInsensitive)) {
         s += " <font color='Blue'>NOT CONNECTED</font>";
+        stepResult = "ISMAS not connected";
     } else
     if (status.contains(UpdateCommand::ISMAS_CONNECTION_IN_PROGRESS, Qt::CaseInsensitive)) {
         s += " <font color='Green'>connecting</font>";
+        stepResult = "connecting ISMAS";
     } else
     if (status.contains(UpdateCommand::ISMAS_NOT_CONNECTED, Qt::CaseInsensitive)) {
         if (custRepoExists) {
             s += " <font color='Red'>NOT CONNECTED. STOP</font>";
+            stepResult = "ISMAS not connected";
         } else {
             s += " <font color='Red'>not connected.&nbsp;(initial configuration)</font>";
+            stepResult = "ISMAS not connected (initial configuration)";
         }
     } else {
         s += " <font color='Red'>UNKNOWN STATUS</font>";
+        stepResult = "unknown status";
+    }
+
+    struct LogLineEntry logLine =
+        initLogLineEntry(1, // receiver
+                         QDateTime::currentDateTime().toString(Qt::ISODate).toUtf8().constData(),
+                         _ISMAS_CONTINUE,
+                         0, // eventState
+                         CHECK_ISMAS_CONNECT_PERCENT_START,
+                         ISMAS::RESULT_CODE::E_SUCCESS,
+                         "show ISMAS connectivity", // step
+                         stepResult.toUtf8().constData()); // stepResult
+
+    int w = 0;
+    if ((w = m_updateLog.write((char *)(&logLine), sizeof(logLine))) != sizeof(logLine)) {
+        qCritical() << __func__ << ":" << __LINE__ << "ERROR only" << w << "bytes written";
     }
 
     m_updateSteps[CHECK_BACKEND_CONNECTION] = s;
@@ -307,6 +371,20 @@ void MainWindow::onShowISMASConnectivity(QString status) {
         s += m_updateSteps[i] + "<br />";
     }
     ui->stepLabel->setText(s);
+
+    logLine =
+        initLogLineEntry(1, // receiver
+                         QDateTime::currentDateTime().toString(Qt::ISODate).toUtf8().constData(),
+                         _ISMAS_CONTINUE,
+                         0, // eventState
+                         CHECK_ISMAS_CONNECT_PERCENT_END,
+                         ISMAS::RESULT_CODE::E_SUCCESS,
+                         "show ISMAS connectivity", // step
+                         stepResult.toUtf8().constData()); // stepResult
+
+    if ((w = m_updateLog.write((char *)(&logLine), sizeof(logLine))) != sizeof(logLine)) {
+        qCritical() << __func__ << ":" << __LINE__ << "ERROR only" << w << "bytes written";
+    }
 }
 
 void MainWindow::onShowCustRepoStatus(QString status) {
@@ -458,6 +536,7 @@ void MainWindow::onShowUpdateDCFirmware(QString status) {
 void MainWindow::onShowUpdateRequest(QString status) {
     // qCritical() << __func__ << ":" << __LINE__ << "status" << status;
 
+    //ui->updateProgress->setValue(CHECK_UPDATE_REQUEST_PERCENT_START);
     QString s = m_updateSteps[CHECK_UPDATE_REQUEST].trimmed();
 
     bool const custRepoExists = internal::customerRepoExists();
@@ -469,17 +548,20 @@ void MainWindow::onShowUpdateRequest(QString status) {
             s += " <font color='Blue'>not requested&nbsp;(initial configuration)</font>";
         }
     } else
-    if (status.contains(UpdateCommand::UPDATE_REQUESTED, Qt::CaseInsensitive)) {
+    if (status.contains(internal::UPDATE_REQUESTED, Qt::CaseInsensitive)) {
         if (custRepoExists) {
             s += " <font color='Green'>requested</font>";
         } else {
             s += " <font color='Blue'>requested&nbsp;(initial configuration)</font>";
         }
     } else
-    if (status.contains(UpdateCommand::UPDATE_NOT_NECESSARY, Qt::CaseInsensitive)) {
+    if (status.contains(internal::UPDATE_INITIAL, Qt::CaseInsensitive)) {
+        s += " <font color='Green'>requested&nbsp;(initial configuration)</font>";
+    } else
+    if (status.contains(internal::UPDATE_NOT_NECESSARY, Qt::CaseInsensitive)) {
         s += " <font color='Green'>not necessary</font>";
     } else
-    if (status.contains(UpdateCommand::NO_CUSTOMER_REPOSITORY, Qt::CaseInsensitive)) {
+    if (status.contains(internal::NO_CUSTOMER_REPOSITORY, Qt::CaseInsensitive)) {
         s += " <font color='Blue'>UNKNOWN (ISMAS not connected)</font>";
     } else {
         s += " <font color='Red'>UNKNOWN</font>";
@@ -491,6 +573,7 @@ void MainWindow::onShowUpdateRequest(QString status) {
         s += m_updateSteps[i] + "<br />";
     }
     ui->stepLabel->setText(s);
+    //ui->updateProgress->setValue(CHECK_UPDATE_REQUEST_PERCENT_END);
 }
 
 void MainWindow::onShowISMASChecks(QString) {

UpdatePTUDevCtrl/mainwindow.h

@@ -6,6 +6,7 @@
 #include <QStatusBar>
 #include <QVector>
 #include <QString>
+#include <QProgressBar>
 
 QT_BEGIN_NAMESPACE
 namespace Ui { class MainWindow; }
@@ -39,6 +40,7 @@ public:
     void setUpdateStep(UpdateDcEvent::UpdateStep updateStep) { m_updateStep = updateStep; }
 
     QString targetDcVersion() {return  m_targetDcVersion; }
+    QProgressBar *progressBar();
 
 public slots:
     void onAppendText(QString, QString suffix = "");
@@ -69,6 +71,7 @@ public slots:
     void onSetDcDownloadProgress(int);
     void onShowSummary(QString);
     void onSummary();
+    void onFileChanged(QString const&);
 #if EMERGENCY_LEAVE_BL==1
     void emergencyLeaveBL();
 #endif
@@ -103,5 +106,6 @@ private:
 
     QVector<QString> m_updateSteps{};
 
+    QFile m_updateLog;
 };
 #endif // MAINWINDOW_H

UpdatePTUDevCtrl/process/check_update_activation_command.cpp

@@ -34,6 +34,9 @@ void CheckUpdateActivationCommand::readyReadStandardOutput() {
             } else
             if (s == internal::NO_CUSTOMER_REPOSITORY) {
                 emit w->showUpdateRequest(internal::NO_CUSTOMER_REPOSITORY);
+            } else
+            if (s == internal::UPDATE_INITIAL) {
+                emit w->showUpdateRequest(internal::UPDATE_INITIAL);
             }
         }
     }

UpdatePTUDevCtrl/process/update_command.cpp

@@ -45,10 +45,6 @@ void UpdateCommand::finished(int exitCode, QProcess::ExitStatus exitStatus) {
         //static constexpr const int PERCENT_UPDATE_DC{80};
         //static constexpr const int PERCENT_SHOW_FINAL_STATUS{90};
 
-        qCritical() << __func__ << ":" << __LINE__ << m_command
-                    << "exitCode" << exitCode
-                    << "exitStatus" << exitStatus;
-
         if (exitCode == 0 && exitStatus == QProcess::ExitStatus::NormalExit) {
             if (m_command.contains("ATBUpdateCheck")) {
 
@@ -127,10 +123,19 @@ void UpdateCommand::finished(int exitCode, QProcess::ExitStatus exitStatus) {
 
             if (m_worker->workList().nextExec()) {
                 m_worker->workList().exec();
+            } else {
+                // testing
+                qCritical() << __func__ << ":" << __LINE__ << "TEST: SEND UPDATE SUCCEEDED TO ISMAS";
+                m_worker->setLastFailedUpdateStep(Worker::UPDATE_STEP::NONE);
+                Worker::UpdateProcessRunning _(m_worker);
             }
         } else {
             bool execShowStatus = true;
             m_worker->workList().exec(execShowStatus);
         }
+    } else {
+        Q_ASSERT_X(false,
+                QString("%1:%2").arg(__func__).arg(__LINE__).toUtf8().constData(),
+                "empty worker list");
     }
 }

UpdatePTUDevCtrl/process/update_dc_command.h

@@ -9,7 +9,7 @@ public:
                              Worker *worker,
                              int nextCommandIndex,
                              int start_timeout = 100000,
-                             int finish_timeout = 100000);
+                             int finish_timeout = -1);
 public slots:
     virtual void readyReadStandardOutput() override;
     virtual void finished(int exitCode, QProcess::ExitStatus exitStatus) override;

UpdatePTUDevCtrl/work_process_list.h

@@ -31,6 +31,8 @@ public:
     unsigned nextExecIndex() const;
     bool nextExec() const;
     bool exec(bool last=false);
+
+    unsigned size() { return m_workList.size(); }
 };
 
 #endif // WORK_LIST_H_INCLUDED

UpdatePTUDevCtrl/worker.cpp

@@ -19,6 +19,7 @@
 #include <QScopedPointer>
 #include <QRegularExpression>
 #include <QJsonArray>
+#include <QProgressBar>
 
 #include <memory>
 
@@ -29,6 +30,7 @@
 #include "mainwindow.h"
 #include "utils.h"  // deprecated
 #include "utils_internal.h"
+#include "log_line_entry.h"
 #include "process/command.h"
 #include "process/update_command.h"
 #include "process/check_ismas_connectivity_command.h"
@@ -193,7 +195,28 @@ Worker::Worker(int customerNr,
   , m_dcDownloadJsonFiles(new Command(
         QString("/opt/app/tools/atbupdate/ATBDownloadDCJsonFiles --set-ppid %1").arg(QCoreApplication::applicationPid())))
   //, m_withoutIsmasDirectPort(true) /* useful for testing */ {
-  , m_withoutIsmasDirectPort(false) /* useful for testing */  {
+  , m_withoutIsmasDirectPort(false) /* useful for testing */
+  , m_updateLog("/opt/app/tools/atbupdate/update.log") // TODO: in ini-file eintragen
+  , m_updateLogBackup("/opt/app/tools/atbupdate/updateBackup.log") { // TODO: in ini-file eintragen
+
+    if (!m_updateLog.exists()) {
+        qCritical() << "ERROR" << m_updateLog.fileName() << "does not exist";
+    } else {
+        if (!m_updateLog.open(QIODevice::ReadWrite | QIODevice::Unbuffered)) {
+            qCritical() << "ERROR can not open" << m_updateLog.fileName();
+        } else {
+            m_updateLog.resize(0);
+            m_fileWatcher.addPath(QFileInfo(m_updateLog).absoluteFilePath());
+            connect(&m_fileWatcher, SIGNAL(fileChanged(QString const&)), this, SLOT(onFileChanged(QString const&)));
+        }
+    }
+
+    if (!m_updateLogBackup.open(QIODevice::ReadWrite | QIODevice::Unbuffered)) {
+        qCritical() << "ERROR can not open" << m_updateLogBackup.fileName();
+    } else {
+        m_updateLogBackup.resize(0);
+        m_updateLogBackup.close();
+    }
 
     // *** check ISMAS connectivity ***
     // NOTE: if the customer repository does not exist, then it does not matter
@@ -202,8 +225,8 @@ Worker::Worker(int customerNr,
     int next = 1;
     m_workList.push_back(
                 std::make_unique<CheckIsmasConnectivityCommand>(
-                    QString("echo ATBUpdateCheck --ismas-connected")
+                    //QString("echo ATBUpdateCheck --ismas-connected")
-                    //QString("/opt/app/tools/atbupdate/ATBUpdateCheck --ismas-connected")
+                    QString("/opt/app/tools/atbupdate/ATBUpdateCheck --ismas-connected")
                     , this, ++next));
 
     // *** check if update activated in ISMAS ***
@@ -211,8 +234,8 @@ Worker::Worker(int customerNr,
     // if the update has been activated via ISMAS.
     m_workList.push_back(
                 std::make_unique<CheckUpdateActivationCommand>(
-                    QString("echo ATBUpdateCheck --update-requested")
+                    // QString("echo ATBUpdateCheck --update-requested")
-                    //QString("/opt/app/tools/atbupdate/ATBUpdateCheck --update-requested")
+                    QString("/opt/app/tools/atbupdate/ATBUpdateCheck --update-requested")
                     , this, ++next));
 
     // *** check and fetch git-customer repository ***
@@ -221,16 +244,16 @@ Worker::Worker(int customerNr,
     //      the corresponding branch, and check the integrity of the repository.
     m_workList.push_back(
                 std::make_unique<CheckAndFetchCustomerRepositoryCommand>(
-                    QString("echo ATBUpdateGit")
+                    // QString("echo ATBUpdateGit")
-                    // QString("/opt/app/tools/atbupdate/ATBUpdateGit")
+                    QString("/opt/app/tools/atbupdate/ATBUpdateGit")
                     , this, ++next));
 
     // *** exec opkg-commands (noaction) ***
     // NOTE: first run the opkg commands with no action -> dry-run
     m_workList.push_back(
                 std::make_unique<ExecOpkgCommand>(
-                    QString("echo ATBUpdateOpkg --noaction")
+                    // QString("echo ATBUpdateOpkg --noaction")
-                    // QString("/opt/app/tools/atbupdate/ATBUpdateOpkg --noaction")
+                    QString("/opt/app/tools/atbupdate/ATBUpdateOpkg --noaction")
                     , this, ++next, true));
 
     // *** exec opkg-commands ***
@@ -241,12 +264,12 @@ Worker::Worker(int customerNr,
                     // QString("/opt/app/tools/atbupdate/ATBUpdateOpkg")
                     , this, ++next, false));
 
-    // *** send json files down to device controller ***
+    // send device-controller firmware down to device-controller-hardware
     m_workList.push_back(
-                std::make_unique<UpdateJsonCommand>(
+                std::make_unique<UpdateDCCommand>(
-                    QString("echo ATBDownloadDCJsonFiles")
+                    // QString("echo ATBUpdateDC")
-                    //QString("/opt/app/tools/atbupdate/ATBDownloadDCJsonFiles --set-ppid %1").arg(QCoreApplication::applicationPid())
+                    QString("/opt/app/tools/atbupdate/ATBUpdateDC")
-                    , this, ++next, false));
+                    , this, ++next));
 
     // sync json files in repo etc-directory with /etc fs-directory
     m_workList.push_back(
@@ -254,12 +277,15 @@ Worker::Worker(int customerNr,
                     QString("echo ATBUpdateSync")
                     , this, ++next));
 
-    // send device-controller firmware down to device-controller-hardware
+    // *** send json files down to device controller ***
     m_workList.push_back(
-                std::make_unique<UpdateDCCommand>(
+                std::make_unique<UpdateJsonCommand>(
-                    // QString("echo ATBUpdateDC")
+                    //QString("echo ATBUpdateJsonFiles")
-                    QString("/opt/app/tools/atbupdate/ATBUpdateDC")
+                    //QString("/opt/app/tools/atbupdate/ATBUpdateJsonFiles --set-ppid %1").arg(QCoreApplication::applicationPid())
-                    , this, ++next));
+
+                    // use customer repo
+                    QString("/opt/app/tools/atbupdate/ATBUpdateJsonFiles").arg(QCoreApplication::applicationPid())
+                    , this, ++next, false));
 
     // show/send software-status
     m_workList.push_back(
@@ -301,10 +327,91 @@ Worker::~Worker() {
     }
 }
 
+#if 0
+struct LogLineEntry {
+    char receiver;      // 1    receiver can be: ISMAS
+    char reason[5];     // 6    SW_UP
+    char timestamp[19]; // 25   ISO-format: 1900-xx-xxT00:00:00
+    char eventId;       // 26
+    char event[5];      // 31
+    /*
+        Note:
+        ! After U0002 immer ein CMD_SENDVERSION
+        ! Only U0002 and U0003 finish the Update process.
+        ! U0001: Update finished but not activated
+        ! U0002: Update finished and activated
+        ! U0003: Update finished but FAILed.
+    */
+
+    // #define _ISMAS_DONE                 "U0001" // 100%, Check: Resultcode: 0
+    // #define _ISMAS_SET_WAIT_OK          "U0002" // empty WAIT-button (""), ResultCode: 0
+    // #define _ISMAS_NO_UPDATE_NECESSARY  "M0100" // empty WAIT-button (""), ResultCode: 0
+    // #define _ISMAS_FAILURE              "U0003" // FAIL
+    // #define _ISMAS_CONTINUE             "U0010" // %-values: Update laeuft, Resultcodes entsprechend laufender Schritt
+    // #define _ISMAS_RESET_WAIT           "ISMAS" // reset WAIT-button to "WAIT"
+    // #define _ISMAS_TEST_TRIGGER         "U0099" // check the WAIT-button
+    char eventState;    // 32
+    char percent;       // 33   percent in progressbar of update-tool
+    char resultCode;    // 34
+    char step[40];      // 74   step executed
+    char stepResult[40];// 114  result for step
+    char version[14];   // 128
+};
+#endif
+
+void Worker::onFileChanged(QString const& fname) {
+
+    QFile f(fname);
+    //if (m_updateLog.fileName().contains(fname)) {
+    //    if (f.exists() && m_updateLogBackup.exists()) {
+    if (!m_updateLogBackup.open(QIODevice::ReadWrite | QIODevice::Unbuffered)) {
+        qCritical() << "ERROR can not open" << m_updateLogBackup.fileName();
+        return;
+    }
+    if (f.open(QIODevice::ReadOnly)) {
+        QByteArray const &backup = m_updateLogBackup.readAll();
+        QByteArray const &data = f.readAll();
+        int const diff = data.size() - backup.size();
+        if (diff > 0) {
+            QByteArray const &newLines = data.mid(backup.size());
+            int const size = newLines.size();
+            if (size > 0) {
+                LogLineEntry logLine;
+                int pos = 0;
+                while (pos < size) {
+                    QByteArray const &a = newLines.mid(pos, sizeof(logLine));
+                    if (a.size() == sizeof(logLine)) {
+                        memcpy(&logLine, a.data(), sizeof(logLine));
+
+                        qCritical() << "    reason:" << QString(QByteArray(logLine.reason, sizeof(logLine.reason)));
+                        qCritical() << " timestamp:" << QString(QByteArray(logLine.timestamp, sizeof(logLine.timestamp)));
+                        qCritical() << "     event:" << QString(QByteArray(logLine.event, sizeof(logLine.event)));
+                        qCritical() << "      step:" << QString(QByteArray(logLine.step, sizeof(logLine.step)));
+                        qCritical() << "stepResult:" << QString(QByteArray(logLine.stepResult, sizeof(logLine.stepResult)));
+                        qCritical() << "   percent:" << (int)logLine.percent;
+
+                        displayProgressInMainWindow(logLine.percent);
+                    }
+                    pos += sizeof(logLine);
+                }
+                m_updateLogBackup.write(newLines);
+            }
+        }
+        f.close();
+    }
+    //}
+    m_updateLogBackup.close();
+    // TODO: daten an ISMAS senden
+}
+
 void Worker::displayProgressInMainWindow(int progress) {
     if (m_mainWindow) {
-        QApplication::postEvent(m_mainWindow,
+        QProgressBar *progressBar = m_mainWindow->progressBar();
-            new ProgressEvent(this, progress));
+        if (progressBar) {
+            progressBar->setValue(progress);
+        }
+        //QApplication::postEvent(m_mainWindow,
+        //    new ProgressEvent(this, progress));
     }
 }
 

UpdatePTUDevCtrl/worker.h

@@ -13,6 +13,7 @@
 #include <QThread>
 #include <QByteArray>
 #include <QScopedPointer>
+#include <QFileSystemWatcher>
 
 #include <optional>
 #include <initializer_list>
@@ -230,6 +231,7 @@ class Worker : public QThread{
     int sendUpdateSucceededAndActivated();
     int sendFinalResult();
 
+public:
     struct UpdateProcessRunning {
         Worker *m_worker;
 
@@ -394,6 +396,14 @@ protected:
     virtual void run();
 
 public:
+    UPDATE_STEP lastFailedUpdateStep() const {
+        return m_lastFailedUpdateStep;
+    }
+
+    void setLastFailedUpdateStep(UPDATE_STEP step) {
+        m_lastFailedUpdateStep = step;
+    }
+
     QDebug CONSOLE(QStringList const &lst = QStringList()) {
         m_debugMsg = lst;
         return QDebug(QtMsgType::QtInfoMsg);
@@ -522,6 +532,7 @@ private slots:
     bool syncCustomerRepositoryAndFS();
     // bool sendIsmasLastVersionNotification(int progress);
     bool saveLogFile();
+    void onFileChanged(QString const&);
 
 public slots:
     void readyReadStandardOutput();
@@ -535,6 +546,9 @@ private:
 
     QDateTime m_start;
     QByteArray m_standardOutput;
+    QFileSystemWatcher m_fileWatcher;
+    QFile m_updateLog;
+    QFile m_updateLogBackup;
 
     static const QMap<UPDATE_STEP, const char*> smap;
 

common/include/log_line_entry.h

@@ -0,0 +1,69 @@
+#ifndef LOG_LINE_ENTRY_H_INCLUDED
+#define LOG_LINE_ENTRY_H_INCLUDED
+
+#include <cstring>
+#include <algorithm>
+
+struct LogLineEntry {
+    char receiver;      // 1    receiver can be: ISMAS
+    char reason[5];     // 6    SW_UP
+    char timestamp[19]; // 25   ISO-format: 1900-xx-xxT00:00:00
+    char eventId;       // 26
+    char event[5];      // 31
+    /*
+        Note:
+        ! After U0002 immer ein CMD_SENDVERSION
+        ! Only U0002 and U0003 finish the Update process.
+        ! U0001: Update finished but not activated
+        ! U0002: Update finished and activated
+        ! U0003: Update finished but FAILed.
+    */
+
+    // #define _ISMAS_DONE                 "U0001" // 100%, Check: Resultcode: 0
+    // #define _ISMAS_SET_WAIT_OK          "U0002" // empty WAIT-button (""), ResultCode: 0
+    // #define _ISMAS_NO_UPDATE_NECESSARY  "M0100" // empty WAIT-button (""), ResultCode: 0
+    // #define _ISMAS_FAILURE              "U0003" // FAIL
+    // #define _ISMAS_CONTINUE             "U0010" // %-values: Update laeuft, Resultcodes entsprechend laufender Schritt
+    // #define _ISMAS_RESET_WAIT           "ISMAS" // reset WAIT-button to "WAIT"
+    // #define _ISMAS_TEST_TRIGGER         "U0099" // check the WAIT-button
+    char eventState;    // 32
+    char percent;       // 33   percent in progressbar of update-tool
+    char resultCode;    // 34
+    char step[40];      // 74   step executed
+    char stepResult[40];// 114  result for step
+    char version[13];   // 127
+    char dummy;         // 128
+};
+
+inline static LogLineEntry initLogLineEntry(
+    char const receiver,
+    char const timestamp[19],
+    char const event[5],
+    char const eventState,
+    char const percent,
+    char const resultCode,
+    char const step[40],
+    char const stepResult[40],
+    char const eventId = 0,
+    char const reason[5] = "SW_UP",
+    char const version[14] = "") {
+    LogLineEntry e;
+    memset(&e, 0, sizeof(e));
+
+    e.receiver = receiver;
+    std::memcpy(e.reason, reason, std::min(sizeof(e.reason), strlen(reason)));
+    std::memcpy(e.timestamp, timestamp, std::min(sizeof(e.timestamp), strlen(timestamp)));
+    e.eventId = eventId;
+    std::memcpy(e.event, event, std::min(sizeof(e.event), strlen(event)));
+    e.eventState = eventState;
+    e.percent = percent;
+    e.resultCode = resultCode;
+    std::memcpy(e.step, step, std::min(sizeof(e.step), strlen(step)));
+    std::memcpy(e.stepResult, stepResult, std::min(sizeof(e.stepResult), strlen(stepResult)));
+    std::memcpy(e.version, version, std::min(sizeof(e.version), strlen(version)));
+    e.dummy = '\0';
+
+    return e;
+}
+
+#endif // LOG_LINE_ENTRY_H_INCLUDED

common/include/utils_internal.h

@@ -9,6 +9,7 @@ namespace internal {
 
     static constexpr const char *UPDATE_NOT_NECESSARY{"not necessary"};
     static constexpr const char *UPDATE_NOT_REQUESTED{"not requested"};
+    static constexpr const char *UPDATE_INITIAL{"initial update"};
     static constexpr const char *UPDATE_REQUESTED{"requested"};
 
     static constexpr const char *NO_CUSTOMER_REPOSITORY{"no customer repository"};

common/src/utils_internal.cpp

@@ -64,7 +64,8 @@ QString branchName() {
 std::unique_ptr<QSettings> readSettings(QString const &optionalDirName) {
     std::unique_ptr<QSettings> settings{std::make_unique<QSettings>()};
 
-    QString const fileName{settings->applicationName() + ".ini"};
+    //QString const fileName{settings->applicationName() + ".ini"};
+    QString const fileName{"ATBUpdateTool.ini"};
     QDir d;
 
     if (!optionalDirName.isEmpty()) {
@@ -116,6 +117,8 @@ std::unique_ptr<QSettings> readSettings(QString const &optionalDirName) {
 std::unique_ptr<QString> dcCandidateToInstall(QString const &dcDirectory) {
     std::unique_ptr<QString> dcCandidate{nullptr};
 
+    qCritical() << __func__ << __LINE__ << dcDirectory;
+
     QDir dcDir{dcDirectory.isEmpty() ? customerRepoDcDir() : dcDirectory};
     if (dcDir.exists()) {