Merge branch 'pu/ATBUpdateDC_CommandLineParameter'

-> remove wrong default values.
 -> remove dependency for certain host-names

ATBUpdateTool.ini

@@ -9,7 +9,7 @@ psa-tariff-directory="etc/psa_tariff/"
 
 
 [PLUGINS]
-plugin-name="libCAmaster.so"
+plugin-name="libCAslave.so"
 
 [FLAGS]
 no-psa-hardware-update=false

ATBUpdateTool.pro

@@ -1,4 +1,3 @@
 TEMPLATE = subdirs
 CONFIG += ordered
-#SUBDIRS = DownloadDCFirmware DownloadDCJsonFiles UpdatePTUDevCtrl
+SUBDIRS = DownloadDCFirmware DownloadDCJsonFiles UpdatePTUDevCtrl
-SUBDIRS = UpdatePTUDevCtrl

DownloadDCFirmware/DownloadDCFirmware.pro

@@ -2,9 +2,6 @@ QT += core serialport
 
 TARGET = ATBUpdateDC
 
-include(../common.pri)
-
-
 VERSION="0.1.0"
 win32 {
     BUILD_DATE=$$system("date /t")
@@ -101,9 +98,6 @@ OTHER_FILES += \
     ../ATBUpdateTool.ini
 
 
-FORMS += \
-    mainwindow.ui
-
 ##########################################################################################
 # for running program on target through QtCreator
 contains( CONFIG, PTU5 ) {

DownloadDCFirmware/main.cpp

@@ -4,7 +4,6 @@
 #include <QByteArray>
 
 #include <QProcess>
-#include <QCommandLineParser>
 #include <QStandardPaths>
 #include <QSettings>
 #include <QDir>
@@ -65,8 +64,6 @@ int main(int argc, char **argv) {
         setDebugLevel(LOG_NOTICE);
     }
 
-    //return 0;
-
     /*
     CommandLineParser parser;
     parser.process(a);
@@ -129,21 +126,13 @@ int main(int argc, char **argv) {
         printf(APP_EXTENDED_VERSION"\n");
         return 0;
     }
-
-    QString const &customerRepo
-        = QDir::cleanPath(workingDir + QDir::separator() + QString("customer_%1").arg(customerNr));
     */
 
-    QString const &psaDcDir = internal::customerRepoDcDir();
-    QString const &psaRepoRootDir = internal::customerRepoRoot();
-    QString const &psaRepoDir = internal::customerRepoDir();
-    QString const &branchName = internal::branchName();
-
     bool debug = false;
     bool noaction = true;
-    QString workingDir;
     QString libDir;
     QString libca;
+    QString workingDir;
 
     std::unique_ptr<QSettings> settings = internal::readSettings();
 
@@ -162,37 +151,37 @@ int main(int argc, char **argv) {
         settings->endGroup();
     }
 
-    // etc/dc: located under mount-path
-    std::optional<QString> mountPath = System::checkForUSBStick(psaDcDir);
     QFileInfo fi;
-    if (mountPath.has_value()) {
-        fi.setFile(mountPath.value(), System::getDCFileOnUsbStick(mountPath.value()));
-    } else
-    if ((mountPath = System::checkForSDCard(psaDcDir)).has_value()) {
-        fi.setFile(mountPath.value(), System::getDCFileOnSDCard(mountPath.value()));
-    } else {
 
-        if (debug) {
+    // ------------------- single command line argument is DC-firmware binary file -----------------
-            qInfo() << "using customer repository" << psaRepoDir;
+    QStringList args = a.arguments();
+    if (args.size() != 2)    {
+        qCritical() << "ERROR: missing parameter <dc-firmware>";
+        exit(1);
     }
 
-        std::unique_ptr<QString> c = internal::dcCandidateToInstall("/etc/dc/");
+    qCritical() << "------------------------------------------------------";
-        if (c) {
+    qCritical() << "main: argument dc-firmware: " << args.at(1);
-            fi.setFile(*c);
+    qCritical() << "------------------------------------------------------";
-            if (fi.exists() == false) {
+
-                qCritical() << "dc2c.bin candidate" << *c << "does not exist. STOP.";
+    fi.setFile(args.at(1));
-                return -1;
+
-            }
+    if (!fi.isFile()) {
-            qInfo() << "dc2c.bin canditate" << fi.absoluteFilePath();
+        qCritical() << "ERROR: parameter " << fi.absoluteFilePath() << " is not a file";
-        }
+        exit(1);
     }
 
-    if (debug) {
+    if (!fi.isReadable()) {
-        qInfo() << "downloading dc-firmware" << fi.absoluteFilePath();
+        qCritical() << "ERROR: parameter " << fi.absoluteFilePath() << " is not readable";
-        qInfo() << "dc-firmware size (bytes)" << fi.size();
+        exit(1);
-        qInfo() << "dc-version" << Update::dcVersion(fi.absoluteFilePath());
     }
 
+    qCritical() << "------------------------------------------------------";
+    qCritical() << "uploading dc-firmware" << fi.absoluteFilePath();
+    qCritical() << "dc-firmware size (bytes)" << fi.size();
+    qCritical() << "dc-version" << Update::dcVersion(fi.absoluteFilePath());
+    qCritical() << "------------------------------------------------------";
+
     Update u(fi.absoluteFilePath(), libca, debug, noaction);
     u.run();
 

DownloadDCFirmware/update.cpp

@@ -397,9 +397,7 @@ int Update::run() {
         qInfo() << "<DC-VERSION>" << Update::dcVersion(m_dcFileName);
     }
 
-    if (!m_debug) {
     m_hw->dc_autoRequest(false);
-    }
 
     qInfo() << "DC auto request OFF";
 

DownloadDCJsonFiles/DownloadDCJsonFiles.pro

@@ -1,8 +1,6 @@
 QT += core
 QT += serialport network
 
-include(../common.pri)
-
 TARGET = ATBDownloadDCJsonFiles
 
 VERSION="0.1.0"

UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro

@@ -1,8 +1,6 @@
 QT += core gui
 QT += widgets serialport network
 
-include(../common.pri)
-
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 TARGET = ATBUpdateTool
@@ -152,10 +150,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
 # 1.5.7   : Add support for dynamic portrait / landscape.
 # 1.5.8   : Use EVENT_ID=<pid of update-tool> for CMD_EVENT.
 # 1.5.9   : Removed restart of Apism if ISMAS unreachable.
-# 1.5.99  : Special version for 281/Szeged: remove all DC-library dependencies, as
+VERSION="1.5.9"
-#           DC-firmware in Szeged does not support uploading json-files or uploading
-#           DC-firmware binaries.
-VERSION="1.5.99"
 # 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
@@ -261,6 +256,9 @@ contains( CONFIG, PTU5_YOCTO ) {
     PTU5BASEPATH = /opt/devel/ptu5
     ARCH = PTU5
     DEFINES+=PTU5
+
+    LIBS += -lCAslave
+    LIBS += -lCAmaster
 }
 contains( CONFIG, DesktopLinux ) {
     greaterThan(QT_MAJOR_VERSION, 4): QT += serialport

UpdatePTUDevCtrl/git/git_client.cpp

@@ -405,7 +405,7 @@ std::optional<QString> GitClient::gitPull() {
         export GIT_SSH_COMMAND="ssh -i /opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig -o StrictHostKeyChecking=no"
 
         ... or use separate known_hosts file:
-        export GIT_SSH_COMMAND="ssh -i /mypath/.keys/id_ed25519 -o StrictHostKeyChecking=yes -o UserKnownHostsFile=/opt/app/tools/atbupdate/.keys/known_hosts
+        export GIT_SSH_COMMAND="ssh -i /mypath/.keys/id_ed25519 -o StrictHostKeyChecking=yes -o UserKnownHostsFile=/opt/app/tools/atbupdate/.keys/known_hosts"
         git pull
 
         leads to the following warning/error message:

UpdatePTUDevCtrl/update.cpp

@@ -40,7 +40,6 @@ QPluginLoader Update::pluginLoader;
 
 hwinf *Update::loadDCPlugin(QDir const &plugInDir, QString const &fname) {
     hwinf *hw = nullptr;
-#if 0
     if (plugInDir.exists()) {
         QString pluginLibName(fname);
         pluginLibName = plugInDir.absoluteFilePath(pluginLibName);
@@ -75,7 +74,6 @@ hwinf *Update::loadDCPlugin(QDir const &plugInDir, QString const &fname) {
         qCritical() << "plugins directory" << plugInDir.absolutePath()
                     << "does not exist";
     }
-#endif
     return hw;
 }
 
@@ -119,7 +117,6 @@ Update::Update(Worker *worker,
     , m_dryRun(dryRun)
     , m_sys_areDCdataValid(false) {
 
-#if 0
     if (!m_hw) {
         qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_hw == nullptr -> ca-slave plugin not loaded";
     } else {
@@ -137,7 +134,6 @@ Update::Update(Worker *worker,
         qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_sys_areDCDataValid ..."
                     << m_sys_areDCdataValid;
     }
-#endif
 }
 
 Update::~Update() {
@@ -610,8 +606,6 @@ QString Update::getFileVersion(QString const& jsonFileName) {
 }
 
 bool Update::checkDownloadedJsonVersions(QStringList const& jsonFileNames) {
-// note: 2026-02-09: this method is not used!
-#if 0
 
     for (QStringList::size_type i=0; i < jsonFileNames.size(); ++i) {
 
@@ -685,14 +679,14 @@ bool Update::checkDownloadedJsonVersions(QStringList const& jsonFileNames) {
             qCritical() << "CANNOT FIND JSON-NR FOR" << fName;
         }
     }
-#endif
+
     return false;
 }
 
 QMap<QString, QString>
 Update::getInstalledJsonVersions(QStringList const& jsonFileNames) {
     QMap<QString, QString> map;
-#if 0
+
     if (!m_hw) {
         qCritical() << "(" << __func__ << ":" << __LINE__ << "):"
                     << "ERROR!!! m_hw == nullptr";
@@ -792,7 +786,6 @@ Update::getInstalledJsonVersions(QStringList const& jsonFileNames) {
         }
     }
 
-#endif
     return map;
 }
 

UpdatePTUDevCtrl/utils.cpp

@@ -178,6 +178,9 @@ QString Utils::zoneName(quint8 i) {
     //if (i < (sizeof(zName)/sizeof(char const *))) {
     //    return zName[i];
     //}
+
+    Q_UNUSED(i)
+
     return "---";
 }
 

UpdatePTUDevCtrl/worker.cpp

@@ -290,7 +290,7 @@ void Worker::privateUpdate() {
         return;
     }
 
-    //return;
+    return;
 
     QString func(__PRETTY_FUNCTION__);
 
@@ -541,10 +541,9 @@ void Worker::privateUpdate() {
     //                  UPDATE THE PSA USING THE CHANGED FILES
     //
     ////////////////////////////////////////////////////////////////////////////
-    // for 281/Szeged: skip uploading files to DeviceController
+    if ((continueUpdate = downloadFilesToPSAHardware()) == false) {
-    //if ((continueUpdate = downloadFilesToPSAHardware()) == false) {
+        return;
-    //    return;
+    }
-    //}
     lst = QStringList(QString("DONE"));
     ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS));
 

common.pri

@@ -1 +0,0 @@
-INCLUDEPATH += $$PWD/common/include