set version to 1.3.21

the last line followed by a suffix.

OnDemandUpdatePTU.pro

@@ -60,9 +60,12 @@ DEFINES += QT_DEPRECATED_WARNINGS
 #           Turned previous worker-object into its own thread, but without any
 #           own event-loop (so it cannot block anything inside the CA-plugin).
 # 1.3.16:   Bug fixes found during testing.
-VERSION="1.3.17"
-#           Add ATBUpdateTool.ini and custom command line parser. Settings
+# 1.3.17:   Add ATBUpdateTool.ini and custom command line parser. Settings
 #           given in ATBUpdateTool.ini can be overwritten on the command-line.
+# 1.3.18:   Bug fixes found during testing.
+# 1.3.19:   Bug fixes found during testing.
+# 1.3.20:   Bug fixes found during testing.
+VERSION="1.3.21"
 
 # PLANNED TODOS:
 #   1:  Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
@@ -89,7 +92,13 @@ VERSION="1.3.17"
 #       es so arrangieren, dass der DC plus die Json-files im Repository immer
 #       runtergeladen werden, obwohl sich im Repository gar nicts veraendert
 #       hat. Eeventuell nuetzlich beim initialen Setuo eines PSA.
-
+#   9:  Das Kunden-Repository sollte immer gezogen werden, unabhaengig von der
+#       Stellung des WAIT-Button. Grund: es koennte sein, dass andernfalls ein
+#       PSA weit hiter anderen steht, und dann ploetzlich einmal alle vorher-
+#       gehenden Aenderungen anzieht, die gar nicht fuer ihn gemeint waren.
+#  10:  Bei einer Neuinstallation (Neuhauser) immer JSON files runterladen,
+#       Tariff-Files syncen (d.h. nur wenn noch kein Repo vorhanden ist), und
+#       zwar auch ohne WAIT-Button.
 
 
 win32 {

commandline_parser.cpp

@@ -6,16 +6,18 @@
 #include <QFile>
 
 CommandLineParser::CommandLineParser()
-  : m_repositoryUrl("")
-  , m_plugInDir("")
-  , m_plugInName("")
-  , m_workingDir("")
-  , m_dryRun("")
-  , m_noUpdatePsaHardware("")
-  , m_showYoctoVersion("")
-  , m_showYoctoInstallStatus("")
-  , m_showExtendedVersion("")
-  , m_iniFileName("")
+  : m_repositoryUrl("https://git.mimbach49.de/GerhardHoffmann")
+  , m_plugInDir("/usr/lib/")
+  , m_plugInName("libCAslave.so")
+  , m_workingDir("/opt/app/tools/atbupdate/")
+  , m_dryRun("false")
+  , m_noUpdatePsaHardware("false")
+  , m_showYoctoVersion("false")
+  , m_showYoctoInstallStatus("false")
+  , m_showExtendedVersion("false")
+  , m_iniFileName("ATBUpdateTool.ini")
+  , m_alwaysDownloadConfig("false")
+  , m_alwaysDownloadDC("false")
   , m_repositoryUrlOption(
         QCommandLineOption(
             QStringList() << "repository-url" << "repository-url",

interfaces.h

@@ -1834,6 +1834,9 @@ public:
     virtual uint8_t prn_getPrintResult() const {
        return 0;
     }
+    // return:  0: just printing, wait
+    //          1: OK - last print was succesful
+    //          2: error - not printed
 
 
 
@@ -2273,7 +2276,32 @@ public:
 
 
 signals:
+    virtual void hwapi_templatePrintFinished_OK(void) const=0;
+    virtual void hwapi_templatePrintFinished_Err(void) const=0;
+
+    virtual void hwapi_coinCollectionJustStarted(void) const=0;
+    virtual void hwapi_coinCollectionAborted(void) const=0;
+
+    virtual void hwapi_gotNewCoin(void) const=0;
+    virtual void hwapi_payStopByMax(void) const=0;
+    virtual void hwapi_payStopByPushbutton(void) const=0;
+
+    virtual void hwapi_payStopByEscrow(void) const=0;
+    virtual void hwapi_payStopByError(void) const=0;
+    virtual void hwapi_payStopByTimeout(void) const=0;
+    virtual void hwapi_payCancelled(void) const=0;
+    virtual void hwapi_coinProcessJustStopped(void) const=0;
+
+    virtual void hwapi_doorServiceDoorOpened(void) const=0;
+    virtual void hwapi_doorVaultDoorOpened(void) const=0;
+    virtual void hwapi_doorCoinBoxRemoved(void) const=0;
+    virtual void hwapi_doorCoinBoxInserted(void) const=0;
+    virtual void hwapi_doorCBinAndAllDoorsClosed(void) const=0;
+    virtual void hwapi_doorAllDoorsClosed(void) const=0;
+
+
     // NOTE: declaring a "pure virtual" "signal" should be an error and thus not valid.
+    /* GH Version, bringt Fehler
     void hwapi_templatePrintFinished_OK() const;
     void hwapi_templatePrintFinished_Err() const;
 
@@ -2296,6 +2324,7 @@ signals:
     void hwapi_doorCoinBoxInserted() const;
     void hwapi_doorCBinAndAllDoorsClosed() const;
     void hwapi_doorAllDoorsClosed() const;
+    */
 };
 
 

main.cpp

@@ -74,6 +74,7 @@ int main(int argc, char *argv[]) {
     QString plugInDir = parser.plugInDir();
     QString plugInName = parser.plugInName();
     QString workingDir = parser.workingDir();
+    QString iniFileName = parser.iniFileName();
     bool const dryRun = parser.dryRun();
     bool const noUpdatePsaHardware = parser.noUpdatePsaHardware();
     bool const showYoctoVersion = parser.yoctoVersion();
@@ -84,6 +85,12 @@ int main(int argc, char *argv[]) {
 
     QString const rtPath = QCoreApplication::applicationDirPath();
 
+    int const machineNr = Utils::read1stLineOfFile("/mnt/system_data/machine_nr");
+    int const customerNr = Utils::read1stLineOfFile("/mnt/system_data/cust_nr");
+    int const zoneNr = Utils::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;
@@ -93,7 +100,14 @@ int main(int argc, char *argv[]) {
     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");
@@ -108,11 +122,6 @@ int main(int argc, char *argv[]) {
         return 0;
     }
 
-    int machineNr = Utils::read1stLineOfFile("/etc/machine_nr");
-    int customerNr = Utils::read1stLineOfFile("/etc/cust_nr");
-    int zoneNr = Utils::read1stLineOfFile("/etc/zone_nr");
-    QString const branchName = (zoneNr != 0)
-            ? QString("zg1/zone%1").arg(zoneNr) : "master";
 
     QThread::currentThread()->setObjectName("main thread");
     qInfo() << "Main thread" << QThread::currentThreadId();

mainwindow.cpp

@@ -208,13 +208,12 @@ void MainWindow::onAppendText(QString text, QString suffix) {
     // Utils::printLineEditInfo(editText.split('\n', QString::SplitBehavior::SkipEmptyParts));
     // ui->updateStatus->setText(editText.trimmed());
 
-    // scrollDownTextEdit();
+    scrollDownTextEdit();
 }
 
 void MainWindow::onReplaceLast(QStringList newTextLines, QString suffix) {
     // Utils::printInfoMsg(QString("ON REPLACE LAST (LIST) CALLED AT ")
     //    + QDateTime::currentDateTime().toString(Qt::ISODateWithMs));
-
     int const s = newTextLines.size();
     if (s > 0) {
         QString editText = ui->updateStatus->toPlainText();
@@ -249,11 +248,15 @@ void MainWindow::onReplaceLast(QStringList newTextLines, QString suffix) {
 void MainWindow::onReplaceLast(QString text, QString suffix) {
     // Utils::printInfoMsg(QString("ON REPLACE LAST (TEXT) CALLED AT ")
     //    + QDateTime::currentDateTime().toString(Qt::ISODateWithMs));
-
     QString editText = ui->updateStatus->toPlainText();
     QStringList lines = editText.split('\n', QString::SplitBehavior::SkipEmptyParts);
     if (lines.size() > 0) {
-        lines.removeLast();
+        // removing the last line is really meant for refreshing the last line
+        // with a string very similar than the original one, typically only
+        // followed by a suffix.
+        if (lines.last().contains(text)) {
+            lines.removeLast();
+        }
         if (!suffix.isNull() && suffix.size() > 0 && suffix != "\n") {
             QString const add = text.leftJustified(m_width-10) + suffix;
             if (!add.isEmpty()) {

update.cpp

@@ -115,15 +115,28 @@ Update::Update(Worker *worker,
     , m_branchName(branchName)
     , m_pluginName(pluginName)
     , m_workingDir(workingDir)
-    , m_dryRun(dryRun) {
+    , m_dryRun(dryRun)
+    , m_sys_areDCdataValid(false) {
 
-    qInfo() << "UPDATE: m_serialInterface    ..." << m_serialInterface;
-    qInfo() << "UPDATE: m_baudrate           ..." << m_baudrate;
-    qInfo() << "UPDATE: m_customerRepository ..." << m_customerRepository;
-    qInfo() << "UPDATE: m_customerNr ..........." << m_customerNrStr;
-    qInfo() << "UPDATE: m_branchName ..........." << m_branchName;
-    qInfo() << "UPDATE: m_pluginName ..........." << m_pluginName;
-    qInfo() << "UPDATE: m_workingDirectory ....." << m_workingDir;
+    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";
+        }
+        m_hw->dc_autoRequest(true);
+        QThread::msleep(500);
+    }
+
+    qCritical() << "UPDATE: m_sys_areDCDataValid ..." << m_sys_areDCdataValid;
+
+    //qInfo() << "UPDATE: m_serialInterface    ..." << m_serialInterface;
+    //qInfo() << "UPDATE: m_baudrate           ..." << m_baudrate;
+    //qInfo() << "UPDATE: m_customerRepository ..." << m_customerRepository;
+    //qInfo() << "UPDATE: m_customerNr ..........." << m_customerNrStr;
+    //qInfo() << "UPDATE: m_branchName ..........." << m_branchName;
+    //qInfo() << "UPDATE: m_pluginName ..........." << m_pluginName;
+    //qInfo() << "UPDATE: m_workingDirectory ....." << m_workingDir;
 }
 
 Update::~Update() {
@@ -363,23 +376,24 @@ bool Update::downloadJson(enum FileTypeJson type,
                                                    templateIdx,
                                                    (uint8_t *)ba.data())) {
 
-                        QThread::msleep(1000);
+                        m_hw->dc_autoRequest(true);
+                        QThread::msleep(500);
 
                         // testing
-                        //m_hw->request_ReadbackMachineID();
-                        //QThread::msleep(500);
+                        m_hw->request_ReadbackMachineID();
+                        QThread::msleep(500);
 
-                        //uint8_t data[64];
-                        //memset(data, 0x00, sizeof(data));
-                        //uint8_t length = 0;
+                        uint8_t data[64];
+                        memset(data, 0x00, sizeof(data));
+                        uint8_t length = 0;
 
-                        //m_hw->readback_machineIDdata(&length, data);
+                        m_hw->readback_machineIDdata(&length, data);
 
-                        //QThread::msleep(500);
+                        QThread::msleep(500);
 
-                        //QByteArray ba((const char*)data, length);
+                        QByteArray ba((const char*)data, length);
 
-                        //qCritical() << length << "MACHINE ID =" << ba.toHex(':');
+                        qCritical() << length << "MACHINE ID =" << ba.toHex(':');
 
                         ret = true;
                     }
@@ -481,15 +495,9 @@ QStringList Update::getDcSoftAndHardWareVersion() {
 }
 
 bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
-    int tries = 20;
-    while (!m_hw->sys_areDCdataValid()) { // 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";
-            return false;
-        }
-        m_hw->dc_autoRequest(true);
-        QThread::msleep(500);
+    if (m_sys_areDCdataValid == false) {
+        qCritical() << "ERROR!!! DC DATA NOT VALID -> CA-MASTER-PLUGIN NOT CONNECTED";
+        return false;
     }
 
     bool res = false;

update.h

@@ -32,6 +32,7 @@ class Update : public QObject {
     QString m_workingDir;
     bool m_maintenanceMode;
     bool m_dryRun;
+    bool m_sys_areDCdataValid;
 
     static QPluginLoader pluginLoader;
 

worker.cpp

@@ -457,7 +457,7 @@ bool Worker::updateTriggerSet() {
 
     GUI() << (ISMAS() << (CONSOLE() << UPDATE_STEP::CHECK_ISMAS_TRIGGER));
 
-    QString triggerValue("");
+    QString triggerValue("NOT CHECKED YET");
 
     for (int repeat = 1; repeat <= 100; ++repeat) {
 
@@ -682,6 +682,9 @@ bool Worker::filesToUpdate() {
             }
         }
         m_filesToUpdate.removeDuplicates();
+
+        qCritical() << __PRETTY_FUNCTION__ << "FILES-TO-UPDATE" << m_filesToUpdate;
+
         GUI(m_filesToUpdate) << (CONSOLE(m_filesToUpdate) << UPDATE_STEP::FILES_TO_UPDATE);
         setProgress(_FILES_TO_UPDATE);
     } else {
@@ -724,7 +727,7 @@ bool Worker::execOpkgCommands() {
                     if (f.open(QIODevice::ReadOnly)) {
                         QTextStream in(&f);
                         m_opkgCommands.clear();
-                        bool executeOpkgCommandFailed = false;
+                        QStringList opkgErrorLst;
                         while (!in.atEnd()) {
                             QString line = in.readLine();
                             static const QRegularExpression comment("^\\s*#.*$");
@@ -732,7 +735,7 @@ bool Worker::execOpkgCommands() {
                                 // found opkg command
                                 QString opkgCommand = line.trimmed();
                                 if (!executeOpkgCommand(opkgCommand)) {
-                                    executeOpkgCommandFailed = true;
+                                    opkgErrorLst << opkgCommand;
                                 } else {
                                     QString cmd = "\n  " + opkgCommand;
                                     emit appendText(cmd);
@@ -786,14 +789,15 @@ bool Worker::execOpkgCommands() {
                             }
                         }
                         f.close();
-                        if (!executeOpkgCommandFailed) {
+                        if (opkgErrorLst.size() == 0) {
                             if (m_opkgCommands.size() > 0) {
                                 m_displayIndex = 1;
-                                GUI() << UPDATE_STEP::EXEC_OPKG_COMMAND_SUCCESS;
+                                ISMAS() << (GUI() << (CONSOLE() << UPDATE_STEP::EXEC_OPKG_COMMAND_SUCCESS));
                                 setProgress(_EXEC_OPKG_COMMAND_SUCCESS);
                             }
                         } else {
                             m_displayIndex = 1;
+                            ISMAS(opkgErrorLst) << (GUI(opkgErrorLst) << (CONSOLE() << UPDATE_STEP::EXEC_OPKG_COMMAND_FAILURE));
                             GUI() << UPDATE_STEP::EXEC_OPKG_COMMAND_FAILURE;
                             setProgress(_EXEC_OPKG_COMMAND_FAILURE);
                             return false;
@@ -809,7 +813,7 @@ bool Worker::execOpkgCommands() {
 bool Worker::downloadFilesToPSAHardware() {
     m_displayIndex = 0;
 
-    GUI(m_filesToUpdate) << (CONSOLE(m_filesToUpdate) << UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE);
+    GUI(m_filesToDownload) << (CONSOLE(m_filesToDownload) << UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE);
     setProgress(_DOWNLOAD_FILES_TO_PSA_HARDWARE);
 
     if (m_noUpdatePsaHardware == false) {

worker.h

@@ -520,8 +520,10 @@ private:
         break;
         case UPDATE_STEP::CHECK_FOR_REPOSITORY_CHANGES_FAILURE:
         break;
-        case UPDATE_STEP::FILES_TO_UPDATE:
-        break;
+        case UPDATE_STEP::FILES_TO_UPDATE: {
+            lst << instance->m_debugMsg;
+            Utils::printUpdateStatusMsg(debug, lst);
+        } break;
         case UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE: {
             lst << instance->m_debugMsg;
             Utils::printUpdateStatusMsg(debug, lst);
@@ -555,8 +557,10 @@ private:
         break;
         case UPDATE_STEP::EXEC_OPKG_COMMAND_SUCCESS:
         break;
-        case UPDATE_STEP::EXEC_OPKG_COMMAND_FAILURE:
-        break;
+        case UPDATE_STEP::EXEC_OPKG_COMMAND_FAILURE: {
+            lst << instance->m_debugMsg;
+            Utils::printUpdateStatusMsg(debug, lst);
+        } break;
         case UPDATE_STEP::DOWNLOAD_CONFIG_FILE:
         break;
         case UPDATE_STEP::DOWNLOAD_CONFIG_FILE_SUCCESS:
@@ -1173,7 +1177,8 @@ private:
                 for (int i = 0; i < size; ++i) {
                     emit worker->appendText(QString("\n ") + worker->m_filesToUpdate.at(i));
                 }
-            } else {
+            }
+            if (size == 1) {
                 emit worker->appendText("Found 1 file to update :", UPDATE_STEP_DONE);
                 emit worker->appendText(QString("\n ") + worker->m_filesToUpdate.at(0));
             }