Compare commits
No commits in common. "336d208906896907f9abaee36bf9803e96616e9f" and "8f0a9112d6adb00edd23db7d510c87b3180753e3" have entirely different histories.
336d208906
...
8f0a9112d6
@ -132,8 +132,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
|
||||
# update.
|
||||
# In case there is an automatic update (00:00-04:00) use M0100 instead
|
||||
# of U0002.
|
||||
# 1.4.10 : Fix: for the time being, never set the autoRequest-flag to false.
|
||||
VERSION="1.4.10"
|
||||
VERSION="1.4.9"
|
||||
# PLANNED TODOS:
|
||||
# 1: Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
|
||||
# 2: Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu
|
||||
|
@ -193,8 +193,8 @@ bool Update::openSerial(int br, QString baudrate, QString comPort) const {
|
||||
+ " " + baudrate + " " + comPort + "...OK");
|
||||
|
||||
// m_hw->dc_autoRequest(true);
|
||||
// m_hw->dc_autoRequest(false);
|
||||
// QThread::sleep(1);
|
||||
m_hw->dc_autoRequest(false);
|
||||
QThread::sleep(1);
|
||||
|
||||
Utils::printInfoMsg(QString("IS PORT OPEN %1").arg(m_hw->dc_isPortOpen()));
|
||||
return true;
|
||||
@ -507,9 +507,9 @@ 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
|
||||
m_hw->dc_autoRequest(false);
|
||||
qDebug() << "SET AUTO-REQUEST=FALSE";
|
||||
QThread::sleep(1); // make sure the auto-request flag is acknowledged
|
||||
}
|
||||
|
||||
return true;
|
||||
@ -584,8 +584,8 @@ QStringList Update::getDcSoftAndHardWareVersion() {
|
||||
QString const &hwVersion = m_hw->dc_getHWversion().toLower().trimmed();
|
||||
QString const &swVersion = m_hw->dc_getSWversion().toLower().trimmed();
|
||||
|
||||
//m_hw->dc_autoRequest(false);
|
||||
//QThread::sleep(1); // make sure the timer-slots are inactive
|
||||
m_hw->dc_autoRequest(false);
|
||||
QThread::sleep(1); // make sure the timer-slots are inactive
|
||||
|
||||
if (!hwVersion.isEmpty() && !swVersion.isEmpty()) {
|
||||
return QStringList() << hwVersion << swVersion;
|
||||
|
Loading…
x
Reference in New Issue
Block a user