Compare commits
4 Commits
includeNew
...
281/Szeged
| Author | SHA1 | Date | |
|---|---|---|---|
|
24bf190c90
|
|||
|
b656b5eab6
|
|||
|
6681e61f59
|
|||
|
7ec6ab00b1
|
@@ -9,7 +9,7 @@ psa-tariff-directory="etc/psa_tariff/"
|
|||||||
|
|
||||||
|
|
||||||
[PLUGINS]
|
[PLUGINS]
|
||||||
plugin-name="libCAslave.so"
|
plugin-name="libCAmaster.so"
|
||||||
|
|
||||||
[FLAGS]
|
[FLAGS]
|
||||||
no-psa-hardware-update=false
|
no-psa-hardware-update=false
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
TEMPLATE = subdirs
|
TEMPLATE = subdirs
|
||||||
CONFIG += ordered
|
CONFIG += ordered
|
||||||
SUBDIRS = DownloadDCFirmware DownloadDCJsonFiles UpdatePTUDevCtrl
|
#SUBDIRS = DownloadDCFirmware DownloadDCJsonFiles UpdatePTUDevCtrl
|
||||||
|
SUBDIRS = UpdatePTUDevCtrl
|
||||||
|
|||||||
@@ -2,6 +2,9 @@ QT += core serialport
|
|||||||
|
|
||||||
TARGET = ATBUpdateDC
|
TARGET = ATBUpdateDC
|
||||||
|
|
||||||
|
include(../common.pri)
|
||||||
|
|
||||||
|
|
||||||
VERSION="0.1.0"
|
VERSION="0.1.0"
|
||||||
win32 {
|
win32 {
|
||||||
BUILD_DATE=$$system("date /t")
|
BUILD_DATE=$$system("date /t")
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
QT += core
|
QT += core
|
||||||
QT += serialport network
|
QT += serialport network
|
||||||
|
|
||||||
|
include(../common.pri)
|
||||||
|
|
||||||
TARGET = ATBDownloadDCJsonFiles
|
TARGET = ATBDownloadDCJsonFiles
|
||||||
|
|
||||||
VERSION="0.1.0"
|
VERSION="0.1.0"
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
QT += core gui
|
QT += core gui
|
||||||
QT += widgets serialport network
|
QT += widgets serialport network
|
||||||
|
|
||||||
|
include(../common.pri)
|
||||||
|
|
||||||
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
|
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
|
||||||
|
|
||||||
TARGET = ATBUpdateTool
|
TARGET = ATBUpdateTool
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ QPluginLoader Update::pluginLoader;
|
|||||||
|
|
||||||
hwinf *Update::loadDCPlugin(QDir const &plugInDir, QString const &fname) {
|
hwinf *Update::loadDCPlugin(QDir const &plugInDir, QString const &fname) {
|
||||||
hwinf *hw = nullptr;
|
hwinf *hw = nullptr;
|
||||||
|
#if 0
|
||||||
if (plugInDir.exists()) {
|
if (plugInDir.exists()) {
|
||||||
QString pluginLibName(fname);
|
QString pluginLibName(fname);
|
||||||
pluginLibName = plugInDir.absoluteFilePath(pluginLibName);
|
pluginLibName = plugInDir.absoluteFilePath(pluginLibName);
|
||||||
@@ -74,6 +75,7 @@ hwinf *Update::loadDCPlugin(QDir const &plugInDir, QString const &fname) {
|
|||||||
qCritical() << "plugins directory" << plugInDir.absolutePath()
|
qCritical() << "plugins directory" << plugInDir.absolutePath()
|
||||||
<< "does not exist";
|
<< "does not exist";
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
return hw;
|
return hw;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -117,6 +119,7 @@ Update::Update(Worker *worker,
|
|||||||
, m_dryRun(dryRun)
|
, m_dryRun(dryRun)
|
||||||
, m_sys_areDCdataValid(false) {
|
, m_sys_areDCdataValid(false) {
|
||||||
|
|
||||||
|
#if 0
|
||||||
if (!m_hw) {
|
if (!m_hw) {
|
||||||
qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_hw == nullptr -> ca-slave plugin not loaded";
|
qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_hw == nullptr -> ca-slave plugin not loaded";
|
||||||
} else {
|
} else {
|
||||||
@@ -134,6 +137,7 @@ Update::Update(Worker *worker,
|
|||||||
qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_sys_areDCDataValid ..."
|
qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_sys_areDCDataValid ..."
|
||||||
<< m_sys_areDCdataValid;
|
<< m_sys_areDCdataValid;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
Update::~Update() {
|
Update::~Update() {
|
||||||
@@ -606,6 +610,8 @@ QString Update::getFileVersion(QString const& jsonFileName) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool Update::checkDownloadedJsonVersions(QStringList const& jsonFileNames) {
|
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) {
|
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;
|
qCritical() << "CANNOT FIND JSON-NR FOR" << fName;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
QMap<QString, QString>
|
QMap<QString, QString>
|
||||||
Update::getInstalledJsonVersions(QStringList const& jsonFileNames) {
|
Update::getInstalledJsonVersions(QStringList const& jsonFileNames) {
|
||||||
QMap<QString, QString> map;
|
QMap<QString, QString> map;
|
||||||
|
#if 0
|
||||||
if (!m_hw) {
|
if (!m_hw) {
|
||||||
qCritical() << "(" << __func__ << ":" << __LINE__ << "):"
|
qCritical() << "(" << __func__ << ":" << __LINE__ << "):"
|
||||||
<< "ERROR!!! m_hw == nullptr";
|
<< "ERROR!!! m_hw == nullptr";
|
||||||
@@ -786,6 +792,7 @@ Update::getInstalledJsonVersions(QStringList const& jsonFileNames) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -541,9 +541,10 @@ void Worker::privateUpdate() {
|
|||||||
// UPDATE THE PSA USING THE CHANGED FILES
|
// UPDATE THE PSA USING THE CHANGED FILES
|
||||||
//
|
//
|
||||||
////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////
|
||||||
if ((continueUpdate = downloadFilesToPSAHardware()) == false) {
|
// for 281/Szeged: skip uploading files to DeviceController
|
||||||
return;
|
//if ((continueUpdate = downloadFilesToPSAHardware()) == false) {
|
||||||
}
|
// return;
|
||||||
|
//}
|
||||||
lst = QStringList(QString("DONE"));
|
lst = QStringList(QString("DONE"));
|
||||||
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS));
|
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