From 91db59b9f3d80ce7a906e1bb7cf44e3301193862 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Thu, 12 Oct 2023 12:09:19 +0200 Subject: [PATCH] Integrate version of ATBUpdateTool in send-last-version. --- worker.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/worker.cpp b/worker.cpp index 92c50a3..0db5419 100644 --- a/worker.cpp +++ b/worker.cpp @@ -58,6 +58,7 @@ Worker::Worker(int customerNr, , m_gc(m_customerNrStr, m_customerRepository, m_workingDirectory, m_branchName, this) , m_osVersion(getOsVersion()) , m_atbqtVersion(getATBQTVersion()) + , m_atbUpdateToolVersion(getATBUpdateToolVersion()) , m_cpuSerial(getCPUSerial()) , m_pluginVersionATBDeciceController(getPluginVersion("/opt/app/ATBAPP/plugins/libATBDeviceControllerPlugin.so")) , m_pluginVersionIngenicoISelf(getPluginVersion("/opt/app/ATBAPP/plugins/libIngenicoISelf_CCPlugin.so")) @@ -71,6 +72,7 @@ Worker::Worker(int customerNr, , m_filesToUpdate() , m_updateProcessRunning(true) , m_returnCode(0) + , m_mainWindow(nullptr) /* contains plugin */ , m_progressValue(0) //, m_withoutIsmasDirectPort(true) /* useful for testing */ { , m_withoutIsmasDirectPort(false) /* useful for testing */ { @@ -97,6 +99,7 @@ Worker::Worker(int customerNr, qInfo() << "PLUGIN_NAME ................" << m_pluginName; qInfo() << "WORKING_DIRECTORY .........." << m_workingDirectory; qInfo() << "APISM VERSION .............." << m_apismVersion; + qInfo() << "ATB UPDATE TOOL VERSION ...." << m_atbUpdateToolVersion; this->moveToThread(&m_workerThread); m_workerThread.start(); @@ -987,6 +990,10 @@ QString Worker::getATBQTVersion() const { return "N/A"; } +QString Worker::getATBUpdateToolVersion() const { + return APP_EXTENDED_VERSION; +} + QString Worker::getCPUSerial() const { QString const cmd = QString("echo -n $(cat /proc/cpuinfo | grep -i Serial | cut -d':' -f2)"); Command c("bash");