Compare commits
123 Commits
Author | SHA1 | Date | |
---|---|---|---|
24f2ba7c44 | |||
2ed6768953 | |||
a1327388bc | |||
8d18ae10fe | |||
31bc2d0fa2 | |||
175b8fd3a1 | |||
a57fa6c31e | |||
c22c924e38 | |||
bdc64920a2 | |||
7bc9fa0c04 | |||
334da1fe4a | |||
e5054582c2 | |||
bbd287c92b | |||
5c152c9dc2 | |||
367ffaa3a1 | |||
2fd004f249 | |||
721a156fce | |||
b7576d04e1 | |||
753954ecd7 | |||
df7cabe2c1 | |||
cfca8d2ef4 | |||
829932f29d | |||
8968667c23 | |||
a5e0154757 | |||
f346390631 | |||
c77fa097c1 | |||
074e60d8dc | |||
8eff6e5d10 | |||
4233ca8637 | |||
68fc83ba67 | |||
052028afe8 | |||
a240711946 | |||
75fdca95d9 | |||
9b087f62f9 | |||
7d38cc1269 | |||
f5baad16d5 | |||
b35e6812aa | |||
d7e709d997 | |||
4d93aa1392 | |||
b0f1e0a493 | |||
0dffc1d1c2 | |||
3581dd4b1d | |||
8d2d7bbb15 | |||
e2e7c0772d | |||
807cea1042 | |||
80712964ef | |||
978e98b2ee | |||
44c2820130 | |||
123f22cd21 | |||
b60af1a4fc | |||
bb3ecc4b76 | |||
fa30fe045b | |||
bae014822d | |||
6c472b542e | |||
7578746d2f | |||
0b1ed62df1 | |||
76ec41c291 | |||
630cd36f13 | |||
cbe8bb7aeb | |||
e04636e3f7 | |||
728185ddb9 | |||
aaa485e2fc | |||
9a9480035b | |||
0a43654f9b | |||
4dba36a420 | |||
f9ce6a6c1b | |||
c2c6bc3f8a | |||
8c02ebcf15 | |||
100bfd63ab | |||
23ff4977d9 | |||
8da6443833 | |||
6b3ebde2b5 | |||
41392a98e3 | |||
1c9bb11f0b | |||
ec0e687c21 | |||
e040e784fc | |||
d2300b87c6 | |||
0dff2ece75 | |||
db24853062 | |||
530ea33460 | |||
005e4d249f | |||
1c0786e28c | |||
0aa8d9ba5a | |||
1ecb844b64 | |||
9a687e6628 | |||
979afa37d3 | |||
1e1820724d | |||
d90954c6eb | |||
cf77d0ff76 | |||
73d02d214a | |||
6a67d8e9b0 | |||
30d8cc3684 | |||
bc9ebb7d68 | |||
e6f6d43bf2 | |||
854c8b9706 | |||
d521fd977a | |||
ebbdc2f864 | |||
62496c5d95 | |||
edd606fe78 | |||
1748c35c45 | |||
4c46932a3c | |||
686e113c3a | |||
6ddfbbfd9e | |||
7bfbdc0f07 | |||
dd591fdd23 | |||
18c7b656c3 | |||
5e9b05e887 | |||
37aae73f21 | |||
0b4eed9dc0 | |||
12f48ad1bb | |||
5d7d1a2870 | |||
5d7f13a254 | |||
d332a990d5 | |||
bfa39eb3df | |||
d7fcfa3d0f | |||
f1e449c108 | |||
32346c2665 | |||
38e7bf4985 | |||
6df73e1082 | |||
19250a0a2f | |||
6f5c8103e4 | |||
07dcf0ba30 | |||
1e379cf086 |
3
.gitignore
vendored
Normal file
3
.gitignore
vendored
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
tags
|
||||||
|
*.tags
|
||||||
|
*.user
|
@@ -14,5 +14,5 @@ dry-run=false
|
|||||||
extended-version=false
|
extended-version=false
|
||||||
yocto-version=false
|
yocto-version=false
|
||||||
yocto-install=false
|
yocto-install=false
|
||||||
always-download-config=false
|
always-download-config=true
|
||||||
always-download-dc=false
|
always-download-dc=false
|
||||||
|
3
ATBUpdateTool.pro
Normal file
3
ATBUpdateTool.pro
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
TEMPLATE = subdirs
|
||||||
|
CONFIG += ordered
|
||||||
|
SUBDIRS = DownloadDCFirmware DownloadDCJsonFiles UpdatePTUDevCtrl
|
0
DownloadDCFirmware/ATBDownloadDCFirmware.ini
Normal file
0
DownloadDCFirmware/ATBDownloadDCFirmware.ini
Normal file
83
DownloadDCFirmware/DownloadDCFirmware.pro
Normal file
83
DownloadDCFirmware/DownloadDCFirmware.pro
Normal file
@@ -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
|
||||||
|
}
|
0
DownloadDCFirmware/README.md
Normal file
0
DownloadDCFirmware/README.md
Normal file
8
DownloadDCFirmware/main.cpp
Normal file
8
DownloadDCFirmware/main.cpp
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
#include <QtGlobal>
|
||||||
|
|
||||||
|
int main(int argc, char **argv) {
|
||||||
|
Q_UNUSED(argc);
|
||||||
|
Q_UNUSED(argv);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
0
DownloadDCJsonFiles/ATBDownloadDCJsonFiles.ini
Normal file
0
DownloadDCJsonFiles/ATBDownloadDCJsonFiles.ini
Normal file
93
DownloadDCJsonFiles/DownloadDCJsonFiles.pro
Normal file
93
DownloadDCJsonFiles/DownloadDCJsonFiles.pro
Normal file
@@ -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
|
||||||
|
}
|
445
DownloadDCJsonFiles/DownloadDCJsonFiles.pro.user
Normal file
445
DownloadDCJsonFiles/DownloadDCJsonFiles.pro.user
Normal file
@@ -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>
|
0
DownloadDCJsonFiles/README.md
Normal file
0
DownloadDCJsonFiles/README.md
Normal file
56
DownloadDCJsonFiles/main.cpp
Normal file
56
DownloadDCJsonFiles/main.cpp
Normal file
@@ -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();
|
||||||
|
}
|
97
DownloadDCJsonFiles/message_handler.cpp
Normal file
97
DownloadDCJsonFiles/message_handler.cpp
Normal file
@@ -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
|
||||||
|
|
23
DownloadDCJsonFiles/message_handler.h
Normal file
23
DownloadDCJsonFiles/message_handler.h
Normal file
@@ -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
|
99
interfaces.h → DownloadDCJsonFiles/plugins/interfaces.h
Executable file → Normal file
99
interfaces.h → DownloadDCJsonFiles/plugins/interfaces.h
Executable file → Normal file
@@ -24,6 +24,7 @@ struct T_emp
|
|||||||
|
|
||||||
// dynamic:
|
// dynamic:
|
||||||
uint8_t state; // step counter of EMP (electronic coin checker) FSM (finite state machine):
|
uint8_t state; // step counter of EMP (electronic coin checker) FSM (finite state machine):
|
||||||
|
/*
|
||||||
// 0=start command
|
// 0=start command
|
||||||
// 1=powered, do emp ini, send reset
|
// 1=powered, do emp ini, send reset
|
||||||
// 2=delay
|
// 2=delay
|
||||||
@@ -39,7 +40,7 @@ struct T_emp
|
|||||||
// 90: stop all, 1s delay
|
// 90: stop all, 1s delay
|
||||||
// 99: off, all stopped
|
// 99: off, all stopped
|
||||||
|
|
||||||
|
*/
|
||||||
uint8_t pollingRunning;
|
uint8_t pollingRunning;
|
||||||
uint8_t paymentRunning;
|
uint8_t paymentRunning;
|
||||||
|
|
||||||
@@ -238,6 +239,7 @@ struct T_dynamicCondition
|
|||||||
uint8_t lastVDoorState;
|
uint8_t lastVDoorState;
|
||||||
uint8_t lastCBstate;
|
uint8_t lastCBstate;
|
||||||
char paymentInProgress;
|
char paymentInProgress;
|
||||||
|
// Version Szeged: aug2023
|
||||||
// 0: stopped by timeout
|
// 0: stopped by timeout
|
||||||
// 1: running 2: wait4lastCoin
|
// 1: running 2: wait4lastCoin
|
||||||
// 3: payment stopped manually, coins in Escrow
|
// 3: payment stopped manually, coins in Escrow
|
||||||
@@ -246,6 +248,21 @@ struct T_dynamicCondition
|
|||||||
// 6: coins encashed 7:coins returned
|
// 6: coins encashed 7:coins returned
|
||||||
// 8: CoinChecker or MDB on Error
|
// 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;
|
char res1;
|
||||||
uint16_t U_Batt;
|
uint16_t U_Batt;
|
||||||
@@ -397,6 +414,7 @@ struct T_bna
|
|||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
class DownloadThread;
|
||||||
class hwinf
|
class hwinf
|
||||||
{
|
{
|
||||||
|
|
||||||
@@ -2252,14 +2270,23 @@ public:
|
|||||||
virtual void bna_requestCurrentNotes() const {}
|
virtual void bna_requestCurrentNotes() const {}
|
||||||
// send command to DC in order to get transaction data
|
// 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(latestBill);
|
||||||
Q_UNUSED(currentNotes);
|
Q_UNUSED(currentNotes);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
// returns number of collected bank notes since start-command (current transaction)
|
// returns number of collected bank notes since start-command (current transaction)
|
||||||
// latestBill: last accepted bank note, value in cent
|
// return value: numbers of bills or 99 in case of error
|
||||||
// currentNotes an array with up to 16 (further) notes collected
|
// 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 {}
|
virtual void bna_requestStackerLevel() const {}
|
||||||
|
|
||||||
@@ -2273,9 +2300,73 @@ public:
|
|||||||
// countOfBills[1] for 10€ and so on
|
// 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:
|
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_OK(void) const=0;
|
||||||
virtual void hwapi_templatePrintFinished_Err(void) const=0;
|
virtual void hwapi_templatePrintFinished_Err(void) const=0;
|
||||||
|
|
36
DownloadDCJsonFiles/process/command.h
Normal file
36
DownloadDCJsonFiles/process/command.h
Normal file
@@ -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
|
@@ -53,7 +53,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
|
|||||||
# local filesystem, json-files will be downloaded to firmware.
|
# local filesystem, json-files will be downloaded to firmware.
|
||||||
# The device-controller firmware will be handled in a later version.
|
# The device-controller firmware will be handled in a later version.
|
||||||
# 1.3.15: Bug fixes found during testing.
|
# 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
|
# Removed worker-thread with an own event-loop: only the GUI thread
|
||||||
# has an event loop. Tested JSON-downloads several times successfully
|
# has an event loop. Tested JSON-downloads several times successfully
|
||||||
# (using the slave lib where the CA helper tool was active as master).
|
# (using the slave lib where the CA helper tool was active as master).
|
||||||
@@ -65,8 +65,47 @@ DEFINES += QT_DEPRECATED_WARNINGS
|
|||||||
# 1.3.18: Bug fixes found during testing.
|
# 1.3.18: Bug fixes found during testing.
|
||||||
# 1.3.19: Bug fixes found during testing.
|
# 1.3.19: Bug fixes found during testing.
|
||||||
# 1.3.20: Bug fixes found during testing.
|
# 1.3.20: Bug fixes found during testing.
|
||||||
VERSION="1.3.21"
|
# 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:
|
# PLANNED TODOS:
|
||||||
# 1: Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
|
# 1: Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
|
||||||
# 2: Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu
|
# 2: Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu
|
||||||
@@ -80,7 +119,6 @@ VERSION="1.3.21"
|
|||||||
# ISMAS eine entsprechende Meldung anzeigen als Teil von SEND-LAST-VERSION.
|
# ISMAS eine entsprechende Meldung anzeigen als Teil von SEND-LAST-VERSION.
|
||||||
# Wenn der WAIT-button aktiv ist, dann werden zumindest die opkg-commands
|
# Wenn der WAIT-button aktiv ist, dann werden zumindest die opkg-commands
|
||||||
# ausgefuehrt.
|
# ausgefuehrt.
|
||||||
# 4: rsync: immer alle Dateien soiegeln (bis auf opkg-commands)
|
|
||||||
# 5: Falls das Tool mal abstuerzt, dann einen Signal-Handler (fuer TERM)
|
# 5: Falls das Tool mal abstuerzt, dann einen Signal-Handler (fuer TERM)
|
||||||
# installieren, sodass zumnidest SEND-LAST-VERSION mit rausgeht.
|
# installieren, sodass zumnidest SEND-LAST-VERSION mit rausgeht.
|
||||||
# 6: rsync: explizites Binary, nicht das in busybox enthaltene.
|
# 6: rsync: explizites Binary, nicht das in busybox enthaltene.
|
||||||
@@ -96,9 +134,32 @@ VERSION="1.3.21"
|
|||||||
# Stellung des WAIT-Button. Grund: es koennte sein, dass andernfalls ein
|
# Stellung des WAIT-Button. Grund: es koennte sein, dass andernfalls ein
|
||||||
# PSA weit hiter anderen steht, und dann ploetzlich einmal alle vorher-
|
# PSA weit hiter anderen steht, und dann ploetzlich einmal alle vorher-
|
||||||
# gehenden Aenderungen anzieht, die gar nicht fuer ihn gemeint waren.
|
# gehenden Aenderungen anzieht, die gar nicht fuer ihn gemeint waren.
|
||||||
# 10: Bei einer Neuinstallation (Neuhauser) immer JSON files runterladen,
|
# 11: Das Edit-Fenster teilen um die Anzeige zu verbessern.
|
||||||
# Tariff-Files syncen (d.h. nur wenn noch kein Repo vorhanden ist), und
|
# 12: Bei einem Update muss immer ersichtlich sein, warum es ueberhaupt
|
||||||
# zwar auch ohne WAIT-Button.
|
# 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 {
|
win32 {
|
||||||
@@ -126,7 +187,7 @@ DEFINES+=APP_EXTENDED_VERSION=\\\"$$EXTENDED_VERSION\\\"
|
|||||||
# keep comments, as /* fall through */
|
# keep comments, as /* fall through */
|
||||||
QMAKE_CXXFLAGS += -C
|
QMAKE_CXXFLAGS += -C
|
||||||
QMAKE_CXXFLAGS += -g
|
QMAKE_CXXFLAGS += -g
|
||||||
QMAKE_CXXFLAGS += -Wno-deprecated-copy
|
QMAKE_CXXFLAGS += -Wno-deprecated-copy -O
|
||||||
|
|
||||||
contains( CONFIG, PTU5 ) {
|
contains( CONFIG, PTU5 ) {
|
||||||
greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
|
greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
|
||||||
@@ -186,6 +247,7 @@ HEADERS += \
|
|||||||
process/command.h \
|
process/command.h \
|
||||||
message_handler.h \
|
message_handler.h \
|
||||||
worker.h \
|
worker.h \
|
||||||
|
interfaces.h \
|
||||||
commandline_parser.h \
|
commandline_parser.h \
|
||||||
plugins/interfaces.h
|
plugins/interfaces.h
|
||||||
|
|
275
UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro
Normal file
275
UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro
Normal file
@@ -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
|
||||||
|
}
|
@@ -87,7 +87,7 @@ void CommandLineParser::configure() {
|
|||||||
m_repositoryUrlOption.setDefaultValue("https://git.mimbach49.de/GerhardHoffmann");
|
m_repositoryUrlOption.setDefaultValue("https://git.mimbach49.de/GerhardHoffmann");
|
||||||
m_parser.addOption(m_repositoryUrlOption);
|
m_parser.addOption(m_repositoryUrlOption);
|
||||||
|
|
||||||
m_iniFileDirectoryOption.setDefaultValue(".");
|
m_iniFileDirectoryOption.setDefaultValue(QCoreApplication::applicationDirPath());
|
||||||
m_parser.addOption(m_iniFileDirectoryOption);
|
m_parser.addOption(m_iniFileDirectoryOption);
|
||||||
|
|
||||||
m_iniFileNameOption.setDefaultValue("ATBUpdateTool.ini");
|
m_iniFileNameOption.setDefaultValue("ATBUpdateTool.ini");
|
||||||
@@ -129,12 +129,19 @@ void CommandLineParser::readSettings() {
|
|||||||
QString const iniFileName = m_parser.value(m_iniFileNameOption);
|
QString const iniFileName = m_parser.value(m_iniFileNameOption);
|
||||||
m_iniFileName = QDir::cleanPath(iniFileDir + QDir::separator() + iniFileName);
|
m_iniFileName = QDir::cleanPath(iniFileDir + QDir::separator() + iniFileName);
|
||||||
|
|
||||||
|
qCritical() << __PRETTY_FUNCTION__ << " iniFileDir" << iniFileDir;
|
||||||
|
qCritical() << __PRETTY_FUNCTION__ << "iniFileName" << m_iniFileName;
|
||||||
|
|
||||||
if (!m_iniFileName.isEmpty()) {
|
if (!m_iniFileName.isEmpty()) {
|
||||||
if (QFile(m_iniFileName).exists()) {
|
if (QFile(m_iniFileName).exists()) {
|
||||||
QSettings settings(m_iniFileName, QSettings::IniFormat);
|
QSettings settings(m_iniFileName, QSettings::IniFormat);
|
||||||
QStringList keys = settings.allKeys();
|
QStringList keys = settings.allKeys();
|
||||||
for (QString const &key: keys) {
|
for (QString const &key: keys) {
|
||||||
QVariant v = settings.value(key);
|
QVariant v = settings.value(key);
|
||||||
|
|
||||||
|
qCritical() << __PRETTY_FUNCTION__
|
||||||
|
<< key << " -> " << v.toString();
|
||||||
|
|
||||||
if (key.contains("repository-url")) {
|
if (key.contains("repository-url")) {
|
||||||
m_repositoryUrl = v.toString();
|
m_repositoryUrl = v.toString();
|
||||||
} else
|
} else
|
||||||
@@ -167,8 +174,14 @@ void CommandLineParser::readSettings() {
|
|||||||
} else
|
} else
|
||||||
if (key.contains("plugin-name")) {
|
if (key.contains("plugin-name")) {
|
||||||
m_plugInName = v.toString();
|
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() {
|
bool CommandLineParser::alwaysDownloadConfig() {
|
||||||
if (m_parser.isSet(m_alwaysDownloadConfigOption)) {
|
if (m_parser.isSet(m_alwaysDownloadConfigOption)) {
|
||||||
m_alwaysDownloadConfig = m_parser.value(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;
|
return m_alwaysDownloadConfig == "false" ? false : true;
|
||||||
}
|
}
|
||||||
|
|
BIN
UpdatePTUDevCtrl/doc/ATBUpdateTool.drawio-4.pdf
Normal file
BIN
UpdatePTUDevCtrl/doc/ATBUpdateTool.drawio-4.pdf
Normal file
Binary file not shown.
BIN
UpdatePTUDevCtrl/doc/ATBUpdateTool4.pdf
Normal file
BIN
UpdatePTUDevCtrl/doc/ATBUpdateTool4.pdf
Normal file
Binary file not shown.
@@ -316,6 +316,31 @@ std::optional<QString> GitClient::gitPull() {
|
|||||||
// 6ed893f..5d9882c zg1/zone2 -> origin/zg1/zone2
|
// 6ed893f..5d9882c zg1/zone2 -> origin/zg1/zone2
|
||||||
// 4384d17..77045d8 zg1/zone3 -> origin/zg1/zone3
|
// 4384d17..77045d8 zg1/zone3 -> origin/zg1/zone3
|
||||||
// 89d2812..36a0d74 zg1/zone5 -> origin/zg1/zone5
|
// 89d2812..36a0d74 zg1/zone5 -> origin/zg1/zone5
|
||||||
|
//
|
||||||
|
// More exactly:
|
||||||
|
// remote: Counting objects: 382, done.
|
||||||
|
// remote: Compressing objects: 100% (203/203), done.
|
||||||
|
// remote: Total 278 (delta 177), reused 103 (delta 59)
|
||||||
|
// Receiving objects: 100% (278/278), 4.89 MiB | 539 KiB/s, done.
|
||||||
|
// Resolving deltas: 100% (177/177), completed with 40 local objects.
|
||||||
|
// From ssh://longair@pacific.mpi-cbg.de/srv/git/fiji
|
||||||
|
// 3036acc..9eb5e40 debian-release-20081030 -> origin/debian-release-20081030
|
||||||
|
// * [new branch] debian-release-20081112 -> origin/debian-release-20081112
|
||||||
|
// * [new branch] debian-release-20081112.1 -> origin/debian-release-20081112.1
|
||||||
|
// 3d619e7..6260626 master -> origin/master
|
||||||
|
//
|
||||||
|
// The most important bits here are the lines like these:
|
||||||
|
//
|
||||||
|
// 3036acc..9eb5e40 debian-release-20081030 -> origin/debian-release-20081030
|
||||||
|
// * [new branch] debian-release-20081112 -> origin/debian-release-20081112
|
||||||
|
//
|
||||||
|
// The first line of these two shows that your remote-tracking branch
|
||||||
|
// origin/debian-release-20081030 has been advanced from the commit 3036acc to 9eb5e40.
|
||||||
|
// The bit before the arrow is the name of the branch in the remote repository.
|
||||||
|
// The second line similarly show that since we last did this, a new remote tracking
|
||||||
|
// branch has been created. (git fetch may also fetch new tags if they have appeared
|
||||||
|
// in the remote repository.)
|
||||||
|
|
||||||
bool found = false;
|
bool found = false;
|
||||||
for (int i=0; i < lines.size(); ++i) {
|
for (int i=0; i < lines.size(); ++i) {
|
||||||
if (lines.at(i).contains(m_branchName)) {
|
if (lines.at(i).contains(m_branchName)) {
|
@@ -793,6 +793,152 @@ QString IsmasClient::updateOfPSASendVersion(PSAInstalled const &psa) {
|
|||||||
return buf;
|
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 IsmasClient::updateOfPSAContinues(QString currentStage,
|
||||||
QString currentStageInfo,
|
QString currentStageInfo,
|
||||||
QString const &version) {
|
QString const &version) {
|
@@ -14,6 +14,7 @@ struct PSAInstalled {
|
|||||||
} versionInfo;
|
} versionInfo;
|
||||||
|
|
||||||
struct Tariff {
|
struct Tariff {
|
||||||
|
// VersionInfo versionInfo;
|
||||||
QString name;
|
QString name;
|
||||||
QString version;
|
QString version;
|
||||||
QString project;
|
QString project;
|
||||||
@@ -31,6 +32,7 @@ struct PSAInstalled {
|
|||||||
} hw;
|
} hw;
|
||||||
|
|
||||||
struct Opkg {
|
struct Opkg {
|
||||||
|
// VersionInfo versionInfo;
|
||||||
int size;
|
int size;
|
||||||
QString blob;
|
QString blob;
|
||||||
QString lastCommit;
|
QString lastCommit;
|
||||||
@@ -38,6 +40,7 @@ struct PSAInstalled {
|
|||||||
} opkg;
|
} opkg;
|
||||||
|
|
||||||
struct DC {
|
struct DC {
|
||||||
|
// VersionInfo versionInfo;
|
||||||
QString versionHW;
|
QString versionHW;
|
||||||
QString versionSW;
|
QString versionSW;
|
||||||
QString gitBlob;
|
QString gitBlob;
|
||||||
@@ -62,6 +65,7 @@ struct PSAInstalled {
|
|||||||
} pluginVersion;
|
} pluginVersion;
|
||||||
|
|
||||||
struct DC2C {
|
struct DC2C {
|
||||||
|
// VersionInfo versionInfo;
|
||||||
QString name;
|
QString name;
|
||||||
QString blob;
|
QString blob;
|
||||||
int size;
|
int size;
|
||||||
@@ -194,8 +198,68 @@ public:
|
|||||||
QString jsonParseFailed(int resultCode, QString reason, QString const &version = QString());
|
QString jsonParseFailed(int resultCode, QString reason, QString const &version = QString());
|
||||||
std::optional<QString> finalResult(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);
|
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:
|
private:
|
||||||
static void printDebugMessage(int port, QString const &clientIP, int clientPort,
|
static void printDebugMessage(int port, QString const &clientIP, int clientPort,
|
||||||
QString const &message);
|
QString const &message);
|
@@ -9,7 +9,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "message_handler.h"
|
#include "message_handler.h"
|
||||||
#include "plugins/interfaces.h"
|
#include <DeviceController/interfaces.h>
|
||||||
#include "commandline_parser.h"
|
#include "commandline_parser.h"
|
||||||
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
@@ -4,7 +4,7 @@
|
|||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
#include "progress_event.h"
|
#include "progress_event.h"
|
||||||
#include "update_dc_event.h"
|
#include "update_dc_event.h"
|
||||||
#include "plugins/interfaces.h"
|
#include <DeviceController/interfaces.h>
|
||||||
|
|
||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
@@ -146,7 +146,7 @@ void MainWindow::onEnableExit() {
|
|||||||
|
|
||||||
void MainWindow::onRestartExitTimer() {
|
void MainWindow::onRestartExitTimer() {
|
||||||
m_exitTimer->stop();
|
m_exitTimer->stop();
|
||||||
m_exitTimer->start(60 * 1000);
|
m_exitTimer->start(5 * 1000);
|
||||||
|
|
||||||
scrollDownTextEdit();
|
scrollDownTextEdit();
|
||||||
ui->updateStatus->setEnabled(false);
|
ui->updateStatus->setEnabled(false);
|
97
UpdatePTUDevCtrl/message_handler.cpp
Executable file
97
UpdatePTUDevCtrl/message_handler.cpp
Executable file
@@ -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
|
||||||
|
|
23
UpdatePTUDevCtrl/message_handler.h
Executable file
23
UpdatePTUDevCtrl/message_handler.h
Executable file
@@ -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
|
124
UpdatePTUDevCtrl/process/command.cpp
Normal file
124
UpdatePTUDevCtrl/process/command.cpp
Normal file
@@ -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;
|
||||||
|
}
|
@@ -18,7 +18,7 @@
|
|||||||
#include "unistd.h"
|
#include "unistd.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "plugins/interfaces.h"
|
#include <DeviceController/interfaces.h>
|
||||||
|
|
||||||
#include <QSharedMemory>
|
#include <QSharedMemory>
|
||||||
#include <QScopedPointer>
|
#include <QScopedPointer>
|
||||||
@@ -54,6 +54,10 @@ hwinf *Update::loadDCPlugin(QDir const &plugInDir, QString const &fname) {
|
|||||||
qCritical() << pluginLoader.errorString();
|
qCritical() << pluginLoader.errorString();
|
||||||
exit(-1);
|
exit(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
qCritical() << "loadDCPlugin() plugin directory:" << plugInDir.absolutePath();
|
||||||
|
qCritical() << "loadDCPlugin() plugin file name:" << pluginLoader.fileName();
|
||||||
|
|
||||||
if (!pluginLoader.isLoaded()) {
|
if (!pluginLoader.isLoaded()) {
|
||||||
qCritical() << pluginLoader.errorString();
|
qCritical() << pluginLoader.errorString();
|
||||||
exit(-2);
|
exit(-2);
|
||||||
@@ -94,6 +98,7 @@ bool Update::unloadDCPlugin() {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class hwapi;
|
||||||
Update::Update(Worker *worker,
|
Update::Update(Worker *worker,
|
||||||
QString customerRepository,
|
QString customerRepository,
|
||||||
QString customerNrStr,
|
QString customerNrStr,
|
||||||
@@ -118,30 +123,72 @@ Update::Update(Worker *worker,
|
|||||||
, m_dryRun(dryRun)
|
, m_dryRun(dryRun)
|
||||||
, m_sys_areDCdataValid(false) {
|
, m_sys_areDCdataValid(false) {
|
||||||
|
|
||||||
|
if (!m_hw) {
|
||||||
|
qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_hw == nullptr -> ca-slave plugin loaded ???";
|
||||||
|
} else {
|
||||||
int tries = 20;
|
int tries = 20;
|
||||||
while ((m_sys_areDCdataValid = m_hw->sys_areDCdataValid()) == false) {
|
while ((m_sys_areDCdataValid = m_hw->sys_areDCdataValid()) == false) {
|
||||||
// must deliver 'true', only then are all data from hwapi valid
|
// must deliver 'true', only then are all data from hwapi valid
|
||||||
if (--tries < 0) {
|
if (--tries < 0) {
|
||||||
qCritical() << "ERROR!!! DC DATA NOT VALID -> CA-MASTER-PLUGIN NOT CONNECTED";
|
qCritical() << "ERROR!!! DC DATA NOT VALID -> CA-MASTER-PLUGIN NOT CONNECTED";
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
m_hw->dc_autoRequest(true);
|
m_hw->dc_autoRequest(true);
|
||||||
QThread::msleep(500);
|
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;
|
#if 0
|
||||||
//qInfo() << "UPDATE: m_baudrate ..." << m_baudrate;
|
QObject const *obj = m_hw->getAPI();
|
||||||
//qInfo() << "UPDATE: m_customerRepository ..." << m_customerRepository;
|
Q_ASSERT(obj != nullptr);
|
||||||
//qInfo() << "UPDATE: m_customerNr ..........." << m_customerNrStr;
|
|
||||||
//qInfo() << "UPDATE: m_branchName ..........." << m_branchName;
|
QDebug critical = qCritical();
|
||||||
//qInfo() << "UPDATE: m_pluginName ..........." << m_pluginName;
|
critical << "connect() to onReportDCDownloadStatus() ...";
|
||||||
//qInfo() << "UPDATE: m_workingDirectory ....." << m_workingDir;
|
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() {
|
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.
|
// br is a index into a table, used for historical reasons.
|
||||||
bool Update::openSerial(int br, QString baudrate, QString comPort) const {
|
bool Update::openSerial(int br, QString baudrate, QString comPort) const {
|
||||||
qDebug() << "opening serial" << br << baudrate << comPort << "...";
|
qDebug() << "opening serial" << br << baudrate << comPort << "...";
|
||||||
@@ -261,6 +308,7 @@ bool Update::updateBinary(QString const &fileToSendToDC) {
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
#if 0
|
||||||
QFile fn(fileToSendToDC);
|
QFile fn(fileToSendToDC);
|
||||||
if (!fn.exists()) {
|
if (!fn.exists()) {
|
||||||
// output via CONSOLE() etc
|
// output via CONSOLE() etc
|
||||||
@@ -329,6 +377,7 @@ bool Update::updateBinary(QString const &fileToSendToDC) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
QString Update::jsonType(enum FileTypeJson type) {
|
QString Update::jsonType(enum FileTypeJson type) {
|
||||||
@@ -351,23 +400,32 @@ bool Update::downloadJson(enum FileTypeJson type,
|
|||||||
qDebug() << "SET AUTO-REQUEST=TRUE";
|
qDebug() << "SET AUTO-REQUEST=TRUE";
|
||||||
QThread::sleep(1); // make sure the auto-request flag is acknowledged
|
QThread::sleep(1); // make sure the auto-request flag is acknowledged
|
||||||
|
|
||||||
|
QStringList lst;
|
||||||
bool ready = false;
|
bool ready = false;
|
||||||
int nTry = 25;
|
int nTry = 25;
|
||||||
while ((ready = m_hw->sys_ready4sending()) == false) {
|
while ((ready = m_hw->sys_ready4sending()) == false) {
|
||||||
QThread::msleep(200);
|
QThread::msleep(200);
|
||||||
if (--nTry <= 0) {
|
if (--nTry <= 0) {
|
||||||
Utils::printCriticalErrorMsg("SYS NOT READY FOR SENDING AFTER 5 SECONDS");
|
QString msg("SYS NOT READY FOR SENDING AFTER 5 SECONDS");
|
||||||
|
Utils::printCriticalErrorMsg(msg);
|
||||||
|
lst << msg;
|
||||||
|
|
||||||
|
if (m_worker) {
|
||||||
|
m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ret = false;
|
bool ret = false;
|
||||||
|
QString msg;
|
||||||
|
lst.clear();
|
||||||
if (ready) {
|
if (ready) {
|
||||||
QFile file(jsFileToSendToDC);
|
QFile file(jsFileToSendToDC);
|
||||||
QFileInfo fi(jsFileToSendToDC); // max. size of template file is 800 bytes
|
QFileInfo fi(jsFileToSendToDC); // max. size of template file is 800 bytes
|
||||||
if (file.exists()) {
|
if (file.exists()) {
|
||||||
if (file.open(QIODevice::ReadOnly)) {
|
if (file.open(QIODevice::ReadOnly)) {
|
||||||
if (fi.size() <= 800) {
|
if (fi.size() > 0 && fi.size() <= 800) {
|
||||||
QByteArray ba = file.readAll();
|
QByteArray ba = file.readAll();
|
||||||
// kindOfFile: 1=config, 2=device, 3=cash, 4=serial, 5=time, 6=printer
|
// kindOfFile: 1=config, 2=device, 3=cash, 4=serial, 5=time, 6=printer
|
||||||
// nrOfTemplate=1...32 if kindOfFile==6
|
// nrOfTemplate=1...32 if kindOfFile==6
|
||||||
@@ -376,6 +434,13 @@ bool Update::downloadJson(enum FileTypeJson type,
|
|||||||
templateIdx,
|
templateIdx,
|
||||||
(uint8_t *)ba.data())) {
|
(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);
|
m_hw->dc_autoRequest(true);
|
||||||
QThread::msleep(500);
|
QThread::msleep(500);
|
||||||
|
|
||||||
@@ -394,21 +459,50 @@ bool Update::downloadJson(enum FileTypeJson type,
|
|||||||
QByteArray ba((const char*)data, length);
|
QByteArray ba((const char*)data, length);
|
||||||
|
|
||||||
qCritical() << length << "MACHINE ID =" << ba.toHex(':');
|
qCritical() << length << "MACHINE ID =" << ba.toHex(':');
|
||||||
|
*/
|
||||||
|
|
||||||
|
if (m_worker) {
|
||||||
|
m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
|
||||||
|
}
|
||||||
|
|
||||||
ret = true;
|
ret = true;
|
||||||
|
} else {
|
||||||
|
msg = QString("ERROR SEND JSON-FILE %1 TO DC").arg(file.fileName());
|
||||||
|
Utils::printCriticalErrorMsg(msg);
|
||||||
|
lst << msg;
|
||||||
|
if (m_worker) {
|
||||||
|
m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst)
|
||||||
|
<< Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
Utils::printCriticalErrorMsg(
|
msg = QString("SIZE OF %1 TOO BIG (%2 BYTES)").arg(jsFileToSendToDC).arg(fi.size());
|
||||||
QString("SIZE OF %1 TOO BIG (%2 BYTES)")
|
Utils::printCriticalErrorMsg(msg);
|
||||||
.arg(jsFileToSendToDC).arg(fi.size()));
|
lst << msg;
|
||||||
|
if (m_worker) {
|
||||||
|
m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst)
|
||||||
|
<< Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
Utils::printCriticalErrorMsg(
|
msg = QString("CAN NOT OPEN ") + jsFileToSendToDC + " FOR READING";
|
||||||
QString("CAN NOT OPEN ") + jsFileToSendToDC + " FOR READING");
|
Utils::printCriticalErrorMsg(msg);
|
||||||
|
lst << msg;
|
||||||
|
|
||||||
|
if (m_worker) {
|
||||||
|
m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst)
|
||||||
|
<< Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
Utils::printCriticalErrorMsg(
|
msg = QString(jsFileToSendToDC) + " DOES NOT EXIST";
|
||||||
QString(jsFileToSendToDC) + " DOES NOT EXIST");
|
Utils::printCriticalErrorMsg(msg);
|
||||||
|
lst << msg;
|
||||||
|
|
||||||
|
if (m_worker) {
|
||||||
|
m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst)
|
||||||
|
<< Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -494,6 +588,87 @@ QStringList Update::getDcSoftAndHardWareVersion() {
|
|||||||
<< "DC SW-version not available";
|
<< "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) {
|
bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
|
||||||
if (m_sys_areDCdataValid == false) {
|
if (m_sys_areDCdataValid == false) {
|
||||||
qCritical() << "ERROR!!! DC DATA NOT VALID -> CA-MASTER-PLUGIN NOT CONNECTED";
|
qCritical() << "ERROR!!! DC DATA NOT VALID -> CA-MASTER-PLUGIN NOT CONNECTED";
|
||||||
@@ -501,16 +676,84 @@ bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool res = false;
|
bool res = false;
|
||||||
|
bool dcDownloadPossible = true;
|
||||||
|
|
||||||
QList<QString>::const_iterator it;
|
QList<QString>::const_iterator it;
|
||||||
for (it = filesToWorkOn.cbegin(); it != filesToWorkOn.cend(); ++it) {
|
for (it = filesToWorkOn.cbegin(); it != filesToWorkOn.cend(); ++it) {
|
||||||
m_worker->startProgressLoop();
|
m_worker->startProgressLoop();
|
||||||
QString const &fToWorkOn = QDir::cleanPath(m_customerRepository + QDir::separator() + it->trimmed());
|
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.endsWith("/dc2c.bin") && dcDownloadPossible) {
|
||||||
if (fToWorkOn.contains(version)) {
|
#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;
|
bool updateBinaryRes = true;
|
||||||
|
|
||||||
// CONSOLE()
|
// CONSOLE()
|
||||||
|
#if 0
|
||||||
m_hw->dc_autoRequest(false);// default: turn auto-request setting off
|
m_hw->dc_autoRequest(false);// default: turn auto-request setting off
|
||||||
QThread::sleep(1); // wait to be sure that there are no more
|
QThread::sleep(1); // wait to be sure that there are no more
|
||||||
// commands sent to dc-hardware
|
// commands sent to dc-hardware
|
||||||
@@ -539,7 +782,7 @@ bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
|
|||||||
qInfo() << "dc-firmware-version (NOT UPDATED)" << versions[1];
|
qInfo() << "dc-firmware-version (NOT UPDATED)" << versions[1];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
res = updateBinaryRes;
|
res = updateBinaryRes;
|
||||||
|
|
||||||
} else if (fToWorkOn.contains("DC2C_print", Qt::CaseInsensitive)
|
} else if (fToWorkOn.contains("DC2C_print", Qt::CaseInsensitive)
|
@@ -9,7 +9,7 @@
|
|||||||
#include <QProcess>
|
#include <QProcess>
|
||||||
#include <QPluginLoader>
|
#include <QPluginLoader>
|
||||||
|
|
||||||
#include "plugins/interfaces.h"
|
#include <DeviceController/interfaces.h>
|
||||||
|
|
||||||
#ifdef PTU5
|
#ifdef PTU5
|
||||||
#define SERIAL_PORT "ttymxc2"
|
#define SERIAL_PORT "ttymxc2"
|
||||||
@@ -58,6 +58,7 @@ public:
|
|||||||
char const *baudrate = "115200");
|
char const *baudrate = "115200");
|
||||||
virtual ~Update() override;
|
virtual ~Update() override;
|
||||||
bool doUpdate(int &displayIndex, QStringList const &linesToWorkOn);
|
bool doUpdate(int &displayIndex, QStringList const &linesToWorkOn);
|
||||||
|
bool checkDownloadedJsonVersions(QStringList const& jsonFileNames);
|
||||||
|
|
||||||
hwinf *hw() { return m_hw; }
|
hwinf *hw() { return m_hw; }
|
||||||
hwinf const *hw() const { return m_hw; }
|
hwinf const *hw() const { return m_hw; }
|
||||||
@@ -87,11 +88,14 @@ private:
|
|||||||
bool downloadJson(enum FileTypeJson type, int templateIdx,
|
bool downloadJson(enum FileTypeJson type, int templateIdx,
|
||||||
QString jsFileToSendToDC) const;
|
QString jsFileToSendToDC) const;
|
||||||
QStringList getDcSoftAndHardWareVersion();
|
QStringList getDcSoftAndHardWareVersion();
|
||||||
|
QString getFileVersion(QString const& jsonFile);
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void readyReadStandardOutput();
|
void readyReadStandardOutput();
|
||||||
void readyReadStandardError();
|
void readyReadStandardError();
|
||||||
void finished(int exitCode, QProcess::ExitStatus exitStatus);
|
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
|
#endif // UPDATE_H_INCLUDED
|
@@ -30,6 +30,82 @@ int Utils::read1stLineOfFile(QString fileName) {
|
|||||||
return -1;
|
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) {
|
QString Utils::zoneName(quint8 i) {
|
||||||
static constexpr char const *zName[] = {
|
static constexpr char const *zName[] = {
|
||||||
"",
|
"",
|
||||||
@@ -201,21 +277,24 @@ bool Utils::sameFilesInDirs(QDir const &dir1, QDir const &dir2,
|
|||||||
fileNameLst2 << i2.next().fileName();
|
fileNameLst2 << i2.next().fileName();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QString dirPath1 = dir1.absolutePath();
|
||||||
|
QString dirPath2 = dir2.absolutePath();
|
||||||
|
|
||||||
if (fileNameLst1.isEmpty()) {
|
if (fileNameLst1.isEmpty()) {
|
||||||
qCritical() << "DIR1" << dir1.dirName() << " DOES NOT CONTAIN EXPECTED FILES";
|
qCritical() << "DIR1" << dirPath1 << " DOES NOT CONTAIN EXPECTED FILES";
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (fileNameLst2.isEmpty()) {
|
if (fileNameLst2.isEmpty()) {
|
||||||
qCritical() << "DIR1" << dir2.dirName() << " DOES NOT CONTAIN EXPECTED FILES";
|
qCritical() << "DIR1" << dirPath2 << " DOES NOT CONTAIN EXPECTED FILES";
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (fileNameLst1 != fileNameLst2) {
|
if (fileNameLst1 != fileNameLst2) {
|
||||||
printCriticalErrorMsg(dir1.dirName() + " AND " + dir2.dirName()
|
printCriticalErrorMsg(dirPath1 + " AND " + dirPath2
|
||||||
+ " DIFFER: [" + fileNameLst1.join(',') + "],["
|
+ " DIFFER: [" + fileNameLst1.join(',') + "],["
|
||||||
+ fileNameLst2.join(',') + "]");
|
+ fileNameLst2.join(',') + "]");
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
printInfoMsg(dir1.dirName() + " AND " + dir2.dirName()
|
printInfoMsg(dirPath1 + " AND " + dirPath2
|
||||||
+ " ARE EQUAL: [" + fileNameLst1.join(',') + "]");
|
+ " ARE EQUAL: [" + fileNameLst1.join(',') + "]");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -231,21 +310,21 @@ bool Utils::sameFilesInDirs(QDir const &dir1, QDir const &dir2,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (gitBlobLst1.isEmpty()) {
|
if (gitBlobLst1.isEmpty()) {
|
||||||
qCritical() << "DIR1" << dir1.dirName() << " DOES NOT CONTAIN EXPECTED FILES";
|
qCritical() << "DIR1" << dirPath1 << " DOES NOT CONTAIN EXPECTED FILES";
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (gitBlobLst2.isEmpty()) {
|
if (gitBlobLst2.isEmpty()) {
|
||||||
qCritical() << "DIR1" << dir2.dirName() << " DOES NOT CONTAIN EXPECTED FILES";
|
qCritical() << "DIR1" << dirPath2 << " DOES NOT CONTAIN EXPECTED FILES";
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (gitBlobLst1 != gitBlobLst2) {
|
if (gitBlobLst1 != gitBlobLst2) {
|
||||||
printCriticalErrorMsg(dir1.dirName() + " AND " + dir2.dirName()
|
printCriticalErrorMsg(dirPath1 + " AND " + dirPath2
|
||||||
+ " DIFFER: [" + gitBlobLst1.join(',') + "],["
|
+ " DIFFER: [" + gitBlobLst1.join(',') + "],["
|
||||||
+ gitBlobLst2.join(',') + "]");
|
+ gitBlobLst2.join(',') + "]");
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
printInfoMsg(dir1.dirName() + " AND " + dir2.dirName()
|
printInfoMsg(dirPath1 + " AND " + dirPath2
|
||||||
+ " CONTAIN SAME GIT-BLOBS FOR FILES: [" + fileNameLst1.join(',') + "]");
|
+ " CONTAIN SAME GIT-BLOBS FOR FILES: [" + fileNameLst1.join(',') + "]");
|
||||||
|
|
||||||
}
|
}
|
@@ -12,6 +12,9 @@
|
|||||||
|
|
||||||
namespace Utils {
|
namespace Utils {
|
||||||
int read1stLineOfFile(QString fileName);
|
int read1stLineOfFile(QString fileName);
|
||||||
|
QString getLocation(QString fileName);
|
||||||
|
QString getTariffVersion(QString fileName);
|
||||||
|
QString getTariffInfo(QString fileName);
|
||||||
QString zoneName(quint8 i);
|
QString zoneName(quint8 i);
|
||||||
void printCriticalErrorMsg(QString const &errorMsg, bool upper=false, bool lower=false);
|
void printCriticalErrorMsg(QString const &errorMsg, bool upper=false, bool lower=false);
|
||||||
void printCriticalErrorMsg(QStringList const &errorMsg);
|
void printCriticalErrorMsg(QStringList const &errorMsg);
|
@@ -19,7 +19,7 @@
|
|||||||
#include <QScopedPointer>
|
#include <QScopedPointer>
|
||||||
|
|
||||||
#include "message_handler.h"
|
#include "message_handler.h"
|
||||||
#include "plugins/interfaces.h"
|
#include <DeviceController/interfaces.h>
|
||||||
#include "ismas/ismas_client.h"
|
#include "ismas/ismas_client.h"
|
||||||
#include "progress_event.h"
|
#include "progress_event.h"
|
||||||
#include "mainwindow.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_SUCCESS),
|
||||||
INSERT_ELEMENT(UPDATE_STEP::SAVE_LOGS_FAILURE),
|
INSERT_ELEMENT(UPDATE_STEP::SAVE_LOGS_FAILURE),
|
||||||
INSERT_ELEMENT(UPDATE_STEP::SEND_LAST_VERSION),
|
INSERT_ELEMENT(UPDATE_STEP::SEND_LAST_VERSION),
|
||||||
|
INSERT_ELEMENT(UPDATE_STEP::UPDATE_FINALIZE),
|
||||||
INSERT_ELEMENT(UPDATE_STEP::UPDATE_SUCCEEDED),
|
INSERT_ELEMENT(UPDATE_STEP::UPDATE_SUCCEEDED),
|
||||||
|
INSERT_ELEMENT(UPDATE_STEP::UPDATE_NOT_NECESSARY),
|
||||||
INSERT_ELEMENT(UPDATE_STEP::UPDATE_FAILED),
|
INSERT_ELEMENT(UPDATE_STEP::UPDATE_FAILED),
|
||||||
INSERT_ELEMENT(UPDATE_STEP::UPDATE_ACTIVATED),
|
INSERT_ELEMENT(UPDATE_STEP::UPDATE_ACTIVATED),
|
||||||
INSERT_ELEMENT(UPDATE_STEP::FINISHED),
|
INSERT_ELEMENT(UPDATE_STEP::FINISHED),
|
||||||
INSERT_ELEMENT(UPDATE_STEP::DEBUG),
|
INSERT_ELEMENT(UPDATE_STEP::DEBUG),
|
||||||
INSERT_ELEMENT(UPDATE_STEP::ERROR)
|
INSERT_ELEMENT(UPDATE_STEP::ERROR),
|
||||||
|
INSERT_ELEMENT(UPDATE_STEP::NONE)
|
||||||
#undef INSERT_ELEMENT
|
#undef INSERT_ELEMENT
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -140,6 +143,7 @@ Worker::Worker(int customerNr,
|
|||||||
, m_serialInterface(serialInterface)
|
, m_serialInterface(serialInterface)
|
||||||
, m_baudrate(baudrate)
|
, m_baudrate(baudrate)
|
||||||
, m_gc(m_customerNrStr, m_customerRepository, m_workingDirectory, m_branchName, this)
|
, m_gc(m_customerNrStr, m_customerRepository, m_workingDirectory, m_branchName, this)
|
||||||
|
, m_versionInfo(QStringList())
|
||||||
, m_osVersion(getOsVersion())
|
, m_osVersion(getOsVersion())
|
||||||
, m_atbqtVersion(getATBQTVersion())
|
, m_atbqtVersion(getATBQTVersion())
|
||||||
, m_atbUpdateToolVersion(getATBUpdateToolVersion())
|
, m_atbUpdateToolVersion(getATBUpdateToolVersion())
|
||||||
@@ -161,6 +165,14 @@ Worker::Worker(int customerNr,
|
|||||||
|
|
||||||
// TODO: turn object into singleton
|
// TODO: turn object into singleton
|
||||||
instance = this;
|
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");
|
this->setObjectName("worker-object");
|
||||||
QDir::setCurrent(m_workingDirectory);
|
QDir::setCurrent(m_workingDirectory);
|
||||||
@@ -169,6 +181,10 @@ Worker::Worker(int customerNr,
|
|||||||
}
|
}
|
||||||
|
|
||||||
Worker::~Worker() {
|
Worker::~Worker() {
|
||||||
|
if (m_update != nullptr) {
|
||||||
|
delete m_update;
|
||||||
|
m_update = nullptr;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Worker::displayProgressInMainWindow(int progress) {
|
void Worker::displayProgressInMainWindow(int progress) {
|
||||||
@@ -214,6 +230,12 @@ bool Worker::isRepositoryCorrupted() {
|
|||||||
Utils::printCriticalErrorMsg("CORRUPTED CUSTOMER REPOSITORY .GIT DOES NOT EXIST");
|
Utils::printCriticalErrorMsg("CORRUPTED CUSTOMER REPOSITORY .GIT DOES NOT EXIST");
|
||||||
return true;
|
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;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -248,11 +270,62 @@ void Worker::privateUpdate() {
|
|||||||
GUI() << (ISMAS() << (CONSOLE() << UPDATE_STEP::STARTED));
|
GUI() << (ISMAS() << (CONSOLE() << UPDATE_STEP::STARTED));
|
||||||
|
|
||||||
QScopedPointer<UpdateProcessRunning> upr(new UpdateProcessRunning(this));
|
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 ¤t = 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 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_clone = false;
|
||||||
m_repairClone = false;
|
m_repairClone = false;
|
||||||
@@ -275,26 +348,27 @@ void Worker::privateUpdate() {
|
|||||||
|
|
||||||
if (isRepositoryCorrupted()) { // a not-existing repository is not meant
|
if (isRepositoryCorrupted()) { // a not-existing repository is not meant
|
||||||
// to be corrupted
|
// to be corrupted
|
||||||
CONSOLE() << UPDATE_STEP::CHECK_SANITY_FAILURE;
|
CONSOLE() << (ISMAS() << UPDATE_STEP::CHECK_SANITY_FAILURE);
|
||||||
if ((continueUpdate = repairCorruptedRepository()) == true) {
|
if ((continueUpdate = repairCorruptedRepository()) == true) {
|
||||||
m_repairClone = true;
|
m_repairClone = true;
|
||||||
CONSOLE() << UPDATE_STEP::REPOSITORY_RECOVERED_SUCCESS;
|
CONSOLE() << (ISMAS() << UPDATE_STEP::REPOSITORY_RECOVERED_SUCCESS);
|
||||||
} else {
|
} else {
|
||||||
ISMAS() << (GUI() << (CONSOLE() << UPDATE_STEP::REPOSITORY_RECOVERED_FAILURE));
|
ISMAS() << (GUI() << (CONSOLE() << UPDATE_STEP::REPOSITORY_RECOVERED_FAILURE));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
CONSOLE() << UPDATE_STEP::CHECK_SANITY_SUCCESS;
|
CONSOLE() << (ISMAS() << UPDATE_STEP::CHECK_SANITY_SUCCESS);
|
||||||
|
|
||||||
if (continueUpdate) {
|
if (continueUpdate) {
|
||||||
if ((continueUpdate = customerRepository.exists()) == false) {
|
if ((continueUpdate = customerRepository.exists()) == false) {
|
||||||
m_initialClone = (m_repairClone == 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
|
for (int i = 0; i < 5; ++i) { // try to checkout git repository
|
||||||
setProgress(i); // and switch to branch
|
setProgress(i); // and switch to branch
|
||||||
if (m_gc.gitCloneAndCheckoutBranch()) {
|
if (m_gc.gitCloneAndCheckoutBranch()) {
|
||||||
if (!isRepositoryCorrupted()) {
|
if (!isRepositoryCorrupted()) {
|
||||||
|
m_versionInfo = m_gc.gitShowReason(m_branchName);
|
||||||
GUI() << (ISMAS() << (CONSOLE() << UPDATE_STEP::CLONE_REPOSITORY_SUCCESS));
|
GUI() << (ISMAS() << (CONSOLE() << UPDATE_STEP::CLONE_REPOSITORY_SUCCESS));
|
||||||
continueUpdate = true;
|
continueUpdate = true;
|
||||||
m_clone = true;
|
m_clone = true;
|
||||||
@@ -305,7 +379,7 @@ void Worker::privateUpdate() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (continueUpdate == false) {
|
if (continueUpdate == false) {
|
||||||
GUI() << (ISMAS() << (CONSOLE() << UPDATE_STEP::CLONE_REPOSITORY_FAILURE));
|
GUI() << (ISMAS() << (CONSOLE() << (m_lastFailedUpdateStep = UPDATE_STEP::CLONE_REPOSITORY_FAILURE)));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -319,36 +393,37 @@ void Worker::privateUpdate() {
|
|||||||
|
|
||||||
CONSOLE() << UPDATE_STEP::CHECK_REPOSITORY;
|
CONSOLE() << UPDATE_STEP::CHECK_REPOSITORY;
|
||||||
if (isRepositoryCorrupted()) {
|
if (isRepositoryCorrupted()) {
|
||||||
ISMAS() << (GUI() << (CONSOLE() << UPDATE_STEP::CHECK_REPOSITORY_FAILURE));
|
ISMAS() << (GUI() << (CONSOLE() << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_REPOSITORY_FAILURE)));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
m_versionInfo = m_gc.gitShowReason(m_branchName);
|
||||||
|
|
||||||
CONSOLE() << UPDATE_STEP::CHECK_REPOSITORY_SUCCESS;
|
CONSOLE() << UPDATE_STEP::CHECK_REPOSITORY_SUCCESS;
|
||||||
setProgress(_CHECKOUT_REPOSITORY_SUCCESS);
|
setProgress(_CHECKOUT_REPOSITORY_SUCCESS);
|
||||||
|
|
||||||
|
if (m_clone == false) {
|
||||||
////////////////////////////////////////////////////////////////////////////
|
if (m_ismasTriggerActive == false) {
|
||||||
//
|
return;
|
||||||
// CHECK UPDATE TRIGGER
|
} else {
|
||||||
//
|
GUI() << (ISMAS() << (CONSOLE() << UPDATE_STEP::CHECK_ISMAS_TRIGGER_SUCCESS));
|
||||||
////////////////////////////////////////////////////////////////////////////
|
setProgress(_CHECK_ISMAS_TRIGGER_SUCCESS);
|
||||||
m_ismasTriggerActive = false;
|
}
|
||||||
if ((continueUpdate = updateTriggerSet()) == false) {
|
} else {
|
||||||
if (m_initialClone) {
|
if (m_initialClone) {
|
||||||
GUI() << (ISMAS() << (CONSOLE() << UPDATE_STEP::INITIAL_CLONE_WITHOUT_ACTIVE_ISMAS_TRIGGER));
|
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
|
if (m_ismasTriggerActive == false) {// make it explicit again: only if the
|
||||||
// ismas trigger is active ('WAIT'),
|
// ismas trigger is active ('WAIT'),
|
||||||
// then proceed
|
// then proceed
|
||||||
return;
|
|
||||||
}
|
if (m_clone == false) { // if it is an (initial) clone, then
|
||||||
GUI() << (ISMAS() << (CONSOLE() << UPDATE_STEP::CHECK_ISMAS_TRIGGER_SUCCESS));
|
return; // run the whole update process:
|
||||||
setProgress(_CHECK_ISMAS_TRIGGER_SUCCESS);
|
} // sync tariff-files, download jsons,
|
||||||
|
} // download device controller
|
||||||
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////
|
||||||
@@ -359,7 +434,9 @@ void Worker::privateUpdate() {
|
|||||||
if ((continueUpdate = customerEnvironment()) == false) {
|
if ((continueUpdate = customerEnvironment()) == false) {
|
||||||
return;
|
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);
|
setProgress(_CHECKOUT_BRANCH_SUCCESS);
|
||||||
|
|
||||||
|
|
||||||
@@ -371,9 +448,23 @@ void Worker::privateUpdate() {
|
|||||||
if ((continueUpdate = filesToUpdate()) == false) {
|
if ((continueUpdate = filesToUpdate()) == false) {
|
||||||
return;
|
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);
|
setProgress(_UPDATE_REPOSITORY_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);
|
||||||
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
@@ -383,7 +474,8 @@ void Worker::privateUpdate() {
|
|||||||
if ((continueUpdate = execOpkgCommands()) == false) {
|
if ((continueUpdate = execOpkgCommands()) == false) {
|
||||||
return;
|
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);
|
setProgress(_EXEC_OPKG_COMMAND_SUCCESS);
|
||||||
|
|
||||||
|
|
||||||
@@ -395,22 +487,10 @@ void Worker::privateUpdate() {
|
|||||||
if ((continueUpdate = downloadFilesToPSAHardware()) == false) {
|
if ((continueUpdate = downloadFilesToPSAHardware()) == false) {
|
||||||
return;
|
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);
|
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
|
// FUTURE: SAVE LOG FILES
|
||||||
@@ -422,28 +502,8 @@ void Worker::privateUpdate() {
|
|||||||
// ISMAS() << (GUI() << (CONSOLE() << UPDATE_STEP::SAVE_LOGS_SUCCESS));
|
// ISMAS() << (GUI() << (CONSOLE() << UPDATE_STEP::SAVE_LOGS_SUCCESS));
|
||||||
setProgress(_SAVE_LOGS_SUCCESS);
|
setProgress(_SAVE_LOGS_SUCCESS);
|
||||||
|
|
||||||
|
// final messages: see destructor of UpdateProcessRunning subclass
|
||||||
////////////////////////////////////////////////////////////////////////////
|
m_lastFailedUpdateStep = UPDATE_STEP::NONE;
|
||||||
//
|
|
||||||
// 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)
|
|
||||||
//
|
|
||||||
////////////////////////////////////////////////////////////////////////////
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Worker::updateTriggerSet() {
|
bool Worker::updateTriggerSet() {
|
||||||
@@ -451,31 +511,38 @@ bool Worker::updateTriggerSet() {
|
|||||||
// (WAIT-button) is activated even in case of initial checkout
|
// (WAIT-button) is activated even in case of initial checkout
|
||||||
static const QString func = "UPDATE-TRIGGER-SET";
|
static const QString func = "UPDATE-TRIGGER-SET";
|
||||||
|
|
||||||
if (m_withoutIsmasDirectPort) { // useful for testing
|
// if (m_withoutIsmasDirectPort) { // useful for testing
|
||||||
return true;
|
// return true;
|
||||||
}
|
//}
|
||||||
|
|
||||||
GUI() << (ISMAS() << (CONSOLE() << UPDATE_STEP::CHECK_ISMAS_TRIGGER));
|
m_ismasTriggerStatusMessage.clear();
|
||||||
|
|
||||||
|
GUI() << (CONSOLE() << UPDATE_STEP::CHECK_ISMAS_TRIGGER);
|
||||||
|
|
||||||
|
bool const automaticUpdate = (QDateTime::currentDateTime().time().hour() < 4);
|
||||||
|
|
||||||
QString triggerValue("NOT CHECKED YET");
|
QString triggerValue("NOT CHECKED YET");
|
||||||
|
static constexpr int const repeats = 15;
|
||||||
for (int repeat = 1; repeat <= 100; ++repeat) {
|
for (int repeat = 1; repeat <= repeats; ++repeat) {
|
||||||
|
|
||||||
if (repeat > 1) {
|
if (repeat > 1) {
|
||||||
int const startMs = QTime::currentTime().msecsSinceStartOfDay();
|
int const startMs = QTime::currentTime().msecsSinceStartOfDay();
|
||||||
int const durationMs = QTime::currentTime().msecsSinceStartOfDay() - startMs;
|
int const durationMs = QTime::currentTime().msecsSinceStartOfDay() - startMs;
|
||||||
QString const &s = QString("elapsed: %1.%2s").arg(durationMs / 1000).arg(durationMs % 1000);
|
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 {
|
} 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;
|
CONSOLE(QStringList(func) << "RESTART APISM") << UPDATE_STEP::DEBUG;
|
||||||
Command c("systemctl restart apism");
|
Command c("systemctl restart apism");
|
||||||
if (c.execute("/tmp")) {
|
if (c.execute("/tmp")) {
|
||||||
QThread::sleep(20); // give APISM some time to reconnect
|
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 +551,35 @@ bool Worker::updateTriggerSet() {
|
|||||||
IsmasClient::APISM::DIRECT_PORT, "#M=APISM#C=REQ_ISMASPARAMETER#J={}")) {
|
IsmasClient::APISM::DIRECT_PORT, "#M=APISM#C=REQ_ISMASPARAMETER#J={}")) {
|
||||||
|
|
||||||
QString const &msg = QString("APISM RESPONSE(%1)=(").arg(repeat) + result.value() + ")";
|
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;
|
QJsonParseError parseError;
|
||||||
QJsonDocument document(QJsonDocument::fromJson(result.value().toUtf8(), &parseError));
|
QJsonDocument document(QJsonDocument::fromJson(result.value().toUtf8(), &parseError));
|
||||||
if (parseError.error != QJsonParseError::NoError) {
|
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(msg)
|
||||||
.arg(parseError.error)
|
.arg(parseError.error)
|
||||||
.arg(parseError.errorString())
|
.arg(parseError.errorString())
|
||||||
.arg(parseError.offset));
|
.arg(parseError.offset));
|
||||||
GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
|
QStringList lst = m_ismasTriggerStatusMessage;
|
||||||
break;
|
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE)));
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
if (!document.isObject()) {
|
if (!document.isObject()) {
|
||||||
QStringList lst(QString("not a json-object %1").arg(result.value()));
|
m_ismasTriggerStatusMessage = QStringList(QString("not a json-object %1").arg(result.value()));
|
||||||
GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
|
QStringList lst = m_ismasTriggerStatusMessage;
|
||||||
break;
|
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE)));
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
QJsonObject obj = document.object();
|
QJsonObject obj = document.object();
|
||||||
|
|
||||||
// always look for an 'error' first
|
// always look for an 'error' first
|
||||||
if (obj.contains("error")) {
|
if (obj.contains("error")) {
|
||||||
QStringList lst(obj.value("error").toString());
|
m_ismasTriggerStatusMessage = QStringList(obj.value("error").toString());
|
||||||
CONSOLE(QStringList(lst)) << UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE;
|
QStringList lst = m_ismasTriggerStatusMessage;
|
||||||
|
CONSOLE(QStringList(lst)) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
|
||||||
QThread::sleep(6);
|
QThread::sleep(6);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -523,31 +594,35 @@ bool Worker::updateTriggerSet() {
|
|||||||
int const customerNr = obj.value("Custom_ID").toInt(-1);
|
int const customerNr = obj.value("Custom_ID").toInt(-1);
|
||||||
int const machineNr = obj.value("Device_ID").toInt(-1);
|
int const machineNr = obj.value("Device_ID").toInt(-1);
|
||||||
if (customerNr != m_customerNr) {
|
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));
|
.arg(customerNr).arg(m_customerNr));
|
||||||
GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
|
QStringList lst = m_ismasTriggerStatusMessage;
|
||||||
break;
|
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE)));
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
if (machineNr != m_machineNr) {
|
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));
|
.arg(machineNr).arg(m_machineNr));
|
||||||
GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
|
QStringList lst = m_ismasTriggerStatusMessage;
|
||||||
break;
|
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE)));
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
QStringList lst("Dev_ID DOES NOT CONTAIN Custom_ID AND/OR Device_ID");
|
QStringList lst(QString("Dev_ID DOES NOT CONTAIN Custom_ID AND/OR Device_ID (LINE=%1)").arg(__LINE__));
|
||||||
GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
|
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE)));
|
||||||
break;
|
return false;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
QStringList lst("Dev_ID KEY NOT A JSON-OBJECT");
|
m_ismasTriggerStatusMessage = QStringList(QString("Dev_ID KEY NOT A JSON-OBJECT (LINE=%1)").arg(__LINE__));
|
||||||
GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
|
QStringList lst = m_ismasTriggerStatusMessage;
|
||||||
break;
|
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE)));
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
QStringList lst("Dev_ID KEY NOT AVAILABLE");
|
m_ismasTriggerStatusMessage = QStringList(QString("Dev_ID KEY NOT AVAILABLE (LINE=%1)").arg(__LINE__));
|
||||||
GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
|
QStringList lst = m_ismasTriggerStatusMessage;
|
||||||
break;
|
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE)));
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (obj.contains("Fileupload")) {
|
if (obj.contains("Fileupload")) {
|
||||||
@@ -556,56 +631,86 @@ bool Worker::updateTriggerSet() {
|
|||||||
obj = v.toObject();
|
obj = v.toObject();
|
||||||
if (obj.contains("TRG")) {
|
if (obj.contains("TRG")) {
|
||||||
if ((triggerValue = obj.value("TRG").toString()) == "WAIT") {
|
if ((triggerValue = obj.value("TRG").toString()) == "WAIT") {
|
||||||
|
m_ismasTriggerStatusMessage = QStringList("ISMAS_UPDATE-TRIGGER SET TO WAIT");
|
||||||
m_ismasTriggerActive = true;
|
m_ismasTriggerActive = true;
|
||||||
return m_ismasTriggerActive;
|
return m_ismasTriggerActive;
|
||||||
} else
|
} else
|
||||||
if (QRegExp("\\s*").exactMatch(triggerValue)) { // check for whitespace
|
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) {
|
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
|
// 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);
|
|
||||||
}
|
}
|
||||||
|
// not a clone and empty update-trigger
|
||||||
|
if (automaticUpdate) {
|
||||||
|
// do not inform ISMAS in case of automatic update, because the
|
||||||
|
// update is not necessary as the trigger-button is not set to WAIT.
|
||||||
|
GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_WRONG_VALUE));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
|
||||||
|
|
||||||
QThread::sleep(6);
|
QThread::sleep(6);
|
||||||
continue;
|
continue;
|
||||||
} else {
|
} 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) {
|
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;
|
||||||
|
if (automaticUpdate) {
|
||||||
|
// do not inform ISMAS in case of automatic update
|
||||||
|
GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_WRONG_VALUE));
|
||||||
} else {
|
} else {
|
||||||
QStringList lst(QString("TRIGGER-VALUE=<%1> NOT 'WAIT'").arg(triggerValue));
|
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_WRONG_VALUE)));
|
||||||
GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
QStringList lst("TRG key not available");
|
m_ismasTriggerStatusMessage = QStringList(QString("TRIGGER-VALUE='%1' != 'WAIT'").arg(triggerValue));
|
||||||
GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
|
QStringList lst = m_ismasTriggerStatusMessage;
|
||||||
break;
|
if (automaticUpdate) {
|
||||||
|
// do not inform ISMAS in case of automatic update
|
||||||
|
GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_WRONG_VALUE));
|
||||||
|
} else {
|
||||||
|
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
QStringList lst("Fileupload not a json-object");
|
m_ismasTriggerStatusMessage = QStringList(QString("TRG key not available (LINE=%1)").arg(__LINE__));
|
||||||
GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
|
QStringList lst = m_ismasTriggerStatusMessage;
|
||||||
break;
|
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE)));
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
QStringList lst(QString("Fileupload not available"));
|
m_ismasTriggerStatusMessage = QStringList(QString("Fileupload not a json-object (LINE=%1)").arg(__LINE__));
|
||||||
GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
|
QStringList lst = m_ismasTriggerStatusMessage;
|
||||||
break;
|
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE)));
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
QStringList lst = QStringList(QString("no ISMAS response"));
|
m_ismasTriggerStatusMessage = QStringList(QString("Fileupload not available (LINE=%1)").arg(__LINE__));
|
||||||
GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
|
QStringList lst = m_ismasTriggerStatusMessage;
|
||||||
|
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE)));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
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);
|
QThread::sleep(6);
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_initialClone == false) {
|
if (m_initialClone == false) {
|
||||||
if (!triggerValue.contains("WAIT", Qt::CaseInsensitive)) {
|
if (!triggerValue.contains("WAIT", Qt::CaseInsensitive)) {
|
||||||
QStringList lst(QString("ISMAS_UPDATE-TRIGGER-NOT-SET-OR-WRONG: VALUE=(") + triggerValue + ")");
|
m_ismasTriggerStatusMessage = QStringList(QString("ISMAS_UPDATE-TRIGGER-NOT-SET-OR-WRONG: VALUE=(") + triggerValue + ")");
|
||||||
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE));
|
QStringList lst = m_ismasTriggerStatusMessage;
|
||||||
|
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE)));
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -623,11 +728,11 @@ bool Worker::customerEnvironment() {
|
|||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
QStringList lst(QString("CHECKOUT OF " + m_customerRepository + "FAILED"));
|
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
|
} else {// cannot happen
|
||||||
QStringList lst(QString(m_customerRepository + " DOES NOT EXIST"));
|
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;
|
return false;
|
||||||
@@ -642,37 +747,31 @@ bool Worker::filesToUpdate() {
|
|||||||
// always execute contents of opkg_commands-file
|
// always execute contents of opkg_commands-file
|
||||||
m_filesToUpdate << "etc/psa_update/opkg_commands";
|
m_filesToUpdate << "etc/psa_update/opkg_commands";
|
||||||
|
|
||||||
if (m_alwaysDownloadConfig) {
|
if (m_clone && m_alwaysDownloadConfig) {
|
||||||
#if 0
|
|
||||||
QStringList lst(QString("m_alwaysDownloadConfig NOT TESTED"));
|
|
||||||
CONSOLE(lst) << UPDATE_STEP::UPDATE_REPOSITORY;
|
|
||||||
// always download all json-config files, even if none of them have been
|
// always download all json-config files, even if none of them have been
|
||||||
// changed in the git repository. useful for first installation.
|
// changed in the git repository. useful for first installation.
|
||||||
QDir dir(QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/psa_config"));
|
QDir dir(QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/psa_config"));
|
||||||
if (dir.exists()) {
|
if (dir.exists()) {
|
||||||
QStringList jsons = dir.entryList(QStringList() << "DC2C*.json", QDir::Files);
|
QStringList jsons = dir.entryList(QStringList() << "DC2C*.json", QDir::Files);
|
||||||
if (!jsons.isEmpty()) {
|
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 (m_clone && m_alwaysDownloadDC) {
|
||||||
#if 0
|
|
||||||
QStringList lst(QString("m_alwaysDownloadDC NOT TESTED"));
|
|
||||||
CONSOLE(lst) << UPDATE_STEP::UPDATE_REPOSITORY;
|
|
||||||
// always download the last dc-binary, even if not changed in the
|
// always download the last dc-binary, even if not changed in the
|
||||||
// git repository. useful for first installation.
|
// 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()) {
|
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);
|
QDir::SortFlag::Time | QDir::SortFlag::Reversed);
|
||||||
if (!dc.isEmpty()) {
|
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()) {
|
if (std::optional<QString> changes = m_gc.gitPull()) {
|
||||||
@@ -683,12 +782,12 @@ bool Worker::filesToUpdate() {
|
|||||||
}
|
}
|
||||||
m_filesToUpdate.removeDuplicates();
|
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);
|
GUI(m_filesToUpdate) << (CONSOLE(m_filesToUpdate) << UPDATE_STEP::FILES_TO_UPDATE);
|
||||||
setProgress(_FILES_TO_UPDATE);
|
setProgress(_FILES_TO_UPDATE);
|
||||||
} else {
|
} else {
|
||||||
ISMAS() << (GUI() << (CONSOLE() << UPDATE_STEP::UPDATE_REPOSITORY_FAILURE));
|
ISMAS() << (GUI() << (CONSOLE() << (m_lastFailedUpdateStep = UPDATE_STEP::UPDATE_REPOSITORY_FAILURE)));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -705,8 +804,7 @@ bool Worker::computeFilesToDownload() {
|
|||||||
fName.contains("DC2C_cash", Qt::CaseInsensitive)) {
|
fName.contains("DC2C_cash", Qt::CaseInsensitive)) {
|
||||||
m_filesToDownload << fName; // download printer-config-files
|
m_filesToDownload << fName; // download printer-config-files
|
||||||
} else {
|
} else {
|
||||||
static const QRegularExpression version("^.*dc2c[.][0-9]{1,2}[.][0-9]{1,2}[.]bin.*$");
|
if (fName.contains("dc2c.bin")) {
|
||||||
if (fName.contains(version)) {
|
|
||||||
m_filesToDownload << fName; // download device controller
|
m_filesToDownload << fName; // download device controller
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -797,7 +895,7 @@ bool Worker::execOpkgCommands() {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
m_displayIndex = 1;
|
m_displayIndex = 1;
|
||||||
ISMAS(opkgErrorLst) << (GUI(opkgErrorLst) << (CONSOLE() << UPDATE_STEP::EXEC_OPKG_COMMAND_FAILURE));
|
ISMAS(opkgErrorLst) << (GUI(opkgErrorLst) << (CONSOLE() << (m_lastFailedUpdateStep = UPDATE_STEP::EXEC_OPKG_COMMAND_FAILURE)));
|
||||||
GUI() << UPDATE_STEP::EXEC_OPKG_COMMAND_FAILURE;
|
GUI() << UPDATE_STEP::EXEC_OPKG_COMMAND_FAILURE;
|
||||||
setProgress(_EXEC_OPKG_COMMAND_FAILURE);
|
setProgress(_EXEC_OPKG_COMMAND_FAILURE);
|
||||||
return false;
|
return false;
|
||||||
@@ -817,21 +915,24 @@ bool Worker::downloadFilesToPSAHardware() {
|
|||||||
setProgress(_DOWNLOAD_FILES_TO_PSA_HARDWARE);
|
setProgress(_DOWNLOAD_FILES_TO_PSA_HARDWARE);
|
||||||
|
|
||||||
if (m_noUpdatePsaHardware == false) {
|
if (m_noUpdatePsaHardware == false) {
|
||||||
if (computeFilesToDownload()) {
|
if (computeFilesToDownload() > 0) {
|
||||||
CONSOLE(m_filesToDownload) << UPDATE_STEP::FILES_TO_DOWNLOAD;
|
QStringList lst = m_filesToDownload;
|
||||||
|
ISMAS(lst) << (CONSOLE(lst) << UPDATE_STEP::FILES_TO_DOWNLOAD);
|
||||||
|
|
||||||
Update update(this,
|
if (m_update && m_update->doUpdate(m_displayIndex, m_filesToDownload)) {
|
||||||
QDir::cleanPath(m_workingDirectory + QDir::separator() + m_customerNrStr),
|
// prepared for use: at the moment, the dc-library does not work
|
||||||
m_customerNrStr,
|
// as expected.
|
||||||
m_branchName,
|
|
||||||
m_pluginDir,
|
|
||||||
m_pluginName,
|
|
||||||
m_workingDirectory);
|
|
||||||
|
|
||||||
return update.doUpdate(m_displayIndex, m_filesToDownload);
|
// static const QRegularExpression re("^.*\\.json$");
|
||||||
} else {
|
// return update.checkDownloadedJsonVersions(m_filesToDownload.filter(re));
|
||||||
CONSOLE(QStringList("NO FILES TO DOWNLOAD TO PSA-HW")) << UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE;
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE);
|
||||||
setProgress(_DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE);
|
setProgress(_DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE);
|
||||||
|
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -848,7 +949,7 @@ bool Worker::syncCustomerRepositoryAndFS() {
|
|||||||
QStringList() << "-c" << "mkdir -p /etc/psa_config /etc/dc /etc/psa_tariff")) {
|
QStringList() << "-c" << "mkdir -p /etc/psa_config /etc/dc /etc/psa_tariff")) {
|
||||||
qCritical() << "COULD NOT EXECUTE '" << md.command() << "' exitCode=(" << md.exitCode() << ")";
|
qCritical() << "COULD NOT EXECUTE '" << md.command() << "' exitCode=(" << md.exitCode() << ")";
|
||||||
}
|
}
|
||||||
QString const params("-vvv "
|
QString const params("-v "
|
||||||
"--recursive "
|
"--recursive "
|
||||||
"--progress "
|
"--progress "
|
||||||
"--checksum "
|
"--checksum "
|
||||||
@@ -911,14 +1012,16 @@ bool Worker::syncCustomerRepositoryAndFS() {
|
|||||||
QDir dir1(QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/psa_tariff"));
|
QDir dir1(QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/psa_tariff"));
|
||||||
QDir dir2("/etc/psa_tariff");
|
QDir dir2("/etc/psa_tariff");
|
||||||
if (Utils::sameFilesInDirs(dir1, dir2)) {
|
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);
|
setProgress(_SYNC_CUSTOMER_REPOSITORY_SUCCESS);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
ISMAS() << (GUI() << (CONSOLE() << (m_lastFailedUpdateStep = UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_FAILURE)));
|
||||||
ISMAS() << (GUI() << (CONSOLE() << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_FAILURE));
|
|
||||||
setProgress(_SYNC_CUSTOMER_REPOSITORY_FAILURE);
|
setProgress(_SYNC_CUSTOMER_REPOSITORY_FAILURE);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -951,7 +1054,7 @@ QString Worker::getATBUpdateToolYoctoVersion() {
|
|||||||
|
|
||||||
QString Worker::getAPISMYoctoVersion() {
|
QString Worker::getAPISMYoctoVersion() {
|
||||||
if (QFile::exists("/var/lib/opkg/status")) {
|
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");
|
Command c("bash");
|
||||||
if (c.execute("/tmp", QStringList() << "-c" << cmd)) {
|
if (c.execute("/tmp", QStringList() << "-c" << cmd)) {
|
||||||
return c.getCommandResult(); // 1.4.1.0-r4
|
return c.getCommandResult(); // 1.4.1.0-r4
|
||||||
@@ -982,6 +1085,17 @@ QString Worker::getAPISMYoctoInstallationStatus() {
|
|||||||
return "N/A";
|
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 Worker::getATBQTVersion() const {
|
||||||
QString const cmd = QString("echo -n $(/opt/app/ATBAPP/ATBQT -v | head -n 2 | cut -d':' -f2)");
|
QString const cmd = QString("echo -n $(/opt/app/ATBAPP/ATBQT -v | head -n 2 | cut -d':' -f2)");
|
||||||
@@ -1099,15 +1213,18 @@ PSAInstalled Worker::getPSAInstalled() {
|
|||||||
QString absPathName;
|
QString absPathName;
|
||||||
QString absPathNameRepository;
|
QString absPathNameRepository;
|
||||||
|
|
||||||
psaInstalled.versionInfo.lastCommit = "";
|
psaInstalled.versionInfo.lastCommit = "N/A";
|
||||||
psaInstalled.versionInfo.reason = "";
|
psaInstalled.versionInfo.reason = "N/A";
|
||||||
psaInstalled.versionInfo.created = "";
|
psaInstalled.versionInfo.created = "N/A";
|
||||||
|
|
||||||
QStringList versionInfo = m_gc.gitShowReason(m_branchName);
|
if (m_versionInfo.size() == 3) {
|
||||||
if (versionInfo.size() == 3) {
|
qCritical() << QString("***** %1:%2").arg(__func__).arg(__LINE__)
|
||||||
psaInstalled.versionInfo.lastCommit = versionInfo.at(0);
|
<< "m_versionInfo" << m_versionInfo << "*****";
|
||||||
psaInstalled.versionInfo.reason = versionInfo.at(1);
|
psaInstalled.versionInfo.lastCommit = QString("%1-%2")
|
||||||
psaInstalled.versionInfo.created = versionInfo.at(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) {
|
if (m_zoneNr != 0) {
|
||||||
@@ -1120,10 +1237,10 @@ PSAInstalled Worker::getPSAInstalled() {
|
|||||||
psaInstalled.tariff.size = getFileSize(absPathName);
|
psaInstalled.tariff.size = getFileSize(absPathName);
|
||||||
psaInstalled.tariff.zone = m_zoneNr;
|
psaInstalled.tariff.zone = m_zoneNr;
|
||||||
psaInstalled.tariff.loadTime = Utils::getTariffLoadTime(absPathName);
|
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.linuxVersion = getOsVersion();
|
||||||
psaInstalled.hw.cpuSerial = m_cpuSerial;
|
psaInstalled.hw.cpuSerial = m_cpuSerial;
|
@@ -33,37 +33,40 @@
|
|||||||
#define _ISMAS_RESET_WAIT "ISMAS" // reset WAIT-button to "WAIT"
|
#define _ISMAS_RESET_WAIT "ISMAS" // reset WAIT-button to "WAIT"
|
||||||
|
|
||||||
#define _STARTED (1)
|
#define _STARTED (1)
|
||||||
#define _CHECK_SANITY (2)
|
#define _CHECK_ISMAS_TRIGGER (2)
|
||||||
#define _CHECK_SANITY_FAILURE (3)
|
#define _CHECK_SANITY (3)
|
||||||
#define _CHECK_SANITY_SUCCESS (4)
|
#define _CHECK_SANITY_FAILURE (4)
|
||||||
#define _REPOSITORY_RECOVERED_FAILURE (5)
|
#define _CHECK_SANITY_SUCCESS (5)
|
||||||
#define _REPOSITORY_RECOVERED_SUCCESS (6)
|
#define _REPOSITORY_RECOVERED_FAILURE (6)
|
||||||
#define _CHECK_REPOSITORY (7)
|
#define _REPOSITORY_RECOVERED_SUCCESS (7)
|
||||||
#define _CHECK_REPOSITORY_FAILURE (8)
|
#define _CHECK_REPOSITORY (8)
|
||||||
#define _CHECK_REPOSITORY_SUCCESS (9)
|
#define _CHECK_REPOSITORY_FAILURE (9)
|
||||||
#define _CLONE_REPOSITORY (10)
|
#define _CHECK_REPOSITORY_SUCCESS (10)
|
||||||
#define _CLONE_REPOSITORY_FAILURE (11)
|
#define _CLONE_REPOSITORY (11)
|
||||||
#define _CLONE_REPOSITORY_SUCCESS (12)
|
#define _CLONE_REPOSITORY_FAILURE (12)
|
||||||
#define _CHECKOUT_REPOSITORY (13)
|
#define _CLONE_REPOSITORY_SUCCESS (13)
|
||||||
#define _CHECKOUT_REPOSITORY_FAILURE (14)
|
#define _CHECKOUT_REPOSITORY (14)
|
||||||
#define _CHECKOUT_REPOSITORY_SUCCESS (15)
|
#define _CHECKOUT_REPOSITORY_FAILURE (15)
|
||||||
#define _INITIAL_CLONE_WITHOUT_ACTIVE_ISMAS_TRIGGER (16)
|
#define _CHECKOUT_REPOSITORY_SUCCESS (16)
|
||||||
#define _INITIAL_CLONE_WITH_ACTIVE_ISMAS_TRIGGER (17)
|
#define _INITIAL_CLONE_WITHOUT_ACTIVE_ISMAS_TRIGGER (17)
|
||||||
#define _CHECK_ISMAS_TRIGGER (19)
|
#define _INITIAL_CLONE_WITH_ACTIVE_ISMAS_TRIGGER (18)
|
||||||
#define _CHECK_ISMAS_TRIGGER_WRONG_VALUE (20)
|
#define _CHECK_ISMAS_TRIGGER_WRONG_VALUE (19)
|
||||||
#define _CHECK_ISMAS_TRIGGER_SUCCESS (21)
|
#define _CHECK_ISMAS_TRIGGER_SUCCESS (20)
|
||||||
#define _CHECK_ISMAS_TRIGGER_FAILURE (22)
|
#define _CHECK_ISMAS_TRIGGER_FAILURE (21)
|
||||||
#define _CHECKOUT_BRANCH (23)
|
#define _CHECKOUT_BRANCH (22)
|
||||||
#define _CHECKOUT_BRANCH_FAILURE (24)
|
#define _CHECKOUT_BRANCH_FAILURE (23)
|
||||||
#define _CHECKOUT_BRANCH_SUCCESS (25)
|
#define _CHECKOUT_BRANCH_SUCCESS (24)
|
||||||
#define _UPDATE_REPOSITORY (26)
|
#define _UPDATE_REPOSITORY (25)
|
||||||
#define _UPDATE_REPOSITORY_FAILURE (28)
|
#define _UPDATE_REPOSITORY_FAILURE (26)
|
||||||
#define _UPDATE_REPOSITORY_SUCCESS (29)
|
#define _UPDATE_REPOSITORY_SUCCESS (27)
|
||||||
#define _CHECK_FOR_REPOSITORY_CHANGES (30)
|
#define _CHECK_FOR_REPOSITORY_CHANGES (28)
|
||||||
#define _CHECK_FOR_REPOSITORY_CHANGES_SUCCESS (36)
|
#define _CHECK_FOR_REPOSITORY_CHANGES_SUCCESS (29)
|
||||||
#define _FILES_TO_UPDATE (37)
|
#define _SYNC_CUSTOMER_REPOSITORY (30)
|
||||||
#define _CHECK_FOR_REPOSITORY_CHANGES_FAILURE (38)
|
#define _SYNC_CUSTOMER_REPOSITORY_FAILURE (31)
|
||||||
#define _FILES_TO_DOWNLOAD (39)
|
#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_COMMANDS (41)
|
||||||
#define _EXEC_OPKG_COMMAND_1 (42)
|
#define _EXEC_OPKG_COMMAND_1 (42)
|
||||||
#define _EXEC_OPKG_COMMAND_2 (43)
|
#define _EXEC_OPKG_COMMAND_2 (43)
|
||||||
@@ -82,28 +85,29 @@
|
|||||||
#define _DOWNLOAD_CONFIG_FILE_SUCCESS (56)
|
#define _DOWNLOAD_CONFIG_FILE_SUCCESS (56)
|
||||||
#define _DOWNLOAD_CONFIG_FILE_FAILURE (57)
|
#define _DOWNLOAD_CONFIG_FILE_FAILURE (57)
|
||||||
#define _DOWNLOAD_DEVICE_CONTROLLER (65)
|
#define _DOWNLOAD_DEVICE_CONTROLLER (65)
|
||||||
#define _DOWNLOAD_DEVICE_CONTROLLER_SUCCESS (86)
|
#define _DOWNLOAD_DEVICE_CONTROLLER_SUCCESS (85)
|
||||||
#define _DOWNLOAD_DEVICE_CONTROLLER_FAILURE (87)
|
#define _DOWNLOAD_DEVICE_CONTROLLER_FAILURE (86)
|
||||||
#define _DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE (88)
|
#define _DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE (87)
|
||||||
#define _DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS (89)
|
#define _DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS (88)
|
||||||
#define _SYNC_CUSTOMER_REPOSITORY (90)
|
#define _SAVE_LOGS (92)
|
||||||
#define _SYNC_CUSTOMER_REPOSITORY_FAILURE (91)
|
#define _SAVE_LOGS_FAILURE (93)
|
||||||
#define _SYNC_CUSTOMER_REPOSITORY_SUCCESS (92)
|
#define _SAVE_LOGS_SUCCESS (94)
|
||||||
#define _SAVE_LOGS (93)
|
#define _SEND_LAST_VERSION (95)
|
||||||
#define _SAVE_LOGS_FAILURE (94)
|
#define _UPDATE_FINALIZE (95)
|
||||||
#define _SAVE_LOGS_SUCCESS (95)
|
#define _UPDATE_SUCCEEDED (96)
|
||||||
#define _SEND_LAST_VERSION (96)
|
#define _UPDATE_FAILED (97)
|
||||||
#define _UPDATE_SUCCEEDED (97)
|
#define _UPDATE_ACTIVATED (98)
|
||||||
#define _UPDATE_FAILED (98)
|
#define _UPDATE_NOT_NECESSARY (99)
|
||||||
#define _UPDATE_ACTIVATED (99)
|
|
||||||
#define _FINISHED (100)
|
#define _FINISHED (100)
|
||||||
#define _DEBUG (1000)
|
#define _DEBUG (1000)
|
||||||
#define _ERROR (1001)
|
#define _ERROR (1001)
|
||||||
|
#define _NONE (1002)
|
||||||
|
|
||||||
#define _SEND_LAST_VERSION_CORRECTION (4)
|
#define _SEND_LAST_VERSION_CORRECTION (5)
|
||||||
#define _UPDATE_SUCCEEDED_CORRECTION (3)
|
#define _UPDATE_SUCCEEDED_CORRECTION (4)
|
||||||
#define _UPDATE_FAILED_CORRECTION (2)
|
#define _UPDATE_FAILED_CORRECTION (3)
|
||||||
#define _UPDATE_ACTIVATED_CORRECTION (1)
|
#define _UPDATE_ACTIVATED_CORRECTION (2)
|
||||||
|
#define _UPDATE_NOT_NECESSARY_CORRECTION (1)
|
||||||
|
|
||||||
#define ISMAS_UPDATE_REQUESTS (10)
|
#define ISMAS_UPDATE_REQUESTS (10)
|
||||||
#define CHECK_UPDATE_TRIGGER_SET "Check update trigger ..."
|
#define CHECK_UPDATE_TRIGGER_SET "Check update trigger ..."
|
||||||
@@ -132,6 +136,7 @@ class Worker : public QThread{
|
|||||||
QString const m_baudrate;
|
QString const m_baudrate;
|
||||||
IsmasClient m_ismasClient;
|
IsmasClient m_ismasClient;
|
||||||
GitClient m_gc;
|
GitClient m_gc;
|
||||||
|
QStringList m_versionInfo;
|
||||||
QString const m_osVersion;
|
QString const m_osVersion;
|
||||||
QString const m_atbqtVersion;
|
QString const m_atbqtVersion;
|
||||||
QString const m_atbUpdateToolVersion;
|
QString const m_atbUpdateToolVersion;
|
||||||
@@ -155,6 +160,9 @@ class Worker : public QThread{
|
|||||||
bool m_initialClone = false;
|
bool m_initialClone = false;
|
||||||
bool m_repairClone = false;
|
bool m_repairClone = false;
|
||||||
bool m_ismasTriggerActive = false;
|
bool m_ismasTriggerActive = false;
|
||||||
|
bool m_updateNotNecessary = false;
|
||||||
|
bool m_automaticUpdate = false;
|
||||||
|
QStringList m_ismasTriggerStatusMessage;
|
||||||
|
|
||||||
MainWindow *m_mainWindow;
|
MainWindow *m_mainWindow;
|
||||||
bool m_withoutIsmasDirectPort;
|
bool m_withoutIsmasDirectPort;
|
||||||
@@ -198,10 +206,50 @@ class Worker : public QThread{
|
|||||||
}
|
}
|
||||||
|
|
||||||
virtual ~UpdateProcessRunning() {
|
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;
|
||||||
|
QStringList lst;
|
||||||
|
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;
|
m_worker->m_updateProcessRunning = false;
|
||||||
emit m_worker->enableExit();
|
emit m_worker->enableExit();
|
||||||
emit m_worker->restartExitTimer();
|
emit m_worker->restartExitTimer();
|
||||||
@@ -273,12 +321,15 @@ public:
|
|||||||
SAVE_LOGS_SUCCESS = _SAVE_LOGS_SUCCESS,
|
SAVE_LOGS_SUCCESS = _SAVE_LOGS_SUCCESS,
|
||||||
SAVE_LOGS_FAILURE = _SAVE_LOGS_FAILURE,
|
SAVE_LOGS_FAILURE = _SAVE_LOGS_FAILURE,
|
||||||
SEND_LAST_VERSION = _SEND_LAST_VERSION,
|
SEND_LAST_VERSION = _SEND_LAST_VERSION,
|
||||||
|
UPDATE_FINALIZE = _UPDATE_FINALIZE,
|
||||||
UPDATE_SUCCEEDED = _UPDATE_SUCCEEDED,
|
UPDATE_SUCCEEDED = _UPDATE_SUCCEEDED,
|
||||||
UPDATE_ACTIVATED = _UPDATE_ACTIVATED,
|
UPDATE_ACTIVATED = _UPDATE_ACTIVATED,
|
||||||
|
UPDATE_NOT_NECESSARY = _UPDATE_NOT_NECESSARY,
|
||||||
UPDATE_FAILED = _UPDATE_FAILED,
|
UPDATE_FAILED = _UPDATE_FAILED,
|
||||||
FINISHED = _FINISHED,
|
FINISHED = _FINISHED,
|
||||||
DEBUG = _DEBUG,
|
DEBUG = _DEBUG,
|
||||||
ERROR = _ERROR
|
ERROR = _ERROR,
|
||||||
|
NONE = _NONE
|
||||||
};
|
};
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@@ -289,6 +340,8 @@ private:
|
|||||||
static Worker *instance;
|
static Worker *instance;
|
||||||
QStringList m_opkgCommands;
|
QStringList m_opkgCommands;
|
||||||
Update *m_update = nullptr;
|
Update *m_update = nullptr;
|
||||||
|
hwinf *m_hw = nullptr;
|
||||||
|
UPDATE_STEP m_lastFailedUpdateStep = UPDATE_STEP::NONE;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void run();
|
virtual void run();
|
||||||
@@ -317,6 +370,7 @@ public:
|
|||||||
static QString getATBUpdateToolYoctoInstallationStatus();
|
static QString getATBUpdateToolYoctoInstallationStatus();
|
||||||
static QString getAPISMYoctoVersion();
|
static QString getAPISMYoctoVersion();
|
||||||
static QString getAPISMYoctoInstallationStatus();
|
static QString getAPISMYoctoInstallationStatus();
|
||||||
|
static QString getDCVersionPreparedForDownload(QString const &filename);
|
||||||
|
|
||||||
static const QString UPDATE_STEP_OK;
|
static const QString UPDATE_STEP_OK;
|
||||||
static const QString UPDATE_STEP_DONE;
|
static const QString UPDATE_STEP_DONE;
|
||||||
@@ -346,6 +400,8 @@ public:
|
|||||||
void displayProgressInMainWindow(int progress);
|
void displayProgressInMainWindow(int progress);
|
||||||
void startProgressLoop();
|
void startProgressLoop();
|
||||||
void stopProgressLoop();
|
void stopProgressLoop();
|
||||||
|
void setHW(hwinf *hw) { m_hw = hw; }
|
||||||
|
hwinf *getHW() { return m_hw; }
|
||||||
|
|
||||||
IsmasClient &getIsmasClient() { return m_ismasClient; }
|
IsmasClient &getIsmasClient() { return m_ismasClient; }
|
||||||
IsmasClient const &getIsmasClient() const { return m_ismasClient; }
|
IsmasClient const &getIsmasClient() const { return m_ismasClient; }
|
||||||
@@ -405,6 +461,8 @@ private:
|
|||||||
QStringList lst = QStringList(smap[step]);
|
QStringList lst = QStringList(smap[step]);
|
||||||
|
|
||||||
switch (step) {
|
switch (step) {
|
||||||
|
case UPDATE_STEP::NONE: {
|
||||||
|
} break;
|
||||||
case UPDATE_STEP::STARTED: {
|
case UPDATE_STEP::STARTED: {
|
||||||
Utils::printUpdateStatusMsg(
|
Utils::printUpdateStatusMsg(
|
||||||
debug,
|
debug,
|
||||||
@@ -612,6 +670,10 @@ private:
|
|||||||
lst << instance->m_debugMsg;
|
lst << instance->m_debugMsg;
|
||||||
Utils::printUpdateStatusMsg(debug, lst);
|
Utils::printUpdateStatusMsg(debug, lst);
|
||||||
break;
|
break;
|
||||||
|
case UPDATE_STEP::UPDATE_NOT_NECESSARY:
|
||||||
|
lst << instance->m_debugMsg;
|
||||||
|
Utils::printUpdateStatusMsg(debug, lst);
|
||||||
|
break;
|
||||||
case UPDATE_STEP::UPDATE_FAILED:
|
case UPDATE_STEP::UPDATE_FAILED:
|
||||||
break;
|
break;
|
||||||
case UPDATE_STEP::FINISHED:
|
case UPDATE_STEP::FINISHED:
|
||||||
@@ -645,28 +707,86 @@ private:
|
|||||||
QStringList lst = QStringList(smap[step]);
|
QStringList lst = QStringList(smap[step]);
|
||||||
|
|
||||||
switch (step) {
|
switch (step) {
|
||||||
|
case UPDATE_STEP::NONE: {
|
||||||
|
} break;
|
||||||
case UPDATE_STEP::STARTED: {
|
case UPDATE_STEP::STARTED: {
|
||||||
ismasClient.setProgressInPercent(_STARTED);
|
ismasClient.setProgressInPercent(_STARTED);
|
||||||
} break;
|
} break;
|
||||||
case UPDATE_STEP::CHECK_REPOSITORY:
|
case UPDATE_STEP::CHECK_REPOSITORY:
|
||||||
ismasClient.setProgressInPercent(_CHECK_REPOSITORY);
|
ismasClient.setProgressInPercent(_CHECK_REPOSITORY);
|
||||||
break;
|
break;
|
||||||
case UPDATE_STEP::CHECK_REPOSITORY_SUCCESS:
|
case UPDATE_STEP::CHECK_REPOSITORY_SUCCESS: {
|
||||||
break;
|
ismasClient.setProgressInPercent(_CHECK_REPOSITORY_SUCCESS);
|
||||||
case UPDATE_STEP::CHECK_REPOSITORY_FAILURE:
|
QString const &ismasUpdateNews =
|
||||||
break;
|
QString("#M=APISM#C=CMD_EVENT#J=") +
|
||||||
case UPDATE_STEP::CHECK_SANITY:
|
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);
|
ismasClient.setProgressInPercent(_CHECK_SANITY);
|
||||||
break;
|
} break;
|
||||||
case UPDATE_STEP::CHECK_SANITY_SUCCESS:
|
case UPDATE_STEP::CHECK_SANITY_SUCCESS: {
|
||||||
ismasClient.setProgressInPercent(_CHECK_SANITY_SUCCESS);
|
ismasClient.setProgressInPercent(_CHECK_SANITY_SUCCESS);
|
||||||
break;
|
QString const &ismasUpdateNews =
|
||||||
case UPDATE_STEP::CHECK_SANITY_FAILURE:
|
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);
|
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:
|
case UPDATE_STEP::REPOSITORY_RECOVERED_SUCCESS:
|
||||||
|
ismasClient.setProgressInPercent(_REPOSITORY_RECOVERED_SUCCESS);
|
||||||
break;
|
break;
|
||||||
case UPDATE_STEP::REPOSITORY_RECOVERED_FAILURE:
|
case UPDATE_STEP::REPOSITORY_RECOVERED_FAILURE:
|
||||||
|
ismasClient.setProgressInPercent(_REPOSITORY_RECOVERED_FAILURE);
|
||||||
break;
|
break;
|
||||||
case UPDATE_STEP::CLONE_REPOSITORY:
|
case UPDATE_STEP::CLONE_REPOSITORY:
|
||||||
ismasClient.setProgressInPercent(_CLONE_REPOSITORY);
|
ismasClient.setProgressInPercent(_CLONE_REPOSITORY);
|
||||||
@@ -679,11 +799,11 @@ private:
|
|||||||
"U0010",
|
"U0010",
|
||||||
_CLONE_REPOSITORY_SUCCESS,
|
_CLONE_REPOSITORY_SUCCESS,
|
||||||
IsmasClient::RESULT_CODE::SUCCESS,
|
IsmasClient::RESULT_CODE::SUCCESS,
|
||||||
smap[step],
|
smap[UPDATE_STEP::CLONE_REPOSITORY],
|
||||||
QString("CLONED REPOSITORY %1 AND CHECKED OUT BRANCH %2")
|
QString("CLONED REPOSITORY %1 AND CHECKED OUT BRANCH %2")
|
||||||
.arg(instance->m_customerRepository)
|
.arg(instance->m_customerRepository)
|
||||||
.arg(instance->m_gc.branchName()).toStdString().c_str(),
|
.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,
|
ismasClient.sendRequestReceiveResponse(IsmasClient::APISM::DB_PORT,
|
||||||
ismasUpdateNews);
|
ismasUpdateNews);
|
||||||
} break;
|
} break;
|
||||||
@@ -695,11 +815,11 @@ private:
|
|||||||
"U0003",
|
"U0003",
|
||||||
_CLONE_REPOSITORY_FAILURE,
|
_CLONE_REPOSITORY_FAILURE,
|
||||||
IsmasClient::RESULT_CODE::INSTALL_ERROR,
|
IsmasClient::RESULT_CODE::INSTALL_ERROR,
|
||||||
smap[step],
|
smap[UPDATE_STEP::CHECKOUT_REPOSITORY],
|
||||||
QString("CLONING REPOSITORY %1 OR CHECKING OUT BRANCH %2 FAILED")
|
QString("CLONING REPOSITORY %1 OR CHECKING OUT BRANCH %2 FAILED")
|
||||||
.arg(instance->m_customerRepository)
|
.arg(instance->m_customerRepository)
|
||||||
.arg(instance->m_gc.branchName()).toStdString().c_str(),
|
.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.sendRequestReceiveResponse(
|
||||||
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
||||||
} break;
|
} break;
|
||||||
@@ -713,7 +833,8 @@ private:
|
|||||||
ismasClient.cloneAndCheckoutCustomerRepository(
|
ismasClient.cloneAndCheckoutCustomerRepository(
|
||||||
QString("CHECKED OUT REPOSITORY %1 AND CHECKED OUT BRANCH %2")
|
QString("CHECKED OUT REPOSITORY %1 AND CHECKED OUT BRANCH %2")
|
||||||
.arg(instance->m_customerRepository)
|
.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;
|
break;
|
||||||
case UPDATE_STEP::CHECKOUT_REPOSITORY_FAILURE:
|
case UPDATE_STEP::CHECKOUT_REPOSITORY_FAILURE:
|
||||||
ismasClient.setProgressInPercent(_CHECKOUT_REPOSITORY_FAILURE);
|
ismasClient.setProgressInPercent(_CHECKOUT_REPOSITORY_FAILURE);
|
||||||
@@ -725,7 +846,8 @@ private:
|
|||||||
ismasClient.setProgressInPercent(_CHECK_ISMAS_TRIGGER_SUCCESS);
|
ismasClient.setProgressInPercent(_CHECK_ISMAS_TRIGGER_SUCCESS);
|
||||||
ismasClient.sendRequestReceiveResponse(IsmasClient::APISM::DB_PORT,
|
ismasClient.sendRequestReceiveResponse(IsmasClient::APISM::DB_PORT,
|
||||||
QString("#M=APISM#C=CMD_EVENT#J=") +
|
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;
|
break;
|
||||||
case UPDATE_STEP::CHECK_ISMAS_TRIGGER_WRONG_VALUE:
|
case UPDATE_STEP::CHECK_ISMAS_TRIGGER_WRONG_VALUE:
|
||||||
ismasClient.setProgressInPercent(_CHECK_ISMAS_TRIGGER_WRONG_VALUE);
|
ismasClient.setProgressInPercent(_CHECK_ISMAS_TRIGGER_WRONG_VALUE);
|
||||||
@@ -738,9 +860,9 @@ private:
|
|||||||
"U0003",
|
"U0003",
|
||||||
_CHECK_ISMAS_TRIGGER_FAILURE,
|
_CHECK_ISMAS_TRIGGER_FAILURE,
|
||||||
IsmasClient::RESULT_CODE::INSTALL_ERROR,
|
IsmasClient::RESULT_CODE::INSTALL_ERROR,
|
||||||
smap[step],
|
smap[UPDATE_STEP::CHECK_ISMAS_TRIGGER],
|
||||||
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
||||||
"");
|
instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
|
||||||
ismasClient.sendRequestReceiveResponse(
|
ismasClient.sendRequestReceiveResponse(
|
||||||
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
||||||
} break;
|
} break;
|
||||||
@@ -750,9 +872,20 @@ private:
|
|||||||
case UPDATE_STEP::INITIAL_CLONE_WITH_ACTIVE_ISMAS_TRIGGER:
|
case UPDATE_STEP::INITIAL_CLONE_WITH_ACTIVE_ISMAS_TRIGGER:
|
||||||
ismasClient.setProgressInPercent(_INITIAL_CLONE_WITH_ACTIVE_ISMAS_TRIGGER);
|
ismasClient.setProgressInPercent(_INITIAL_CLONE_WITH_ACTIVE_ISMAS_TRIGGER);
|
||||||
break;
|
break;
|
||||||
case UPDATE_STEP::CHECKOUT_BRANCH:
|
case UPDATE_STEP::CHECKOUT_BRANCH: {
|
||||||
ismasClient.setProgressInPercent(_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: {
|
case UPDATE_STEP::CHECKOUT_BRANCH_SUCCESS: {
|
||||||
ismasClient.setProgressInPercent(_CHECKOUT_BRANCH_SUCCESS);
|
ismasClient.setProgressInPercent(_CHECKOUT_BRANCH_SUCCESS);
|
||||||
QString const &ismasUpdateNews =
|
QString const &ismasUpdateNews =
|
||||||
@@ -761,9 +894,9 @@ private:
|
|||||||
"U0010",
|
"U0010",
|
||||||
_CHECKOUT_BRANCH_SUCCESS,
|
_CHECKOUT_BRANCH_SUCCESS,
|
||||||
IsmasClient::RESULT_CODE::SUCCESS,
|
IsmasClient::RESULT_CODE::SUCCESS,
|
||||||
smap[step],
|
smap[UPDATE_STEP::CHECKOUT_BRANCH],
|
||||||
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
||||||
"");
|
instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
|
||||||
ismasClient.sendRequestReceiveResponse(
|
ismasClient.sendRequestReceiveResponse(
|
||||||
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
||||||
} break;
|
} break;
|
||||||
@@ -775,9 +908,9 @@ private:
|
|||||||
"U0003",
|
"U0003",
|
||||||
_CHECKOUT_BRANCH_FAILURE,
|
_CHECKOUT_BRANCH_FAILURE,
|
||||||
IsmasClient::RESULT_CODE::INSTALL_ERROR,
|
IsmasClient::RESULT_CODE::INSTALL_ERROR,
|
||||||
smap[step],
|
smap[UPDATE_STEP::CHECKOUT_BRANCH],
|
||||||
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
||||||
"");
|
instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
|
||||||
ismasClient.sendRequestReceiveResponse(
|
ismasClient.sendRequestReceiveResponse(
|
||||||
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
||||||
} break;
|
} break;
|
||||||
@@ -911,12 +1044,23 @@ private:
|
|||||||
IsmasClient::RESULT_CODE::SUCCESS,
|
IsmasClient::RESULT_CODE::SUCCESS,
|
||||||
smap[step],
|
smap[step],
|
||||||
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
||||||
"");
|
instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
|
||||||
ismasClient.sendRequestReceiveResponse(
|
ismasClient.sendRequestReceiveResponse(
|
||||||
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
||||||
} break;
|
} break;
|
||||||
case UPDATE_STEP::EXEC_OPKG_COMMAND_SUCCESS: {
|
case UPDATE_STEP::EXEC_OPKG_COMMAND_SUCCESS: {
|
||||||
ismasClient.setProgressInPercent(_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;
|
} break;
|
||||||
case UPDATE_STEP::EXEC_OPKG_COMMAND_FAILURE: {
|
case UPDATE_STEP::EXEC_OPKG_COMMAND_FAILURE: {
|
||||||
ismasClient.setProgressInPercent(_EXEC_OPKG_COMMAND_FAILURE);
|
ismasClient.setProgressInPercent(_EXEC_OPKG_COMMAND_FAILURE);
|
||||||
@@ -928,7 +1072,7 @@ private:
|
|||||||
IsmasClient::RESULT_CODE::INSTALL_ERROR,
|
IsmasClient::RESULT_CODE::INSTALL_ERROR,
|
||||||
smap[step],
|
smap[step],
|
||||||
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
||||||
"");
|
instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
|
||||||
ismasClient.sendRequestReceiveResponse(
|
ismasClient.sendRequestReceiveResponse(
|
||||||
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
||||||
} break;
|
} break;
|
||||||
@@ -952,9 +1096,9 @@ private:
|
|||||||
_ISMAS_CONTINUE,
|
_ISMAS_CONTINUE,
|
||||||
ismasClient.getProgressInPercent(),
|
ismasClient.getProgressInPercent(),
|
||||||
IsmasClient::RESULT_CODE::SUCCESS,
|
IsmasClient::RESULT_CODE::SUCCESS,
|
||||||
smap[step],
|
smap[UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER],
|
||||||
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
||||||
"");
|
instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
|
||||||
ismasClient.sendRequestReceiveResponse(
|
ismasClient.sendRequestReceiveResponse(
|
||||||
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
||||||
} break;
|
} break;
|
||||||
@@ -969,9 +1113,9 @@ private:
|
|||||||
_ISMAS_CONTINUE,
|
_ISMAS_CONTINUE,
|
||||||
ismasClient.getProgressInPercent(),
|
ismasClient.getProgressInPercent(),
|
||||||
IsmasClient::RESULT_CODE::SUCCESS,
|
IsmasClient::RESULT_CODE::SUCCESS,
|
||||||
smap[step],
|
smap[UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE],
|
||||||
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
||||||
"");
|
instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
|
||||||
ismasClient.sendRequestReceiveResponse(
|
ismasClient.sendRequestReceiveResponse(
|
||||||
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
||||||
} break;
|
} break;
|
||||||
@@ -989,9 +1133,9 @@ private:
|
|||||||
_ISMAS_CONTINUE,
|
_ISMAS_CONTINUE,
|
||||||
ismasClient.getProgressInPercent(),
|
ismasClient.getProgressInPercent(),
|
||||||
IsmasClient::RESULT_CODE::SUCCESS,
|
IsmasClient::RESULT_CODE::SUCCESS,
|
||||||
smap[step],
|
smap[UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY],
|
||||||
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
||||||
"");
|
instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
|
||||||
ismasClient.sendRequestReceiveResponse(
|
ismasClient.sendRequestReceiveResponse(
|
||||||
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
||||||
} break;
|
} break;
|
||||||
@@ -1011,7 +1155,7 @@ private:
|
|||||||
IsmasClient::RESULT_CODE::SUCCESS,
|
IsmasClient::RESULT_CODE::SUCCESS,
|
||||||
smap[step],
|
smap[step],
|
||||||
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
||||||
"");
|
instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
|
||||||
ismasClient.sendRequestReceiveResponse(
|
ismasClient.sendRequestReceiveResponse(
|
||||||
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
||||||
} break;
|
} break;
|
||||||
@@ -1029,12 +1173,12 @@ private:
|
|||||||
QString const &ismasUpdateNews =
|
QString const &ismasUpdateNews =
|
||||||
QString("#M=APISM#C=CMD_EVENT#J=") +
|
QString("#M=APISM#C=CMD_EVENT#J=") +
|
||||||
ismasClient.updateNewsToIsmas(
|
ismasClient.updateNewsToIsmas(
|
||||||
"U0001", // WAIT-button set to 100%
|
_ISMAS_DONE, // WAIT-button set to 100%
|
||||||
ismasClient.getProgressInPercent(),
|
ismasClient.getProgressInPercent(),
|
||||||
IsmasClient::RESULT_CODE::SUCCESS,
|
IsmasClient::RESULT_CODE::SUCCESS,
|
||||||
smap[step],
|
smap[UPDATE_STEP::UPDATE_FINALIZE],
|
||||||
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
||||||
"");
|
instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
|
||||||
ismasClient.sendRequestReceiveResponse(
|
ismasClient.sendRequestReceiveResponse(
|
||||||
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
||||||
} break;
|
} break;
|
||||||
@@ -1043,12 +1187,26 @@ private:
|
|||||||
QString const &ismasUpdateNews =
|
QString const &ismasUpdateNews =
|
||||||
QString("#M=APISM#C=CMD_EVENT#J=") +
|
QString("#M=APISM#C=CMD_EVENT#J=") +
|
||||||
ismasClient.updateNewsToIsmas(
|
ismasClient.updateNewsToIsmas(
|
||||||
"U0002", // reset WAIT-button to "" (empty string)
|
_ISMAS_SET_WAIT_OK,
|
||||||
ismasClient.getProgressInPercent(),
|
ismasClient.getProgressInPercent(),
|
||||||
IsmasClient::RESULT_CODE::SUCCESS,
|
IsmasClient::RESULT_CODE::SUCCESS,
|
||||||
smap[step],
|
smap[UPDATE_STEP::UPDATE_FINALIZE],
|
||||||
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
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.sendRequestReceiveResponse(
|
||||||
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
||||||
} break;
|
} break;
|
||||||
@@ -1057,12 +1215,12 @@ private:
|
|||||||
QString const &ismasUpdateNews =
|
QString const &ismasUpdateNews =
|
||||||
QString("#M=APISM#C=CMD_EVENT#J=") +
|
QString("#M=APISM#C=CMD_EVENT#J=") +
|
||||||
ismasClient.updateNewsToIsmas(
|
ismasClient.updateNewsToIsmas(
|
||||||
"U0003",
|
_ISMAS_FAILURE,
|
||||||
ismasClient.getProgressInPercent(),
|
ismasClient.getProgressInPercent(),
|
||||||
IsmasClient::RESULT_CODE::INSTALL_ERROR,
|
IsmasClient::RESULT_CODE::INSTALL_ERROR,
|
||||||
smap[step],
|
smap[UPDATE_STEP::UPDATE_FINALIZE],
|
||||||
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
||||||
"");
|
instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
|
||||||
ismasClient.sendRequestReceiveResponse(
|
ismasClient.sendRequestReceiveResponse(
|
||||||
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
||||||
} break;
|
} break;
|
||||||
@@ -1089,6 +1247,8 @@ private:
|
|||||||
Worker::instance->m_currentStep = step;
|
Worker::instance->m_currentStep = step;
|
||||||
|
|
||||||
switch (step) {
|
switch (step) {
|
||||||
|
case UPDATE_STEP::NONE: {
|
||||||
|
} break;
|
||||||
case UPDATE_STEP::STARTED:
|
case UPDATE_STEP::STARTED:
|
||||||
break;
|
break;
|
||||||
case UPDATE_STEP::CHECK_REPOSITORY:
|
case UPDATE_STEP::CHECK_REPOSITORY:
|
||||||
@@ -1127,6 +1287,9 @@ private:
|
|||||||
break;
|
break;
|
||||||
case UPDATE_STEP::CHECK_ISMAS_TRIGGER:
|
case UPDATE_STEP::CHECK_ISMAS_TRIGGER:
|
||||||
emit worker->appendText("\n" CHECK_UPDATE_TRIGGER_SET);
|
emit worker->appendText("\n" CHECK_UPDATE_TRIGGER_SET);
|
||||||
|
if (worker->m_guiMsg.size() > 0) {
|
||||||
|
emit worker->showStatusMessage(worker->m_guiMsg);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case UPDATE_STEP::CHECK_ISMAS_TRIGGER_SUCCESS:
|
case UPDATE_STEP::CHECK_ISMAS_TRIGGER_SUCCESS:
|
||||||
break;
|
break;
|
||||||
@@ -1260,6 +1423,8 @@ private:
|
|||||||
break;
|
break;
|
||||||
case UPDATE_STEP::UPDATE_ACTIVATED:
|
case UPDATE_STEP::UPDATE_ACTIVATED:
|
||||||
break;
|
break;
|
||||||
|
case UPDATE_STEP::UPDATE_NOT_NECESSARY:
|
||||||
|
break;
|
||||||
case UPDATE_STEP::UPDATE_FAILED:
|
case UPDATE_STEP::UPDATE_FAILED:
|
||||||
emit worker->appendText(QString("UPDATE "), UPDATE_STEP_FAIL);
|
emit worker->appendText(QString("UPDATE "), UPDATE_STEP_FAIL);
|
||||||
break;
|
break;
|
2372
plugins/interfaces.h
2372
plugins/interfaces.h
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user