diff --git a/DownloadDCFirmware/main.cpp b/DownloadDCFirmware/main.cpp index b9e957f..0c1267a 100644 --- a/DownloadDCFirmware/main.cpp +++ b/DownloadDCFirmware/main.cpp @@ -65,7 +65,6 @@ int main(int argc, char **argv) { setDebugLevel(LOG_NOTICE); } - //return 0; /* @@ -172,7 +171,7 @@ int main(int argc, char **argv) { qInfo() << "using customer repository" << psaRepoDir; } - std::unique_ptr c = internal::dcCandidateToInstall(); + std::unique_ptr c = internal::dcCandidateToInstall("/etc/dc/"); if (c) { fi.setFile(*c); if (fi.exists() == false) { diff --git a/DownloadDCFirmware/update.cpp b/DownloadDCFirmware/update.cpp index 7a0f4dc..52ac204 100644 --- a/DownloadDCFirmware/update.cpp +++ b/DownloadDCFirmware/update.cpp @@ -392,6 +392,10 @@ int Update::run() { qInfo() << "DC auto request OFF"; + // dennis einzelne linie + qCritical() << "start dc-update for" << m_dcFileName << "at" << m_start.toString(Qt::ISODate); + + QByteArray ba = loadBinaryDCFile(m_dcFileName); if (ba.size() > 0) { m_totalBlocks = (((ba.size())%64)==0) ? (ba.size()/64) : (ba.size()/64)+1; diff --git a/UpdatePTUDevCtrl/worker.cpp b/UpdatePTUDevCtrl/worker.cpp index 3cab431..afe860b 100644 --- a/UpdatePTUDevCtrl/worker.cpp +++ b/UpdatePTUDevCtrl/worker.cpp @@ -280,8 +280,8 @@ Worker::Worker(int customerNr, // 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") + // QString("echo ATBUpdateDC") + QString("/opt/app/tools/atbupdate/ATBUpdateDC") , this, ++next)); // show/send software-status diff --git a/common/src/utils_internal.cpp b/common/src/utils_internal.cpp index e21d0b1..2615c87 100644 --- a/common/src/utils_internal.cpp +++ b/common/src/utils_internal.cpp @@ -116,6 +116,8 @@ std::unique_ptr readSettings(QString const &optionalDirName) { std::unique_ptr dcCandidateToInstall(QString const &dcDirectory) { std::unique_ptr dcCandidate{nullptr}; + qCritical() << __func__ << __LINE__ << dcDirectory; + QDir dcDir{dcDirectory.isEmpty() ? customerRepoDcDir() : dcDirectory}; if (dcDir.exists()) {