Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r28f3f8dd18981262995386d29d3c2ab31418bfc4 -r1f36c7f6eb909b9f78b97cc43c4fa24995ae9ef3
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 28f3f8dd18981262995386d29d3c2ab31418bfc4)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 1f36c7f6eb909b9f78b97cc43c4fa24995ae9ef3)
@@ -217,21 +217,23 @@
         break;
 
     case Gui::GuiActionType::ID_PowerOff                            : INTERPRET_RECEIVED_MESSAGE(AdjustPowerOffRequestData              ); break;
-    case Gui::GuiActionType::ID_AdjustBloodDialysateReq             : INTERPRET_RECEIVED_MESSAGE(AdjustBloodDialysateRequestData        ); break;
+    // in-treatment
     case Gui::GuiActionType::ID_AdjustDurationReq                   : INTERPRET_RECEIVED_MESSAGE(AdjustDurationRequestData              ); break;
+    case Gui::GuiActionType::ID_AdjustBloodDialysateReq             : INTERPRET_RECEIVED_MESSAGE(AdjustBloodDialysateRequestData        ); break;
     case Gui::GuiActionType::ID_AdjustUltrafiltrationInitReq        : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationInitRequestData   ); break;
     case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq       : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationStateRequestData  ); break;
     case Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq        : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationEditRequestData   ); break;
     case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq     : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationConfirmRequestData); break;
-    case Gui::GuiActionType::ID_AdjustSalineReq                     : INTERPRET_RECEIVED_MESSAGE(AdjustSalineRequestData                ); break;
-    case Gui::GuiActionType::ID_AdjustHeparinReq                    : INTERPRET_RECEIVED_MESSAGE(AdjustHeparinRequestData               ); break;
-    case Gui::GuiActionType::ID_AdjustPressuresLimitsReq            : INTERPRET_RECEIVED_MESSAGE(AdjustPressuresLimitsRequestData       ); break;
-    case Gui::GuiActionType::ID_AlarmSilenceReq                     : INTERPRET_RECEIVED_MESSAGE(AlarmSilenceRequestData                ); break;
-    case Gui::GuiActionType::ID_AlarmUserAckReq                     : INTERPRET_RECEIVED_MESSAGE(AlarmAcknowledgeRequestData            ); break;
+    // pre-Treatment
     case Gui::GuiActionType::ID_StartTreatmentReq                   : INTERPRET_RECEIVED_MESSAGE(StartTreatmentRequestData              ); break;
     case Gui::GuiActionType::ID_ConfirmTreatmentReq                 : INTERPRET_RECEIVED_MESSAGE(ConfirmTreatmentRequestData            ); break;
     case Gui::GuiActionType::ID_EndTreatmentReq                     : INTERPRET_RECEIVED_MESSAGE(EndTreatmentRequestData                ); break;
     case Gui::GuiActionType::ID_CreateTreatmentReq                  : INTERPRET_RECEIVED_MESSAGE(AdjustTreatmentParametersRequestData   ); break;
+    // alarms
+    case Gui::GuiActionType::ID_AlarmSilenceReq                     : INTERPRET_RECEIVED_MESSAGE(AlarmSilenceRequestData                ); break;
+    case Gui::GuiActionType::ID_AlarmUserActionReq                  : INTERPRET_RECEIVED_MESSAGE(AlarmUserActionRequestData             ); break;
+    case Gui::GuiActionType::ID_AlarmClearedConditionReq            : INTERPRET_RECEIVED_MESSAGE(AlarmClearedConditionRequestData       ); break;
+
     default:
         QString mActionIdHexString = Format::toHexString(vActionId);
         LOG_DEBUG(mSenderID + tr("Unknown transmit Message with ID '%1'").arg(mActionIdHexString));
@@ -314,20 +316,15 @@
     case Gui::GuiActionType::ID_Acknow                          : ok = true;                                           break; // TODO : implement notify<>()
     case Gui::GuiActionType::ID_PowerOff                        : ok = notify<Model::MPowerOff                    >(vMessage, vData, Gui::GuiActionType::ID_PowerOff               ); break;
     case Gui::GuiActionType::ID_ShuttingDown                    : ok = true; LOG_EVENT("HD,ShuttingDown");             break; // TODO : implement notify<>()
-
-    case Gui::GuiActionType::ID_AlarmTriggered                  : ok = notify<Model::MAlarmTriggered              >(vMessage, vData, Gui::GuiActionType::ID_AlarmTriggered         ); break;
-    case Gui::GuiActionType::ID_AlarmCleared                    : ok = notify<Model::MAlarmCleared                >(vMessage, vData, Gui::GuiActionType::ID_AlarmCleared           ); break;
-    case Gui::GuiActionType::ID_AlarmStatus                     : ok = notify<Model::MAlarmStatus                 >(vMessage, vData, Gui::GuiActionType::ID_AlarmStatus            ); break;
-
     case Gui::GuiActionType::ID_CreateTreatmentRsp              : ok = notify<Model::MTreatmentParametersResponse >(vMessage, vData, Gui::GuiActionType::ID_CreateTreatmentRsp     ); break;
 
     // Adjustment Response Messages
     case Gui::GuiActionType::ID_AdjustDurationRsp               : ok = notify<Model::MAdjustDurationResponse                >(vMessage, vData, Gui::GuiActionType::ID_AdjustDurationRsp             ); break;
     case Gui::GuiActionType::ID_AdjustBloodDialysateRsp         : ok = notify<Model::MAdjustBloodDialysateResponse          >(vMessage, vData, Gui::GuiActionType::ID_AdjustBloodDialysateRsp       ); break;
+    case Gui::GuiActionType::ID_AdjustPressuresLimitsRsp        : ok = notify<Model::MAdjustPressuresLimitsResponse         >(vMessage, vData, Gui::GuiActionType::ID_AdjustPressuresLimitsRsp      ); break;
     case Gui::GuiActionType::ID_AdjustSalineRsp                 : ok = notify<Model::MAdjustSalineResponse                  >(vMessage, vData, Gui::GuiActionType::ID_AdjustSalineRsp               ); break;
     case Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp    : ok = notify<Model::MAdjustUltrafiltrationInitResponse     >(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp  ); break;
     case Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp   : ok = notify<Model::MAdjustUltrafiltrationStateResponse    >(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp ); break;
-    case Gui::GuiActionType::ID_AdjustPressuresLimitsRsp        : ok = notify<Model::MAdjustPressuresLimitsResponse         >(vMessage, vData, Gui::GuiActionType::ID_AdjustPressuresLimitsRsp      ); break;
     case Gui::GuiActionType::ID_AdjustHeparinRsp                : ok = notify<Model::MAdjustHeparinResponse                 >(vMessage, vData, Gui::GuiActionType::ID_AdjustHeparinRsp              ); break;
 
     // these need to be standard and use notify as well
@@ -337,6 +334,13 @@
     case Gui::GuiActionType::ID_StartTreatmentRsp               : ok = notify<Model::MStartTreatmentResponse>      (vMessage, vData, Gui::GuiActionType::ID_StartTreatmentRsp      ); break;
     case Gui::GuiActionType::ID_EndTreatmentRsp                 : ok = notify<Model::MEndTreatmentResponse>        (vMessage, vData, Gui::GuiActionType::ID_EndTreatmentRsp        ); break;
 
+    // Alarms
+    case Gui::GuiActionType::ID_AlarmStatus                     : ok = notify<Model::MAlarmStatus                 >(vMessage, vData, Gui::GuiActionType::ID_AlarmStatus            ); break;
+    case Gui::GuiActionType::ID_AlarmTriggered                  : ok = notify<Model::MAlarmTriggered              >(vMessage, vData, Gui::GuiActionType::ID_AlarmTriggered         ); break;
+    case Gui::GuiActionType::ID_AlarmCleared                    : ok = notify<Model::MAlarmCleared                >(vMessage, vData, Gui::GuiActionType::ID_AlarmCleared           ); break;
+    case Gui::GuiActionType::ID_AlarmClearedConditionRsp        : ok = notify<Model::MAlarmClearedCondition       >(vMessage, vData, Gui::GuiActionType::ID_AlarmClearedConditionRsp); break;
+
+
     // unhandles messages: these will only be logged as received message
     // there has nothing been defined for these messages.
     default                                                 :      printUnhandled                   (vMessage       ); break;