Compare commits

..

8 Commits

6 changed files with 18 additions and 19 deletions

View File

@@ -1,5 +1,5 @@
[REPOSITORY_URL] [REPOSITORY_URL]
repository-url="https://git.mimbach49.de/GerhardHoffmann" repository-url="https://ptu-config.atb-comm.de/ATB"
[DIRECTORIES] [DIRECTORIES]
plugin-directory="/usr/lib/" plugin-directory="/usr/lib/"

View File

@@ -1,6 +1,7 @@
#include "dc_download.h" #include "dc_download.h"
#include "hwapi.h" #include <DeviceController/interfaces.h>
#include <QFile>
#include <QDebug> #include <QDebug>
#include <QDateTime> #include <QDateTime>
#include <QThread> #include <QThread>

View File

@@ -55,7 +55,7 @@ int main(int argc, char **argv) {
openlog("ATB-UPDATE-DC-FIRMWARE", LOG_PERROR | LOG_PID | LOG_CONS, LOG_USER); openlog("ATB-UPDATE-DC-FIRMWARE", LOG_PERROR | LOG_PID | LOG_CONS, LOG_USER);
QApplication a(argc, argv); QApplication a(argc, argv);
QApplication::setApplicationName("ATBUpdateTool"); QApplication::setApplicationName("ATBDownloadDCFirmware");
QApplication::setApplicationVersion(APP_VERSION); QApplication::setApplicationVersion(APP_VERSION);
if (!messageHandlerInstalled()) { // change internal qt-QDebug-handling if (!messageHandlerInstalled()) { // change internal qt-QDebug-handling
@@ -124,11 +124,12 @@ int main(int argc, char **argv) {
MainWindow mw; MainWindow mw;
mw.setWindowFlags(Qt::Window | Qt::FramelessWindowHint); mw.setWindowFlags(Qt::Window | Qt::FramelessWindowHint);
//mw.showFullScreen(); // mw.showFullScreen();
qCritical() << "SHOW"; // qCritical() << "SHOW";
mw.show(); // mw.show();
return a.exec(); return 0;
// return a.exec();
} }

View File

@@ -414,10 +414,6 @@ bool Update::downloadJson(enum FileTypeJson type,
} }
} }
m_hw->dc_autoRequest(false);
qDebug() << "SET AUTO-REQUEST=FALSE";
QThread::sleep(1); // make sure the auto-request flag is acknowledged
return ret; return ret;
} }

View File

@@ -132,7 +132,8 @@ DEFINES += QT_DEPRECATED_WARNINGS
# update. # update.
# In case there is an automatic update (00:00-04:00) use M0100 instead # In case there is an automatic update (00:00-04:00) use M0100 instead
# of U0002. # of U0002.
VERSION="1.4.9" # 1.4.10 : Fix: for the time being, never set the autoRequest-flag to false.
VERSION="1.4.10"
# 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

View File

@@ -193,8 +193,8 @@ bool Update::openSerial(int br, QString baudrate, QString comPort) const {
+ " " + baudrate + " " + comPort + "...OK"); + " " + baudrate + " " + comPort + "...OK");
// m_hw->dc_autoRequest(true); // m_hw->dc_autoRequest(true);
m_hw->dc_autoRequest(false); // m_hw->dc_autoRequest(false);
QThread::sleep(1); // QThread::sleep(1);
Utils::printInfoMsg(QString("IS PORT OPEN %1").arg(m_hw->dc_isPortOpen())); Utils::printInfoMsg(QString("IS PORT OPEN %1").arg(m_hw->dc_isPortOpen()));
return true; return true;
@@ -507,9 +507,9 @@ 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 true; return true;
@@ -584,8 +584,8 @@ QStringList Update::getDcSoftAndHardWareVersion() {
QString const &hwVersion = m_hw->dc_getHWversion().toLower().trimmed(); QString const &hwVersion = m_hw->dc_getHWversion().toLower().trimmed();
QString const &swVersion = m_hw->dc_getSWversion().toLower().trimmed(); QString const &swVersion = m_hw->dc_getSWversion().toLower().trimmed();
m_hw->dc_autoRequest(false); //m_hw->dc_autoRequest(false);
QThread::sleep(1); // make sure the timer-slots are inactive //QThread::sleep(1); // make sure the timer-slots are inactive
if (!hwVersion.isEmpty() && !swVersion.isEmpty()) { if (!hwVersion.isEmpty() && !swVersion.isEmpty()) {
return QStringList() << hwVersion << swVersion; return QStringList() << hwVersion << swVersion;