Build: remove lib dependency

ATBUpdateTool.ini

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

DownloadDCFirmware/DownloadDCFirmware.pro

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

DownloadDCJsonFiles/DownloadDCJsonFiles.pro

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

UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro

@@ -1,6 +1,8 @@
 QT += core gui
 QT += widgets serialport network
 
+include(../common.pri)
+
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 TARGET = ATBUpdateTool
@@ -149,7 +151,8 @@ DEFINES += QT_DEPRECATED_WARNINGS
 # 1.5.6   : Show additional update progress info in status bar.
 # 1.5.7   : Add support for dynamic portrait / landscape.
 # 1.5.8   : Use EVENT_ID=<pid of update-tool> for CMD_EVENT.
-VERSION="1.5.8"
+# 1.5.9   : Removed restart of Apism if ISMAS unreachable.
+VERSION="1.5.9"
 # 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
@@ -256,8 +259,8 @@ contains( CONFIG, PTU5_YOCTO ) {
     ARCH = PTU5
     DEFINES+=PTU5
 
-    LIBS += -lCAslave
-    LIBS += -lCAmaster
+    #LIBS += -lCAslave
+    #LIBS += -lCAmaster
 }
 contains( CONFIG, DesktopLinux ) {
     greaterThan(QT_MAJOR_VERSION, 4): QT += serialport

UpdatePTUDevCtrl/worker.cpp

@@ -584,16 +584,6 @@ bool Worker::updateTriggerSet() {
             CONSOLE(lst) << UPDATE_STEP::DEBUG;
         }
 
-        if ((repeat % 8) == 0) {
-            CONSOLE(QStringList(func) << "RESTART APISM") << UPDATE_STEP::DEBUG;
-            Command c("systemctl restart apism");
-            if (c.execute("/tmp")) {
-                QThread::sleep(20); // give APISM some time to reconnect
-                QStringList lst = (m_ismasTriggerStatusMessage = (QStringList(func) << "RESTART APISM DONE"));
-                CONSOLE(lst) << UPDATE_STEP::DEBUG;
-            }
-        }
-
         if (std::optional<QString> result
                 = IsmasClient::sendRequestReceiveResponse(
                     IsmasClient::APISM::DIRECT_PORT, "#M=APISM#C=REQ_ISMASPARAMETER#J={}")) {

common.pri

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