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

Merge branch 'master' of https://git.mimbach49.de/GerhardHoffmann/ATBUpdateTool

Browse Source
This commit is contained in:
Gerhard Hoffmann
2024-03-19 09:23:54 +01:00
parent 5c152c9dc2 e5054582c2
commit 334da1fe4a
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -1,2 +1,3 @@
tags tags
*.tags *.tags
*.user

2
DownloadDCJsonFiles/main.cpp
View File

@@ -34,7 +34,7 @@ int main(int argc, char **argv) {
setDebugLevel(LOG_NOTICE); setDebugLevel(LOG_NOTICE);
} }
int r = std::system("ls -l /proc/[0-9]*/fd/* 2>/dev/null | grep /dev/ttymxc2 > /tmp/slave-or-master.txt"); // int r = std::system("ls -l /proc/[0-9]*/fd/* 2>/dev/null | grep /dev/ttymxc2 > /tmp/slave-or-master.txt");
// lrwx------ 1 root root 64 Oct 31 14:55 /proc/884/fd/18 -> /dev/ttymxc2 // lrwx------ 1 root root 64 Oct 31 14:55 /proc/884/fd/18 -> /dev/ttymxc2
//std::ifstream ifs("/tmp/slave-or-master.txt"); //std::ifstream ifs("/tmp/slave-or-master.txt");

3
UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro
View File

@@ -108,7 +108,8 @@ DEFINES += QT_DEPRECATED_WARNINGS
# 1.4.2 : Do not check if <repo_dir>/etc/psa_tariff and /etc/psa_tariff are # 1.4.2 : Do not check if <repo_dir>/etc/psa_tariff and /etc/psa_tariff are
# the same after an rsync. They might be noy after a change of the # the same after an rsync. They might be noy after a change of the
# customer-number. # customer-number.
VERSION="1.4.2" # 1.4.3 : Use global directory for device-controller interfaces.h-file.
VERSION="1.4.3"
# 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.
# 2: Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu # 2: Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu

5
UpdatePTUDevCtrl/update.cpp
View File

@@ -140,6 +140,7 @@ Update::Update(Worker *worker,
qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_sys_areDCDataValid ..." qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_sys_areDCDataValid ..."
<< m_sys_areDCdataValid; << m_sys_areDCdataValid;
#if 0
QObject const *obj = m_hw->getAPI(); QObject const *obj = m_hw->getAPI();
Q_ASSERT(obj != nullptr); Q_ASSERT(obj != nullptr);
@@ -167,6 +168,7 @@ Update::Update(Worker *worker,
SLOT(onReportDCDownloadFailure(QString const &)))) { SLOT(onReportDCDownloadFailure(QString const &)))) {
critical << "FAILED"; critical << "FAILED";
} else critical << "DONE"; } else critical << "DONE";
#endif
} }
} }
@@ -644,6 +646,7 @@ bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
m_worker->startProgressLoop(); m_worker->startProgressLoop();
QString const &fToWorkOn = QDir::cleanPath(m_customerRepository + QDir::separator() + it->trimmed()); QString const &fToWorkOn = QDir::cleanPath(m_customerRepository + QDir::separator() + it->trimmed());
if (fToWorkOn.endsWith("/dc2c.bin") && dcDownloadPossible) { if (fToWorkOn.endsWith("/dc2c.bin") && dcDownloadPossible) {
#if 0
// download for dc possible only once // download for dc possible only once
// download of device-controller should always be the last step // download of device-controller should always be the last step
dcDownloadPossible = false; dcDownloadPossible = false;
@@ -709,7 +712,7 @@ bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
break; break;
} }
} }
#endif
bool updateBinaryRes = true; bool updateBinaryRes = true;
// CONSOLE() // CONSOLE()