Compare commits

..

No commits in common. "f623b364212fed09be42dd1d4ee2648399bd1812" and "2c1afa463f0aef5cbe597fc9a28d61e3b481e3b4" have entirely different histories.

2 changed files with 4 additions and 16 deletions

View File

@ -450,25 +450,16 @@ int Update::run() {
qCritical() << "DownloadThread::run(): last result" << (int)sendStatus(m_hw->bl_wasSendingDataOK());
#endif
}
// TODO
stopBootloader(); // there is no harm in stopping the bootloader even
// if starting the bootloader failed
qInfo() << nextTimePoint().toUtf8().constData() << "<DC-UPDATE-SUCCESS>";
// check if update was successful
if (!m_debug) {
m_hw->dc_autoRequest(true); //restart dc_autoRequest after download else E255!
}
for (int i = 0; i < 3; ++i) {
qInfo() << "waiting for device controller restart...(" << i << ")";
QThread::sleep(20);
resetDeviceController();
if (startBootloader()) {
qInfo() << nextTimePoint().toUtf8().constData() << "<DC-UPDATE-SUCCESS>";
stopBootloader();
return -(int)Result::SUCCESS;
}
}
return -(int)Result::SUCCESS;
}
qInfo() << nextTimePoint().toUtf8().constData() << "<DC-UPDATE-FAILURE>";

View File

@ -281,10 +281,7 @@ Worker::Worker(int customerNr,
m_workList.push_back(
std::make_unique<UpdateJsonCommand>(
//QString("echo ATBUpdateJsonFiles")
//QString("/opt/app/tools/atbupdate/ATBUpdateJsonFiles --set-ppid %1").arg(QCoreApplication::applicationPid())
// use customer repo
QString("/opt/app/tools/atbupdate/ATBUpdateJsonFiles").arg(QCoreApplication::applicationPid())
QString("/opt/app/tools/atbupdate/ATBUpdateJsonFiles --set-ppid %1").arg(QCoreApplication::applicationPid())
, this, ++next, false));
// show/send software-status