Compare commits

..

4 Commits

Author SHA1 Message Date
24bf190c90 281/Szeged: Skip updating json files ...
... because this is not supported in currently installed DC-FW version
and DC-lib version.
2026-02-09 15:57:22 +01:00
b656b5eab6 281/Szeged: compile only main program ATBUpdateTool
... because current installed DC-FW version or current installed DClib
in Szeged do not support updating DC-json-files and DC-FW.
2026-02-09 15:55:01 +01:00
6681e61f59 Szeged is still using libCAmaster 2026-02-09 15:21:45 +01:00
7ec6ab00b1 Use interfaces.h from version 1.3.5 2026-02-09 15:19:42 +01:00
9 changed files with 1451 additions and 7 deletions

View File

@@ -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

View File

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

View File

@@ -2,6 +2,9 @@ QT += core serialport
TARGET = ATBUpdateDC
include(../common.pri)
VERSION="0.1.0"
win32 {
BUILD_DATE=$$system("date /t")

View File

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

View File

@@ -1,6 +1,8 @@
QT += core gui
QT += widgets serialport network
include(../common.pri)
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = ATBUpdateTool

View File

@@ -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;
}

View File

@@ -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
View File

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

File diff suppressed because it is too large Load Diff