Compare commits
8 Commits
korneuburg
...
6c472b542e
| Author | SHA1 | Date | |
|---|---|---|---|
| 6c472b542e | |||
| 854c8b9706 | |||
| d521fd977a | |||
| ebbdc2f864 | |||
| 62496c5d95 | |||
| edd606fe78 | |||
| 1748c35c45 | |||
| 4c46932a3c |
@@ -6,7 +6,7 @@ plugin-directory="/usr/lib/"
|
|||||||
working-directory="/opt/app/tools/atbupdate/"
|
working-directory="/opt/app/tools/atbupdate/"
|
||||||
|
|
||||||
[PLUGINS]
|
[PLUGINS]
|
||||||
plugin-name="libCAslave.so"
|
plugin-name="libCAmaster.so"
|
||||||
|
|
||||||
[FLAGS]
|
[FLAGS]
|
||||||
no-psa-hardware-update=false
|
no-psa-hardware-update=false
|
||||||
|
|||||||
@@ -104,7 +104,6 @@ DEFINES += QT_DEPRECATED_WARNINGS
|
|||||||
# Disable EXIT-button for the whole update-process, except for the
|
# Disable EXIT-button for the whole update-process, except for the
|
||||||
# checking of the ISMAS-trigger-button (aka WAIT-button).
|
# checking of the ISMAS-trigger-button (aka WAIT-button).
|
||||||
VERSION="1.4.0"
|
VERSION="1.4.0"
|
||||||
|
|
||||||
# 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
|
||||||
|
|||||||
1806
interfaces.h
Executable file → Normal file
1806
interfaces.h
Executable file → Normal file
File diff suppressed because it is too large
Load Diff
1819
plugins/interfaces.h
1819
plugins/interfaces.h
File diff suppressed because it is too large
Load Diff
@@ -266,6 +266,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
|
||||||
@@ -334,6 +335,7 @@ bool Update::updateBinary(QString const &fileToSendToDC) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
QString Update::jsonType(enum FileTypeJson type) {
|
QString Update::jsonType(enum FileTypeJson type) {
|
||||||
@@ -561,7 +563,7 @@ bool Update::checkDownloadedJsonVersions(QStringList const& jsonFileNames) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (jsonNr != 0) {
|
if (jsonNr != 0) {
|
||||||
|
#if 0
|
||||||
m_hw->sys_requestJsonVersions(jsonNr);
|
m_hw->sys_requestJsonVersions(jsonNr);
|
||||||
QThread::msleep(500);
|
QThread::msleep(500);
|
||||||
|
|
||||||
@@ -579,6 +581,8 @@ bool Update::checkDownloadedJsonVersions(QStringList const& jsonFileNames) {
|
|||||||
if (installedVersion == fileVersion) {
|
if (installedVersion == fileVersion) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
qCritical() << "CANNOT FIND JSON-NR FOR" << jsonFileNames[i];
|
qCritical() << "CANNOT FIND JSON-NR FOR" << jsonFileNames[i];
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user