Added updateDC() and updatePrinterTemplate(). Prepared for live testing.

OnDemandUpdatePTU.pro

@@ -3,7 +3,7 @@ QT += core
 QT += widgets serialport
 QT += network
 
-TARGET = ATBUpdateDC
+TARGET = ATBUpdateTool
 
 INCLUDEPATH += plugins
 

main.cpp

@@ -4,6 +4,10 @@
 #include <QTimer>
 #include <QFileInfo>
 
+#ifdef __linux__
+#include <stdlib.h> // system()
+#endif
+
 #include "message_handler.h"
 #include "plugins/interfaces.h"
 
@@ -14,6 +18,9 @@
 #include <QRunnable>
 #include <QThreadPool>
 #include <QDir>
+#include <QProcess>
+#include <QCommandLineParser>
+#include <QStandardPaths>
 
 #include "update.h"
 #include "worker_thread.h"
@@ -27,17 +34,26 @@
 #define SERIAL_PORT "ttyUSB0"
 #endif
 
-static void doWork(QString update_ctrl_file, QString workingDir) {
+class hwinf;
+static void doWork(hwinf *hw, QString update_ctrl_file, QString workingDir) {
     std::this_thread::sleep_for(std::chrono::milliseconds(2000));
-    //Update update(update_ctrl_file, workingDir);
+    Update update(hw, update_ctrl_file, workingDir);
-    //update.doUpdate();
+    update.doUpdate();
     std::this_thread::sleep_for(std::chrono::milliseconds(2000));
     QCoreApplication::quit();
 }
 
 // argv[1]: file to send to dc
 int main(int argc, char *argv[]) {
+
+    QByteArray const value = qgetenv("XDG_RUNTIME_DIR");
+    if (value.size() == 0) {
+        qputenv("XDG_RUNTIME_DIR", "/run/user/0");
+    }
+
     QApplication a(argc, argv);
+    QApplication::setApplicationName("ATBUpdateTool");
+    QApplication::setApplicationVersion("1.0");
 
     if (!messageHandlerInstalled()) { // change internal qt-QDebug-handling
         atbInstallMessageHandler(atbDebugOutput);
@@ -45,31 +61,64 @@ int main(int argc, char *argv[]) {
         //setDebugLevel(QtMsgType::QtDebugMsg);
     }
 
-    QByteArray const value = qgetenv("XDG_RUNTIME_DIR");
+    QCommandLineParser parser;
-    if (value.size() == 0) {
+    parser.setApplicationDescription("Download tool for downloading device controller firmware, printer json-files and executing opkg-commands.");
-        qputenv("XDG_RUNTIME_DIR", "/run/user/0");
+    parser.addHelpOption();
-    }
+    parser.addVersionOption();
 
-    QString rtPath = QCoreApplication::applicationDirPath();
+    QCommandLineOption pluginDirectoryOption(QStringList() << "plugin-directory" << "plugin-directory",
-    QString plugInDir(rtPath +(rtPath.endsWith("/") ? "" : "/") + "plugins");
+        QCoreApplication::translate("main", "Where to find dc-plugin."),
+        QCoreApplication::translate("main", "directory"));
+    QString const pluginDefault = "./plugins";
+    pluginDirectoryOption.setDefaultValue(pluginDefault);
+    parser.addOption(pluginDirectoryOption);
+
+    QCommandLineOption pluginNameOption(QStringList() << "plugin-name" << "plugin-name",
+        QCoreApplication::translate("main", "Name of dc-plugin."),
+        QCoreApplication::translate("main", "directory"));
+    QString const pluginNameDefault = "libCAmaster.so";
+    pluginNameOption.setDefaultValue(pluginNameDefault);
+    parser.addOption(pluginNameOption);
+
+    QCommandLineOption workingDirectoryOption(QStringList() << "working-directory" << "working-directory",
+        QCoreApplication::translate("main", "working directory of update-script."),
+        QCoreApplication::translate("main", "directory"));
+    QString const workingDirectoryDefault = ".";
+    workingDirectoryOption.setDefaultValue(workingDirectoryDefault);
+    parser.addOption(workingDirectoryOption);
+
+    // Process the actual command line arguments given by the user
+    parser.process(a);
+    QString plugInDir = parser.value(pluginDirectoryOption);
+    QString plugInName = parser.value(pluginNameOption);
+    QString workingDir = parser.value(workingDirectoryOption);
+    QString const rtPath = QCoreApplication::applicationDirPath();
+
+    if (plugInDir == pluginDefault) {
+        plugInDir = (rtPath + "/" + pluginDefault);
+    }
     if (!QDir(plugInDir).exists()) {
         qCritical() << plugInDir
                     << "does not exists, but has to contain dc-library";
         exit(-1);
     }
-
     qInfo() << "pwd" << "=" << rtPath;
     qInfo() << "plugInDir" << "=" << plugInDir;
+    qInfo() << "plugInName" << "=" << plugInName;
+    qInfo() << "workingDir" << "=" << workingDir;
 
-    hwinf *hw = Update::loadDCPlugin(QDir(plugInDir), "libCAmaster.so");
+    // before loading the library, delete all possible shared memory segments
+#if defined Q_OS_LINUX || defined Q_OS_UNIX
+    // system("rm -rf /tmp/qipc*");
+#else
+#error "Only tested under UNIX/LINUX"
+#endif
+
+    hwinf *hw = Update::loadDCPlugin(QDir(plugInDir), plugInName);
+    hw->dc_autoRequest(false);
 
     QString const update_ctrl_file = "/opt/app/tools/atbupdate/update_log.csv";
-    QString const workingDir = (argc == 2) ? argv[1] : ".";
+    std::thread t(doWork, hw, update_ctrl_file, workingDir);
-    Update update(hw, update_ctrl_file, workingDir);
-
-    return 0;
-
-    std::thread t(doWork, update_ctrl_file, workingDir);
 
     int ret = a.exec();
     t.join();

update.cpp

@@ -17,12 +17,18 @@
 #include <QThread>
 #include <QDateTime>
 #include <QPluginLoader>
+#include <QMap>
 
 #define COLUMN_REQUEST      (0)
 #define COLUMN_NAME         (1)
 #define COLUMN_DATE_TIME    (2)
 #define COLUMN_RESULT       (3)
 
+static const QMap<QString, int> baudrateMap = {
+  {"1200"   ,   0}, {"9600"   ,   1}, {"19200"  ,   2}, {"38400"  ,   3},
+  {"57600"  ,   4}, {"115200" ,   5}
+};
+
 hwinf *Update::loadDCPlugin(QDir const &plugInDir, QString const &fname) {
     hwinf *hw = nullptr;
     if (plugInDir.exists()) {
@@ -78,12 +84,6 @@ Update::Update(hwinf *hw,
     , m_workingDir(workingDir)
     , m_init(true) {
 
-    // qCritical() << "workingDir" << m_workingDir;
-
-    // m_hw->dc_autoRequest(false);
-
-    return;
-
     execUpdateScript();
 
     if (!m_update_ctrl_file.exists()) {
@@ -106,8 +106,6 @@ Update::Update(hwinf *hw,
         m_init = false;
     }
     qDebug() << "Opened" << m_update_ctrl_file_copy.fileName();
-
-    //QApplication::processEvents();
 }
 
 Update::~Update() {
@@ -373,26 +371,116 @@ bool Update::updateBinary(char const *fileToSendToDC) {
     bool r;
     if ((r = fn.exists()) == true) {
         QString const linkTarget = fn.symLinkTarget();
-        qCritical() << "updating binary (dc): link target" << linkTarget;
+        qInfo() << "updating binary (dc)" << linkTarget << "...";
-        // debug
+        if ((r = updateDC(linkTarget, m_baudrate, m_serialInterface)) == true) {
-        //r = m_hw->dc_updateDC(linkTarget, m_baudrate, m_serialInterface);
+            qInfo() << "updating binary (dc)" << linkTarget << "... done";
-        qCritical() << "updating binary (dc): "
+        } else {
-                    << linkTarget << ((r == true) ? "OK" : "ERROR");
+            qCritical() << "updating binary (dc)" << linkTarget << "... FAILED";
+        }
     } else {
         qCritical() << "symlink" << fileToSendToDC << "does not exist";
     }
     return r;
 }
 
-bool Update::updatePrinterConf(int nrOfTemplate, char const *fileToSendToDC) {
+bool Update::updateDC(QString bFile, QString br, QString serial) const {
+    if (!baudrateMap.contains(br)) { // sanity check
+        qCritical() << "passed wrong baudrate" << br;
+        return false;
+    }
+
+    m_hw->dc_autoRequest(false);
+    qDebug() << "updating dc: " << bFile << br << serial << "...";
+
+    return true;
+
+    if (!openSerial(baudrateMap.value(br), br, serial)) {
+        return false;
+    }
+    if (!resetDeviceController()) {
+        closeSerial();
+        return false;
+    }
+    if (!startBootloader()) {
+        closeSerial();
+        return false;
+    }
+    if (!downloadBinaryToDC(bFile)) {
+        stopBootloader();
+        closeSerial();
+        qCritical() << "updating dc: " << bFile << br << serial << "...FAILED";
+        return false;
+    }
+
+    qInfo() << "updating dc: " << bFile << br << serial << "...OK";
+
+    stopBootloader();
+    QThread::sleep(3);
+
+    closeSerial();
+    return true;
+}
+
+bool Update::updatePrinterTemplate(enum FileTypeJson type,
+                                   int templateIdx,
+                                   QString fname,
+                                   QString br,
+                                   QString serial) const {
+    // sanity checks
+    if (!baudrateMap.contains(br)) {
+        qCritical() << "passed wrong baudrate" << br;
+        return false;
+    }
+    if (type != FileTypeJson::PRINTER) {
+        qCritical() << "wrong file type" << (uint8_t)type;
+        return false;
+    }
+    qDebug() << "updating: " << fname << br << serial << "...";
+    if (!serial.isNull()) {
+        if (!openSerial(baudrateMap.value(br), br, serial)) {
+            return false;
+        }
+    }
+    int nTry = 50;
+    while (!m_hw->sys_ready4sending()) { // wait max. 5 seconds
+        std::this_thread::sleep_for(std::chrono::milliseconds(100));
+        if (--nTry <= 0) {
+            qCritical() << "sys not ready for sending";
+            if (!serial.isNull()) {
+                closeSerial();
+            }
+            return false;
+        }
+    }
+    bool ret = true;
+    QFile file(fname);
+    if (file.exists() && file.open(QIODevice::ReadOnly)) {
+        QByteArray ba = file.readAll();
+        if (ba.size() <= 800) { // max. size is 800 bytes
+            if (m_hw->sys_sendJsonFileToDc((uint8_t)(type),
+                                           templateIdx,
+                                           (uint8_t *)ba.data())) {
+                std::this_thread::sleep_for(std::chrono::seconds(1));
+                qInfo() << "sent file" << fname << "to dc";
+            }
+        }
+    } else {
+        qCritical() << fname << "!!! does not exist!!!";
+        ret = false;
+    }
+    if (!serial.isNull()) {
+        closeSerial();
+    }
+    return ret;
+}
+
+bool Update::updatePrinterConf(int templateIdx, QString fileToSendToDC) {
     qCritical() << "updating printer template: " << fileToSendToDC;
-    return true; // debug
+    return updatePrinterTemplate(FileTypeJson::PRINTER,
-    QVector<int> printTemplates{ nrOfTemplate };
+                                 templateIdx,
-    QVector<QString> filesToSend{ fileToSendToDC };
+                                 fileToSendToDC,
-    //return m_hw->dc_updatePrinterTemplate(hwapi::FileTypeJson::PRINTER,
+                                 QString(m_baudrate),
-    //                                      printTemplates, filesToSend,
+                                 QString(m_serialInterface));
-    //                                      QString(m_baudrate),
-    //                                      QString(m_serialInterface));
 }
 
 QStringList Update::getOpenLines() {
@@ -451,6 +539,15 @@ bool Update::doUpdate() {
     }
 
     QStringList openLines = getOpenLines();
+    if (openLines.size() == 0) {
+        qCritical() << "No lines to handle in" << m_update_ctrl_file.fileName();
+        return false;
+    }
+
+    qDebug() << "open lines...";
+    for (int i=0; i< openLines.size(); ++i) {
+        qDebug() << "line" << i << ":" << openLines.at(i).trimmed();
+    }
 
     QList<QString>::const_iterator it;
     for (it = openLines.cbegin(); it != openLines.cend(); ++it) {
@@ -474,6 +571,7 @@ bool Update::doUpdate() {
             return false;
         }
         if (name.contains("dc2c") && name.endsWith(".bin")) {
+            qInfo() << "downloading" << name.trimmed() << "to DC";
             if ((res = updateBinary(name.toStdString().c_str())) == true) {
                 qInfo() << "downloaded binary" << name;
             }
@@ -481,22 +579,28 @@ bool Update::doUpdate() {
         if (name.contains("DC2C_print") && name.endsWith(".json")) {
             int i = name.indexOf("DC2C_print");
             int templateIdx = name.mid(i).midRef(10, 2).toInt();
-            if ((res = updatePrinterConf(templateIdx, name.toStdString().c_str())) == true) {
+            if ((templateIdx < 1) || (templateIdx > 32)) {
-                qInfo() << "downloaded printer template" << name;
+                qCritical() << "wrong template index";
+                res = false;
+            } else {
+                if ((res = updatePrinterConf(templateIdx, name)) == true) {
+                    qInfo() << "downloaded printer template" << name;
+                }
             }
         } else
         if (name.contains("opkg")) {
-            int i = name.indexOf("opkg ");
+            qInfo() << "starting" << name.trimmed();
-            QString rest = name.mid(i+5).trimmed();
             QScopedPointer<QProcess> p(new QProcess(this));
             p->setProcessChannelMode(QProcess::MergedChannels);
-            p->start("opkg", QStringList() << rest);
+            p->start(name.trimmed());
             if (p->waitForStarted(1000)) {
                 if (p->state() == QProcess::ProcessState::Running) {
-                    if (p->waitForFinished(10000)) {
+                    if (p->waitForFinished(100000)) {
                         QString output = p->readAllStandardOutput();
                         QStringList outputLst = split(output, QChar('\n'));
-                        qDebug() << outputLst;
+                        for (int line=0; line < outputLst.size(); ++line) {
+                            qDebug() << outputLst[line];
+                        }
                         res = true;
                         qInfo() << "EXECUTED" << name;
                     }

update.h

@@ -33,7 +33,7 @@ class Update : public QObject {
     bool m_init;
 
     bool updateBinary(char const *fileToSendToDC);
-    bool updatePrinterConf(int nrOfTemplate, char const *fileToSendToDC);
+    bool updatePrinterConf(int templateIdx, QString fileToSendToDC);
     bool finishUpdate(bool finish);
     QStringList getOpenLines();
     QStringList split(QString line, QChar sep = ',');
@@ -42,6 +42,7 @@ class Update : public QObject {
 
 public:
     enum class DownloadResult {OK, ERROR, TIMEOUT, NOP};
+    enum class FileTypeJson {CONFIG=1, DEVICE, CASH, SERIAL, TIME, PRINTER};
 
     static hwinf *loadDCPlugin(QDir const &plugInDir, QString const &fn);
 
@@ -68,5 +69,8 @@ private:
     bool resetDeviceController() const;
     QByteArray loadBinaryDCFile(QString filename) const;
     bool downloadBinaryToDC(QString const &bFile) const;
+    bool updateDC(QString bFile, QString br, QString serial) const;
+    bool updatePrinterTemplate(enum FileTypeJson type, int templateIdx,
+                               QString fname, QString br, QString serial) const;
 };
 #endif // UPDATE_H_INCLUDED