GerhardHoffmann/ATBUpdateTool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check m_hw before its use

Browse Source
This commit is contained in:
Gerhard Hoffmann 2024-05-03 13:11:33 +02:00
parent d64b029a2d
commit 4477647acf
1 changed files with 121 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
UpdatePTUDevCtrl/update.cpp
View File

@ -118,7 +118,7 @@ Update::Update(Worker *worker,
, m_sys_areDCdataValid(false) { , m_sys_areDCdataValid(false) {
if (!m_hw) { if (!m_hw) {
qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_hw == nullptr -> ca-slave plugin loaded ???"; qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_hw == nullptr -> ca-slave plugin not loaded";
} else { } else {
int tries = 20; int tries = 20;
while ((m_sys_areDCdataValid = m_hw->sys_areDCdataValid()) == false) { while ((m_sys_areDCdataValid = m_hw->sys_areDCdataValid()) == false) {
@ -185,6 +185,7 @@ void Update::onReportDCDownloadFailure(QString const &errorMsg) {
// br is a index into a table, used for historical reasons. // br is a index into a table, used for historical reasons.
bool Update::openSerial(int br, QString baudrate, QString comPort) const { bool Update::openSerial(int br, QString baudrate, QString comPort) const {
if (m_hw) {
qDebug() << "opening serial" << br << baudrate << comPort << "..."; qDebug() << "opening serial" << br << baudrate << comPort << "...";
if (m_hw->dc_openSerial(br, baudrate, comPort, 1) == true) { // 1 for connect if (m_hw->dc_openSerial(br, baudrate, comPort, 1) == true) { // 1 for connect
Utils::printInfoMsg( Utils::printInfoMsg(
@ -202,16 +203,19 @@ bool Update::openSerial(int br, QString baudrate, QString comPort) const {
Utils::printCriticalErrorMsg( Utils::printCriticalErrorMsg(
QString("OPENING SERIAL %1").arg(br) QString("OPENING SERIAL %1").arg(br)
+ " " + baudrate + " " + comPort + "...FAILED"); + " " + baudrate + " " + comPort + "...FAILED");
}
return false; return false;
} }
void Update::closeSerial() const { void Update::closeSerial() const {
qInfo() << "CLOSED SERIAL" << m_baudrate << m_serialInterface; qInfo() << "CLOSED SERIAL" << m_baudrate << m_serialInterface;
if (m_hw) {
m_hw->dc_closeSerial(); m_hw->dc_closeSerial();
}
} }
bool Update::isSerialOpen() const { bool Update::isSerialOpen() const {
return m_hw->dc_isPortOpen(); return m_hw ? m_hw->dc_isPortOpen() : false;
} }
/* /*
@ -390,6 +394,8 @@ bool Update::downloadJson(enum FileTypeJson type,
int templateIdx, int templateIdx,
QString jsFileToSendToDC) const { QString jsFileToSendToDC) const {
bool ret = false;
if (m_hw) {
m_hw->dc_autoRequest(true); // downloading Json needs the AutoEmission flag m_hw->dc_autoRequest(true); // downloading Json needs the AutoEmission flag
qDebug() << "SET AUTO-REQUEST=TRUE"; qDebug() << "SET AUTO-REQUEST=TRUE";
QThread::sleep(1); // make sure the auto-request flag is acknowledged QThread::sleep(1); // make sure the auto-request flag is acknowledged
@ -411,7 +417,6 @@ bool Update::downloadJson(enum FileTypeJson type,
} }
} }
bool ret = false;
QString msg; QString msg;
lst.clear(); lst.clear();
if (ready) { if (ready) {
@ -503,6 +508,7 @@ bool Update::downloadJson(enum FileTypeJson type,
m_hw->dc_autoRequest(false); m_hw->dc_autoRequest(false);
qDebug() << "SET AUTO-REQUEST=FALSE"; qDebug() << "SET AUTO-REQUEST=FALSE";
QThread::sleep(1); // make sure the auto-request flag is acknowledged QThread::sleep(1); // make sure the auto-request flag is acknowledged
}
return ret; return ret;
} }
@ -558,6 +564,7 @@ void Update::finished(int /*exitCode*/, QProcess::ExitStatus /*exitStatus*/) {
} }
QStringList Update::getDcSoftAndHardWareVersion() { QStringList Update::getDcSoftAndHardWareVersion() {
if (m_hw) {
m_hw->dc_autoRequest(true); m_hw->dc_autoRequest(true);
QThread::sleep(1); // make sure the timer-slots are active QThread::sleep(1); // make sure the timer-slots are active
@ -577,6 +584,7 @@ QStringList Update::getDcSoftAndHardWareVersion() {
if (!hwVersion.isEmpty() && !swVersion.isEmpty()) { if (!hwVersion.isEmpty() && !swVersion.isEmpty()) {
return QStringList() << hwVersion << swVersion; return QStringList() << hwVersion << swVersion;
} }
}
return QStringList() << "DC HW-version not available" return QStringList() << "DC HW-version not available"
<< "DC SW-version not available"; << "DC SW-version not available";
@ -665,6 +673,11 @@ bool Update::checkDownloadedJsonVersions(QStringList const& jsonFileNames) {
} }
bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) { bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
if (!m_hw) {
Utils::printInfoMsg("CA-PLUGIN NOT LOADED");
return false;
}
int tries = 20; int tries = 20;
while ((m_sys_areDCdataValid = m_hw->sys_areDCdataValid()) == false) { while ((m_sys_areDCdataValid = m_hw->sys_areDCdataValid()) == false) {
// must deliver 'true', only then are all data from hwapi valid // must deliver 'true', only then are all data from hwapi valid