diff --git a/UpdatePTUDevCtrl/update.cpp b/UpdatePTUDevCtrl/update.cpp index 837e467..29dcd10 100644 --- a/UpdatePTUDevCtrl/update.cpp +++ b/UpdatePTUDevCtrl/update.cpp @@ -105,7 +105,6 @@ Update::Update(Worker *worker, char const *serialInterface, char const *baudrate) : QObject(parent) - , m_hw(loadDCPlugin(QDir(plugInDir), pluginName)) , m_worker(worker) , m_serialInterface(serialInterface) , m_baudrate(baudrate) @@ -116,24 +115,6 @@ Update::Update(Worker *worker, , m_workingDir(workingDir) , m_dryRun(dryRun) , m_sys_areDCdataValid(false) { - - if (!m_hw) { - qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_hw == nullptr -> ca-slave plugin not loaded"; - } else { - 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); - } - - qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_sys_areDCDataValid ..." - << m_sys_areDCdataValid; - } } Update::~Update() { @@ -151,43 +132,6 @@ void Update::onReportDCDownloadFailure(QString const &errorMsg) { qCritical() << "msg" << errorMsg; } - - -// br is a index into a table, used for historical reasons. -bool Update::openSerial(int br, QString baudrate, QString comPort) const { - if (m_hw) { - qDebug() << "opening serial" << br << baudrate << comPort << "..."; - if (m_hw->dc_openSerial(br, baudrate, comPort, 1) == true) { // 1 for connect - Utils::printInfoMsg( - QString("OPENING SERIAL %1").arg(br) - + " " + baudrate + " " + comPort + "...OK"); - - // m_hw->dc_autoRequest(true); - // m_hw->dc_autoRequest(false); - // QThread::sleep(1); - - Utils::printInfoMsg(QString("IS PORT OPEN %1").arg(m_hw->dc_isPortOpen())); - return true; - } - - Utils::printCriticalErrorMsg( - QString("OPENING SERIAL %1").arg(br) - + " " + baudrate + " " + comPort + "...FAILED"); - } - return false; -} - -void Update::closeSerial() const { - qInfo() << "CLOSED SERIAL" << m_baudrate << m_serialInterface; - if (m_hw) { - m_hw->dc_closeSerial(); - } -} - -bool Update::isSerialOpen() const { - return m_hw ? m_hw->dc_isPortOpen() : false; -} - /* /////////////////////////////////////////////////////////////////////////////// @@ -282,95 +226,13 @@ bool Update::updateBinary(QString const &fileToSendToDC) { qInfo() << "updating dc-binary" << fileToSendToDC << "..."; return false; - -#if 0 - QFile fn(fileToSendToDC); - if (!fn.exists()) { - // output via CONSOLE() etc - return false; - } - - bool bl_isUp = false; - if (m_hw->bl_completeStart()) { - int cnt = 5; - while (--cnt > 0) { - if (m_hw->bl_isUp()) { - bl_isUp = true; - break; - } - } - } - - if (!bl_isUp) { - return false; - } - - if (!m_hw->bl_storeFirmware(fileToSendToDC)) { - m_hw->bl_stopBL(); - return false; - } - - uint16_t const nrOfFirmwareBlocks = m_hw->bl_getNrOfFirmwareBlocks(); - - for (uint16_t blockNr = 0; blockNr <= nrOfFirmwareBlocks; ++blockNr) { - m_hw->bl_blockAutoLoad(blockNr); - - int sleepTime = 0; - while (1) { - if (sleepTime > 1500) { - m_hw->bl_stopBL(); - return false; - } - - int8_t const r = m_hw->bl_blockAutoResponse(); - - // after every "bl_blockAutoLoad()" call this until response - // retval 0: wait 1: OK, blk was sent 2: OK, transfer complete - // 3: error despite repeating, cancel. probably bin file corrupted - // Max duration: 3x no response from BL = 900ms - - switch(r) { - case 1: - /* fall through */ - case 2: - sleepTime = 0; - break; - case 0: { - QThread::msleep(100); - sleepTime += 100; - } break; - case 3: - m_hw->bl_stopBL(); - return false; - default: - m_hw->bl_stopBL(); - return false; // unknown error code - } - } - - m_hw->bl_stopBL(); - } - - return true; -#endif -} - -QString Update::jsonType(enum FileTypeJson type) { - switch (type) { - case FileTypeJson::CASH: return "CASH"; - case FileTypeJson::CONFIG: return "CONFIG"; - case FileTypeJson::PRINTER: return "PRINTER"; - case FileTypeJson::SERIAL: return "SERIAL"; - case FileTypeJson::DEVICE: return "DEVICE"; - case FileTypeJson::TIME: return "TIME"; - } - return "N/A"; } bool Update::downloadJson(enum FileTypeJson type, int templateIdx, QString jsFileToSendToDC) const { +#if 0 if (m_hw) { m_hw->dc_autoRequest(true); // downloading Json needs the AutoEmission flag qDebug() << "SET AUTO-REQUEST=TRUE"; @@ -489,6 +351,7 @@ bool Update::downloadJson(enum FileTypeJson type, // QThread::sleep(1); // make sure the auto-request flag is acknowledged } +#endif return true; } @@ -547,6 +410,7 @@ void Update::finished(int /*exitCode*/, QProcess::ExitStatus /*exitStatus*/) { } QStringList Update::getDcSoftAndHardWareVersion() { +#if 0 if (m_hw) { m_hw->dc_autoRequest(true); QThread::sleep(1); // make sure the timer-slots are active @@ -569,15 +433,17 @@ QStringList Update::getDcSoftAndHardWareVersion() { } } +#endif return QStringList() << "DC HW-version not available" << "DC SW-version not available"; } QString Update::getFileVersion(QString const& jsonFileName) { + QString fileVersion(""); +#if 0 // "version":"15.10.2023 14:55 02.00.06", static const QRegularExpression re("^.*(\\\"[Vv]ersion\\\":)([\\s\\\"]{0,})([^,\\\"]{0,}).*$"); - QString fileVersion(""); QFile inputFile(QDir::cleanPath(m_customerRepository + QDir::separator() + jsonFileName)); if (inputFile.exists()) { @@ -602,10 +468,12 @@ QString Update::getFileVersion(QString const& jsonFileName) { // qCritical() << "ERROR" << inputFile.fileName() << "does not exist"; } +#endif return fileVersion; } bool Update::checkDownloadedJsonVersions(QStringList const& jsonFileNames) { +#if 0 for (QStringList::size_type i=0; i < jsonFileNames.size(); ++i) { @@ -680,6 +548,7 @@ bool Update::checkDownloadedJsonVersions(QStringList const& jsonFileNames) { } } +#endif return false; } @@ -687,6 +556,7 @@ QMap Update::getInstalledJsonVersions(QStringList const& jsonFileNames) { QMap map; +#if 0 if (!m_hw) { qCritical() << "(" << __func__ << ":" << __LINE__ << "):" << "ERROR!!! m_hw == nullptr"; @@ -786,11 +656,13 @@ Update::getInstalledJsonVersions(QStringList const& jsonFileNames) { } } +#endif return map; } bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) { +#if 0 if (!m_hw) { Utils::printInfoMsg("CA-PLUGIN NOT LOADED"); return false; @@ -997,4 +869,7 @@ bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) { qDebug() << "SET AUTO-REQUEST=TRUE"; return res; +#endif + + return false; } diff --git a/UpdatePTUDevCtrl/update.h b/UpdatePTUDevCtrl/update.h index b70c02a..4abdd28 100644 --- a/UpdatePTUDevCtrl/update.h +++ b/UpdatePTUDevCtrl/update.h @@ -22,7 +22,6 @@ class Worker; class Update : public QObject { Q_OBJECT - hwinf *m_hw = nullptr; Worker *m_worker = nullptr; char const *m_serialInterface; char const *m_baudrate; @@ -102,12 +101,6 @@ public: QString("etc/psa_config/DC2C_print31.json"), QString("etc/psa_config/DC2C_print32.json")}))); - hwinf *hw() { return m_hw; } - hwinf const *hw() const { return m_hw; } - - //QString customerId() { return m_customerId; } - //QString const customerId() const { return m_customerId; } - QString branchName() { return m_branchName; } QString const branchName() const { return m_branchName; }