Index: sources/view/valarmstatus.cpp =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -rd8004655ec64da6c8806b9a074a0cb07d799ddf9 --- sources/view/valarmstatus.cpp (.../valarmstatus.cpp) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/view/valarmstatus.cpp (.../valarmstatus.cpp) (revision d8004655ec64da6c8806b9a074a0cb07d799ddf9) @@ -37,16 +37,11 @@ return; } - if (acknowledgedAlarms.contains(alarmID)) { - LOG_EVENT(tr("Alarm ID %0 has been acknowledged and is visible. ").arg(alarmID)); + if (vData.mTop == GuiAlarmID::ALARM_ID_NO_ALARM) { + emit noAlarm(); return; } - if (vData.mTop <= GuiAlarmID::ALARM_ID_NO_ALARM) { - emit hideAlarm(); - return; - } - alarm_Priority (vData.mState ); alarm_AlarmID (vData.mTop ); alarm_EscalateIn (vData.mMuteTimeout ); @@ -127,7 +122,8 @@ */ void VAlarmStatus::requestOkay(GuiAlarmID alarmID) { - acknowledgedAlarms.append(alarmID); + // This will need to go to the HD + qDebug() << __FUNCTION__ << "alarmID: " << alarmID; } /*! @@ -136,8 +132,7 @@ */ void VAlarmStatus::requestSilence() { - // TODO: Update with needed data. Placeholder for now. - QVariantList messageData = {1,2,3,4,5}; + QVariantList messageData = {1}; GuiActionType messageAction = GuiActions::ID_AlarmSilenceReq; emit requestActionTransmit(messageAction, messageData); }