281/Szeged: Skip updating json files ...
... because this is not supported in currently installed DC-FW version and DC-lib version.
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user