Index: main.cpp =================================================================== diff -u -r73b965e55528619f22a12ae3b3408c9dcecc9144 -reedecdb4324b51307e4cf94f782d05591d6ceba9 --- main.cpp (.../main.cpp) (revision 73b965e55528619f22a12ae3b3408c9dcecc9144) +++ main.cpp (.../main.cpp) (revision eedecdb4324b51307e4cf94f782d05591d6ceba9) @@ -69,7 +69,7 @@ bool gSendEmptyKeepAwake = false ; bool gFakeSeqAtBegin = false ; bool gDisableHunhandledReport = false ; -bool gDisableAlarms = false ; +bool gDisableTimeout = false ; bool gConsoleoutFrameInterface = false ; bool gConsoleoutCanInterface = false ; @@ -147,9 +147,9 @@ parser.addOption(optionDisableHunhandledReport); // --- -u : disable-unhandled-report - QCommandLineOption optionDisableAlarms(QStringList() << "q" << "disable-alarms", - QCoreApplication::translate("main", "Disables UI display of alarms")); - parser.addOption(optionDisableAlarms); + QCommandLineOption optionDisableTimeout(QStringList() << "q" << "disable-timeout", + QCoreApplication::translate("main", "Disables HD communication timeout")); + parser.addOption(optionDisableTimeout); // --- parse command lines @@ -158,7 +158,7 @@ gConsoleoutCanInterface = parser.isSet(optionConsoleoutCanInterface ); gConsoleoutFrameInterface = parser.isSet(optionConsoleoutFrameInterface ); gDisableHunhandledReport = parser.isSet(optionDisableHunhandledReport ); - gDisableAlarms = parser.isSet(optionDisableAlarms ); + gDisableTimeout = parser.isSet(optionDisableTimeout ); if (parser.isSet(optionSendEmptyKeepAwake)) gSendEmptyKeepAwake = true; bool ok = false; Index: sources/gui/qml/dialogs/NotificationDialog.qml =================================================================== diff -u -ree983e9c2e75a22b5770d67dce553d3df088db64 -reedecdb4324b51307e4cf94f782d05591d6ceba9 --- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision ee983e9c2e75a22b5770d67dce553d3df088db64) +++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision eedecdb4324b51307e4cf94f782d05591d6ceba9) @@ -31,7 +31,8 @@ property alias okayBtn : _okay; property alias dismissBtn : _dismiss; property bool isSilenced : false; - property int alarmID : -1 + property int alarmID : -1 + objectName: "_notification_dialog" // SquishQt signal clickedSilence(); signal clickedOkay(); Index: sources/gui/qml/main.qml =================================================================== diff -u -r73b965e55528619f22a12ae3b3408c9dcecc9144 -reedecdb4324b51307e4cf94f782d05591d6ceba9 --- sources/gui/qml/main.qml (.../main.qml) (revision 73b965e55528619f22a12ae3b3408c9dcecc9144) +++ sources/gui/qml/main.qml (.../main.qml) (revision eedecdb4324b51307e4cf94f782d05591d6ceba9) @@ -71,7 +71,7 @@ // TODO : When Testing data on Setting screen is removed // This needs to be moved into the Treatment______.qml - VAlarmStatus { id: vAlarmStatus + VAlarmStatus { id: vAlarmStatus onRaiseAlarm: { updateAlarm(); _alarm_dialog.isSilenced = vAlarmStatus.alarm_Flag_alarmsSilenced Index: sources/main.h =================================================================== diff -u -r73b965e55528619f22a12ae3b3408c9dcecc9144 -reedecdb4324b51307e4cf94f782d05591d6ceba9 --- sources/main.h (.../main.h) (revision 73b965e55528619f22a12ae3b3408c9dcecc9144) +++ sources/main.h (.../main.h) (revision eedecdb4324b51307e4cf94f782d05591d6ceba9) @@ -44,7 +44,7 @@ extern bool gSendEmptyKeepAwake; extern bool gFakeSeqAtBegin; extern bool gDisableHunhandledReport; -extern bool gDisableAlarms; +extern bool gDisableTimeout; //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------// #define DEBUG_PROPERTY_CHANGED(vVARIABLE) //qDebug() << "#" << #vVARIABLE << v##vVARIABLE; Index: sources/view/valarmstatus.cpp =================================================================== diff -u -r73b965e55528619f22a12ae3b3408c9dcecc9144 -reedecdb4324b51307e4cf94f782d05591d6ceba9 --- sources/view/valarmstatus.cpp (.../valarmstatus.cpp) (revision 73b965e55528619f22a12ae3b3408c9dcecc9144) +++ sources/view/valarmstatus.cpp (.../valarmstatus.cpp) (revision eedecdb4324b51307e4cf94f782d05591d6ceba9) @@ -29,12 +29,13 @@ void VAlarmStatus::onActionReceive(const AlarmStatusData &vData) { - if (gDisableAlarms) { - LOG_EVENT(tr("Disabling ID %0 has been acknowleged and is visible. ")); + GuiAlarmID alarmID = static_cast(vData.mTop); + + if (gDisableTimeout && alarmID == GuiAlarmID::ALARM_ID_HD_COMM_TIMEOUT) { + LOG_EVENT(tr("Suppressing HD communication timeout.")); return; } - GuiAlarmID alarmID = static_cast(vData.mTop); if (acknowledgedAlarms.contains(alarmID)) { qDebug() << "Alarm ID " << alarmID << " has been acknowleged and is visible. "; LOG_EVENT(tr("Alarm ID %0 has been acknowleged and is visible. ").arg(alarmID)); Index: sources/view/valarmstatus.h =================================================================== diff -u -rc66e8e38c6c26cf108c975a7b068e45fe5b56f89 -reedecdb4324b51307e4cf94f782d05591d6ceba9 --- sources/view/valarmstatus.h (.../valarmstatus.h) (revision c66e8e38c6c26cf108c975a7b068e45fe5b56f89) +++ sources/view/valarmstatus.h (.../valarmstatus.h) (revision eedecdb4324b51307e4cf94f782d05591d6ceba9) @@ -38,8 +38,11 @@ private: PROPERTY( quint32 , alarm_Priority , 0) PROPERTY( quint32 , alarm_AlarmID , 0) + // coco begin validated: PROPERTY( quint32 , alarm_EscalateIn , 0) + // coco end PROPERTY( quint32 , alarm_MuteTimeout , 0) + // coco begin validated: PROPERTY( bool , alarm_Flag_systemFault , false) PROPERTY( bool , alarm_Flag_stop , false) PROPERTY( bool , alarm_Flag_noClear , false) @@ -50,6 +53,7 @@ PROPERTY( bool , alarm_Flag_bypassDialyzer , false) PROPERTY( bool , alarm_Flag_alarmsToEscalate , false) PROPERTY( bool , alarm_Flag_alarmsSilenced , false) + // coco end Q_PROPERTY(QString text READ text NOTIFY alarm_AlarmIDChanged) Q_PROPERTY(QString id READ id NOTIFY alarm_AlarmIDChanged)