diff --git a/DownloadDCFirmware/main.cpp b/DownloadDCFirmware/main.cpp index ad64256..0c1267a 100644 --- a/DownloadDCFirmware/main.cpp +++ b/DownloadDCFirmware/main.cpp @@ -189,7 +189,7 @@ int main(int argc, char **argv) { } Update u(fi.absoluteFilePath(), libca, debug, noaction); - // u.run(); + u.run(); qInfo() << ""; diff --git a/DownloadDCFirmware/update.cpp b/DownloadDCFirmware/update.cpp index b57bbfe..8118617 100644 --- a/DownloadDCFirmware/update.cpp +++ b/DownloadDCFirmware/update.cpp @@ -400,19 +400,19 @@ int Update::run() { // TODO resetDeviceController(); if (startBootloader()) { -#if 0 + int currentBlock = 0; DownloadResult res = DownloadResult::OK; qInfo() << nextTimePoint().toUtf8().constData() << "64-byte block" << currentBlock; - while (res != DownloadResult::ERROR && currentBlock < m_totalBlocks) { + while (res != DownloadResult::ERROR && currentBlock <= m_totalBlocks) { if ((res = sendNextAddress(currentBlock)) != DownloadResult::ERROR) { if ((res = sendNextDataBlock(ba, currentBlock)) != DownloadResult::ERROR) { currentBlock += 1; } else break; } } -#endif + #if 0 qCritical() << "DownloadThread::run(): last 64-byte block %04d" << currentBlock; diff --git a/UpdatePTUDevCtrl/worker.cpp b/UpdatePTUDevCtrl/worker.cpp index afe860b..76fd259 100644 --- a/UpdatePTUDevCtrl/worker.cpp +++ b/UpdatePTUDevCtrl/worker.cpp @@ -264,6 +264,14 @@ Worker::Worker(int customerNr, // QString("/opt/app/tools/atbupdate/ATBUpdateOpkg") , this, ++next, false)); + // send device-controller firmware down to device-controller-hardware + m_workList.push_back( + std::make_unique( + // QString("echo ATBUpdateDC") + QString("/opt/app/tools/atbupdate/ATBUpdateDC") + , this, ++next)); + + // *** send json files down to device controller *** m_workList.push_back( std::make_unique( @@ -277,12 +285,6 @@ Worker::Worker(int customerNr, QString("echo ATBUpdateSync") , this, ++next)); - // send device-controller firmware down to device-controller-hardware - m_workList.push_back( - std::make_unique( - // QString("echo ATBUpdateDC") - QString("/opt/app/tools/atbupdate/ATBUpdateDC") - , this, ++next)); // show/send software-status m_workList.push_back(