Add path to global device-controller library

reason is that this might be not the case if the customer-number has been changed.

.gitignore

@@ -0,0 +1,3 @@
+tags
+*.tags
+*.user

ATBUpdateTool.ini

@@ -14,5 +14,5 @@ dry-run=false
 extended-version=false
 yocto-version=false
 yocto-install=false
-always-download-config=false
+always-download-config=true
 always-download-dc=false

ATBUpdateTool.pro

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

DownloadDCFirmware/DownloadDCFirmware.pro

@@ -0,0 +1,83 @@
+QT += core
+QT += serialport network
+
+TARGET = ATBDownloadDCFirmware
+
+VERSION="0.1.0"
+win32 {
+    BUILD_DATE=$$system("date /t")
+    BUILD_TIME=$$system("time /t")
+} else {
+    BUILD_DATE=$$system("date +%d-%m-%y")
+    BUILD_TIME=$$system("date +%H:%M:%S")
+}
+
+GIT_COMMIT=$$system("git log -1 --format=oneline | cut -d' ' -f1")
+
+EXTENDED_VERSION="$${VERSION}-$${GIT_COMMIT}"
+
+CONFIG += c++17
+
+DEFINES+=APP_VERSION=\\\"$$VERSION\\\"
+DEFINES+=APP_BUILD_DATE=\\\"$$BUILD_DATE\\\"
+DEFINES+=APP_BUILD_TIME=\\\"$$BUILD_TIME\\\"
+DEFINES+=APP_EXTENDED_VERSION=\\\"$$EXTENDED_VERSION\\\"
+
+# keep comments, as /* fall through */
+QMAKE_CXXFLAGS += -C
+QMAKE_CXXFLAGS += -g
+QMAKE_CXXFLAGS += -Wno-deprecated-copy -O
+
+contains( CONFIG, PTU5 ) {
+    greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
+    CONFIG += link_pkgconfig
+    lessThan(QT_MAJOR_VERSION, 5):   PKGCONFIG += qextserialport
+    QMAKE_CXXFLAGS += -O2 -std=c++17   # for GCC >= 4.7
+    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
+    PTU5BASEPATH = /opt/devel/ptu5
+
+    INCLUDEPATH += $$PTU5BASEPATH/qt/libs/devicecontroller/include
+    LIBS += -L$$PTU5BASEPATH/qt/libs/devicecontroller/library
+
+    ARCH = PTU5
+    DEFINES+=PTU5
+}
+contains( CONFIG, PTU5_YOCTO ) {
+    greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
+    QMAKE_CXXFLAGS += -std=c++17   # for GCC >= 4.7
+    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
+    PTU5BASEPATH = /opt/devel/ptu5
+    ARCH = PTU5
+    DEFINES+=PTU5
+
+    # add qmqtt lib
+    #LIBS += -lQt5Qmqtt
+}
+contains( CONFIG, DesktopLinux ) {
+    greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
+    lessThan(QT_MAJOR_VERSION, 5):    CONFIG += extserialport
+    # QMAKE_CC = ccache $$QMAKE_CC
+    # QMAKE_CXX = ccache $$QMAKE_CXX
+    QMAKE_CXXFLAGS += -std=c++17
+    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
+    linux-clang {  QMAKE_CXXFLAGS += -Qunused-arguments   }
+    ARCH = DesktopLinux
+    DEFINES+=DesktopLinux
+}
+
+SOURCES += \
+        main.cpp
+
+# HEADERS +=
+
+OTHER_FILES += \
+    ATBDownloadDCFirmware.ini
+
+
+##########################################################################################
+# for running program on target through QtCreator
+contains( CONFIG, PTU5 ) {
+   qnx: target.path = /tmp/$${TARGET}/bin
+   else: unix:!android: target.path = /opt/app/tools/atbupdate/
+   !isEmpty(target.path): INSTALLS += target
+}

DownloadDCFirmware/main.cpp

@@ -0,0 +1,8 @@
+#include <QtGlobal>
+
+int main(int argc, char **argv) {
+    Q_UNUSED(argc);
+    Q_UNUSED(argv);
+
+    return 0;
+}

DownloadDCJsonFiles/DownloadDCJsonFiles.pro

@@ -0,0 +1,93 @@
+QT += core
+QT += serialport network
+
+TARGET = ATBDownloadDCJsonFiles
+
+VERSION="0.1.0"
+win32 {
+    BUILD_DATE=$$system("date /t")
+    BUILD_TIME=$$system("time /t")
+} else {
+    BUILD_DATE=$$system("date +%d-%m-%y")
+    BUILD_TIME=$$system("date +%H:%M:%S")
+}
+
+GIT_COMMIT=$$system("git log -1 --format=oneline | cut -d' ' -f1")
+
+EXTENDED_VERSION="$${VERSION}-$${GIT_COMMIT}"
+
+!contains(CONFIG, INCLUDEINTERFACES) {
+    INCLUDEINTERFACES=/opt/ptu5/opt/DCLibraries/include
+}
+INCLUDEPATH += plugins $${INCLUDEINTERFACES}
+
+CONFIG += c++17
+
+DEFINES+=APP_VERSION=\\\"$$VERSION\\\"
+DEFINES+=APP_BUILD_DATE=\\\"$$BUILD_DATE\\\"
+DEFINES+=APP_BUILD_TIME=\\\"$$BUILD_TIME\\\"
+DEFINES+=APP_EXTENDED_VERSION=\\\"$$EXTENDED_VERSION\\\"
+
+# keep comments, as /* fall through */
+QMAKE_CXXFLAGS += -C
+QMAKE_CXXFLAGS += -g
+QMAKE_CXXFLAGS += -Wno-deprecated-copy -O
+
+contains( CONFIG, PTU5 ) {
+    greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
+    CONFIG += link_pkgconfig
+    lessThan(QT_MAJOR_VERSION, 5):   PKGCONFIG += qextserialport
+    QMAKE_CXXFLAGS += -O2 -std=c++17   # for GCC >= 4.7
+    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
+
+    PTU5BASEPATH = /opt/devel/ptu5
+
+    INCLUDEPATH += $$PTU5BASEPATH/qt/libs/devicecontroller/include
+    LIBS += -L$$PTU5BASEPATH/qt/libs/devicecontroller/library
+
+    ARCH = PTU5
+    DEFINES+=PTU5
+}
+contains( CONFIG, PTU5_YOCTO ) {
+    greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
+    QMAKE_CXXFLAGS += -std=c++17   # for GCC >= 4.7
+    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
+    PTU5BASEPATH = /opt/devel/ptu5
+    ARCH = PTU5
+    DEFINES+=PTU5
+
+    # add qmqtt lib
+    #LIBS += -lQt5Qmqtt
+}
+contains( CONFIG, DesktopLinux ) {
+    greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
+    lessThan(QT_MAJOR_VERSION, 5):    CONFIG += extserialport
+    # QMAKE_CC = ccache $$QMAKE_CC
+    # QMAKE_CXX = ccache $$QMAKE_CXX
+    QMAKE_CXXFLAGS += -std=c++17
+    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
+    linux-clang {  QMAKE_CXXFLAGS += -Qunused-arguments   }
+    ARCH = DesktopLinux
+    DEFINES+=DesktopLinux
+}
+
+SOURCES += \
+        main.cpp \
+        message_handler.cpp \
+        process/command.cpp
+
+HEADERS += \
+        message_handler.h \
+        process/command.h
+
+OTHER_FILES += \
+    ATBDownloadDCJsonFiles.ini
+
+
+##########################################################################################
+# for running program on target through QtCreator
+contains( CONFIG, PTU5 ) {
+   qnx: target.path = /tmp/$${TARGET}/bin
+   else: unix:!android: target.path = /opt/app/tools/atbupdate/
+   !isEmpty(target.path): INSTALLS += target
+}

DownloadDCJsonFiles/DownloadDCJsonFiles.pro.user

@@ -0,0 +1,445 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorProject>
+<!-- Written by QtCreator 5.0.2, 2024-02-28T16:01:22. -->
+<qtcreator>
+ <data>
+  <variable>EnvironmentId</variable>
+  <value type="QByteArray">{6a494cc5-6dea-4681-86fc-d47b9761a1f4}</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.ActiveTarget</variable>
+  <value type="int">0</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.EditorSettings</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
+   <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
+   <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
+    <value type="QString" key="language">Cpp</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
+    </valuemap>
+   </valuemap>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
+    <value type="QString" key="language">QmlJS</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
+    </valuemap>
+   </valuemap>
+   <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
+   <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
+   <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
+   <value type="int" key="EditorConfiguration.IndentSize">4</value>
+   <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
+   <value type="int" key="EditorConfiguration.MarginColumn">80</value>
+   <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
+   <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
+   <value type="int" key="EditorConfiguration.PaddingMode">1</value>
+   <value type="bool" key="EditorConfiguration.PreferSingleLineComments">false</value>
+   <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
+   <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
+   <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
+   <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
+   <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
+   <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
+   <value type="int" key="EditorConfiguration.TabSize">8</value>
+   <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
+   <value type="bool" key="EditorConfiguration.UseIndenter">false</value>
+   <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
+   <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
+   <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
+   <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
+   <value type="QString" key="EditorConfiguration.ignoreFileTypes">*.md, *.MD, Makefile</value>
+   <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
+   <value type="bool" key="EditorConfiguration.skipTrailingWhitespace">true</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.PluginSettings</variable>
+  <valuemap type="QVariantMap">
+   <valuemap type="QVariantMap" key="AutoTest.ActiveFrameworks">
+    <value type="bool" key="AutoTest.Framework.Boost">true</value>
+    <value type="bool" key="AutoTest.Framework.CTest">false</value>
+    <value type="bool" key="AutoTest.Framework.Catch">true</value>
+    <value type="bool" key="AutoTest.Framework.GTest">true</value>
+    <value type="bool" key="AutoTest.Framework.QtQuickTest">true</value>
+    <value type="bool" key="AutoTest.Framework.QtTest">true</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="AutoTest.CheckStates"/>
+   <value type="int" key="AutoTest.RunAfterBuild">0</value>
+   <value type="bool" key="AutoTest.UseGlobal">true</value>
+   <valuemap type="QVariantMap" key="ClangTools">
+    <value type="bool" key="ClangTools.AnalyzeOpenFiles">true</value>
+    <value type="bool" key="ClangTools.BuildBeforeAnalysis">true</value>
+    <value type="QString" key="ClangTools.DiagnosticConfig">Builtin.DefaultTidyAndClazy</value>
+    <value type="int" key="ClangTools.ParallelJobs">3</value>
+    <valuelist type="QVariantList" key="ClangTools.SelectedDirs"/>
+    <valuelist type="QVariantList" key="ClangTools.SelectedFiles"/>
+    <valuelist type="QVariantList" key="ClangTools.SuppressedDiagnostics"/>
+    <value type="bool" key="ClangTools.UseGlobalSettings">true</value>
+   </valuemap>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Target.0</variable>
+  <valuemap type="QVariantMap">
+   <value type="QString" key="DeviceType">GenericLinuxOsType</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Yocto i.MX6-ATB-PTU5</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Yocto i.MX6-ATB-PTU5</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{804f60e1-6e88-41af-b072-9f5c6a606099}</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
+    <value type="int" key="EnableQmlDebugging">0</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/opt/ptu5/opt/build-DownloadDCJsonFiles-Yocto_i_MX6_ATB_PTU5-Debug</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/opt/ptu5/opt/build-DownloadDCJsonFiles-Yocto_i_MX6_ATB_PTU5-Debug</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments">CONFIG+=PTU5</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand">/usr/bin/make</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand">/usr/bin/make</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/opt/ptu5/opt/build-DownloadDCJsonFiles-Yocto_i_MX6_ATB_PTU5-Release</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/opt/ptu5/opt/build-DownloadDCJsonFiles-Yocto_i_MX6_ATB_PTU5-Release</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+    <value type="int" key="QtQuickCompiler">0</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
+    <value type="int" key="EnableQmlDebugging">0</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/opt/ptu5/opt/build-DownloadDCJsonFiles-Yocto_i_MX6_ATB_PTU5-Profile</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/opt/ptu5/opt/build-DownloadDCJsonFiles-Yocto_i_MX6_ATB_PTU5-Profile</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Profile</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+    <value type="int" key="QtQuickCompiler">0</value>
+    <value type="int" key="SeparateDebugInfo">0</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">RemoteLinux.CheckForFreeDiskSpaceStep</value>
+      <valuelist type="QVariantList" key="ProjectExplorer.RunConfiguration.LastDeployedFiles"/>
+      <valuelist type="QVariantList" key="ProjectExplorer.RunConfiguration.LastDeployedHosts"/>
+      <valuelist type="QVariantList" key="ProjectExplorer.RunConfiguration.LastDeployedRemotePaths"/>
+      <valuelist type="QVariantList" key="ProjectExplorer.RunConfiguration.LastDeployedSysroots"/>
+      <value type="QString" key="RemoteLinux.CheckForFreeDiskSpaceStep.PathToCheck">/</value>
+      <value type="qlonglong" key="RemoteLinux.CheckForFreeDiskSpaceStep.RequiredSpace">5242880</value>
+      <valuelist type="QVariantList" key="RemoteLinux.LastDeployedLocalTimes"/>
+      <valuelist type="QVariantList" key="RemoteLinux.LastDeployedRemoteTimes"/>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">RemoteLinux.KillAppStep</value>
+      <valuelist type="QVariantList" key="ProjectExplorer.RunConfiguration.LastDeployedFiles"/>
+      <valuelist type="QVariantList" key="ProjectExplorer.RunConfiguration.LastDeployedHosts"/>
+      <valuelist type="QVariantList" key="ProjectExplorer.RunConfiguration.LastDeployedRemotePaths"/>
+      <valuelist type="QVariantList" key="ProjectExplorer.RunConfiguration.LastDeployedSysroots"/>
+      <valuelist type="QVariantList" key="RemoteLinux.LastDeployedLocalTimes"/>
+      <valuelist type="QVariantList" key="RemoteLinux.LastDeployedRemoteTimes"/>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.DeployConfiguration.CustomData"/>
+    <value type="bool" key="ProjectExplorer.DeployConfiguration.CustomDataEnabled">false</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">DeployToGenericLinux</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
+    <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
+    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
+    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+    <valuelist type="QVariantList" key="CustomOutputParsers"/>
+    <value type="int" key="PE.EnvironmentAspect.Base">1</value>
+    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">DownloadDCJsonFiles</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">RemoteLinuxRunConfiguration:/opt/ptu5/opt/DownloadDCJsonFiles/DownloadDCJsonFiles.pro</value>
+    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">/opt/ptu5/opt/DownloadDCJsonFiles/DownloadDCJsonFiles.pro</value>
+    <value type="int" key="RemoteLinux.EnvironmentAspect.Version">1</value>
+    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+    <value type="QString" key="RunConfiguration.X11Forwarding">:0</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Target.1</variable>
+  <valuemap type="QVariantMap">
+   <value type="QString" key="DeviceType">Desktop</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.12.12 GCC 64bit</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.12.12 GCC 64bit</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.51212.gcc_64_kit</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
+    <value type="int" key="EnableQmlDebugging">0</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/opt/ptu5/opt/build-DownloadDCJsonFiles-Desktop_Qt_5_12_12_GCC_64bit-Debug</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/opt/ptu5/opt/build-DownloadDCJsonFiles-Desktop_Qt_5_12_12_GCC_64bit-Debug</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/opt/ptu5/opt/build-DownloadDCJsonFiles-Desktop_Qt_5_12_12_GCC_64bit-Release</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/opt/ptu5/opt/build-DownloadDCJsonFiles-Desktop_Qt_5_12_12_GCC_64bit-Release</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+    <value type="int" key="QtQuickCompiler">0</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
+    <value type="int" key="EnableQmlDebugging">0</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/opt/ptu5/opt/build-DownloadDCJsonFiles-Desktop_Qt_5_12_12_GCC_64bit-Profile</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/opt/ptu5/opt/build-DownloadDCJsonFiles-Desktop_Qt_5_12_12_GCC_64bit-Profile</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Profile</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+    <value type="int" key="QtQuickCompiler">0</value>
+    <value type="int" key="SeparateDebugInfo">0</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.DeployConfiguration.CustomData"/>
+    <value type="bool" key="ProjectExplorer.DeployConfiguration.CustomDataEnabled">false</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
+    <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
+    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
+    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+    <valuelist type="QVariantList" key="CustomOutputParsers"/>
+    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
+    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
+    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey"></value>
+    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.TargetCount</variable>
+  <value type="int">2</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
+  <value type="int">22</value>
+ </data>
+ <data>
+  <variable>Version</variable>
+  <value type="int">22</value>
+ </data>
+</qtcreator>

DownloadDCJsonFiles/main.cpp

@@ -0,0 +1,56 @@
+
+#include <QtGlobal>
+#include <QCoreApplication>
+#include <QByteArray>
+
+#include "message_handler.h"
+#include <DeviceController/interfaces.h>
+
+
+//#include <unistd.h>
+//#include <errno.h>
+
+#ifdef PTU5
+#define SERIAL_PORT "ttymxc2"
+#else
+#define SERIAL_PORT "ttyUSB0"
+#endif
+
+int main(int argc, char **argv) {
+    QByteArray const value = qgetenv("LC_ALL");
+    if (value != "C") {
+        qputenv("LC_ALL", "C");
+    }
+    // qputenv("XDG_RUNTIME_DIR", "/var/run/user/0");
+
+    openlog("ATB-DL-JSON", LOG_PERROR | LOG_PID | LOG_CONS, LOG_USER);
+
+    QCoreApplication a(argc, argv);
+    QCoreApplication::setApplicationName("ATBDownloadDCJsonFiles");
+    QCoreApplication::setApplicationVersion(APP_VERSION);
+
+    if (!messageHandlerInstalled()) { // change internal qt-QDebug-handling
+        atbInstallMessageHandler(atbDebugOutput);
+        setDebugLevel(LOG_NOTICE);
+    }
+
+    // int r = std::system("ls -l /proc/[0-9]*/fd/* 2>/dev/null | grep /dev/ttymxc2 > /tmp/slave-or-master.txt");
+    // lrwx------    1 root     root            64 Oct 31 14:55 /proc/884/fd/18 -> /dev/ttymxc2
+
+    //std::ifstream ifs("/tmp/slave-or-master.txt");
+
+    //if (ifs.is_open()) {
+    //    std::string line;
+    //    if (std::getline(ifs, line)) {
+    //        if (line.size() > 0) {
+    //            std::cout << "SLAVE " << line << std::endl;
+    //        }
+    //    } else {
+    //    }
+
+    //    ifs.close();
+
+    //}
+
+    return a.exec();
+}

DownloadDCJsonFiles/message_handler.cpp

@@ -0,0 +1,97 @@
+#include "message_handler.h"
+
+#include <QDateTime>
+#include <cstring>
+#include <QString>
+#include <QFileInfo>
+#include <QMessageLogContext>
+
+
+static char const *DBG_NAME[] = { "DBG  ", "WARN ", "CRIT ", "FATAL", "INFO " };
+static bool installedMsgHandler = false;
+static int debugLevel = LOG_NOTICE;
+
+int getDebugLevel() { return debugLevel; }
+void setDebugLevel(int newDebugLevel) {
+    debugLevel = newDebugLevel;
+}
+
+bool messageHandlerInstalled() {
+    return installedMsgHandler;
+}
+
+QtMessageHandler atbInstallMessageHandler(QtMessageHandler handler) {
+    installedMsgHandler = (handler != 0);
+    static QtMessageHandler prevHandler = nullptr;
+    if (handler) {
+        prevHandler = qInstallMessageHandler(handler);
+        return prevHandler;
+    } else {
+        return qInstallMessageHandler(prevHandler);
+    }
+}
+
+///
+/// \brief Print message according to given debug level.
+///
+/// \note Install this function using qInstallMsgHandler().
+///
+///  int main(int argc, char **argv) {
+///     installMsgHandler(atbDebugOutput);
+///     QApplication app(argc, argv);
+///     ...
+///     return app.exec();
+///  }
+///
+#if (QT_VERSION > QT_VERSION_CHECK(5, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+void atbDebugOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg) {
+    Q_UNUSED(context);
+    QString const localMsg = QString(DBG_NAME[type]) + msg.toLocal8Bit();
+
+    switch (debugLevel) {
+        case LOG_DEBUG: { // debug-level message
+            syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
+        } break;
+        case LOG_INFO: { // informational message
+            if (type != QtDebugMsg) {
+                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
+            }
+        } break;
+        case LOG_NOTICE: { // normal, but significant, condition
+            if (type != QtDebugMsg) {
+                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
+            }
+        } break;
+        case LOG_WARNING: { // warning conditions
+            if (type != QtInfoMsg && type != QtDebugMsg) {
+                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
+            }
+        } break;
+        case LOG_ERR: { // error conditions
+            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
+                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
+            }
+        } break;
+        case LOG_CRIT: { // critical conditions
+            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
+                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
+            }
+        } break;
+        case LOG_ALERT: { // action must be taken immediately
+            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
+                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
+            }
+        } break;
+        case LOG_EMERG: { // system is unusable
+            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
+                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
+            }
+        } break;
+        default: {
+            //fprintf(stderr, "%s No ErrorLevel defined! %s\n",
+            //    datetime.toStdString().c_str(), msg.toStdString().c_str());
+        }
+    }
+}
+#endif
+

DownloadDCJsonFiles/message_handler.h

@@ -0,0 +1,23 @@
+#ifndef MESSAGE_HANDLER_H_INCLUDED
+#define MESSAGE_HANDLER_H_INCLUDED
+
+#include <QtGlobal>
+#ifdef __linux__
+#include <syslog.h>
+#endif
+
+int getDebugLevel();
+void setDebugLevel(int newDebugLevel);
+
+bool messageHandlerInstalled();
+QtMessageHandler atbInstallMessageHandler(QtMessageHandler handler);
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+// typedef void (*QtMessageHandler)(QtMsgType, const char *);
+void atbDebugOutput(QtMsgType type, const char *msg);
+#elif QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+// typedef void (*QtMessageHandler)(QtMsgType, const QMessageLogContext &, const QString &);
+void atbDebugOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg);
+#endif
+
+#endif // MESSAGE_HANDLER_H_INCLUDED

DownloadDCJsonFiles/plugins/interfaces.h

@@ -24,6 +24,7 @@ struct T_emp
 
    // dynamic:
    uint8_t state;      // step counter of EMP (electronic coin checker) FSM (finite state machine):
+   /*
    // 0=start command
        // 1=powered, do emp ini, send reset
        // 2=delay
@@ -39,7 +40,7 @@ struct T_emp
        // 90: stop all, 1s delay
        // 99: off, all stopped
 
-
+*/
    uint8_t pollingRunning;
    uint8_t paymentRunning;
 
@@ -238,6 +239,7 @@ struct T_dynamicCondition
         uint8_t lastVDoorState;
         uint8_t lastCBstate;
         char        paymentInProgress;
+        // Version Szeged:  aug2023
         //	0: stopped by timeout
         //  1: running  2: wait4lastCoin
         //				3: payment stopped manually, coins in Escrow
@@ -246,6 +248,21 @@ struct T_dynamicCondition
         //			    6: coins encashed   7:coins returned
         //				8: CoinChecker or MDB on Error
 
+        // since Schoenau with bill and changer, nov2023
+        //0 = no payment
+        //will be set to 1 by cash_startCollection()
+        //neu 1: wait for devices getting ready for payment
+        //2 = payment,
+        //3 = wait for last coin/bill
+        //4 = Bezahlvorgang manuell beendet
+        //5 = payment stopped autom, amount collected, coins in Escrow
+        //6 = Bezahlvorgang beendet weil ZK voll
+        //4,5,6: payment done, keep on polling, wait for cash or return command
+        //7 = encash collected money from coin escrow into cash box
+        //8 = return "amountToReturn", can be complete inserted amount or only overpayment
+        //9 = wait for changer result
+        //10= print refund receipt with "amountToReturn"
+
 
         char        res1;
         uint16_t    U_Batt;
@@ -397,6 +414,7 @@ struct T_bna
 
 };
 
+class DownloadThread;
 class hwinf
 {
 
@@ -1834,6 +1852,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
 
 
 
@@ -2249,14 +2270,23 @@ public:
     virtual void bna_requestCurrentNotes() const {}
     // send command to DC in order to get transaction data
 
-    virtual uint8_t bna_getCurrentNotes(uint16_t latestBill, uint16_t *currentNotes) const {
+    virtual uint8_t bna_getCurrentNotes(uint16_t latestBill, uint16_t *currentNotes) const
+    {
         Q_UNUSED(latestBill);
         Q_UNUSED(currentNotes);
         return 0;
     }
     // returns number of collected bank notes since start-command (current transaction)
-    //  latestBill: last accepted bank note, value in cent
-    //  currentNotes an array with up to 16 (further) notes collected
+    // return value: numbers of bills or 99 in case of error
+    //  latestBill: not used
+    // in case of error: currentNotes[0,1,2,3] = 1..4 error number(s)
+    // in normal case:
+    //  currentNotes[0]: last bill in cent (e.g. 1000 = 10€)
+    //  currentNotes[1]: bin 1 = bill is still in escrow   else bill is stacked
+    //       note: by now (dec2023) escrow is not used, bills always go to stacker (box)
+    //  currentNotes[2]: total sum of bills in cent, low word (16bit)
+    //  currentNotes[3]: total sum of bills in cent, high word (16bit)
+
 
     virtual void bna_requestStackerLevel() const {}
 
@@ -2270,10 +2300,99 @@ public:
     //                                          countOfBills[1] for 10€   and so on
 
 
+    // download device controller
+    virtual bool dcDownloadRequest(QString const &fileToDownload) const {
+        Q_UNUSED(fileToDownload);
+        return false;
+    }
+    virtual bool dcDownloadRequested() const { return false; }
+    virtual bool dcDownloadResetRequest() const { return false; }
+    virtual bool dcDownloadRequestAck() const { return false; }
+    virtual bool dcDownloadRunning() const { return false; }
+    virtual bool dcDownloadFinished() { return false; }
+
+    virtual bool dcDownloadReportStart() const { return false; }
+    virtual bool dcDownloadReportRunning() const { return true; }
+    virtual bool dcDownloadReportFinished() { return true; }
+
+    virtual bool dcDownloadThreadStart() { return false; }
+    virtual bool dcDownloadThreadRunning() const { return true; }
+    virtual void dcDownloadThreadFinalize(DownloadThread *) {}
+    virtual bool dcDownloadThreadFinished() const { return true; }
+    virtual bool dcDownloadReportThreadStart() { return false; }
+    virtual bool dcDownloadReportThreadRunning() const { return true; }
+    virtual void dcDownloadReportThreadFinalize() {}
+    virtual void dcDownloadReportThreadQuit() {}
+    virtual bool dcDownloadReportThreadFinished() const { return true; }
+
+
+    virtual QString dcDownloadFileName() const { return ""; }
+    virtual bool dcDownloadSetRequested(bool requested) {
+       Q_UNUSED(requested); return false;
+    }
+    virtual bool dcDownloadSetRunning(bool running) {
+       Q_UNUSED(running); return false;
+    }
+    virtual bool dcDownloadSetFinished(bool finished) {
+       Q_UNUSED(finished); return false;
+    }
+    virtual void dcDownloadSetTotalBlockNumber(uint16_t totalBlockNumber) {
+       Q_UNUSED(totalBlockNumber);
+    }
+    virtual void dcDownloadSetCurrentBlockNumber(uint16_t currentBlockNumber) {
+       Q_UNUSED(currentBlockNumber);
+    }
+    virtual bool dcDownloadGetRequested() const { return false; }
+    virtual bool dcDownloadGetRunning() const { return false; }
+    virtual bool dcDownloadGetFinished() const { return false; }
+    virtual uint16_t dcDownloadGetTotalBlockNumber() const { return 0; }
+    virtual uint16_t dcDownloadGetCurrentBlockNumber() const { return 0; }
+
+    virtual QObject const *getAPI() { return nullptr; }
 
 
 signals:
+    /*
+        NOTE: the difference between a virtual Qt signal and a normal Qt signal:
+        A Qt virtual signal is a connection that is established using a pointer
+        or reference and is not connected to an object or data. It is therefore
+        not bound to a particular object, but to a specific class (object type).
+        Qt virtual signals are useful because they allow you to create
+        connections without worrying about whether an object or a specific data
+        element has been destroyed.
+        https://www.youtube.com/watch?v=HTH3VFfqsXw
+
+     */
+    virtual void hwapi_reportDCDownloadStatus(QString const&) const {}
+    virtual void hwapi_reportDCDownloadSuccess(QString const&) const {}
+    virtual void hwapi_reportDCDownloadFailure(QString const&) const {}
+
+    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 +2415,7 @@ signals:
     void hwapi_doorCoinBoxInserted() const;
     void hwapi_doorCBinAndAllDoorsClosed() const;
     void hwapi_doorAllDoorsClosed() const;
+    */
 };
 
 

DownloadDCJsonFiles/process/command.h

@@ -0,0 +1,36 @@
+#ifndef COMMAND_H_INCLUDED
+#define COMMAND_H_INCLUDED
+
+#include <QObject>
+#include <QCoreApplication>
+#include <QString>
+#include <QStringList>
+#include <QProcess>
+
+
+class Command : public QObject {
+    Q_OBJECT
+
+    QString m_command;
+    QString m_commandResult;
+    int m_waitForStartTimeout;
+    int m_waitForFinishTimeout;
+    int m_exitCode;
+public:
+    explicit Command(QString const &command,
+                     int start_timeout = 100000,
+                     int finish_timeout = 100000);
+
+    QString getCommandResult() const;
+    QString command() const { return m_command; }
+
+    bool execute(QString workingDirectory, QStringList args = QStringList());
+    int exitCode() const { return m_exitCode; }
+
+private slots:
+    void readyReadStandardOutput();
+    void readyReadStandardError();
+    void finished(int exitCode, QProcess::ExitStatus exitStatus);
+};
+
+#endif // COMMAND_H_INCLUDED

UpdatePTUDevCtrl/OnDemandUpdatePTU.pro

@@ -53,7 +53,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
 #           local filesystem, json-files will be downloaded to firmware.
 #           The device-controller firmware will be handled in a later version.
 # 1.3.15:   Bug fixes found during testing.
-#           Don't disable Exit-button during update-process.
+#           Do not disable Exit-button during update-process.
 #           Removed worker-thread with an own event-loop: only the GUI thread
 #           has an event loop. Tested JSON-downloads several times successfully
 #           (using the slave lib where the CA helper tool was active as master).
@@ -64,9 +64,48 @@ DEFINES += QT_DEPRECATED_WARNINGS
 #           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.
-VERSION="1.3.20"
 # 1.3.20:   Bug fixes found during testing.
-
+# 1.3.21:   Bug fixes found during testing:
+#           Fix directory of ATBUpdateTool.ini to be the working directory of
+#           the application rather than just ".".
+#           Check existance of etc-directory inside customer repository.
+#           Check for valid ISMAS trigger (button) 15x (=90s).
+#           NOTE: if the customer repository is cloned (or repaired and cloned
+#           again), and if the settings always-download-config=true and
+#           always-download-dc=true in the ATBUpdateTool.ini file, the download
+#           the printer-json files and the device controller file, even without
+#           an activated ISMAS trigger (button). The tariff-files are rsynced to
+#           the local filesystem for such clone.
+#           Set new filename for device controller: dc2c.bin.
+# 1.3.22:   Bug fixes found during testing:
+#           Fix the path-names of the json-files and the device-controller.
+#           Set automatic download of json-file in ATBUpdateTool.ini file for
+#           a fresh clone of the repository.
+# 1.3.23:   Added a 'break' to prevent a possible endless loop when checking if
+#           the device is alive.
+#
+# NOTE:     The versioning info has to be shifted up by one version, i.e. what
+#           happened for 1.3.23 was actually done in 1.3.24.
+# 1.3.24
+#
+# 1.3._24_: Special version for szeged using a old dc-controller (4.42):
+#           Changes:
+#               (1) the ini-File now uses the libCAmaster.so.
+# 1.3._25_: Again special version for szeged, using interface.h, version 4.4.
+# 1.4.0   : Start with version at 1.4.0 (mainly to see a difference with Szeged)
+#           Set hash-value in EVENT-objects. Set location (project), version
+#           and info in send-last-version.
+#           If the customer repository does not exist, then do not check the
+#           ISMAS trigger, but proceed with the update procedure. Otherwise,
+#           check the ISMAS update-trigger as first step.
+#           If the current time is between 0.00 - 4.00 o'clock, then a wrong
+#           trigger-value will result in an UPDATE_STEP_NOT_NECESSARY.
+#           Move final processing to subclass UpdateProcessRunning.
+#           Disable EXIT-button for the whole update-process, except for the
+#           checking of the ISMAS-trigger-button (aka WAIT-button).
+# 1.4.1   : Sync files in the customer repository (under ./etc) as the very
+#           first step
+VERSION="1.4.1"
 # 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
@@ -80,7 +119,6 @@ VERSION="1.3.20"
 #       ISMAS eine entsprechende Meldung anzeigen als Teil von SEND-LAST-VERSION.
 #       Wenn der WAIT-button aktiv ist, dann werden zumindest die opkg-commands
 #       ausgefuehrt.
-#   4:  rsync: immer alle Dateien soiegeln (bis auf opkg-commands)
 #   5:  Falls das Tool mal abstuerzt, dann einen Signal-Handler (fuer TERM)
 #       installieren, sodass zumnidest SEND-LAST-VERSION mit rausgeht.
 #   6:  rsync: explizites Binary, nicht das in busybox enthaltene.
@@ -96,6 +134,32 @@ VERSION="1.3.20"
 #       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.
+#  11:  Das Edit-Fenster teilen um die Anzeige zu verbessern.
+#  12:  Bei einem Update muss immer ersichtlich sein, warum es ueberhaupt
+#       angestossen wurde. Steht kein "WAIT" im ISMAS-Trigger, dann kann man
+#       davon ausgehen, dass es sich um ein automatisches Update handelt.
+#       In jedem Fall wird bei einem automatischen Update, bei dem der WAIT-
+#       Button nicht gesetzt war, ein "OK" gesendet, falls sonst nichts weiter
+#       zu tun ist. Beachte aber: wir haben auch noch den Fall, dass eine SD-
+#       Karte gesteckt wird. In diesem Fall wird ein komplettes Update gefahren,
+#       und zwar explizit auch ohne WAIT-Button.
+#       Am Ende eines Updates steht im ISMAS entweder ein "OK" oder ein "FAIL".
+# 13:   SendLastVersion: fuer jedes erfolgreich installierte Paket eine
+#       Send-Last-Version-Nachricht an ISMAS. Dadurch entsteht im ISMAS eine
+#       History (Christian darueber informieren).
+# 14:   Installiert werden nur Dateien, die neu sind oder geaendert wurden.
+#       Nicht etwas Dateien, die geloescht wurden: sicherstellen, dass man hier
+#       immer direkt im repository arbeitet, nicht auf dem Filesystem.
+#       Ferner: der DeviceController heisst dc2c.bin, auch fuer die Jsons
+#       sind Dtandard-Namen vergeben. Alternativ: alle vorhandenen Jsons
+#       werden runtergeladen: Thomas ist eh fuer deren Inhalte verantworlich.
+#       WICHTIG: immer ueberpruefen, ob die Dateien im Customer-Repository
+#       wirklich die richtigen Dateien sind.
+# 15:   Der WAIT-Button laesst sich auf WAIT zuruecksetzen (etwa wenn git
+#       selber Probleme hatte).
+# 16:   Der Download-Thread sollte sowohl die auto-Variable auf false setzen
+#       als auch den cycle-Timer stoppen, damit sichergestellt ist, dass der
+#       Download des DC nicht gestoert wird.
 
 
 win32 {
@@ -123,7 +187,7 @@ DEFINES+=APP_EXTENDED_VERSION=\\\"$$EXTENDED_VERSION\\\"
 # keep comments, as /* fall through */
 QMAKE_CXXFLAGS += -C
 QMAKE_CXXFLAGS += -g
-QMAKE_CXXFLAGS += -Wno-deprecated-copy
+QMAKE_CXXFLAGS += -Wno-deprecated-copy -O
 
 contains( CONFIG, PTU5 ) {
     greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
@@ -183,6 +247,7 @@ HEADERS += \
         process/command.h \
         message_handler.h \
         worker.h \
+        interfaces.h \
         commandline_parser.h \
         plugins/interfaces.h
 

UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro

@@ -0,0 +1,275 @@
+QT += core gui
+QT += widgets serialport network
+
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+TARGET = ATBUpdateTool
+
+# The following define makes your compiler emit warnings if you use
+# any Qt feature that has been marked deprecated (the exact warnings
+# depend on your compiler). Please consult the documentation of the
+# deprecated API in order to know how to port your code away from it.
+DEFINES += QT_DEPRECATED_WARNINGS
+
+# You can also make your code fail to compile if it uses deprecated APIs.
+# In order to do so, uncomment the following line.
+# You can also select to disable deprecated APIs only up to a certain version of Qt.
+#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
+
+# 1.3.6 :   Do not update device-controller/json files, but have the library
+#           (in a later step) do that.
+#           Fixed sending messages to ISMAS.
+#           Always execute contents of opkg_commands-file (even if there are no
+#           changes).
+# 1.3.7 :   Wait forever for git-commands to finish in QProcess executing such
+#           a command.
+# 1.3.8 :   Remove accessing opkg_commands under file-system-path /etc/psa_update.
+#           Activate download of json-configuration files.
+# 1.3.9 :   Fix sendLastVersion: use configured branch and not master branch in
+#               git show origin/master -s --format="c=%h m=%s d=%cI"    ==>
+#               git show origin/zg1/zone1 -s --format="c=%h m=%s d=%cI"
+#           Use dynamic values for os-release and apism-version when sending
+#           last version info.
+# 1.3.10:   Fix premature killing opkg-commands: detected timeout of 100s was
+#           too small when updating apism.
+#           Fix display of UPDATE_SUCCESS when opkg_command fails. Detected when
+#           updating apsim failed.
+# 1.3.11:   Integrate version of ATBUpdateTool in SendLastVersion-ISMAS-message.
+# 1.3.12:   Add command parameters for output of yocto-infos about ATBUpdateTool.
+#           Use 'git pull' instead of 'git fetch'.
+#           Use 'git clone --filter=blob:none' instead of 'git clone' to speed
+#           up cloning of customer repository.
+# 1.3.13:   Fix: if the customer repository is corrupted, remove it and re-clone
+#           the repository (without checking the ISMAS-trigger (WAIT-)button.
+# 1.3.14:   Add additional check for sanity of customer repository using
+#           "git fsck".
+#           Stream-lined code of update process: massive refactoring.
+#           Added functionality: If WAIT button is not active, then an existing
+#           customer repository will be repaired, or a not existing repository
+#           will be cloned. The process stops then.
+#           However, if the WAIT button is active, the at least the commands in
+#           opkg_commands will be executed. Changed files in the customer
+#           repository will be worked on: tariff-files will be synced with the
+#           local filesystem, json-files will be downloaded to firmware.
+#           The device-controller firmware will be handled in a later version.
+# 1.3.15:   Bug fixes found during testing.
+#           Do not disable Exit-button during update-process.
+#           Removed worker-thread with an own event-loop: only the GUI thread
+#           has an event loop. Tested JSON-downloads several times successfully
+#           (using the slave lib where the CA helper tool was active as master).
+#           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.
+# 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.
+# 1.3.21:   Bug fixes found during testing:
+#           Fix directory of ATBUpdateTool.ini to be the working directory of
+#           the application rather than just ".".
+#           Check existance of etc-directory inside customer repository.
+#           Check for valid ISMAS trigger (button) 15x (=90s).
+#           NOTE: if the customer repository is cloned (or repaired and cloned
+#           again), and if the settings always-download-config=true and
+#           always-download-dc=true in the ATBUpdateTool.ini file, the download
+#           the printer-json files and the device controller file, even without
+#           an activated ISMAS trigger (button). The tariff-files are rsynced to
+#           the local filesystem for such clone.
+#           Set new filename for device controller: dc2c.bin.
+# 1.3.22:   Bug fixes found during testing:
+#           Fix the path-names of the json-files and the device-controller.
+#           Set automatic download of json-file in ATBUpdateTool.ini file for
+#           a fresh clone of the repository.
+# 1.3.23:   Added a 'break' to prevent a possible endless loop when checking if
+#           the device is alive.
+#
+# NOTE:     The versioning info has to be shifted up by one version, i.e. what
+#           happened for 1.3.23 was actually done in 1.3.24.
+# 1.3.24
+#
+# 1.3._24_: Special version for szeged using a old dc-controller (4.42):
+#           Changes:
+#               (1) the ini-File now uses the libCAmaster.so.
+# 1.3._25_: Again special version for szeged, using interface.h, version 4.4.
+# 1.4.0   : Start with version at 1.4.0 (mainly to see a difference with Szeged)
+#           Set hash-value in EVENT-objects. Set location (project), version
+#           and info in send-last-version.
+#           If the customer repository does not exist, then do not check the
+#           ISMAS trigger, but proceed with the update procedure. Otherwise,
+#           check the ISMAS update-trigger as first step.
+#           If the current time is between 0.00 - 4.00 o'clock, then a wrong
+#           trigger-value will result in an UPDATE_STEP_NOT_NECESSARY.
+#           Move final processing to subclass UpdateProcessRunning.
+#           Disable EXIT-button for the whole update-process, except for the
+#           checking of the ISMAS-trigger-button (aka WAIT-button).
+# 1.4.1   : Sync files in the customer repository (under ./etc) as the very
+#           first step
+# 1.4.2   : Do not check if <repo_dir>/etc/psa_tariff and /etc/psa_tariff are
+#           the same after an rsync. They might be noy after a change of the
+#           customer-number.
+# 1.4.3   : Use global directory for device-controller interfaces.h-file.
+VERSION="1.4.3"
+# 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
+#       geklont), aber zusaetzlich werden alle verfuegbaren Dateien als neu
+#       angesehen und die entsprechenden Aktionen durchgefuehrt: tariff-files
+#       spiegeln, json-files laden und dc laden. Also VORSICHT: das repository
+#       muss in diesem fall wirklich in ordnung sein.
+#   3:  Wurde keine Datei geaendert, kein initiales Clone und der WAIT-button
+#       nicht aktiv, so (passiert natuerlich nichts) kann man davon ausgehen,
+#       dass es sich um ein automatisches Update handelt. Dann koennte man im
+#       ISMAS eine entsprechende Meldung anzeigen als Teil von SEND-LAST-VERSION.
+#       Wenn der WAIT-button aktiv ist, dann werden zumindest die opkg-commands
+#       ausgefuehrt.
+#   5:  Falls das Tool mal abstuerzt, dann einen Signal-Handler (fuer TERM)
+#       installieren, sodass zumnidest SEND-LAST-VERSION mit rausgeht.
+#   6:  rsync: explizites Binary, nicht das in busybox enthaltene.
+#   7:  Versionen der Json-Files lassen sich auslesen.
+#       Problem: Einstellungen in den Json-Files lassen sich auch mittels
+#       Funktionen in der CD-Library ueberschreiben. Damit ist dann wieder nicht
+#       mehr so klar, was jetzt eigentlich aktiv ist.
+#   8:  m_alwaysDownloadConfig und m_alwaysDownloadDC: vorbereitet: man koennte
+#       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.
+#  11:  Das Edit-Fenster teilen um die Anzeige zu verbessern.
+#  12:  Bei einem Update muss immer ersichtlich sein, warum es ueberhaupt
+#       angestossen wurde. Steht kein "WAIT" im ISMAS-Trigger, dann kann man
+#       davon ausgehen, dass es sich um ein automatisches Update handelt.
+#       In jedem Fall wird bei einem automatischen Update, bei dem der WAIT-
+#       Button nicht gesetzt war, ein "OK" gesendet, falls sonst nichts weiter
+#       zu tun ist. Beachte aber: wir haben auch noch den Fall, dass eine SD-
+#       Karte gesteckt wird. In diesem Fall wird ein komplettes Update gefahren,
+#       und zwar explizit auch ohne WAIT-Button.
+#       Am Ende eines Updates steht im ISMAS entweder ein "OK" oder ein "FAIL".
+# 13:   SendLastVersion: fuer jedes erfolgreich installierte Paket eine
+#       Send-Last-Version-Nachricht an ISMAS. Dadurch entsteht im ISMAS eine
+#       History (Christian darueber informieren).
+# 14:   Installiert werden nur Dateien, die neu sind oder geaendert wurden.
+#       Nicht etwas Dateien, die geloescht wurden: sicherstellen, dass man hier
+#       immer direkt im repository arbeitet, nicht auf dem Filesystem.
+#       Ferner: der DeviceController heisst dc2c.bin, auch fuer die Jsons
+#       sind Dtandard-Namen vergeben. Alternativ: alle vorhandenen Jsons
+#       werden runtergeladen: Thomas ist eh fuer deren Inhalte verantworlich.
+#       WICHTIG: immer ueberpruefen, ob die Dateien im Customer-Repository
+#       wirklich die richtigen Dateien sind.
+# 15:   Der WAIT-Button laesst sich auf WAIT zuruecksetzen (etwa wenn git
+#       selber Probleme hatte).
+# 16:   Der Download-Thread sollte sowohl die auto-Variable auf false setzen
+#       als auch den cycle-Timer stoppen, damit sichergestellt ist, dass der
+#       Download des DC nicht gestoert wird.
+
+
+win32 {
+    BUILD_DATE=$$system("date /t")
+    BUILD_TIME=$$system("time /t")
+} else {
+    BUILD_DATE=$$system("date +%d-%m-%y")
+    BUILD_TIME=$$system("date +%H:%M:%S")
+}
+
+GIT_COMMIT=$$system("git log -1 --format=oneline | cut -d' ' -f1")
+
+EXTENDED_VERSION="$${VERSION}-$${GIT_COMMIT}"
+
+INCLUDEPATH += plugins
+
+CONFIG += c++17
+# CONFIG -= app_bundle
+
+DEFINES+=APP_VERSION=\\\"$$VERSION\\\"
+DEFINES+=APP_BUILD_DATE=\\\"$$BUILD_DATE\\\"
+DEFINES+=APP_BUILD_TIME=\\\"$$BUILD_TIME\\\"
+DEFINES+=APP_EXTENDED_VERSION=\\\"$$EXTENDED_VERSION\\\"
+
+# keep comments, as /* fall through */
+QMAKE_CXXFLAGS += -C
+QMAKE_CXXFLAGS += -g
+QMAKE_CXXFLAGS += -Wno-deprecated-copy -O
+
+contains( CONFIG, PTU5 ) {
+    greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
+    CONFIG += link_pkgconfig
+    lessThan(QT_MAJOR_VERSION, 5):   PKGCONFIG += qextserialport
+    QMAKE_CXXFLAGS += -O2 -std=c++17   # for GCC >= 4.7
+
+    PTU5BASEPATH = /opt/devel/ptu5
+
+    INCLUDEPATH += $$PTU5BASEPATH/qt/libs/devicecontroller/include
+    LIBS += -L$$PTU5BASEPATH/qt/libs/devicecontroller/library
+
+    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
+    ARCH = PTU5
+    DEFINES+=PTU5
+}
+contains( CONFIG, PTU5_YOCTO ) {
+    greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
+    QMAKE_CXXFLAGS += -std=c++17   # for GCC >= 4.7
+    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
+    PTU5BASEPATH = /opt/devel/ptu5
+    ARCH = PTU5
+    DEFINES+=PTU5
+
+    LIBS += -lCAslave
+    LIBS += -lCAmaster
+}
+contains( CONFIG, DesktopLinux ) {
+    greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
+    lessThan(QT_MAJOR_VERSION, 5):    CONFIG += extserialport
+    # QMAKE_CC = ccache $$QMAKE_CC
+    # QMAKE_CXX = ccache $$QMAKE_CXX
+    QMAKE_CXXFLAGS += -std=c++17
+    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
+    linux-clang {  QMAKE_CXXFLAGS += -Qunused-arguments   }
+    ARCH = DesktopLinux
+    DEFINES+=DesktopLinux
+}
+
+SOURCES += \
+        main.cpp \
+        progress_event.cpp \
+        update_dc_event.cpp \
+        mainwindow.cpp \
+        utils.cpp \
+        update.cpp \
+        git/git_client.cpp \
+        ismas/ismas_client.cpp \
+        process/command.cpp \
+        message_handler.cpp \
+        worker.cpp \
+        commandline_parser.cpp
+
+HEADERS += \
+        update.h \
+        progress_event.h \
+        update_dc_event.h \
+        utils.h \
+        mainwindow.h \
+        git/git_client.h \
+        apism/ismas_data.h \
+        ismas/ismas_client.h \
+        process/command.h \
+        message_handler.h \
+        worker.h \
+        commandline_parser.h
+
+OTHER_FILES += \
+    ATBUpdateTool.ini
+
+FORMS += \
+    mainwindow.ui
+
+
+##########################################################################################
+# for running program on target through QtCreator
+contains( CONFIG, PTU5 ) {
+   qnx: target.path = /tmp/$${TARGET}/bin
+   else: unix:!android: target.path = /opt/app/tools/atbupdate/
+   !isEmpty(target.path): INSTALLS += target
+}

UpdatePTUDevCtrl/commandline_parser.cpp

@@ -87,7 +87,7 @@ void CommandLineParser::configure() {
     m_repositoryUrlOption.setDefaultValue("https://git.mimbach49.de/GerhardHoffmann");
     m_parser.addOption(m_repositoryUrlOption);
 
-    m_iniFileDirectoryOption.setDefaultValue(".");
+    m_iniFileDirectoryOption.setDefaultValue(QCoreApplication::applicationDirPath());
     m_parser.addOption(m_iniFileDirectoryOption);
 
     m_iniFileNameOption.setDefaultValue("ATBUpdateTool.ini");
@@ -117,10 +117,10 @@ void CommandLineParser::configure() {
     m_extendedVersionOption.setDefaultValue("false");
     m_parser.addOption(m_extendedVersionOption);
 
-    m_yoctoVersionOption .setDefaultValue("false");
+    m_yoctoVersionOption.setDefaultValue("false");
     m_parser.addOption(m_yoctoVersionOption);
 
-    m_yoctoInstallStatusOption .setDefaultValue("false");
+    m_yoctoInstallStatusOption.setDefaultValue("false");
     m_parser.addOption(m_yoctoInstallStatusOption);
 }
 
@@ -129,12 +129,19 @@ void CommandLineParser::readSettings() {
     QString const iniFileName = m_parser.value(m_iniFileNameOption);
     m_iniFileName = QDir::cleanPath(iniFileDir + QDir::separator() + iniFileName);
 
+    qCritical() << __PRETTY_FUNCTION__ << " iniFileDir" << iniFileDir;
+    qCritical() << __PRETTY_FUNCTION__ << "iniFileName" << m_iniFileName;
+
     if (!m_iniFileName.isEmpty()) {
         if (QFile(m_iniFileName).exists()) {
             QSettings settings(m_iniFileName, QSettings::IniFormat);
             QStringList keys = settings.allKeys();
             for (QString const &key: keys) {
                 QVariant v = settings.value(key);
+
+                qCritical() << __PRETTY_FUNCTION__
+                            << key << " -> " << v.toString();
+
                 if (key.contains("repository-url")) {
                     m_repositoryUrl = v.toString();
                 } else
@@ -167,8 +174,14 @@ void CommandLineParser::readSettings() {
                 } else
                 if (key.contains("plugin-name")) {
                     m_plugInName = v.toString();
+                } else {
+                    qCritical() << __PRETTY_FUNCTION__
+                                << key << " -> (UNKNOWN) " << v.toString();
                 }
             }
+        } else {
+            qCritical() << __PRETTY_FUNCTION__ << "iniFileName" << m_iniFileName
+                        << "DOES NOT EXIST";
         }
     }
 }
@@ -239,7 +252,9 @@ bool CommandLineParser::extendedVersion() {
 bool CommandLineParser::alwaysDownloadConfig() {
     if (m_parser.isSet(m_alwaysDownloadConfigOption)) {
         m_alwaysDownloadConfig = m_parser.value(m_alwaysDownloadConfigOption);
+        qCritical() << "m_alwaysDownloadConfigOption IS SET" << m_alwaysDownloadConfig;
     }
+    qCritical() << "m_alwaysDownloadConfig" << m_alwaysDownloadConfig;
     return m_alwaysDownloadConfig == "false" ? false : true;
 }
 

UpdatePTUDevCtrl/ismas/ismas_client.cpp

@@ -793,6 +793,152 @@ QString IsmasClient::updateOfPSASendVersion(PSAInstalled const &psa) {
     return buf;
 }
 
+#if 0
+// prepare
+QString IsmasClient::sendLastVersion(UPDATE_COMPONENT updateComponent,
+                                     PSAInstalled const &psa) {
+    static char buf[4096*2];
+    memset(buf, 0, sizeof(buf));
+
+    switch (updateComponent) {
+    case UPDATE_COMPONENT::TARIFF:
+    snprintf(buf, sizeof(buf)-1,
+        "{"
+            "\"VERSION_INFO\" : {"
+                "\"UPDATE_REASON\":\"%s\","
+                "\"CREATED\":\"%s\","
+                "\"GIT_COMMIT\":\"%s\""
+            "},"
+            "\"TARIFF\" : {"
+                "\"VERSION\" : \"%s\","
+                "\"PROJECT\" : \"%s\","
+                "\"ZONE\" : %d,"
+                "\"INFO\" : \"%s\","
+                "\"SIZE\" : %d\""
+            "},"
+        "}",
+        psa.tariff.versionInfo.reason.toStdString().c_str(),
+        psa.tariff.versionInfo.created.toStdString().c_str(),
+        psa.tariff.versionInfo.lastCommit.toStdString().c_str(),
+
+        psa.tariff.version.toStdString().c_str(),
+        psa.tariff.project.toStdString().c_str(),
+        psa.tariff.zone,
+        psa.tariff.info.toStdString().c_str(),
+        psa.tariff.size);
+    break;
+    case UPDATE_COMPONENT::SOFTWARE_ATBQT:
+    break;
+    case UPDATE_COMPONENT::SOFTWARE_APISM:
+    break;
+    case UPDATE_COMPONENT::SOFTWARE_ATB_UPDATE_TOOL:
+    break;
+    case UPDATE_COMPONENT::CONFIG_PTU5_CPU_SERIAL:
+    break;
+    case UPDATE_COMPONENT::CONFIG_DEVICE_CONTROLLER:
+    break;
+    case UPDATE_COMPONENT::CONFIG_PRINTER:
+    break;
+    case UPDATE_COMPONENT::CONFIG_BNA:
+    break;
+    case UPDATE_COMPONENT::PLUGIN_ATB_DEVICE_CONTROLLER:
+    break;
+    case UPDATE_COMPONENT::PLUGIN_INGENICO_CC:
+    break;
+    case UPDATE_COMPONENT::PLUGIN_MOBILISIS_CALC_PRICE:
+    break;
+    case UPDATE_COMPONENT::PLUGIN_MOBILISIS_CALC_PRICE_UI:
+    break;
+    case UPDATE_COMPONENT::PLUGIN_PRM_CALC_PRICE:
+    break;
+    case UPDATE_COMPONENT::PLUGIN_PRM_CALC_PRICE_UI:
+    break;
+    case UPDATE_COMPONENT::PLUGIN_TCP_ZVT_CC:
+    break;
+    case UPDATE_COMPONENT::OPKG_COMMANDS:
+    break;
+    case UPDATE_COMPONENT::HARDWARE_DEVICES:
+    break;
+    case UPDATE_COMPONENT::OS:
+    break;
+    case UPDATE_COMPONENT::DC2C_CASH_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_CONF_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_DEVICE_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_PRINT01_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_PRINT02_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_PRINT03_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_PRINT04_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_PRINT05_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_PRINT06_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_PRINT07_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_PRINT08_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_PRINT09_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_PRINT10_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_PRINT11_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_PRINT12_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_PRINT13_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_PRINT14_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_PRINT15_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_PRINT16_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_PRINT17_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_PRINT18_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_PRINT19_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_PRINT20_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_PRINT21_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_PRINT22_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_PRINT23_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_PRINT24_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_PRINT25_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_PRINT26_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_PRINT27_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_PRINT28_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_PRINT29_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_PRINT30_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_PRINT31_JSON:
+    break;
+    case UPDATE_COMPONENT::DC2C_PRINT32_JSON:
+    break;
+    }
+
+    qInfo() << buf;
+
+    return buf;
+}
+#endif
+
 QString IsmasClient::updateOfPSAContinues(QString currentStage,
                                           QString currentStageInfo,
                                           QString const &version) {

UpdatePTUDevCtrl/ismas/ismas_client.h

@@ -14,6 +14,7 @@ struct PSAInstalled {
     } versionInfo;
 
     struct Tariff {
+        // VersionInfo versionInfo;
         QString name;
         QString version;
         QString project;
@@ -31,6 +32,7 @@ struct PSAInstalled {
     } hw;
 
     struct Opkg {
+        // VersionInfo versionInfo;
         int size;
         QString blob;
         QString lastCommit;
@@ -38,6 +40,7 @@ struct PSAInstalled {
     } opkg;
 
     struct DC {
+        // VersionInfo versionInfo;
         QString versionHW;
         QString versionSW;
         QString gitBlob;
@@ -62,6 +65,7 @@ struct PSAInstalled {
     } pluginVersion;
 
     struct DC2C {
+        // VersionInfo versionInfo;
         QString name;
         QString blob;
         int size;
@@ -194,8 +198,68 @@ public:
     QString jsonParseFailed(int resultCode, QString reason, QString const &version = QString());
     std::optional<QString> finalResult(int resultCode, QString reason, QString const &version = QString());
 
+    // legacy
     QString updateOfPSASendVersion(PSAInstalled const &psa);
 
+#if 0
+    enum class UPDATE_COMPONENT {
+        TARIFF,
+        SOFTWARE_ATBQT,
+        SOFTWARE_APISM,
+        SOFTWARE_ATB_UPDATE_TOOL,
+        CONFIG_PTU5_CPU_SERIAL,
+        CONFIG_DEVICE_CONTROLLER,
+        CONFIG_PRINTER,
+        CONFIG_BNA,
+        PLUGIN_ATB_DEVICE_CONTROLLER,
+        PLUGIN_INGENICO_CC,
+        PLUGIN_MOBILISIS_CALC_PRICE,
+        PLUGIN_MOBILISIS_CALC_PRICE_UI,
+        PLUGIN_PRM_CALC_PRICE,
+        PLUGIN_PRM_CALC_PRICE_UI,
+        PLUGIN_TCP_ZVT_CC,
+        OPKG_COMMANDS,
+        HARDWARE_DEVICES,
+        OS,
+        DC2C_CASH_JSON,
+        DC2C_CONF_JSON,
+        DC2C_DEVICE_JSON,
+        DC2C_PRINT01_JSON,
+        DC2C_PRINT02_JSON,
+        DC2C_PRINT03_JSON,
+        DC2C_PRINT04_JSON,
+        DC2C_PRINT05_JSON,
+        DC2C_PRINT06_JSON,
+        DC2C_PRINT07_JSON,
+        DC2C_PRINT08_JSON,
+        DC2C_PRINT09_JSON,
+        DC2C_PRINT10_JSON,
+        DC2C_PRINT11_JSON,
+        DC2C_PRINT12_JSON,
+        DC2C_PRINT13_JSON,
+        DC2C_PRINT14_JSON,
+        DC2C_PRINT15_JSON,
+        DC2C_PRINT16_JSON,
+        DC2C_PRINT17_JSON,
+        DC2C_PRINT18_JSON,
+        DC2C_PRINT19_JSON,
+        DC2C_PRINT20_JSON,
+        DC2C_PRINT21_JSON,
+        DC2C_PRINT22_JSON,
+        DC2C_PRINT23_JSON,
+        DC2C_PRINT24_JSON,
+        DC2C_PRINT25_JSON,
+        DC2C_PRINT26_JSON,
+        DC2C_PRINT27_JSON,
+        DC2C_PRINT28_JSON,
+        DC2C_PRINT29_JSON,
+        DC2C_PRINT30_JSON,
+        DC2C_PRINT31_JSON,
+        DC2C_PRINT32_JSON,
+    };
+    QString sendLastVersion(UPDATE_COMPONENT comp, PSAInstalled const &psa);
+#endif
+
   private:
     static void printDebugMessage(int port, QString const &clientIP, int clientPort,
                                   QString const &message);

UpdatePTUDevCtrl/main.cpp

@@ -9,7 +9,7 @@
 #endif
 
 #include "message_handler.h"
-#include "plugins/interfaces.h"
+#include <DeviceController/interfaces.h>
 #include "commandline_parser.h"
 
 #include <unistd.h>

UpdatePTUDevCtrl/mainwindow.cpp

@@ -4,7 +4,7 @@
 #include "utils.h"
 #include "progress_event.h"
 #include "update_dc_event.h"
-#include "plugins/interfaces.h"
+#include <DeviceController/interfaces.h>
 
 #include <QDateTime>
 #include <QMessageBox>
@@ -146,7 +146,7 @@ void MainWindow::onEnableExit() {
 
 void MainWindow::onRestartExitTimer() {
     m_exitTimer->stop();
-    m_exitTimer->start(60 * 1000);
+    m_exitTimer->start(5 * 1000);
 
     scrollDownTextEdit();
     ui->updateStatus->setEnabled(false);

UpdatePTUDevCtrl/message_handler.cpp

@@ -0,0 +1,97 @@
+#include "message_handler.h"
+
+#include <QDateTime>
+#include <cstring>
+#include <QString>
+#include <QFileInfo>
+#include <QMessageLogContext>
+
+
+static char const *DBG_NAME[] = { "DBG  ", "WARN ", "CRIT ", "FATAL", "INFO " };
+static bool installedMsgHandler = false;
+static int debugLevel = LOG_NOTICE;
+
+int getDebugLevel() { return debugLevel; }
+void setDebugLevel(int newDebugLevel) {
+    debugLevel = newDebugLevel;
+}
+
+bool messageHandlerInstalled() {
+    return installedMsgHandler;
+}
+
+QtMessageHandler atbInstallMessageHandler(QtMessageHandler handler) {
+    installedMsgHandler = (handler != 0);
+    static QtMessageHandler prevHandler = nullptr;
+    if (handler) {
+        prevHandler = qInstallMessageHandler(handler);
+        return prevHandler;
+    } else {
+        return qInstallMessageHandler(prevHandler);
+    }
+}
+
+///
+/// \brief Print message according to given debug level.
+///
+/// \note Install this function using qInstallMsgHandler().
+///
+///  int main(int argc, char **argv) {
+///     installMsgHandler(atbDebugOutput);
+///     QApplication app(argc, argv);
+///     ...
+///     return app.exec();
+///  }
+///
+#if (QT_VERSION > QT_VERSION_CHECK(5, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+void atbDebugOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg) {
+    Q_UNUSED(context);
+    QString const localMsg = QString(DBG_NAME[type]) + msg.toLocal8Bit();
+
+    switch (debugLevel) {
+        case LOG_DEBUG: { // debug-level message
+            syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
+        } break;
+        case LOG_INFO: { // informational message
+            if (type != QtDebugMsg) {
+                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
+            }
+        } break;
+        case LOG_NOTICE: { // normal, but significant, condition
+            if (type != QtDebugMsg) {
+                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
+            }
+        } break;
+        case LOG_WARNING: { // warning conditions
+            if (type != QtInfoMsg && type != QtDebugMsg) {
+                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
+            }
+        } break;
+        case LOG_ERR: { // error conditions
+            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
+                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
+            }
+        } break;
+        case LOG_CRIT: { // critical conditions
+            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
+                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
+            }
+        } break;
+        case LOG_ALERT: { // action must be taken immediately
+            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
+                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
+            }
+        } break;
+        case LOG_EMERG: { // system is unusable
+            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
+                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
+            }
+        } break;
+        default: {
+            //fprintf(stderr, "%s No ErrorLevel defined! %s\n",
+            //    datetime.toStdString().c_str(), msg.toStdString().c_str());
+        }
+    }
+}
+#endif
+

UpdatePTUDevCtrl/message_handler.h

@@ -0,0 +1,23 @@
+#ifndef MESSAGE_HANDLER_H_INCLUDED
+#define MESSAGE_HANDLER_H_INCLUDED
+
+#include <QtGlobal>
+#ifdef __linux__
+#include <syslog.h>
+#endif
+
+int getDebugLevel();
+void setDebugLevel(int newDebugLevel);
+
+bool messageHandlerInstalled();
+QtMessageHandler atbInstallMessageHandler(QtMessageHandler handler);
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+// typedef void (*QtMessageHandler)(QtMsgType, const char *);
+void atbDebugOutput(QtMsgType type, const char *msg);
+#elif QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+// typedef void (*QtMessageHandler)(QtMsgType, const QMessageLogContext &, const QString &);
+void atbDebugOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg);
+#endif
+
+#endif // MESSAGE_HANDLER_H_INCLUDED

UpdatePTUDevCtrl/process/command.cpp

@@ -0,0 +1,124 @@
+#include "command.h"
+
+#include <QProcess>
+#include <QDebug>
+#include <QDir>
+#include <QRegularExpression>
+#include <QDateTime>
+
+Command::Command(QString const &command, int start_timeout, int finish_timeout)
+    : m_command(command.trimmed())
+    , m_commandResult("")
+    , m_waitForStartTimeout(start_timeout)
+    , m_waitForFinishTimeout(finish_timeout)
+    , m_exitCode(-1) {
+}
+
+QString Command::getCommandResult() const {
+    return m_commandResult;
+}
+
+void Command::readyReadStandardOutput() {
+    QProcess *p = (QProcess *)sender();
+    m_commandResult += p->readAllStandardOutput();
+    // qCritical() << m_commandResult;
+}
+
+void Command::readyReadStandardError() {
+    QProcess *p = (QProcess *)sender();
+    QByteArray buf = p->readAllStandardError();
+    qCritical() << buf;
+}
+
+void Command::finished(int /*exitCode*/, QProcess::ExitStatus /*exitStatus*/) {
+    QProcess *p = (QProcess *)sender();
+    // read all remaining data sent to the process, just in case
+    QString d = p->readAllStandardOutput();
+    if (!d.isEmpty()) {
+        m_commandResult += d;
+    }
+    disconnect(p, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(readyReadStandardOutput()));
+    disconnect(p, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(readyReadStandardError()));
+}
+
+bool Command::execute(QString workingDirectory, QStringList args) {
+
+    if (!QDir::setCurrent(workingDirectory)) {
+        qCritical() << "SET WORKING_DIRECTORY" << workingDirectory
+                    << "FAILED FOR" << m_command;
+        return false;
+    }
+
+    QScopedPointer<QProcess> p(new QProcess(this));
+    p->setWorkingDirectory(workingDirectory);
+    p->setProcessChannelMode(QProcess::MergedChannels);
+
+    connect(&(*p), SIGNAL(readyReadStandardOutput()), this, SLOT(readyReadStandardOutput()));
+    connect(&(*p), SIGNAL(readyReadStandardError()), this, SLOT(readyReadStandardError()));
+
+    if (!args.isEmpty()) {
+        qDebug() << "START COMMAND" << m_command << "WITH ARGS" << args
+                 << "IN" << p->workingDirectory();
+        p->start(m_command, args);
+    } else {
+        qDebug() << "START COMMAND" << m_command
+                 << "IN" << p->workingDirectory();
+        p->start(m_command);
+    }
+
+    qint64 const start = QDateTime::currentDateTime().toMSecsSinceEpoch();
+
+    if (p->waitForStarted(m_waitForStartTimeout)) {
+        qDebug() << "PROCESS" << m_command << "STARTED IN" << p->workingDirectory();
+        if (p->state() == QProcess::ProcessState::Running) {
+            qDebug() << "PROCESS" << m_command << "RUNNING IN" << p->workingDirectory();
+            // wait forever for git/opkg-commands to finish
+            int wait = m_waitForFinishTimeout;
+            if (m_command.trimmed().startsWith("git", Qt::CaseInsensitive) ||
+                m_command.trimmed().startsWith("opkg", Qt::CaseInsensitive)) {
+                wait = -1;
+            }
+            bool const no_timeout = p->waitForFinished(wait);
+            if (no_timeout) {
+                qDebug() << "PROCESS" << m_command << "FINISHED IN" << p->workingDirectory();
+                if (p->exitStatus() == QProcess::NormalExit) {
+                    if ((m_exitCode = p->exitCode()) == 0) {
+                        qint64 const end = QDateTime::currentDateTime().toMSecsSinceEpoch();
+                        qDebug() << "EXECUTED" << m_command
+                                 << QString("(runtime %1ms)").arg(end-start)
+                                 << "with code" << m_exitCode
+                                 << "IN" << p->workingDirectory();
+                        return true;
+                    } else {
+                        qint64 const end = QDateTime::currentDateTime().toMSecsSinceEpoch();
+                        qCritical() << "EXECUTED" << m_command
+                                    << QString("(runtime %1ms)").arg(end-start)
+                                    << "with code" << m_exitCode
+                                    << "IN" << p->workingDirectory();
+                    }
+                } else {
+                    qint64 const end = QDateTime::currentDateTime().toMSecsSinceEpoch();
+                    qCritical() << "PROCESS" << m_command << "CRASHED with code"
+                                << p->exitCode()
+                                << QString("(after %1ms)").arg(end-start)
+                                << "IN" << p->workingDirectory();
+                }
+            } else {
+                qint64 const end = QDateTime::currentDateTime().toMSecsSinceEpoch();
+                qCritical() << "PROCESS" << m_command
+                            << "DID NOT FINISH WITH" << wait
+                            << "MS IN" << p->workingDirectory()
+                            << QString("(runtime %1ms)").arg(end-start);
+            }
+        } else {
+            qCritical() << "WRONG PROCESS STATE" << p->state()
+                        << "IN" << p->workingDirectory();
+        }
+    } else {
+        qint64 const end = QDateTime::currentDateTime().toMSecsSinceEpoch();
+        qCritical() << "PROCESS" << m_command << "TIMEOUT AT START"
+                    << QString("(runtime %1ms)").arg(end-start)
+                    << "IN" << p->workingDirectory();
+    }
+    return false;
+}

UpdatePTUDevCtrl/update.cpp

@@ -18,7 +18,7 @@
 #include "unistd.h"
 #endif
 
-#include "plugins/interfaces.h"
+#include <DeviceController/interfaces.h>
 
 #include <QSharedMemory>
 #include <QScopedPointer>
@@ -54,6 +54,10 @@ hwinf *Update::loadDCPlugin(QDir const &plugInDir, QString const &fname) {
                 qCritical() << pluginLoader.errorString();
                 exit(-1);
             }
+
+            qCritical() << "loadDCPlugin() plugin directory:" << plugInDir.absolutePath();
+            qCritical() << "loadDCPlugin() plugin file name:" << pluginLoader.fileName();
+
             if (!pluginLoader.isLoaded()) {
                 qCritical() << pluginLoader.errorString();
                 exit(-2);
@@ -94,6 +98,7 @@ bool Update::unloadDCPlugin() {
     return false;
 }
 
+class hwapi;
 Update::Update(Worker *worker,
                QString customerRepository,
                QString customerNrStr,
@@ -118,30 +123,72 @@ Update::Update(Worker *worker,
     , m_dryRun(dryRun)
     , m_sys_areDCdataValid(false) {
 
+    if (!m_hw) {
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_hw == nullptr -> ca-slave plugin loaded ???";
+    } else {
         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";
+                break;
             }
             m_hw->dc_autoRequest(true);
             QThread::msleep(500);
         }
 
-    qCritical() << "UPDATE: m_sys_areDCDataValid ..." << m_sys_areDCdataValid;
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ") 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;
+#if 0
+        QObject const *obj = m_hw->getAPI();
+        Q_ASSERT(obj != nullptr);
+
+        QDebug critical = qCritical();
+        critical << "connect() to onReportDCDownloadStatus() ...";
+        if (!connect(obj,
+                     SIGNAL(hwapi_reportDCDownloadStatus(QString const&)),
+                     this,
+                     SLOT(onReportDCDownloadStatus(QString const &)))) {
+            critical << "FAILED";
+        } else critical << "DONE";
+
+        critical = qCritical();
+        critical << "connect() to onReportDCDownloadSuccess() ...";
+        if (!connect(obj,
+            SIGNAL(hwapi_reportDCDownloadSuccess(QString const&)), this,
+            SLOT(onReportDCDownloadSuccess(QString const &)))) {
+            critical << "FAILED";
+        } else critical << "DONE";
+
+        critical = qCritical();
+        critical << "connect() to onReportDCDownloadFailure() ...";
+        if (!connect(obj,
+            SIGNAL(hwapi_reportDCDownloadFailure(QString const &)), this,
+            SLOT(onReportDCDownloadFailure(QString const &)))) {
+            critical << "FAILED";
+        } else critical << "DONE";
+#endif
+    }
 }
 
 Update::~Update() {
 }
 
+void Update::onReportDCDownloadStatus(QString const &status) {
+    emit m_worker->showStatusMessage("DL", status);
+}
+
+void Update::onReportDCDownloadSuccess(QString const &msg) {
+    qCritical() << "msg" << msg;
+}
+
+void Update::onReportDCDownloadFailure(QString const &errorMsg) {
+    qCritical() << "msg" << errorMsg;
+}
+
+
+
 // br is a index into a table, used for historical reasons.
 bool Update::openSerial(int br, QString baudrate, QString comPort) const {
     qDebug() << "opening serial" << br << baudrate << comPort << "...";
@@ -261,6 +308,7 @@ bool Update::updateBinary(QString const &fileToSendToDC) {
 
     return false;
 
+#if 0
     QFile fn(fileToSendToDC);
     if (!fn.exists()) {
         // output via CONSOLE() etc
@@ -329,6 +377,7 @@ bool Update::updateBinary(QString const &fileToSendToDC) {
     }
 
     return true;
+#endif
 }
 
 QString Update::jsonType(enum FileTypeJson type) {
@@ -367,7 +416,7 @@ bool Update::downloadJson(enum FileTypeJson type,
         QFileInfo fi(jsFileToSendToDC); // max. size of template file is 800 bytes
         if (file.exists()) {
             if (file.open(QIODevice::ReadOnly)) {
-                if (fi.size() <= 800) {
+                if (fi.size() > 0 && fi.size() <= 800) {
                     QByteArray ba = file.readAll();
                     // kindOfFile: 1=config, 2=device, 3=cash, 4=serial, 5=time, 6=printer
                     //      nrOfTemplate=1...32 if kindOfFile==6
@@ -376,6 +425,13 @@ bool Update::downloadJson(enum FileTypeJson type,
                                                    templateIdx,
                                                    (uint8_t *)ba.data())) {
 
+                        /*
+                         *  Note: the machine id is contained in DC2C_conf.json.
+                         *  The idea was to use this to check if the download of
+                         *  the json-file was correct. It did not work, as the
+                         *  update of the PSA (to reflect a change in the
+                         *  machine id) did not happen immediately.
+                         *
                             m_hw->dc_autoRequest(true);
                             QThread::msleep(500);
 
@@ -394,6 +450,7 @@ bool Update::downloadJson(enum FileTypeJson type,
                             QByteArray ba((const char*)data, length);
 
                             qCritical() << length << "MACHINE ID =" << ba.toHex(':');
+                        */
 
                         ret = true;
                     }
@@ -494,6 +551,87 @@ QStringList Update::getDcSoftAndHardWareVersion() {
                          << "DC SW-version not available";
 }
 
+QString Update::getFileVersion(QString const& jsonFileName) {
+    // "version":"15.10.2023 14:55 02.00.06",
+    static const QRegularExpression re("^.*(\\\"version\\\":)(.*)$");
+
+    QString fileVersion;
+    QFile inputFile(jsonFileName);
+    if (inputFile.open(QIODevice::ReadOnly)) {
+       QTextStream in(&inputFile);
+       while (!in.atEnd()) {
+          QString line = in.readLine();
+
+          QRegularExpressionMatch match;
+          int idx = line.indexOf(re, 0, &match);
+          if (idx != -1) {
+              fileVersion = match.captured(match.lastCapturedIndex());
+              break;
+          }
+       }
+       inputFile.close();
+    }
+
+    return fileVersion;
+}
+
+bool Update::checkDownloadedJsonVersions(QStringList const& jsonFileNames) {
+
+    for (QStringList::size_type i=0; i < jsonFileNames.size(); ++i) {
+
+        uint8_t jsonNr = 0;
+        QFileInfo fInfo(jsonFileNames[i]);
+
+        if (fInfo.fileName().endsWith("conf.json")) {
+            jsonNr = 1;
+        } else
+        if (fInfo.fileName().endsWith("device.json")) {
+            jsonNr = 2;
+        } else
+        if (fInfo.fileName().endsWith("cash.json")) {
+            jsonNr = 3;
+        } else {
+            QRegularExpressionMatch match;
+            static const QRegularExpression re("^(.*print)([0-3][0-9])\\.json\\s*$");
+            int idx = fInfo.fileName().indexOf(re, 0, &match);
+            if (idx != -1) {
+                QString captured = match.captured(match.lastCapturedIndex());
+                bool ok = false;
+                int n = captured.toInt(&ok);
+                if (ok) {
+                    jsonNr = n + 4;
+                }
+            }
+        }
+
+        if (jsonNr != 0) {
+#if 0
+            m_hw->sys_requestJsonVersions(jsonNr);
+            QThread::msleep(500);
+
+            char buf[64];
+            memset(buf, 0x00, sizeof(buf));
+            m_hw->sys_getJsonVersions(jsonNr, buf);
+            buf[sizeof(buf)-1] = '\0';
+
+            QString const installedVersion(buf);
+            QString const fileVersion = getFileVersion(jsonFileNames[i]);
+
+            qCritical() << "installed version:" << installedVersion;
+            qCritical() << "     file version:" << fileVersion;
+
+            if (installedVersion == fileVersion) {
+
+            }
+#endif
+
+        } else {
+            qCritical() << "CANNOT FIND JSON-NR FOR" << jsonFileNames[i];
+        }
+    }
+
+    return false;
+}
 bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
     if (m_sys_areDCdataValid == false) {
         qCritical() << "ERROR!!! DC DATA NOT VALID -> CA-MASTER-PLUGIN NOT CONNECTED";
@@ -501,16 +639,84 @@ bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
     }
 
     bool res = false;
+    bool dcDownloadPossible = true;
+
     QList<QString>::const_iterator it;
     for (it = filesToWorkOn.cbegin(); it != filesToWorkOn.cend(); ++it) {
         m_worker->startProgressLoop();
         QString const &fToWorkOn = QDir::cleanPath(m_customerRepository + QDir::separator() + it->trimmed());
-        static const QRegularExpression version("^.*dc2c[.][0-9]{1,2}[.][0-9]{1,2}[.]bin.*$");
-        if (fToWorkOn.contains(version)) {
+        if (fToWorkOn.endsWith("/dc2c.bin") && dcDownloadPossible) {
+#if 0
+            // download for dc possible only once
+            // download of device-controller should always be the last step
+            dcDownloadPossible = false;
+
+            if (!m_hw->dcDownloadRequest(fToWorkOn)) {  // initiate download process
+                qCritical() << "DOWNLOAD-REQUEST-ERROR FOR" << fToWorkOn;
+                continue;
+            }
+
+            QThread::sleep(2);
+
+            int tries = 5;
+            while (!m_hw->dcDownloadRunning()) { // may take some time
+                if (--tries < 0) {
+                    qCritical() << QDateTime::currentDateTime().toString(Qt::ISODate)
+                                << "(" << __func__ << ":" << __LINE__ << ") DOWNLOAD NOT RUNNING";
+                    break;
+                }
+                QThread::sleep(1);
+                continue;
+            }
+
+            qCritical() << QDateTime::currentDateTime().toString(Qt::ISODate)
+                        << "(" << __func__ << ":" << __LINE__ << ") DOWNLOAD RUNNING";
+
+            QThread::sleep(2);
+
+            tries = 5;
+            while (!m_hw->dcDownloadReportThreadStart()) { // may take some time
+                if (--tries < 0) {
+                    qCritical() << QDateTime::currentDateTime().toString(Qt::ISODate)
+                                << "(" << __func__ << ":" << __LINE__ << ") REPORT THREAD NOT STARTED";
+                    break;
+                }
+                continue;
+            }
+
+            qCritical() << QDateTime::currentDateTime().toString(Qt::ISODate)
+                        << "(" << __func__ << ":" << __LINE__ << ") REPORT THREAD STARTED";
+
+            QThread::sleep(2);
+
+            tries = 5;
+            while (!m_hw->dcDownloadReportRunning()) {     // may take some time
+                if (--tries < 0) {
+                    qCritical() << QDateTime::currentDateTime().toString(Qt::ISODate)
+                                << "(" << __func__ << ":" << __LINE__ << ") DOWNLOAD REPORT NOT RUNNING";
+                    break;
+                }
+                continue;
+            }
+
+            qCritical() << QDateTime::currentDateTime().toString(Qt::ISODate)
+                        << "(" << __func__ << ":" << __LINE__ << ") DOWNLOAD REPORT RUNNING";
+
+            tries = 1200;
+            while (m_hw->dcDownloadReportRunning()) {
+                QThread::msleep(1000);
+                if (--tries < 0) {
+                    qCritical() << QDateTime::currentDateTime().toString(Qt::ISODate)
+                                << "(" << __func__ << ":" << __LINE__
+                                << ") DOWNLOAD REPORT STILL RUNNING AFTER 20mins";
+                    break;
+                }
+            }
+#endif
             bool updateBinaryRes = true;
 
             // CONSOLE()
-
+#if 0
             m_hw->dc_autoRequest(false);// default: turn auto-request setting off
             QThread::sleep(1);          // wait to be sure that there are no more
                                         // commands sent to dc-hardware
@@ -539,7 +745,7 @@ bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
                     qInfo() << "dc-firmware-version (NOT UPDATED)" << versions[1];
                 }
             }
-
+#endif
             res = updateBinaryRes;
 
         } else if (fToWorkOn.contains("DC2C_print", Qt::CaseInsensitive)

UpdatePTUDevCtrl/update.h

@@ -9,7 +9,7 @@
 #include <QProcess>
 #include <QPluginLoader>
 
-#include "plugins/interfaces.h"
+#include <DeviceController/interfaces.h>
 
 #ifdef PTU5
 #define SERIAL_PORT "ttymxc2"
@@ -58,6 +58,7 @@ public:
                     char const *baudrate = "115200");
     virtual ~Update() override;
     bool doUpdate(int &displayIndex, QStringList const &linesToWorkOn);
+    bool checkDownloadedJsonVersions(QStringList const& jsonFileNames);
 
     hwinf *hw() { return m_hw; }
     hwinf const *hw() const { return m_hw; }
@@ -87,11 +88,14 @@ private:
     bool downloadJson(enum FileTypeJson type, int templateIdx,
                       QString jsFileToSendToDC) const;
     QStringList getDcSoftAndHardWareVersion();
+    QString getFileVersion(QString const& jsonFile);
 
 private slots:
     void readyReadStandardOutput();
     void readyReadStandardError();
     void finished(int exitCode, QProcess::ExitStatus exitStatus);
-
+    void onReportDCDownloadStatus(QString const &status);
+    void onReportDCDownloadSuccess(QString const &msg);
+    void onReportDCDownloadFailure(QString const &errorMsg);
 };
 #endif // UPDATE_H_INCLUDED

UpdatePTUDevCtrl/utils.cpp

@@ -30,6 +30,82 @@ int Utils::read1stLineOfFile(QString fileName) {
     return -1;
 }
 
+QString Utils::getLocation(QString fileName) {
+    QString location("N/A");
+    QFile f(fileName);
+    if (f.exists()) {
+        if (f.open(QIODevice::ReadOnly | QIODevice::Text)) {
+            QTextStream in(&f);
+            in.setCodec("UTF-8");
+            while(!in.atEnd()) {
+                QString const &line = in.readLine();
+                if (line.indexOf("Project", Qt::CaseInsensitive) != -1) {
+                    int const c = line.indexOf(":");
+                    if (c != -1) {
+                        location = line.mid(c+1);
+                        if (!location.isEmpty()) {
+                            return location.replace(QChar('"'), QString("")).trimmed();
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    return location;
+}
+
+QString Utils::getTariffVersion(QString fileName) {
+    QString version("N/A");
+    QFile f(fileName);
+    if (f.exists()) {
+        if (f.open(QIODevice::ReadOnly | QIODevice::Text)) {
+            QTextStream in(&f);
+            in.setCodec("UTF-8");
+            while(!in.atEnd()) {
+                QString const &line = in.readLine();
+                if (line.indexOf("Version", Qt::CaseInsensitive) != -1) {
+                    int const c = line.indexOf(":");
+                    if (c != -1) {
+                        version = line.mid(c+1);
+                        if (!version.isEmpty()) {
+                            return version.replace(QChar('"'), QString("")).trimmed();
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    return version;
+}
+
+QString Utils::getTariffInfo(QString fileName) {
+    QString info("N/A");
+    QFile f(fileName);
+    if (f.exists()) {
+        if (f.open(QIODevice::ReadOnly | QIODevice::Text)) {
+            QTextStream in(&f);
+            in.setCodec("UTF-8");
+            while(!in.atEnd()) {
+                QString const &line = in.readLine();
+                if (line.indexOf("Info", Qt::CaseInsensitive) != -1) {
+                    int const c = line.indexOf(":");
+                    if (c != -1) {
+                        info = line.mid(c+1);
+                        if (!info.isEmpty()) {
+                            return info.replace(QChar('"'), QString("")).trimmed();
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    return info;
+
+}
+
 QString Utils::zoneName(quint8 i) {
     static constexpr char const *zName[] = {
         "",

UpdatePTUDevCtrl/utils.h

@@ -12,6 +12,9 @@
 
 namespace Utils {
     int read1stLineOfFile(QString fileName);
+    QString getLocation(QString fileName);
+    QString getTariffVersion(QString fileName);
+    QString getTariffInfo(QString fileName);
     QString zoneName(quint8 i);
     void printCriticalErrorMsg(QString const &errorMsg, bool upper=false, bool lower=false);
     void printCriticalErrorMsg(QStringList const &errorMsg);

UpdatePTUDevCtrl/worker.cpp

@@ -19,7 +19,7 @@
 #include <QScopedPointer>
 
 #include "message_handler.h"
-#include "plugins/interfaces.h"
+#include <DeviceController/interfaces.h>
 #include "ismas/ismas_client.h"
 #include "progress_event.h"
 #include "mainwindow.h"
@@ -96,12 +96,15 @@ const QMap<UPDATE_STEP, const char*> Worker::smap (
         INSERT_ELEMENT(UPDATE_STEP::SAVE_LOGS_SUCCESS),
         INSERT_ELEMENT(UPDATE_STEP::SAVE_LOGS_FAILURE),
         INSERT_ELEMENT(UPDATE_STEP::SEND_LAST_VERSION),
+        INSERT_ELEMENT(UPDATE_STEP::UPDATE_FINALIZE),
         INSERT_ELEMENT(UPDATE_STEP::UPDATE_SUCCEEDED),
+        INSERT_ELEMENT(UPDATE_STEP::UPDATE_NOT_NECESSARY),
         INSERT_ELEMENT(UPDATE_STEP::UPDATE_FAILED),
         INSERT_ELEMENT(UPDATE_STEP::UPDATE_ACTIVATED),
         INSERT_ELEMENT(UPDATE_STEP::FINISHED),
         INSERT_ELEMENT(UPDATE_STEP::DEBUG),
-        INSERT_ELEMENT(UPDATE_STEP::ERROR)
+        INSERT_ELEMENT(UPDATE_STEP::ERROR),
+        INSERT_ELEMENT(UPDATE_STEP::NONE)
 #undef INSERT_ELEMENT
 });
 
@@ -140,6 +143,7 @@ Worker::Worker(int customerNr,
   , m_serialInterface(serialInterface)
   , m_baudrate(baudrate)
   , m_gc(m_customerNrStr, m_customerRepository, m_workingDirectory, m_branchName, this)
+  , m_versionInfo(QStringList())
   , m_osVersion(getOsVersion())
   , m_atbqtVersion(getATBQTVersion())
   , m_atbUpdateToolVersion(getATBUpdateToolVersion())
@@ -161,6 +165,14 @@ Worker::Worker(int customerNr,
 
     // TODO: turn object into singleton
     instance = this;
+    m_lastFailedUpdateStep = UPDATE_STEP::NONE;
+    m_update = new Update(this,
+                          QDir::cleanPath(m_workingDirectory + QDir::separator() + m_customerNrStr),
+                          m_customerNrStr,
+                          m_branchName,
+                          m_pluginDir,
+                          m_pluginName,
+                          m_workingDirectory);
 
     this->setObjectName("worker-object");
     QDir::setCurrent(m_workingDirectory);
@@ -169,6 +181,10 @@ Worker::Worker(int customerNr,
 }
 
 Worker::~Worker() {
+    if (m_update != nullptr) {
+        delete m_update;
+        m_update = nullptr;
+    }
 }
 
 void Worker::displayProgressInMainWindow(int progress) {
@@ -214,6 +230,12 @@ bool Worker::isRepositoryCorrupted() {
             Utils::printCriticalErrorMsg("CORRUPTED CUSTOMER REPOSITORY .GIT DOES NOT EXIST");
             return true;
         }
+        QDir customerRepositoryEtc(QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/"));
+        if (!customerRepositoryEtc.exists()) {
+            // should never happen
+            Utils::printCriticalErrorMsg(QString("CORRUPTED CUSTOMER REPOSITORY %1/etc DOES NOT EXIST").arg(m_customerRepository));
+            return true;
+        }
     }
     return false;
 }
@@ -248,11 +270,62 @@ void Worker::privateUpdate() {
     GUI() << (ISMAS() << (CONSOLE() << UPDATE_STEP::STARTED));
 
     QScopedPointer<UpdateProcessRunning> upr(new UpdateProcessRunning(this));
+    QStringList lst;
+
+    ////////////////////////////////////////////////////////////////////////////
+    //
+    //                         CHECK UPDATE TRIGGER
+    //
+    ////////////////////////////////////////////////////////////////////////////
+    // NOTE: make sure that nothing is sent to ISMAS during updateTriggerSet
+    ISMAS() << UPDATE_STEP::CHECK_ISMAS_TRIGGER;
+    m_ismasTriggerActive = false;
+    m_updateNotNecessary = false;
+
+    if (QDir(m_customerRepository).exists()) { // ignore a possibly corrupted repository
+        m_ismasTriggerActive = updateTriggerSet();
+        if (m_ismasTriggerActive == false) {
+            QDateTime const &current = QDateTime::currentDateTime();
+            m_automaticUpdate = (current.time().hour() < 4);
+            m_versionInfo = m_gc.gitShowReason(m_branchName);
+
+            qCritical() << "***";
+            qCritical() << "privateUpdate ............. m_versionInfo:" << m_versionInfo;
+            qCritical() << "privateUpdate ......... m_automaticUpdate:" << m_automaticUpdate;
+
+            if (m_automaticUpdate) { // update has been triggered within [00:00:00, 00:03:59]
+                m_updateNotNecessary = true;
+                m_ismasTriggerStatusMessage = QStringList(QString("NO UPDATE NECESSARY (%1)").arg(current.toString(Qt::ISODate)));
+
+                qCritical() << "privateUpdate m_ismasTriggerStatusMessage:" << QStringList(QString("NO UPDATE NECESSARY (%1)").arg(current.toString(Qt::ISODate)));
+                qCritical() << "***";
+
+                // the customer-repository does exist, but the ISMAS-trigger is
+                // *NOT* "WAIT", but from 00:00:00 - 00:03:59 this counts as an
+                // automatic update
+
+                m_lastFailedUpdateStep = UPDATE_STEP::NONE;
+                return;
+            }
+
+            qCritical() << "***";
+
+            // the customer-repository does exist, but the ISMAS-trigger is
+            // *NOT* "WAIT", so STOP the update procedure
+            return;
+        }
+        // the customer-repository does exist, and the ISMAS-trigger is "WAIT",
+        // so continue the update procedure
+    } else {
+        // the customer-repository does not exist, so PROCEED with the
+        // update procedure, even if ISMAS-trigger is not correctly set ("WAIT")
+    }
+
+    emit this->disableExit();
 
     QDir customerRepository(m_customerRepository);
-    QDir customerRepositoryEtc(QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/"));
 
-    CONSOLE() << UPDATE_STEP::CHECK_SANITY;
+    CONSOLE() << (ISMAS() << UPDATE_STEP::CHECK_SANITY);
 
     m_clone = false;
     m_repairClone = false;
@@ -275,26 +348,27 @@ void Worker::privateUpdate() {
 
     if (isRepositoryCorrupted()) {  // a not-existing repository is not meant
                                     // to be corrupted
-        CONSOLE() << UPDATE_STEP::CHECK_SANITY_FAILURE;
+        CONSOLE() << (ISMAS() << UPDATE_STEP::CHECK_SANITY_FAILURE);
         if ((continueUpdate = repairCorruptedRepository()) == true) {
             m_repairClone = true;
-            CONSOLE() << UPDATE_STEP::REPOSITORY_RECOVERED_SUCCESS;
+            CONSOLE() << (ISMAS() << UPDATE_STEP::REPOSITORY_RECOVERED_SUCCESS);
         } else {
             ISMAS() << (GUI() << (CONSOLE() << UPDATE_STEP::REPOSITORY_RECOVERED_FAILURE));
             return;
         }
     }
 
-    CONSOLE() << UPDATE_STEP::CHECK_SANITY_SUCCESS;
+    CONSOLE() << (ISMAS() << UPDATE_STEP::CHECK_SANITY_SUCCESS);
 
     if (continueUpdate) {
         if ((continueUpdate = customerRepository.exists()) == false) {
             m_initialClone = (m_repairClone == false);
-            GUI() << (CONSOLE() << UPDATE_STEP::CLONE_REPOSITORY);
+            ISMAS() << (GUI() << (CONSOLE() << UPDATE_STEP::CLONE_REPOSITORY));
             for (int i = 0; i < 5; ++i) {   // try to checkout git repository
                 setProgress(i);             // and switch to branch
                 if (m_gc.gitCloneAndCheckoutBranch()) {
                     if (!isRepositoryCorrupted()) {
+                        m_versionInfo = m_gc.gitShowReason(m_branchName);
                         GUI() << (ISMAS() << (CONSOLE() << UPDATE_STEP::CLONE_REPOSITORY_SUCCESS));
                         continueUpdate = true;
                         m_clone = true;
@@ -305,7 +379,7 @@ void Worker::privateUpdate() {
             }
 
             if (continueUpdate == false) {
-                GUI() << (ISMAS() << (CONSOLE() << UPDATE_STEP::CLONE_REPOSITORY_FAILURE));
+                GUI() << (ISMAS() << (CONSOLE() << (m_lastFailedUpdateStep = UPDATE_STEP::CLONE_REPOSITORY_FAILURE)));
                 return;
             }
 
@@ -319,36 +393,37 @@ void Worker::privateUpdate() {
 
             CONSOLE() << UPDATE_STEP::CHECK_REPOSITORY;
             if (isRepositoryCorrupted()) {
-                ISMAS() << (GUI() << (CONSOLE() << UPDATE_STEP::CHECK_REPOSITORY_FAILURE));
+                ISMAS() << (GUI() << (CONSOLE() << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_REPOSITORY_FAILURE)));
                 return;
             }
         }
     }
+    m_versionInfo = m_gc.gitShowReason(m_branchName);
+
     CONSOLE() << UPDATE_STEP::CHECK_REPOSITORY_SUCCESS;
     setProgress(_CHECKOUT_REPOSITORY_SUCCESS);
 
-
-    ////////////////////////////////////////////////////////////////////////////
-    //
-    //                         CHECK UPDATE TRIGGER
-    //
-    ////////////////////////////////////////////////////////////////////////////
-    m_ismasTriggerActive = false;
-    if ((continueUpdate = updateTriggerSet()) == false) {
+    if (m_clone == false) {
+        if (m_ismasTriggerActive == false) {
+            return;
+        } else {
+            GUI() << (ISMAS() << (CONSOLE() << UPDATE_STEP::CHECK_ISMAS_TRIGGER_SUCCESS));
+            setProgress(_CHECK_ISMAS_TRIGGER_SUCCESS);
+        }
+    } else {
         if (m_initialClone) {
             GUI() << (ISMAS() << (CONSOLE() << UPDATE_STEP::INITIAL_CLONE_WITHOUT_ACTIVE_ISMAS_TRIGGER));
         }
-        return;
-    } else {
-        GUI() << (ISMAS() << (CONSOLE() << UPDATE_STEP::INITIAL_CLONE_WITH_ACTIVE_ISMAS_TRIGGER));
     }
+
     if (m_ismasTriggerActive == false) {// make it explicit again: only if the
                                         // ismas trigger is active ('WAIT'),
                                         // then proceed
-        return;
-    }
-    GUI() << (ISMAS() << (CONSOLE() << UPDATE_STEP::CHECK_ISMAS_TRIGGER_SUCCESS));
-    setProgress(_CHECK_ISMAS_TRIGGER_SUCCESS);
+
+        if (m_clone == false) {  // if it is an (initial) clone, then
+            return;              // run the whole update process:
+        }                        // sync tariff-files, download jsons,
+    }                            // download device controller
 
 
     ////////////////////////////////////////////////////////////////////////////
@@ -359,9 +434,22 @@ void Worker::privateUpdate() {
     if ((continueUpdate = customerEnvironment()) == false) {
         return;
     }
-    CONSOLE() << UPDATE_STEP::CHECKOUT_BRANCH_SUCCESS;
+    m_versionInfo = m_gc.gitShowReason(m_branchName);
+    lst = QStringList(QString(smap[UPDATE_STEP::CHECKOUT_BRANCH_SUCCESS]));
+    ISMAS(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECKOUT_BRANCH);
     setProgress(_CHECKOUT_BRANCH_SUCCESS);
 
+    ////////////////////////////////////////////////////////////////////////////
+    //
+    //             (R)SYNC THE REPOSITORY WITH THE LOCAL FILEYSTEM
+    //
+    ////////////////////////////////////////////////////////////////////////////
+    if ((continueUpdate = syncCustomerRepositoryAndFS()) == false) {
+        return;
+    }
+    lst = QStringList(QString(smap[UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS]));
+    ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS));
+    setProgress(_SYNC_CUSTOMER_REPOSITORY_SUCCESS);
 
     ////////////////////////////////////////////////////////////////////////////
     //
@@ -371,7 +459,9 @@ void Worker::privateUpdate() {
     if ((continueUpdate = filesToUpdate()) == false) {
         return;
     }
-    ISMAS() << (GUI() << (CONSOLE() << UPDATE_STEP::UPDATE_REPOSITORY_SUCCESS));
+    m_versionInfo = m_gc.gitShowReason(m_branchName);
+    lst = QStringList(QString(smap[UPDATE_STEP::UPDATE_REPOSITORY_SUCCESS]));
+    ISMAS() << (GUI() << (CONSOLE() << UPDATE_STEP::UPDATE_REPOSITORY));
     setProgress(_UPDATE_REPOSITORY_SUCCESS);
 
 
@@ -383,7 +473,8 @@ void Worker::privateUpdate() {
     if ((continueUpdate = execOpkgCommands()) == false) {
         return;
     }
-    GUI() << (CONSOLE() << UPDATE_STEP::EXEC_OPKG_COMMAND_SUCCESS);
+    lst = QStringList(QString(smap[UPDATE_STEP::EXEC_OPKG_COMMAND_SUCCESS]));
+    GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::EXEC_OPKG_COMMANDS);
     setProgress(_EXEC_OPKG_COMMAND_SUCCESS);
 
 
@@ -395,22 +486,10 @@ void Worker::privateUpdate() {
     if ((continueUpdate = downloadFilesToPSAHardware()) == false) {
         return;
     }
-    GUI() << (CONSOLE() << UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS);
+    lst = QStringList(QString(smap[UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS]));
+    ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
     setProgress(_DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS);
 
-
-    ////////////////////////////////////////////////////////////////////////////
-    //
-    //             (R)SYNC THE REPOSITORY WITH THE LOCAL FILEYSTEM
-    //
-    ////////////////////////////////////////////////////////////////////////////
-    if ((continueUpdate = syncCustomerRepositoryAndFS()) == false) {
-        return;
-    }
-    ISMAS() << (GUI() << (CONSOLE() << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS));
-    setProgress(_SYNC_CUSTOMER_REPOSITORY_SUCCESS);
-
-
     ////////////////////////////////////////////////////////////////////////////
     //
     //                            FUTURE: SAVE LOG FILES
@@ -422,28 +501,8 @@ void Worker::privateUpdate() {
     // ISMAS() << (GUI() << (CONSOLE() << UPDATE_STEP::SAVE_LOGS_SUCCESS));
     setProgress(_SAVE_LOGS_SUCCESS);
 
-
-    ////////////////////////////////////////////////////////////////////////////
-    //
-    //                      FINAL MESSAGES (PART 1)
-    //
-    ////////////////////////////////////////////////////////////////////////////
-    ISMAS() << (GUI() << (CONSOLE() << UPDATE_STEP::UPDATE_SUCCEEDED));
-    setProgress(_UPDATE_SUCCEEDED);
-
-    ISMAS() << (GUI() << (CONSOLE() << UPDATE_STEP::UPDATE_ACTIVATED));
-    setProgress(_UPDATE_ACTIVATED);
-
-    ISMAS() << (GUI() << (CONSOLE() << UPDATE_STEP::FINISHED));
-    setProgress(_FINISHED);
-
-
-    ////////////////////////////////////////////////////////////////////////////
-    //
-    //                 FINAL MESSAGES (PART 2): SEND-LAST-VERSION
-    //                 (destructor of struct UpdateProcessRunning)
-    //
-    ////////////////////////////////////////////////////////////////////////////
+    // final messages: see destructor of UpdateProcessRunning subclass
+    m_lastFailedUpdateStep = UPDATE_STEP::NONE;
 }
 
 bool Worker::updateTriggerSet() {
@@ -451,31 +510,36 @@ bool Worker::updateTriggerSet() {
     // (WAIT-button) is activated even in case of initial checkout
     static const QString func = "UPDATE-TRIGGER-SET";
 
-    if (m_withoutIsmasDirectPort) { // useful for testing
-        return true;
-    }
+    // if (m_withoutIsmasDirectPort) { // useful for testing
+    //    return true;
+    //}
 
-    GUI() << (ISMAS() << (CONSOLE() << UPDATE_STEP::CHECK_ISMAS_TRIGGER));
+    m_ismasTriggerStatusMessage.clear();
+
+    GUI() << (CONSOLE() << UPDATE_STEP::CHECK_ISMAS_TRIGGER);
 
     QString triggerValue("NOT CHECKED YET");
-
-    for (int repeat = 1; repeat <= 100; ++repeat) {
+    static constexpr int const repeats = 15;
+    for (int repeat = 1; repeat <= repeats; ++repeat) {
 
         if (repeat > 1) {
             int const startMs = QTime::currentTime().msecsSinceStartOfDay();
             int const durationMs = QTime::currentTime().msecsSinceStartOfDay() - startMs;
             QString const &s = QString("elapsed: %1.%2s").arg(durationMs / 1000).arg(durationMs % 1000);
-            CONSOLE(QStringList(func) << s) << UPDATE_STEP::DEBUG;
+            QStringList lst = (m_ismasTriggerStatusMessage = (QStringList(func) << s));
+            CONSOLE(lst) << UPDATE_STEP::DEBUG;
         } else {
-            CONSOLE(QStringList(func) << QString("-> REPEAT=%1").arg(repeat)) << UPDATE_STEP::DEBUG;
+            QStringList lst = (m_ismasTriggerStatusMessage = (QStringList(func) << QString("-> REPEAT=%1 (%2)").arg(repeat).arg(repeats-repeat)));
+            CONSOLE(lst) << UPDATE_STEP::DEBUG;
         }
 
-        if ((repeat % 10) == 0) {
+        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
-                CONSOLE(QStringList(func) << "RESTART APISM DONE") << UPDATE_STEP::DEBUG;
+                QStringList lst = (m_ismasTriggerStatusMessage = (QStringList(func) << "RESTART APISM DONE"));
+                CONSOLE(lst) << UPDATE_STEP::DEBUG;
             }
         }
 
@@ -484,31 +548,35 @@ bool Worker::updateTriggerSet() {
                     IsmasClient::APISM::DIRECT_PORT, "#M=APISM#C=REQ_ISMASPARAMETER#J={}")) {
 
             QString const &msg = QString("APISM RESPONSE(%1)=(").arg(repeat) + result.value() + ")";
-            CONSOLE(QStringList(func) << msg) << UPDATE_STEP::DEBUG;
+            QStringList lst = (m_ismasTriggerStatusMessage = (QStringList(func) << msg));
+            CONSOLE(lst) << UPDATE_STEP::DEBUG;
 
             QJsonParseError parseError;
             QJsonDocument document(QJsonDocument::fromJson(result.value().toUtf8(), &parseError));
             if (parseError.error != QJsonParseError::NoError) {
-                QStringList lst(QString("INVALID JSON MSG: PARSING FAILED (json=<START>%1<END> error=[%2] str=[%3] offset=[%4])")
+                m_ismasTriggerStatusMessage = QStringList(QString("INVALID JSON MSG: PARSING FAILED (json=<START>%1<END> error=[%2] str=[%3] offset=[%4])")
                                                 .arg(msg)
                                                 .arg(parseError.error)
                                                 .arg(parseError.errorString())
                                                 .arg(parseError.offset));
-                GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
-                break;
+                QStringList lst = m_ismasTriggerStatusMessage;
+                ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE)));
+                return false;
             }
             if (!document.isObject()) {
-                QStringList lst(QString("not a json-object %1").arg(result.value()));
-                GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
-                break;
+                m_ismasTriggerStatusMessage = QStringList(QString("not a json-object %1").arg(result.value()));
+                QStringList lst = m_ismasTriggerStatusMessage;
+                ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE)));
+                return false;
             }
 
             QJsonObject obj = document.object();
 
             // always look for an 'error' first
             if (obj.contains("error")) {
-                QStringList lst(obj.value("error").toString());
-                CONSOLE(QStringList(lst)) << UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE;
+                m_ismasTriggerStatusMessage = QStringList(obj.value("error").toString());
+                QStringList lst = m_ismasTriggerStatusMessage;
+                CONSOLE(QStringList(lst)) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
                 QThread::sleep(6);
                 continue;
             }
@@ -523,31 +591,35 @@ bool Worker::updateTriggerSet() {
                         int const customerNr = obj.value("Custom_ID").toInt(-1);
                         int const machineNr = obj.value("Device_ID").toInt(-1);
                         if (customerNr != m_customerNr) {
-                            QStringList lst(QString("CUSTOMER-NR (%1) != LOCAL CUSTOMER-NR (%2)")
+                            m_ismasTriggerStatusMessage = QStringList(QString("CUSTOMER-NR (%1) != LOCAL CUSTOMER-NR (%2)")
                                                             .arg(customerNr).arg(m_customerNr));
-                            GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
-                            break;
+                            QStringList lst = m_ismasTriggerStatusMessage;
+                            ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE)));
+                            return false;
                         }
                         if (machineNr != m_machineNr) {
-                            QStringList lst(QString("MACHINE-NR (%1) != LOCAL MACHINE-NR (%2)")
+                            m_ismasTriggerStatusMessage = QStringList(QString("MACHINE-NR (%1) != LOCAL MACHINE-NR (%2)")
                                                             .arg(machineNr).arg(m_machineNr));
-                            GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
-                            break;
+                            QStringList lst = m_ismasTriggerStatusMessage;
+                            ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE)));
+                            return false;
                         }
                     } else {
-                        QStringList lst("Dev_ID DOES NOT CONTAIN Custom_ID AND/OR Device_ID");
-                        GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
-                        break;
+                        QStringList lst(QString("Dev_ID DOES NOT CONTAIN Custom_ID AND/OR Device_ID (LINE=%1)").arg(__LINE__));
+                        ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE)));
+                        return false;
                     }
                 } else {
-                    QStringList lst("Dev_ID KEY NOT A JSON-OBJECT");
-                    GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
-                    break;
+                    m_ismasTriggerStatusMessage = QStringList(QString("Dev_ID KEY NOT A JSON-OBJECT (LINE=%1)").arg(__LINE__));
+                    QStringList lst = m_ismasTriggerStatusMessage;
+                    ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE)));
+                    return false;
                 }
             } else {
-                QStringList lst("Dev_ID KEY NOT AVAILABLE");
-                GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
-                break;
+                m_ismasTriggerStatusMessage = QStringList(QString("Dev_ID KEY NOT AVAILABLE (LINE=%1)").arg(__LINE__));
+                QStringList lst = m_ismasTriggerStatusMessage;
+                ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE)));
+                return false;
             }
 
             if (obj.contains("Fileupload")) {
@@ -556,56 +628,68 @@ bool Worker::updateTriggerSet() {
                     obj = v.toObject();
                     if (obj.contains("TRG")) {
                         if ((triggerValue = obj.value("TRG").toString()) == "WAIT") {
+                            m_ismasTriggerStatusMessage = QStringList("ISMAS_UPDATE-TRIGGER SET TO WAIT");
                             m_ismasTriggerActive = true;
                             return m_ismasTriggerActive;
                         } else
                         if (QRegExp("\\s*").exactMatch(triggerValue)) { // check for whitespace
-                            QStringList lst("empty update trigger");
+                            m_ismasTriggerStatusMessage = QStringList(QString("%1 EMPTY UPDATE TRIGGER (%2)").arg(repeat).arg(repeats-repeat));
+                            QStringList lst = m_ismasTriggerStatusMessage;
                             if (m_clone) {
-                                GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECK_ISMAS_TRIGGER_WRONG_VALUE);
+                                ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_WRONG_VALUE)));
                                                     // if the customer repository has just been cloned
-                                break;              // it is OK the ISMAS trigger might not be 'WAIT'
+                                return false;       // it is OK the ISMAS trigger might not be 'WAIT'
                             } else {
-                                GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
+                                CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
                             }
                             QThread::sleep(6);
                             continue;
                         } else {
-                            // if the download-button once has the wrong value, it will never recover
+                            // if the download-button once has a wrong value, it will never recover
                             if (m_clone) {
-                                GUI() << (CONSOLE() << UPDATE_STEP::CHECK_ISMAS_TRIGGER_WRONG_VALUE);
+                                m_ismasTriggerStatusMessage = QStringList(QString("TRIGGER-VALUE='%1' != 'WAIT'").arg(triggerValue));
+                                QStringList lst = m_ismasTriggerStatusMessage;
+                                ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_WRONG_VALUE)));
                             } else {
-                                QStringList lst(QString("TRIGGER-VALUE=<%1> NOT 'WAIT'").arg(triggerValue));
-                                GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
+                                m_ismasTriggerStatusMessage = QStringList(QString("TRIGGER-VALUE='%1' != 'WAIT'").arg(triggerValue));
+                                QStringList lst = m_ismasTriggerStatusMessage;
+                                ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE)));
                             }
-                            break;
+                            return false;
                         }
                     } else {
-                        QStringList lst("TRG key not available");
-                        GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
-                        break;
+                        m_ismasTriggerStatusMessage = QStringList(QString("TRG key not available (LINE=%1)").arg(__LINE__));
+                        QStringList lst = m_ismasTriggerStatusMessage;
+                        ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE)));
+                        return false;
                     }
                 } else {
-                    QStringList lst("Fileupload not a json-object");
-                    GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
-                    break;
+                    m_ismasTriggerStatusMessage = QStringList(QString("Fileupload not a json-object (LINE=%1)").arg(__LINE__));
+                    QStringList lst = m_ismasTriggerStatusMessage;
+                    ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE)));
+                    return false;
                 }
             } else {
-                QStringList lst(QString("Fileupload not available"));
-                GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
-                break;
+                m_ismasTriggerStatusMessage = QStringList(QString("Fileupload not available (LINE=%1)").arg(__LINE__));
+                QStringList lst = m_ismasTriggerStatusMessage;
+                ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE)));
+                return false;
             }
         } else {
-            QStringList lst = QStringList(QString("no ISMAS response"));
-            GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
+            m_ismasTriggerStatusMessage = QStringList(QString("no ISMAS response (LINE=%1)").arg(__LINE__));
+            QStringList lst = m_ismasTriggerStatusMessage;
+            CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
             QThread::sleep(6);
+            continue;
         }
     }
 
     if (m_initialClone == false) {
         if (!triggerValue.contains("WAIT", Qt::CaseInsensitive)) {
-            QStringList lst(QString("ISMAS_UPDATE-TRIGGER-NOT-SET-OR-WRONG: VALUE=(") + triggerValue + ")");
-            ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE));
+            m_ismasTriggerStatusMessage = QStringList(QString("ISMAS_UPDATE-TRIGGER-NOT-SET-OR-WRONG: VALUE=(") + triggerValue + ")");
+            QStringList lst = m_ismasTriggerStatusMessage;
+            ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE)));
+            return false;
         }
     }
 
@@ -623,11 +707,11 @@ bool Worker::customerEnvironment() {
             return true;
         } else {
             QStringList lst(QString("CHECKOUT OF " + m_customerRepository + "FAILED"));
-            ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECKOUT_BRANCH_FAILURE));
+            ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECKOUT_BRANCH_FAILURE)));
         }
     } else {// cannot happen
         QStringList lst(QString(m_customerRepository + " DOES NOT EXIST"));
-        ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECKOUT_BRANCH_FAILURE));
+        ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECKOUT_BRANCH_FAILURE)));
     }
 
     return false;
@@ -642,37 +726,31 @@ bool Worker::filesToUpdate() {
     // always execute contents of opkg_commands-file
     m_filesToUpdate << "etc/psa_update/opkg_commands";
 
-    if (m_alwaysDownloadConfig) {
-#if 0
-        QStringList lst(QString("m_alwaysDownloadConfig NOT TESTED"));
-        CONSOLE(lst) << UPDATE_STEP::UPDATE_REPOSITORY;
+    if (m_clone && m_alwaysDownloadConfig) {
         // always download all json-config files, even if none of them have been
         // changed in the git repository. useful for first installation.
         QDir dir(QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/psa_config"));
         if (dir.exists()) {
             QStringList jsons = dir.entryList(QStringList() << "DC2C*.json", QDir::Files);
             if (!jsons.isEmpty()) {
-                m_filesToUpdate << jsons;
+                for (QStringList::size_type i=0; i<jsons.size(); ++i) {
+                    m_filesToUpdate << QDir::cleanPath(QString("etc/psa_config/") + jsons.at(i));
+                }
             }
         }
-#endif
     }
 
-    if (m_alwaysDownloadDC) {
-#if 0
-        QStringList lst(QString("m_alwaysDownloadDC NOT TESTED"));
-        CONSOLE(lst) << UPDATE_STEP::UPDATE_REPOSITORY;
+    if (m_clone && m_alwaysDownloadDC) {
         // always download the last dc-binary, even if not changed in the
         // git repository. useful for first installation.
-        QDir dir(QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/psa_update"));
+        QDir dir(QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/dc"));
         if (dir.exists()) {
-            QStringList dc = dir.entryList(QStringList() << "dc2c*.bin", QDir::Files,
+            QStringList dc = dir.entryList(QStringList() << "dc2c.bin", QDir::Files,
                                            QDir::SortFlag::Time | QDir::SortFlag::Reversed);
             if (!dc.isEmpty()) {
-                m_filesToUpdate << dc.first();
+                m_filesToUpdate << QDir::cleanPath(QString("etc/dc/") + dc.first());
             }
         }
-#endif
     }
 
     if (std::optional<QString> changes = m_gc.gitPull()) {
@@ -683,12 +761,12 @@ bool Worker::filesToUpdate() {
         }
         m_filesToUpdate.removeDuplicates();
 
-        qCritical() << __PRETTY_FUNCTION__ << "FILES-TO-UPDATE" << m_filesToUpdate;
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ") FILES-TO-UPDATE" << m_filesToUpdate;
 
         GUI(m_filesToUpdate) << (CONSOLE(m_filesToUpdate) << UPDATE_STEP::FILES_TO_UPDATE);
         setProgress(_FILES_TO_UPDATE);
     } else {
-        ISMAS() << (GUI() << (CONSOLE() << UPDATE_STEP::UPDATE_REPOSITORY_FAILURE));
+        ISMAS() << (GUI() << (CONSOLE() << (m_lastFailedUpdateStep = UPDATE_STEP::UPDATE_REPOSITORY_FAILURE)));
         return false;
     }
 
@@ -705,8 +783,7 @@ bool Worker::computeFilesToDownload() {
             fName.contains("DC2C_cash", Qt::CaseInsensitive)) {
             m_filesToDownload << fName;  // download printer-config-files
         } else {
-            static const QRegularExpression version("^.*dc2c[.][0-9]{1,2}[.][0-9]{1,2}[.]bin.*$");
-            if (fName.contains(version)) {
+            if (fName.contains("dc2c.bin")) {
                 m_filesToDownload << fName; // download device controller
             }
         }
@@ -727,7 +804,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*#.*$");
@@ -735,7 +812,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);
@@ -789,14 +866,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() << (m_lastFailedUpdateStep = UPDATE_STEP::EXEC_OPKG_COMMAND_FAILURE)));
                             GUI() << UPDATE_STEP::EXEC_OPKG_COMMAND_FAILURE;
                             setProgress(_EXEC_OPKG_COMMAND_FAILURE);
                             return false;
@@ -816,21 +894,24 @@ bool Worker::downloadFilesToPSAHardware() {
     setProgress(_DOWNLOAD_FILES_TO_PSA_HARDWARE);
 
     if (m_noUpdatePsaHardware == false) {
-        if (computeFilesToDownload()) {
-            CONSOLE(m_filesToDownload) << UPDATE_STEP::FILES_TO_DOWNLOAD;
+        if (computeFilesToDownload() > 0) {
+            QStringList lst = m_filesToDownload;
+            ISMAS(lst) << (CONSOLE(lst) << UPDATE_STEP::FILES_TO_DOWNLOAD);
 
-            Update update(this,
-                          QDir::cleanPath(m_workingDirectory + QDir::separator() + m_customerNrStr),
-                          m_customerNrStr,
-                          m_branchName,
-                          m_pluginDir,
-                          m_pluginName,
-                          m_workingDirectory);
+            if (m_update && m_update->doUpdate(m_displayIndex, m_filesToDownload)) {
+                // prepared for use: at the moment, the dc-library does not work
+                // as expected.
 
-            return update.doUpdate(m_displayIndex, m_filesToDownload);
-        } else {
-            CONSOLE(QStringList("NO FILES TO DOWNLOAD TO PSA-HW")) << UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE;
+                // static const QRegularExpression re("^.*\\.json$");
+                // return update.checkDownloadedJsonVersions(m_filesToDownload.filter(re));
+
+                return true;
+            }
+
+            CONSOLE(QStringList("NO FILES TO DOWNLOAD TO PSA-HW")) << (m_lastFailedUpdateStep = UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE);
             setProgress(_DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE);
+
+            return false;
         }
     }
 
@@ -847,7 +928,7 @@ bool Worker::syncCustomerRepositoryAndFS() {
                             QStringList() << "-c" << "mkdir -p /etc/psa_config /etc/dc /etc/psa_tariff")) {
                 qCritical() << "COULD NOT EXECUTE '" << md.command() << "' exitCode=(" << md.exitCode() << ")";
             }
-            QString const params("-vvv                    "
+            QString const params("-v                      "
                                  "--recursive             "
                                  "--progress              "
                                  "--checksum              "
@@ -910,14 +991,16 @@ bool Worker::syncCustomerRepositoryAndFS() {
                 QDir dir1(QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/psa_tariff"));
                 QDir dir2("/etc/psa_tariff");
                 if (Utils::sameFilesInDirs(dir1, dir2)) {
-                    ISMAS() << (GUI() << (CONSOLE() << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS));
+                    CONSOLE() <<  QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/psa_tariff")
+                              << "AND /etc/psa_tariff ARE DIFFERENT: CHANGED CUSTOMER-NUMBER?";
+                }
+                CONSOLE() << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS;
                 setProgress(_SYNC_CUSTOMER_REPOSITORY_SUCCESS);
                 return true;
             }
         }
     }
-    }
-    ISMAS() << (GUI() << (CONSOLE() << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_FAILURE));
+    ISMAS() << (GUI() << (CONSOLE() << (m_lastFailedUpdateStep = UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_FAILURE)));
     setProgress(_SYNC_CUSTOMER_REPOSITORY_FAILURE);
     return false;
 }
@@ -950,7 +1033,7 @@ QString Worker::getATBUpdateToolYoctoVersion() {
 
 QString Worker::getAPISMYoctoVersion() {
     if (QFile::exists("/var/lib/opkg/status")) {
-        QString const cmd = QString("echo -n $(cat /var/lib/opkg/status | grep -A1 apism | tail -n 1 | cut -d':' -f2 | cut -d' ' -f2)");
+        QString const cmd = QString("echo -n $(cat /var/lib/opkg/status | grep -A1 -e apism[[:space:]]*$ | tail -n 1 | cut -d':' -f2 | cut -d' ' -f2)");
         Command c("bash");
         if (c.execute("/tmp", QStringList() << "-c" << cmd)) {
             return c.getCommandResult(); // 1.4.1.0-r4
@@ -981,6 +1064,17 @@ QString Worker::getAPISMYoctoInstallationStatus()  {
     return "N/A";
 }
 
+QString Worker::getDCVersionPreparedForDownload(QString const &filename) {
+    if (QFile::exists(filename)) {  // <customer-repo/etc/dc/dc2c.bin>
+        QString const cmd = QString("strings %1 | grep -e DC2[Cc]\\. | head -n1").arg(filename);
+        Command c("bash");
+        if (c.execute("/tmp", QStringList() << "-c" << cmd)) {
+            return c.getCommandResult(); // DC2c.04.42  14.09.2023
+        }
+    }
+    return "N/A";
+}
+
 
 QString Worker::getATBQTVersion() const {
     QString const cmd = QString("echo -n $(/opt/app/ATBAPP/ATBQT -v | head -n 2 | cut -d':' -f2)");
@@ -1098,15 +1192,18 @@ PSAInstalled Worker::getPSAInstalled() {
     QString absPathName;
     QString absPathNameRepository;
 
-    psaInstalled.versionInfo.lastCommit = "";
-    psaInstalled.versionInfo.reason = "";
-    psaInstalled.versionInfo.created = "";
+    psaInstalled.versionInfo.lastCommit = "N/A";
+    psaInstalled.versionInfo.reason = "N/A";
+    psaInstalled.versionInfo.created = "N/A";
 
-    QStringList versionInfo = m_gc.gitShowReason(m_branchName);
-    if (versionInfo.size() == 3) {
-        psaInstalled.versionInfo.lastCommit = versionInfo.at(0);
-        psaInstalled.versionInfo.reason = versionInfo.at(1);
-        psaInstalled.versionInfo.created = versionInfo.at(2);
+    if (m_versionInfo.size() == 3) {
+        qCritical() << QString("***** %1:%2").arg(__func__).arg(__LINE__)
+                    << "m_versionInfo" << m_versionInfo << "*****";
+        psaInstalled.versionInfo.lastCommit = QString("%1-%2")
+                .arg(QCoreApplication::applicationPid())
+                .arg(m_versionInfo.at(0));
+        psaInstalled.versionInfo.reason = m_versionInfo.at(1);
+        psaInstalled.versionInfo.created = m_versionInfo.at(2);
     }
 
     if (m_zoneNr != 0) {
@@ -1119,10 +1216,10 @@ PSAInstalled Worker::getPSAInstalled() {
         psaInstalled.tariff.size = getFileSize(absPathName);
         psaInstalled.tariff.zone = m_zoneNr;
         psaInstalled.tariff.loadTime = Utils::getTariffLoadTime(absPathName);
+        psaInstalled.tariff.project = Utils::getLocation(absPathName);
+        psaInstalled.tariff.version = Utils::getTariffVersion(absPathName);
+        psaInstalled.tariff.info = Utils::getTariffInfo(absPathName);
     }
-    psaInstalled.tariff.project = "Szeged";
-    psaInstalled.tariff.info = "N/A";
-    psaInstalled.tariff.version = "N/A";
 
     psaInstalled.hw.linuxVersion = getOsVersion();
     psaInstalled.hw.cpuSerial = m_cpuSerial;

UpdatePTUDevCtrl/worker.h

@@ -33,37 +33,40 @@
 #define _ISMAS_RESET_WAIT   "ISMAS" // reset WAIT-button to "WAIT"
 
 #define _STARTED                                    (1)
-#define _CHECK_SANITY                               (2)
-#define _CHECK_SANITY_FAILURE                       (3)
-#define _CHECK_SANITY_SUCCESS                       (4)
-#define _REPOSITORY_RECOVERED_FAILURE               (5)
-#define _REPOSITORY_RECOVERED_SUCCESS               (6)
-#define _CHECK_REPOSITORY                           (7)
-#define _CHECK_REPOSITORY_FAILURE                   (8)
-#define _CHECK_REPOSITORY_SUCCESS                   (9)
-#define _CLONE_REPOSITORY                           (10)
-#define _CLONE_REPOSITORY_FAILURE                   (11)
-#define _CLONE_REPOSITORY_SUCCESS                   (12)
-#define _CHECKOUT_REPOSITORY                        (13)
-#define _CHECKOUT_REPOSITORY_FAILURE                (14)
-#define _CHECKOUT_REPOSITORY_SUCCESS                (15)
-#define _INITIAL_CLONE_WITHOUT_ACTIVE_ISMAS_TRIGGER (16)
-#define _INITIAL_CLONE_WITH_ACTIVE_ISMAS_TRIGGER    (17)
-#define _CHECK_ISMAS_TRIGGER                        (19)
-#define _CHECK_ISMAS_TRIGGER_WRONG_VALUE            (20)
-#define _CHECK_ISMAS_TRIGGER_SUCCESS                (21)
-#define _CHECK_ISMAS_TRIGGER_FAILURE                (22)
-#define _CHECKOUT_BRANCH                            (23)
-#define _CHECKOUT_BRANCH_FAILURE                    (24)
-#define _CHECKOUT_BRANCH_SUCCESS                    (25)
-#define _UPDATE_REPOSITORY                          (26)
-#define _UPDATE_REPOSITORY_FAILURE                  (28)
-#define _UPDATE_REPOSITORY_SUCCESS                  (29)
-#define _CHECK_FOR_REPOSITORY_CHANGES               (30)
-#define _CHECK_FOR_REPOSITORY_CHANGES_SUCCESS       (36)
-#define _FILES_TO_UPDATE                            (37)
-#define _CHECK_FOR_REPOSITORY_CHANGES_FAILURE       (38)
-#define _FILES_TO_DOWNLOAD                          (39)
+#define _CHECK_ISMAS_TRIGGER                        (2)
+#define _CHECK_SANITY                               (3)
+#define _CHECK_SANITY_FAILURE                       (4)
+#define _CHECK_SANITY_SUCCESS                       (5)
+#define _REPOSITORY_RECOVERED_FAILURE               (6)
+#define _REPOSITORY_RECOVERED_SUCCESS               (7)
+#define _CHECK_REPOSITORY                           (8)
+#define _CHECK_REPOSITORY_FAILURE                   (9)
+#define _CHECK_REPOSITORY_SUCCESS                   (10)
+#define _CLONE_REPOSITORY                           (11)
+#define _CLONE_REPOSITORY_FAILURE                   (12)
+#define _CLONE_REPOSITORY_SUCCESS                   (13)
+#define _CHECKOUT_REPOSITORY                        (14)
+#define _CHECKOUT_REPOSITORY_FAILURE                (15)
+#define _CHECKOUT_REPOSITORY_SUCCESS                (16)
+#define _INITIAL_CLONE_WITHOUT_ACTIVE_ISMAS_TRIGGER (17)
+#define _INITIAL_CLONE_WITH_ACTIVE_ISMAS_TRIGGER    (18)
+#define _CHECK_ISMAS_TRIGGER_WRONG_VALUE            (19)
+#define _CHECK_ISMAS_TRIGGER_SUCCESS                (20)
+#define _CHECK_ISMAS_TRIGGER_FAILURE                (21)
+#define _CHECKOUT_BRANCH                            (22)
+#define _CHECKOUT_BRANCH_FAILURE                    (23)
+#define _CHECKOUT_BRANCH_SUCCESS                    (24)
+#define _UPDATE_REPOSITORY                          (25)
+#define _UPDATE_REPOSITORY_FAILURE                  (26)
+#define _UPDATE_REPOSITORY_SUCCESS                  (27)
+#define _CHECK_FOR_REPOSITORY_CHANGES               (28)
+#define _CHECK_FOR_REPOSITORY_CHANGES_SUCCESS       (29)
+#define _SYNC_CUSTOMER_REPOSITORY                   (30)
+#define _SYNC_CUSTOMER_REPOSITORY_FAILURE           (31)
+#define _SYNC_CUSTOMER_REPOSITORY_SUCCESS           (32)
+#define _FILES_TO_UPDATE                            (33)
+#define _CHECK_FOR_REPOSITORY_CHANGES_FAILURE       (34)
+#define _FILES_TO_DOWNLOAD                          (35)
 #define _EXEC_OPKG_COMMANDS                         (41)
 #define _EXEC_OPKG_COMMAND_1                        (42)
 #define _EXEC_OPKG_COMMAND_2                        (43)
@@ -82,28 +85,29 @@
 #define _DOWNLOAD_CONFIG_FILE_SUCCESS               (56)
 #define _DOWNLOAD_CONFIG_FILE_FAILURE               (57)
 #define _DOWNLOAD_DEVICE_CONTROLLER                 (65)
-#define _DOWNLOAD_DEVICE_CONTROLLER_SUCCESS         (86)
-#define _DOWNLOAD_DEVICE_CONTROLLER_FAILURE         (87)
-#define _DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE     (88)
-#define _DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS     (89)
-#define _SYNC_CUSTOMER_REPOSITORY                   (90)
-#define _SYNC_CUSTOMER_REPOSITORY_FAILURE           (91)
-#define _SYNC_CUSTOMER_REPOSITORY_SUCCESS           (92)
-#define _SAVE_LOGS                                  (93)
-#define _SAVE_LOGS_FAILURE                          (94)
-#define _SAVE_LOGS_SUCCESS                          (95)
-#define _SEND_LAST_VERSION                          (96)
-#define _UPDATE_SUCCEEDED                           (97)
-#define _UPDATE_FAILED                              (98)
-#define _UPDATE_ACTIVATED                           (99)
+#define _DOWNLOAD_DEVICE_CONTROLLER_SUCCESS         (85)
+#define _DOWNLOAD_DEVICE_CONTROLLER_FAILURE         (86)
+#define _DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE     (87)
+#define _DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS     (88)
+#define _SAVE_LOGS                                  (92)
+#define _SAVE_LOGS_FAILURE                          (93)
+#define _SAVE_LOGS_SUCCESS                          (94)
+#define _SEND_LAST_VERSION                          (95)
+#define _UPDATE_FINALIZE                            (95)
+#define _UPDATE_SUCCEEDED                           (96)
+#define _UPDATE_FAILED                              (97)
+#define _UPDATE_ACTIVATED                           (98)
+#define _UPDATE_NOT_NECESSARY                       (99)
 #define _FINISHED                                   (100)
 #define _DEBUG                                      (1000)
 #define _ERROR                                      (1001)
+#define _NONE                                       (1002)
 
-#define _SEND_LAST_VERSION_CORRECTION               (4)
-#define _UPDATE_SUCCEEDED_CORRECTION                (3)
-#define _UPDATE_FAILED_CORRECTION                   (2)
-#define _UPDATE_ACTIVATED_CORRECTION                (1)
+#define _SEND_LAST_VERSION_CORRECTION               (5)
+#define _UPDATE_SUCCEEDED_CORRECTION                (4)
+#define _UPDATE_FAILED_CORRECTION                   (3)
+#define _UPDATE_ACTIVATED_CORRECTION                (2)
+#define _UPDATE_NOT_NECESSARY_CORRECTION            (1)
 
 #define ISMAS_UPDATE_REQUESTS                       (10)
 #define CHECK_UPDATE_TRIGGER_SET                    "Check update trigger ..."
@@ -132,6 +136,7 @@ class Worker : public QThread{
     QString const m_baudrate;
     IsmasClient m_ismasClient;
     GitClient m_gc;
+    QStringList m_versionInfo;
     QString const m_osVersion;
     QString const m_atbqtVersion;
     QString const m_atbUpdateToolVersion;
@@ -155,6 +160,9 @@ class Worker : public QThread{
     bool m_initialClone = false;
     bool m_repairClone = false;
     bool m_ismasTriggerActive = false;
+    bool m_updateNotNecessary = false;
+    bool m_automaticUpdate = false;
+    QStringList m_ismasTriggerStatusMessage;
 
     MainWindow *m_mainWindow;
     bool m_withoutIsmasDirectPort;
@@ -198,10 +206,49 @@ class Worker : public QThread{
         }
 
         virtual ~UpdateProcessRunning() {
-            m_worker->ISMAS() << (m_worker->GUI() << (m_worker->CONSOLE()
-                              << UPDATE_STEP::SEND_LAST_VERSION));
-            m_worker->stopProgressLoop();
 
+            if (m_worker->m_lastFailedUpdateStep == UPDATE_STEP::NONE) {
+                if (m_worker->m_updateNotNecessary) {
+                    QStringList lst = m_worker->m_ismasTriggerStatusMessage;
+                    m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << (m_worker->ISMAS(lst) << UPDATE_STEP::UPDATE_NOT_NECESSARY));
+                } else {
+                    QStringList lst(QString(m_worker->smap[UPDATE_STEP::UPDATE_SUCCEEDED]));
+                    m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << UPDATE_STEP::UPDATE_SUCCEEDED));
+                    m_worker->setProgress(_UPDATE_SUCCEEDED);
+
+                    lst = QStringList(QString(m_worker->smap[UPDATE_STEP::UPDATE_ACTIVATED]));
+                    m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << UPDATE_STEP::UPDATE_ACTIVATED));
+                    m_worker->setProgress(_UPDATE_ACTIVATED);
+
+                    lst = QStringList(QString(m_worker->smap[UPDATE_STEP::FINISHED]));
+                    m_worker->CONSOLE(lst) << UPDATE_STEP::FINISHED;
+                    m_worker->setProgress(_FINISHED);
+                }
+            } else {
+                QStringList lst = m_worker->m_ismasTriggerStatusMessage;
+                UPDATE_STEP last = m_worker->m_lastFailedUpdateStep;
+                if (m_worker->smap.contains(last)) {
+                    lst << QString(" (last failed step: %1)").arg(m_worker->smap[last]);
+                } else {
+                    lst << QString(" (last failed step unknown: %1)").arg((int)(last));
+                }
+                m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << (m_worker->ISMAS(lst) << UPDATE_STEP::UPDATE_FAILED));
+            }
+
+            if (m_worker->m_automaticUpdate) {
+                QStringList lst(QString(m_worker->smap[UPDATE_STEP::SEND_LAST_VERSION]));
+                lst << "AUTOMATIC UPDATE";
+                if (m_worker->m_updateNotNecessary) {
+                    lst << "UPDATE NOT NECESSARY";
+                }
+                m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst)
+                                     << UPDATE_STEP::SEND_LAST_VERSION));
+            } else {
+                QStringList lst(QString(m_worker->smap[UPDATE_STEP::SEND_LAST_VERSION]));
+                m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst)
+                                     << UPDATE_STEP::SEND_LAST_VERSION));
+            }
+            m_worker->stopProgressLoop();
             m_worker->m_updateProcessRunning = false;
             emit m_worker->enableExit();
             emit m_worker->restartExitTimer();
@@ -273,12 +320,15 @@ public:
         SAVE_LOGS_SUCCESS = _SAVE_LOGS_SUCCESS,
         SAVE_LOGS_FAILURE = _SAVE_LOGS_FAILURE,
         SEND_LAST_VERSION = _SEND_LAST_VERSION,
+        UPDATE_FINALIZE = _UPDATE_FINALIZE,
         UPDATE_SUCCEEDED = _UPDATE_SUCCEEDED,
         UPDATE_ACTIVATED = _UPDATE_ACTIVATED,
+        UPDATE_NOT_NECESSARY = _UPDATE_NOT_NECESSARY,
         UPDATE_FAILED = _UPDATE_FAILED,
         FINISHED = _FINISHED,
         DEBUG = _DEBUG,
-        ERROR = _ERROR
+        ERROR = _ERROR,
+        NONE = _NONE
     };
 
 private:
@@ -289,6 +339,8 @@ private:
     static Worker *instance;
     QStringList m_opkgCommands;
     Update *m_update = nullptr;
+    hwinf *m_hw = nullptr;
+    UPDATE_STEP m_lastFailedUpdateStep = UPDATE_STEP::NONE;
 
 protected:
     virtual void run();
@@ -317,6 +369,7 @@ public:
     static QString getATBUpdateToolYoctoInstallationStatus();
     static QString getAPISMYoctoVersion();
     static QString getAPISMYoctoInstallationStatus();
+    static QString getDCVersionPreparedForDownload(QString const &filename);
 
     static const QString UPDATE_STEP_OK;
     static const QString UPDATE_STEP_DONE;
@@ -346,6 +399,8 @@ public:
     void displayProgressInMainWindow(int progress);
     void startProgressLoop();
     void stopProgressLoop();
+    void setHW(hwinf *hw) { m_hw = hw; }
+    hwinf *getHW() { return m_hw; }
 
     IsmasClient &getIsmasClient() { return m_ismasClient; }
     IsmasClient const &getIsmasClient() const { return m_ismasClient; }
@@ -405,6 +460,8 @@ private:
         QStringList lst = QStringList(smap[step]);
 
         switch (step) {
+        case UPDATE_STEP::NONE: {
+        } break;
         case UPDATE_STEP::STARTED: {
             Utils::printUpdateStatusMsg(
                 debug,
@@ -557,8 +614,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:
@@ -610,6 +669,10 @@ private:
             lst << instance->m_debugMsg;
             Utils::printUpdateStatusMsg(debug, lst);
         break;
+        case UPDATE_STEP::UPDATE_NOT_NECESSARY:
+            lst << instance->m_debugMsg;
+            Utils::printUpdateStatusMsg(debug, lst);
+        break;
         case UPDATE_STEP::UPDATE_FAILED:
         break;
         case UPDATE_STEP::FINISHED:
@@ -643,28 +706,86 @@ private:
         QStringList lst = QStringList(smap[step]);
 
         switch (step) {
+        case UPDATE_STEP::NONE: {
+        } break;
         case UPDATE_STEP::STARTED: {
             ismasClient.setProgressInPercent(_STARTED);
         } break;
         case UPDATE_STEP::CHECK_REPOSITORY:
             ismasClient.setProgressInPercent(_CHECK_REPOSITORY);
         break;
-        case UPDATE_STEP::CHECK_REPOSITORY_SUCCESS:
-        break;
-        case UPDATE_STEP::CHECK_REPOSITORY_FAILURE:
-        break;
-        case UPDATE_STEP::CHECK_SANITY:
+        case UPDATE_STEP::CHECK_REPOSITORY_SUCCESS: {
+            ismasClient.setProgressInPercent(_CHECK_REPOSITORY_SUCCESS);
+            QString const &ismasUpdateNews =
+                QString("#M=APISM#C=CMD_EVENT#J=") +
+                    ismasClient.updateNewsToIsmas(
+                        "U0010",
+                        _CHECKOUT_REPOSITORY_SUCCESS,
+                        IsmasClient::RESULT_CODE::SUCCESS,
+                        smap[UPDATE_STEP::CHECK_REPOSITORY],
+                        QString("REPOSITORY %1 AND BRANCH %2 OK")
+                            .arg(instance->m_customerRepository)
+                            .arg(instance->m_gc.branchName()).toStdString().c_str(),
+                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
+            ismasClient.sendRequestReceiveResponse(
+                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
+        } break;
+        case UPDATE_STEP::CHECK_REPOSITORY_FAILURE: {
+            ismasClient.setProgressInPercent(_CHECK_REPOSITORY_FAILURE);
+            QString const &ismasUpdateNews =
+                QString("#M=APISM#C=CMD_EVENT#J=") +
+                    ismasClient.updateNewsToIsmas(
+                        "U0010",
+                        _CHECKOUT_REPOSITORY_FAILURE,
+                        IsmasClient::RESULT_CODE::INSTALL_ERROR,
+                        smap[UPDATE_STEP::CHECKOUT_REPOSITORY],
+                        QString("REPOSITORY %1 and BRANCH %2 ***NOT OK***")
+                            .arg(instance->m_customerRepository)
+                            .arg(instance->m_gc.branchName()).toStdString().c_str(),
+                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
+            ismasClient.sendRequestReceiveResponse(
+                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
+        } break;
+        case UPDATE_STEP::CHECK_SANITY: {
             ismasClient.setProgressInPercent(_CHECK_SANITY);
-        break;
-        case UPDATE_STEP::CHECK_SANITY_SUCCESS:
+        } break;
+        case UPDATE_STEP::CHECK_SANITY_SUCCESS: {
             ismasClient.setProgressInPercent(_CHECK_SANITY_SUCCESS);
-        break;
-        case UPDATE_STEP::CHECK_SANITY_FAILURE:
+            QString const &ismasUpdateNews =
+                QString("#M=APISM#C=CMD_EVENT#J=") +
+                    ismasClient.updateNewsToIsmas(
+                        "U0010",
+                        _CHECK_SANITY_SUCCESS,
+                        IsmasClient::RESULT_CODE::SUCCESS,
+                        smap[UPDATE_STEP::CHECK_SANITY],
+                        QString("SANITY OF %1 (BRANCH %2) OK")
+                            .arg(instance->m_customerRepository)
+                            .arg(instance->m_gc.branchName()).toStdString().c_str(),
+                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
+            ismasClient.sendRequestReceiveResponse(
+                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
+        } break;
+        case UPDATE_STEP::CHECK_SANITY_FAILURE: {
             ismasClient.setProgressInPercent(_CHECK_SANITY_FAILURE);
-        break;
+            QString const &ismasUpdateNews =
+                QString("#M=APISM#C=CMD_EVENT#J=") +
+                    ismasClient.updateNewsToIsmas(
+                        "U0010",
+                        _CHECK_SANITY_FAILURE,
+                        IsmasClient::RESULT_CODE::INSTALL_ERROR,
+                        smap[UPDATE_STEP::CHECK_SANITY],
+                        QString("SANITY OF %1 and BRANCH %2 ***NOT*** OK")
+                            .arg(instance->m_customerRepository)
+                            .arg(instance->m_gc.branchName()).toStdString().c_str(),
+                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
+            ismasClient.sendRequestReceiveResponse(
+                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
+        } break;
         case UPDATE_STEP::REPOSITORY_RECOVERED_SUCCESS:
+            ismasClient.setProgressInPercent(_REPOSITORY_RECOVERED_SUCCESS);
         break;
         case UPDATE_STEP::REPOSITORY_RECOVERED_FAILURE:
+            ismasClient.setProgressInPercent(_REPOSITORY_RECOVERED_FAILURE);
         break;
         case UPDATE_STEP::CLONE_REPOSITORY:
             ismasClient.setProgressInPercent(_CLONE_REPOSITORY);
@@ -677,11 +798,11 @@ private:
                         "U0010",
                         _CLONE_REPOSITORY_SUCCESS,
                         IsmasClient::RESULT_CODE::SUCCESS,
-                        smap[step],
+                        smap[UPDATE_STEP::CLONE_REPOSITORY],
                         QString("CLONED REPOSITORY %1 AND CHECKED OUT BRANCH %2")
                             .arg(instance->m_customerRepository)
                             .arg(instance->m_gc.branchName()).toStdString().c_str(),
-                        "");
+                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
             ismasClient.sendRequestReceiveResponse(IsmasClient::APISM::DB_PORT,
                                                    ismasUpdateNews);
         } break;
@@ -693,11 +814,11 @@ private:
                         "U0003",
                         _CLONE_REPOSITORY_FAILURE,
                         IsmasClient::RESULT_CODE::INSTALL_ERROR,
-                        smap[step],
+                        smap[UPDATE_STEP::CHECKOUT_REPOSITORY],
                         QString("CLONING REPOSITORY %1 OR CHECKING OUT BRANCH %2 FAILED")
                             .arg(instance->m_customerRepository)
                             .arg(instance->m_gc.branchName()).toStdString().c_str(),
-                        "");
+                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
             ismasClient.sendRequestReceiveResponse(
                 IsmasClient::APISM::DB_PORT, ismasUpdateNews);
         } break;
@@ -711,7 +832,8 @@ private:
                     ismasClient.cloneAndCheckoutCustomerRepository(
                           QString("CHECKED OUT REPOSITORY %1 AND CHECKED OUT BRANCH %2")
                             .arg(instance->m_customerRepository)
-                            .arg(instance->m_gc.branchName())));
+                            .arg(instance->m_gc.branchName()),
+                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A"));
         break;
         case UPDATE_STEP::CHECKOUT_REPOSITORY_FAILURE:
             ismasClient.setProgressInPercent(_CHECKOUT_REPOSITORY_FAILURE);
@@ -723,7 +845,8 @@ private:
             ismasClient.setProgressInPercent(_CHECK_ISMAS_TRIGGER_SUCCESS);
             ismasClient.sendRequestReceiveResponse(IsmasClient::APISM::DB_PORT,
                 QString("#M=APISM#C=CMD_EVENT#J=") +
-                         ismasClient.updateTriggerSet("ISMAS TRIGGER SET", ""));
+                         ismasClient.updateTriggerSet("ISMAS TRIGGER SET",
+                            instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A"));
         break;
         case UPDATE_STEP::CHECK_ISMAS_TRIGGER_WRONG_VALUE:
             ismasClient.setProgressInPercent(_CHECK_ISMAS_TRIGGER_WRONG_VALUE);
@@ -736,9 +859,9 @@ private:
                         "U0003",
                         _CHECK_ISMAS_TRIGGER_FAILURE,
                         IsmasClient::RESULT_CODE::INSTALL_ERROR,
-                        smap[step],
+                        smap[UPDATE_STEP::CHECK_ISMAS_TRIGGER],
                         instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        "");
+                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
             ismasClient.sendRequestReceiveResponse(
                 IsmasClient::APISM::DB_PORT, ismasUpdateNews);
         } break;
@@ -748,9 +871,20 @@ private:
         case UPDATE_STEP::INITIAL_CLONE_WITH_ACTIVE_ISMAS_TRIGGER:
             ismasClient.setProgressInPercent(_INITIAL_CLONE_WITH_ACTIVE_ISMAS_TRIGGER);
         break;
-        case UPDATE_STEP::CHECKOUT_BRANCH:
+        case UPDATE_STEP::CHECKOUT_BRANCH: {
             ismasClient.setProgressInPercent(_CHECKOUT_BRANCH);
-        break;
+            QString const &ismasUpdateNews =
+                QString("#M=APISM#C=CMD_EVENT#J=") +
+                    ismasClient.updateNewsToIsmas(
+                        "U0010",
+                        _CHECKOUT_BRANCH_SUCCESS,
+                        IsmasClient::RESULT_CODE::SUCCESS,
+                        smap[UPDATE_STEP::CHECKOUT_BRANCH],
+                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
+                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
+            ismasClient.sendRequestReceiveResponse(
+                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
+        } break;
         case UPDATE_STEP::CHECKOUT_BRANCH_SUCCESS: {
             ismasClient.setProgressInPercent(_CHECKOUT_BRANCH_SUCCESS);
             QString const &ismasUpdateNews =
@@ -759,9 +893,9 @@ private:
                         "U0010",
                         _CHECKOUT_BRANCH_SUCCESS,
                         IsmasClient::RESULT_CODE::SUCCESS,
-                        smap[step],
+                        smap[UPDATE_STEP::CHECKOUT_BRANCH],
                         instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        "");
+                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
             ismasClient.sendRequestReceiveResponse(
                 IsmasClient::APISM::DB_PORT, ismasUpdateNews);
         } break;
@@ -773,9 +907,9 @@ private:
                         "U0003",
                         _CHECKOUT_BRANCH_FAILURE,
                         IsmasClient::RESULT_CODE::INSTALL_ERROR,
-                        smap[step],
+                        smap[UPDATE_STEP::CHECKOUT_BRANCH],
                         instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        "");
+                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
             ismasClient.sendRequestReceiveResponse(
                 IsmasClient::APISM::DB_PORT, ismasUpdateNews);
         } break;
@@ -909,12 +1043,23 @@ private:
                         IsmasClient::RESULT_CODE::SUCCESS,
                         smap[step],
                         instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        "");
+                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
             ismasClient.sendRequestReceiveResponse(
                 IsmasClient::APISM::DB_PORT, ismasUpdateNews);
         } break;
         case UPDATE_STEP::EXEC_OPKG_COMMAND_SUCCESS: {
             ismasClient.setProgressInPercent(_EXEC_OPKG_COMMAND_SUCCESS);
+            QString const &ismasUpdateNews =
+                QString("#M=APISM#C=CMD_EVENT#J=") +
+                    ismasClient.updateNewsToIsmas(
+                        _ISMAS_CONTINUE,
+                        ismasClient.getProgressInPercent(),
+                        IsmasClient::RESULT_CODE::SUCCESS,
+                        smap[UPDATE_STEP::EXEC_OPKG_COMMANDS],
+                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
+                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
+            ismasClient.sendRequestReceiveResponse(
+                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
         } break;
         case UPDATE_STEP::EXEC_OPKG_COMMAND_FAILURE: {
             ismasClient.setProgressInPercent(_EXEC_OPKG_COMMAND_FAILURE);
@@ -926,7 +1071,7 @@ private:
                         IsmasClient::RESULT_CODE::INSTALL_ERROR,
                         smap[step],
                         instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        "");
+                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
             ismasClient.sendRequestReceiveResponse(
                 IsmasClient::APISM::DB_PORT, ismasUpdateNews);
         } break;
@@ -950,9 +1095,9 @@ private:
                         _ISMAS_CONTINUE,
                         ismasClient.getProgressInPercent(),
                         IsmasClient::RESULT_CODE::SUCCESS,
-                        smap[step],
+                        smap[UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER],
                         instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        "");
+                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
             ismasClient.sendRequestReceiveResponse(
                 IsmasClient::APISM::DB_PORT, ismasUpdateNews);
         } break;
@@ -967,9 +1112,9 @@ private:
                         _ISMAS_CONTINUE,
                         ismasClient.getProgressInPercent(),
                         IsmasClient::RESULT_CODE::SUCCESS,
-                        smap[step],
+                        smap[UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE],
                         instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        "");
+                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
             ismasClient.sendRequestReceiveResponse(
                 IsmasClient::APISM::DB_PORT, ismasUpdateNews);
         } break;
@@ -987,9 +1132,9 @@ private:
                         _ISMAS_CONTINUE,
                         ismasClient.getProgressInPercent(),
                         IsmasClient::RESULT_CODE::SUCCESS,
-                        smap[step],
+                        smap[UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY],
                         instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        "");
+                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
             ismasClient.sendRequestReceiveResponse(
                 IsmasClient::APISM::DB_PORT, ismasUpdateNews);
         } break;
@@ -1009,7 +1154,7 @@ private:
                         IsmasClient::RESULT_CODE::SUCCESS,
                         smap[step],
                         instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        "");
+                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
             ismasClient.sendRequestReceiveResponse(
                 IsmasClient::APISM::DB_PORT, ismasUpdateNews);
         } break;
@@ -1027,12 +1172,12 @@ private:
             QString const &ismasUpdateNews =
                 QString("#M=APISM#C=CMD_EVENT#J=") +
                     ismasClient.updateNewsToIsmas(
-                        "U0001", // WAIT-button set to 100%
+                        _ISMAS_DONE, // WAIT-button set to 100%
                         ismasClient.getProgressInPercent(),
                         IsmasClient::RESULT_CODE::SUCCESS,
-                        smap[step],
+                        smap[UPDATE_STEP::UPDATE_FINALIZE],
                         instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        "");
+                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
             ismasClient.sendRequestReceiveResponse(
                 IsmasClient::APISM::DB_PORT, ismasUpdateNews);
         } break;
@@ -1041,12 +1186,26 @@ private:
             QString const &ismasUpdateNews =
                 QString("#M=APISM#C=CMD_EVENT#J=") +
                     ismasClient.updateNewsToIsmas(
-                        "U0002", // reset WAIT-button to "" (empty string)
+                        _ISMAS_SET_WAIT_OK,
                         ismasClient.getProgressInPercent(),
                         IsmasClient::RESULT_CODE::SUCCESS,
-                        smap[step],
+                        smap[UPDATE_STEP::UPDATE_FINALIZE],
                         instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        "");
+                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
+            ismasClient.sendRequestReceiveResponse(
+                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
+        } break;
+        case UPDATE_STEP::UPDATE_NOT_NECESSARY: {
+            ismasClient.setProgressInPercent(_UPDATE_NOT_NECESSARY + _UPDATE_NOT_NECESSARY_CORRECTION);
+            QString const &ismasUpdateNews =
+                QString("#M=APISM#C=CMD_EVENT#J=") +
+                    ismasClient.updateNewsToIsmas(
+                        _ISMAS_SET_WAIT_OK,
+                        ismasClient.getProgressInPercent(),
+                        IsmasClient::RESULT_CODE::SUCCESS,
+                        smap[UPDATE_STEP::UPDATE_FINALIZE],
+                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
+                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
             ismasClient.sendRequestReceiveResponse(
                 IsmasClient::APISM::DB_PORT, ismasUpdateNews);
         } break;
@@ -1055,12 +1214,12 @@ private:
             QString const &ismasUpdateNews =
                 QString("#M=APISM#C=CMD_EVENT#J=") +
                     ismasClient.updateNewsToIsmas(
-                        "U0003",
+                        _ISMAS_FAILURE,
                         ismasClient.getProgressInPercent(),
                         IsmasClient::RESULT_CODE::INSTALL_ERROR,
-                        smap[step],
+                        smap[UPDATE_STEP::UPDATE_FINALIZE],
                         instance->m_ismasMsg.join(' ').toStdString().c_str(),
-                        "");
+                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
             ismasClient.sendRequestReceiveResponse(
                 IsmasClient::APISM::DB_PORT, ismasUpdateNews);
         } break;
@@ -1087,6 +1246,8 @@ private:
         Worker::instance->m_currentStep = step;
 
         switch (step) {
+        case UPDATE_STEP::NONE: {
+        } break;
         case UPDATE_STEP::STARTED:
         break;
         case UPDATE_STEP::CHECK_REPOSITORY:
@@ -1125,6 +1286,9 @@ private:
         break;
         case UPDATE_STEP::CHECK_ISMAS_TRIGGER:
             emit worker->appendText("\n" CHECK_UPDATE_TRIGGER_SET);
+            if (worker->m_guiMsg.size() > 0) {
+                emit worker->showStatusMessage(worker->m_guiMsg);
+            }
         break;
         case UPDATE_STEP::CHECK_ISMAS_TRIGGER_SUCCESS:
         break;
@@ -1258,6 +1422,8 @@ private:
         break;
         case UPDATE_STEP::UPDATE_ACTIVATED:
         break;
+        case UPDATE_STEP::UPDATE_NOT_NECESSARY:
+        break;
         case UPDATE_STEP::UPDATE_FAILED:
             emit worker->appendText(QString("UPDATE "), UPDATE_STEP_FAIL);
         break;