diff --git a/update.cpp b/update.cpp index be7cabe..85e8938 100644 --- a/update.cpp +++ b/update.cpp @@ -54,6 +54,10 @@ hwinf *Update::loadDCPlugin(QDir const &plugInDir, QString const &fname) { qCritical() << pluginLoader.errorString(); exit(-1); } + + qCritical() << "loadDCPlugin() plugin directory:" << plugInDir.absolutePath(); + qCritical() << "loadDCPlugin() plugin file name:" << pluginLoader.fileName(); + if (!pluginLoader.isLoaded()) { qCritical() << pluginLoader.errorString(); exit(-2); @@ -118,18 +122,18 @@ Update::Update(Worker *worker, , m_dryRun(dryRun) , m_sys_areDCdataValid(false) { - int tries = 20; - while ((m_sys_areDCdataValid = m_hw->sys_areDCdataValid()) == false) { + //int tries = 20; + //while ((m_sys_areDCdataValid = m_hw->sys_areDCdataValid()) == false) { // must deliver 'true', only then are all data from hwapi valid - if (--tries < 0) { - qCritical() << "ERROR!!! DC DATA NOT VALID -> CA-MASTER-PLUGIN NOT CONNECTED"; - break; - } - m_hw->dc_autoRequest(true); - QThread::msleep(500); - } + // if (--tries < 0) { + // qCritical() << "ERROR!!! DC DATA NOT VALID -> CA-MASTER-PLUGIN NOT CONNECTED"; + // break; + // } + // m_hw->dc_autoRequest(true); + // QThread::msleep(500); + //} - qCritical() << "UPDATE: m_sys_areDCDataValid ..." << m_sys_areDCdataValid; + //qCritical() << "UPDATE: m_sys_areDCDataValid ..." << m_sys_areDCdataValid; //qInfo() << "UPDATE: m_serialInterface ..." << m_serialInterface; //qInfo() << "UPDATE: m_baudrate ..." << m_baudrate; @@ -262,6 +266,7 @@ bool Update::updateBinary(QString const &fileToSendToDC) { return false; +#if 0 QFile fn(fileToSendToDC); if (!fn.exists()) { // output via CONSOLE() etc @@ -330,6 +335,7 @@ bool Update::updateBinary(QString const &fileToSendToDC) { } return true; +#endif } QString Update::jsonType(enum FileTypeJson type) { @@ -557,7 +563,7 @@ bool Update::checkDownloadedJsonVersions(QStringList const& jsonFileNames) { } if (jsonNr != 0) { - +#if 0 m_hw->sys_requestJsonVersions(jsonNr); QThread::msleep(500); @@ -575,6 +581,8 @@ bool Update::checkDownloadedJsonVersions(QStringList const& jsonFileNames) { if (installedVersion == fileVersion) { } +#endif + } else { qCritical() << "CANNOT FIND JSON-NR FOR" << jsonFileNames[i]; } @@ -584,10 +592,10 @@ bool Update::checkDownloadedJsonVersions(QStringList const& jsonFileNames) { } bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) { - if (m_sys_areDCdataValid == false) { - qCritical() << "ERROR!!! DC DATA NOT VALID -> CA-MASTER-PLUGIN NOT CONNECTED"; - return false; - } + //if (m_sys_areDCdataValid == false) { + // qCritical() << "ERROR!!! DC DATA NOT VALID -> CA-MASTER-PLUGIN NOT CONNECTED"; + // return false; + //} bool res = false; QList::const_iterator it;