Compare commits

...

3 Commits

3 changed files with 15 additions and 8 deletions

View File

@ -121,6 +121,8 @@ DEFINES += QT_DEPRECATED_WARNINGS
# when pulling new branch, but branch already existed locally. # when pulling new branch, but branch already existed locally.
# 1.4.6 : No exit()-call if loading CA-plugin fails. # 1.4.6 : No exit()-call if loading CA-plugin fails.
# Check m_hw (pointer to CA-(Slave)Plugin) before its use. # Check m_hw (pointer to CA-(Slave)Plugin) before its use.
# Only exit() if firmware is configured to be possibly updated, but
# loading the CA-plugin failed.
VERSION="1.4.7" VERSION="1.4.7"
# PLANNED TODOS: # PLANNED TODOS:
# 1: Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT. # 1: Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.

View File

@ -130,7 +130,9 @@ int main(int argc, char *argv[]) {
if (!QDir(plugInDir).exists()) { if (!QDir(plugInDir).exists()) {
qCritical() << plugInDir qCritical() << plugInDir
<< "does not exists, but has to contain dc-library"; << "does not exists, but has to contain dc-library";
exit(-1); if (noUpdatePsaHardware == false) {
exit(-1);
}
} }
// before loading the library, delete all possible shared memory segments // before loading the library, delete all possible shared memory segments

View File

@ -170,13 +170,16 @@ Worker::Worker(int customerNr,
// TODO: turn object into singleton // TODO: turn object into singleton
instance = this; instance = this;
m_lastFailedUpdateStep = UPDATE_STEP::NONE; m_lastFailedUpdateStep = UPDATE_STEP::NONE;
m_update = new Update(this,
QDir::cleanPath(m_workingDirectory + QDir::separator() + m_customerNrStr), if (m_noUpdatePsaHardware == false) {
m_customerNrStr, m_update = new Update(this,
m_branchName, QDir::cleanPath(m_workingDirectory + QDir::separator() + m_customerNrStr),
m_pluginDir, m_customerNrStr,
m_pluginName, m_branchName,
m_workingDirectory); m_pluginDir,
m_pluginName,
m_workingDirectory);
}
this->setObjectName("worker-object"); this->setObjectName("worker-object");
QDir::setCurrent(m_workingDirectory); QDir::setCurrent(m_workingDirectory);