Compare commits
9 Commits
v1.4.3
...
175b8fd3a1
| Author | SHA1 | Date | |
|---|---|---|---|
| 175b8fd3a1 | |||
| a57fa6c31e | |||
| c22c924e38 | |||
| bdc64920a2 | |||
| 7bc9fa0c04 | |||
| 334da1fe4a | |||
| 5c152c9dc2 | |||
| 367ffaa3a1 | |||
| 2fd004f249 |
@@ -34,6 +34,11 @@ contains( CONFIG, PTU5 ) {
|
||||
lessThan(QT_MAJOR_VERSION, 5): PKGCONFIG += qextserialport
|
||||
QMAKE_CXXFLAGS += -O2 -std=c++17 # for GCC >= 4.7
|
||||
# QMAKE_CXXFLAGS += -Wno-deprecated-copy
|
||||
PTU5BASEPATH = /opt/devel/ptu5
|
||||
|
||||
INCLUDEPATH += $$PTU5BASEPATH/qt/libs/devicecontroller/include
|
||||
LIBS += -L$$PTU5BASEPATH/qt/libs/devicecontroller/library
|
||||
|
||||
ARCH = PTU5
|
||||
DEFINES+=PTU5
|
||||
}
|
||||
|
||||
@@ -39,6 +39,12 @@ contains( CONFIG, PTU5 ) {
|
||||
lessThan(QT_MAJOR_VERSION, 5): PKGCONFIG += qextserialport
|
||||
QMAKE_CXXFLAGS += -O2 -std=c++17 # for GCC >= 4.7
|
||||
# QMAKE_CXXFLAGS += -Wno-deprecated-copy
|
||||
|
||||
PTU5BASEPATH = /opt/devel/ptu5
|
||||
|
||||
INCLUDEPATH += $$PTU5BASEPATH/qt/libs/devicecontroller/include
|
||||
LIBS += -L$$PTU5BASEPATH/qt/libs/devicecontroller/library
|
||||
|
||||
ARCH = PTU5
|
||||
DEFINES+=PTU5
|
||||
}
|
||||
@@ -72,7 +78,6 @@ SOURCES += \
|
||||
|
||||
HEADERS += \
|
||||
message_handler.h \
|
||||
plugins/interfaces.h \
|
||||
process/command.h
|
||||
|
||||
OTHER_FILES += \
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include <QByteArray>
|
||||
|
||||
#include "message_handler.h"
|
||||
#include "plugins/interfaces.h"
|
||||
#include <DeviceController/interfaces.h>
|
||||
|
||||
|
||||
//#include <unistd.h>
|
||||
|
||||
@@ -518,6 +518,8 @@ bool Worker::updateTriggerSet() {
|
||||
|
||||
GUI() << (CONSOLE() << UPDATE_STEP::CHECK_ISMAS_TRIGGER);
|
||||
|
||||
bool const automaticUpdate = (QDateTime::currentDateTime().time().hour() < 4);
|
||||
|
||||
QString triggerValue("NOT CHECKED YET");
|
||||
static constexpr int const repeats = 15;
|
||||
for (int repeat = 1; repeat <= repeats; ++repeat) {
|
||||
@@ -639,9 +641,17 @@ bool Worker::updateTriggerSet() {
|
||||
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_WRONG_VALUE)));
|
||||
// if the customer repository has just been cloned
|
||||
return false; // it is OK the ISMAS trigger might not be 'WAIT'
|
||||
} else {
|
||||
CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
|
||||
}
|
||||
// not a clone and empty update-trigger
|
||||
if (automaticUpdate) {
|
||||
// do not inform ISMAS in case of automatic update, because the
|
||||
// update is not necessary as the trigger-button is not set to WAIT.
|
||||
GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_WRONG_VALUE));
|
||||
return false;
|
||||
}
|
||||
|
||||
CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE);
|
||||
|
||||
QThread::sleep(6);
|
||||
continue;
|
||||
} else {
|
||||
@@ -649,12 +659,22 @@ bool Worker::updateTriggerSet() {
|
||||
if (m_clone) {
|
||||
m_ismasTriggerStatusMessage = QStringList(QString("TRIGGER-VALUE='%1' != 'WAIT'").arg(triggerValue));
|
||||
QStringList lst = m_ismasTriggerStatusMessage;
|
||||
if (automaticUpdate) {
|
||||
// do not inform ISMAS in case of automatic update
|
||||
GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_WRONG_VALUE));
|
||||
} else {
|
||||
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_WRONG_VALUE)));
|
||||
}
|
||||
} else {
|
||||
m_ismasTriggerStatusMessage = QStringList(QString("TRIGGER-VALUE='%1' != 'WAIT'").arg(triggerValue));
|
||||
QStringList lst = m_ismasTriggerStatusMessage;
|
||||
if (automaticUpdate) {
|
||||
// do not inform ISMAS in case of automatic update
|
||||
GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_WRONG_VALUE));
|
||||
} else {
|
||||
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE)));
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user