Index: sources/view/hd/alarm/VAlarmStatus.cpp
===================================================================
diff -u -r53134008481fd775533e8988b7436f2f75e47336 -r45ce6e781782be5de1480a1e7acecd1d272bcc84
--- sources/view/hd/alarm/VAlarmStatus.cpp	(.../VAlarmStatus.cpp)	(revision 53134008481fd775533e8988b7436f2f75e47336)
+++ sources/view/hd/alarm/VAlarmStatus.cpp	(.../VAlarmStatus.cpp)	(revision 45ce6e781782be5de1480a1e7acecd1d272bcc84)
@@ -52,18 +52,24 @@
     alarm_AlarmID               (vData.mTop                                              );
     alarm_EscalateIn            (vData.mEscalatesIn                                      );
     alarm_MuteTimeout           (vData.mMuteTimeout                                      );
-    alarm_Flag_systemFault      (vData.mFlags.at(AlarmStatusFlag::eFlag_systemFault      ));
-    alarm_Flag_stop             (vData.mFlags.at(AlarmStatusFlag::eFlag_stop             ));
-    alarm_Flag_noClear          (vData.mFlags.at(AlarmStatusFlag::eFlag_noClear          ));
-    alarm_Flag_noResume         (vData.mFlags.at(AlarmStatusFlag::eFlag_noResume         ));
-    alarm_Flag_noRinseback      (vData.mFlags.at(AlarmStatusFlag::eFlag_noRinseback      ));
-    alarm_Flag_noEndTreatment   (vData.mFlags.at(AlarmStatusFlag::eFlag_noEndTreatment   ));
-    alarm_Flag_noNewTreatment   (vData.mFlags.at(AlarmStatusFlag::eFlag_noNewTreatment   ));
-    alarm_Flag_bypassDialyzer   (vData.mFlags.at(AlarmStatusFlag::eFlag_bypassDialyzer   ));
-    alarm_Flag_alarmsToEscalate (vData.mFlags.at(AlarmStatusFlag::eFlag_alarmsToEscalate ));
-    alarm_Flag_alarmsSilenced   (vData.mFlags.at(AlarmStatusFlag::eFlag_alarmsSilenced   ));
-    alarm_Flag_UserAcknowledged (vData.mFlags.at(AlarmStatusFlag::eFlag_userAcknowledged ));
 
+    alarm_Flag_systemFault      (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_SYSTEM_FAULT       ));
+    alarm_Flag_stop             (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_STOP               ));
+    alarm_Flag_noClear          (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_NO_CLEAR           ));
+    alarm_Flag_noResume         (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_NO_RESUME          ));
+    alarm_Flag_noRinseback      (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_NO_RINSEBACK       ));
+    alarm_Flag_noEndTreatment   (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_NO_END_TREATMENT   ));
+    alarm_Flag_noNewTreatment   (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_NO_NEW_TREATMENT   ));
+    alarm_Flag_UserMustAck      (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_USER_MUST_ACK      ));
+    alarm_Flag_alarmsToEscalate (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_ALARMS_TO_ESCALATE ));
+    alarm_Flag_alarmsSilenced   (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_ALARMS_SILENCED    ));
+    alarm_Flag_alarmsLampOn     (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_LAMP_ON            ));
+    // (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_UNUSED_1           ));
+    // (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_UNUSED_2           ));
+    // (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_UNUSED_3           ));
+    // (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_UNUSED_4           ));
+    alarm_Flag_alarmsCondition  (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_TOP_CONDITION      ));
+
     emit raiseAlarm();
 }
 
@@ -130,19 +136,9 @@
     AlarmAcknowledgeRequestData data;
     data.alarmID = (quint32)alarmID;
     emit requestAlarmAcknowledge(data);
-    onSetMinimize(true); // TODO: Remove once FW implements user acknowledge
 }
 
 /*!
- * \brief VAlarmStatus::onToggleMinimize
- * Toggles the whether the alarm should be minimized
- */
-void VAlarmStatus::onSetMinimize(bool minimize)
-{
-    minimizeAlarm(minimize);
-}
-
-/*!
  * \brief VAlarmStatus::requestSilence
  *  Send out a request to silence alarms
  */
@@ -151,5 +147,4 @@
     AlarmSilenceRequestData data;
     data.state = 1;
     emit requestAlarmSilence(data);
-    onSetMinimize(true);
 }