Compare commits
8 Commits
includeNew
...
1.5.99
| Author | SHA1 | Date | |
|---|---|---|---|
|
843ac23770
|
|||
|
c3b2db7797
|
|||
|
51640b70e9
|
|||
|
be84c96953
|
|||
|
24bf190c90
|
|||
|
b656b5eab6
|
|||
|
6681e61f59
|
|||
|
7ec6ab00b1
|
@@ -9,7 +9,7 @@ psa-tariff-directory="etc/psa_tariff/"
|
||||
|
||||
|
||||
[PLUGINS]
|
||||
plugin-name="libCAslave.so"
|
||||
plugin-name="libCAmaster.so"
|
||||
|
||||
[FLAGS]
|
||||
no-psa-hardware-update=false
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
TEMPLATE = subdirs
|
||||
CONFIG += ordered
|
||||
SUBDIRS = DownloadDCFirmware DownloadDCJsonFiles UpdatePTUDevCtrl
|
||||
#SUBDIRS = DownloadDCFirmware DownloadDCJsonFiles UpdatePTUDevCtrl
|
||||
SUBDIRS = UpdatePTUDevCtrl
|
||||
|
||||
@@ -2,6 +2,9 @@ QT += core serialport
|
||||
|
||||
TARGET = ATBUpdateDC
|
||||
|
||||
include(../common.pri)
|
||||
|
||||
|
||||
VERSION="0.1.0"
|
||||
win32 {
|
||||
BUILD_DATE=$$system("date /t")
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
QT += core
|
||||
QT += serialport network
|
||||
|
||||
include(../common.pri)
|
||||
|
||||
TARGET = ATBDownloadDCJsonFiles
|
||||
|
||||
VERSION="0.1.0"
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
QT += core gui
|
||||
QT += widgets serialport network
|
||||
|
||||
include(../common.pri)
|
||||
|
||||
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
|
||||
|
||||
TARGET = ATBUpdateTool
|
||||
@@ -150,7 +152,10 @@ DEFINES += QT_DEPRECATED_WARNINGS
|
||||
# 1.5.7 : Add support for dynamic portrait / landscape.
|
||||
# 1.5.8 : Use EVENT_ID=<pid of update-tool> for CMD_EVENT.
|
||||
# 1.5.9 : Removed restart of Apism if ISMAS unreachable.
|
||||
VERSION="1.5.9"
|
||||
# 1.5.99 : Special version for 281/Szeged: remove all DC-library dependencies, as
|
||||
# DC-firmware in Szeged does not support uploading json-files or uploading
|
||||
# DC-firmware binaries.
|
||||
VERSION="1.5.99"
|
||||
# PLANNED TODOS:
|
||||
# 1: Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
|
||||
# 2: Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu
|
||||
@@ -256,9 +261,6 @@ contains( CONFIG, PTU5_YOCTO ) {
|
||||
PTU5BASEPATH = /opt/devel/ptu5
|
||||
ARCH = PTU5
|
||||
DEFINES+=PTU5
|
||||
|
||||
LIBS += -lCAslave
|
||||
LIBS += -lCAmaster
|
||||
}
|
||||
contains( CONFIG, DesktopLinux ) {
|
||||
greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
|
||||
|
||||
@@ -40,6 +40,7 @@ QPluginLoader Update::pluginLoader;
|
||||
|
||||
hwinf *Update::loadDCPlugin(QDir const &plugInDir, QString const &fname) {
|
||||
hwinf *hw = nullptr;
|
||||
#if 0
|
||||
if (plugInDir.exists()) {
|
||||
QString pluginLibName(fname);
|
||||
pluginLibName = plugInDir.absoluteFilePath(pluginLibName);
|
||||
@@ -74,6 +75,7 @@ hwinf *Update::loadDCPlugin(QDir const &plugInDir, QString const &fname) {
|
||||
qCritical() << "plugins directory" << plugInDir.absolutePath()
|
||||
<< "does not exist";
|
||||
}
|
||||
#endif
|
||||
return hw;
|
||||
}
|
||||
|
||||
@@ -117,6 +119,7 @@ Update::Update(Worker *worker,
|
||||
, m_dryRun(dryRun)
|
||||
, m_sys_areDCdataValid(false) {
|
||||
|
||||
#if 0
|
||||
if (!m_hw) {
|
||||
qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_hw == nullptr -> ca-slave plugin not loaded";
|
||||
} else {
|
||||
@@ -134,6 +137,7 @@ Update::Update(Worker *worker,
|
||||
qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_sys_areDCDataValid ..."
|
||||
<< m_sys_areDCdataValid;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
Update::~Update() {
|
||||
@@ -606,6 +610,8 @@ QString Update::getFileVersion(QString const& jsonFileName) {
|
||||
}
|
||||
|
||||
bool Update::checkDownloadedJsonVersions(QStringList const& jsonFileNames) {
|
||||
// note: 2026-02-09: this method is not used!
|
||||
#if 0
|
||||
|
||||
for (QStringList::size_type i=0; i < jsonFileNames.size(); ++i) {
|
||||
|
||||
@@ -679,14 +685,14 @@ bool Update::checkDownloadedJsonVersions(QStringList const& jsonFileNames) {
|
||||
qCritical() << "CANNOT FIND JSON-NR FOR" << fName;
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
return false;
|
||||
}
|
||||
|
||||
QMap<QString, QString>
|
||||
Update::getInstalledJsonVersions(QStringList const& jsonFileNames) {
|
||||
QMap<QString, QString> map;
|
||||
|
||||
#if 0
|
||||
if (!m_hw) {
|
||||
qCritical() << "(" << __func__ << ":" << __LINE__ << "):"
|
||||
<< "ERROR!!! m_hw == nullptr";
|
||||
@@ -786,6 +792,7 @@ Update::getInstalledJsonVersions(QStringList const& jsonFileNames) {
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
return map;
|
||||
}
|
||||
|
||||
|
||||
@@ -290,7 +290,7 @@ void Worker::privateUpdate() {
|
||||
return;
|
||||
}
|
||||
|
||||
return;
|
||||
//return;
|
||||
|
||||
QString func(__PRETTY_FUNCTION__);
|
||||
|
||||
@@ -541,9 +541,10 @@ void Worker::privateUpdate() {
|
||||
// UPDATE THE PSA USING THE CHANGED FILES
|
||||
//
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
if ((continueUpdate = downloadFilesToPSAHardware()) == false) {
|
||||
return;
|
||||
}
|
||||
// for 281/Szeged: skip uploading files to DeviceController
|
||||
//if ((continueUpdate = downloadFilesToPSAHardware()) == false) {
|
||||
// return;
|
||||
//}
|
||||
lst = QStringList(QString("DONE"));
|
||||
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS));
|
||||
|
||||
|
||||
1
common.pri
Normal file
1
common.pri
Normal file
@@ -0,0 +1 @@
|
||||
INCLUDEPATH += $$PWD/common/include
|
||||
1427
common/include/DeviceController/interfaces.h
Normal file
1427
common/include/DeviceController/interfaces.h
Normal file
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user