Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -rc1111db9c22ad5a8d284f4f15e3d7ba824a2d54b -r7710fea4486a639caaa3c510add0eac0bcd4ddcc
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision c1111db9c22ad5a8d284f4f15e3d7ba824a2d54b)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 7710fea4486a639caaa3c510add0eac0bcd4ddcc)
@@ -224,27 +224,29 @@
         LOG_EVENT(mSenderID + QString("RawData"));
         break;
 
-    case Gui::GuiActionType::ID_PowerOff                            : INTERPRET_RECEIVED_MESSAGE(AdjustPowerOffRequestData              ); break;
+    case Gui::GuiActionType::ID_PowerOff                            : INTERPRET_RECEIVED_MESSAGE(AdjustPowerOffRequestData                  ); 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_AdjustPressuresLimitsReq            : INTERPRET_RECEIVED_MESSAGE(AdjustPressuresLimitsRequestData       ); 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_AdjustDurationReq                   : INTERPRET_RECEIVED_MESSAGE(AdjustDurationRequestData                  ); break;
+    case Gui::GuiActionType::ID_AdjustBloodDialysateReq             : INTERPRET_RECEIVED_MESSAGE(AdjustBloodDialysateRequestData            ); break;
+    case Gui::GuiActionType::ID_AdjustPressuresLimitsReq            : INTERPRET_RECEIVED_MESSAGE(AdjustPressuresLimitsRequestData           ); break;
+    case Gui::GuiActionType::ID_AdjustSalineReq                     : INTERPRET_RECEIVED_MESSAGE(AdjustSalineRequestData                    ); break;
+    case Gui::GuiActionType::ID_AdjustHeparinReq                    : INTERPRET_RECEIVED_MESSAGE(AdjustHeparinRequestData                   ); break;
     // in-treatment - ultrafiltration
-    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_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;
     // 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_RECVD_MT_MESSAGE(EndTreatmentRequestData                ); break;
-    case Gui::GuiActionType::ID_CreateTreatmentReq                  : INTERPRET_RECEIVED_MESSAGE(AdjustTreatmentParametersRequestData   ); break;
+    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_RECVD_MT_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_AlarmUserAckReq                     : INTERPRET_RECEIVED_MESSAGE(AlarmAcknowledgeRequestData            ); break;
-
+    case Gui::GuiActionType::ID_AlarmSilenceReq                     : INTERPRET_RECEIVED_MESSAGE(AlarmSilenceRequestData                    ); break;
+    case Gui::GuiActionType::ID_AlarmUserActionReq                  : INTERPRET_RECEIVED_MESSAGE(AlarmUserActionRequestData                 ); break;
+    // coco begin validated: Manually tested. This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now.
+    case Gui::GuiActionType::ID_AlarmClearedConditionReq            : INTERPRET_RECEIVED_MESSAGE(AlarmClearedConditionRequestData           ); break;
+    // coco end
     default:
         QString mActionIdHexString = Format::toHexString(vActionId);
         LOG_DEBUG(mSenderID + tr("Unknown transmit Message with ID '%1'").arg(mActionIdHexString));
@@ -309,50 +311,53 @@
     case Gui::GuiActionType::ID_CANBusFaultCount                : ok = canbusFaultCountData         (vMessage, vData); break; // TODO : implement notify<>()
 
     // ----- Datum
-    case Gui::GuiActionType::ID_TreatmentTime                   : ok = notify<Model::MTreatmentTime               >(vMessage, vData, Gui::GuiActionType::ID_TreatmentTime          ); break;
-    case Gui::GuiActionType::ID_BloodFlow                       : ok = notify<Model::MBloodFlow                   >(vMessage, vData, Gui::GuiActionType::ID_BloodFlow              ); break;
-    case Gui::GuiActionType::ID_DialysateInletFlow              : ok = notify<Model::MDialysateFlow               >(vMessage, vData, Gui::GuiActionType::ID_DialysateInletFlow     ); break;
-    case Gui::GuiActionType::ID_DialysateOutletFlow             : ok = notify<Model::MOutletFlow                  >(vMessage, vData, Gui::GuiActionType::ID_DialysateOutletFlow    ); break;
-    case Gui::GuiActionType::ID_TreatmentRanges                 : ok = notify<Model::MTreatmentRanges             >(vMessage, vData, Gui::GuiActionType::ID_TreatmentRanges        ); break;
-    case Gui::GuiActionType::ID_PressureOcclusion               : ok = notify<Model::MPressureOcclusion           >(vMessage, vData, Gui::GuiActionType::ID_PressureOcclusion      ); break;
-    case Gui::GuiActionType::ID_TreatmentStates                 : ok = notify<Model::MTreatmentStates             >(vMessage, vData, Gui::GuiActionType::ID_TreatmentStates        ); break;
-    case Gui::GuiActionType::ID_PrimingData                     : ok = notify<Model::MPrimingData                 >(vMessage, vData, Gui::GuiActionType::ID_PrimingData            ); break;
-    case Gui::GuiActionType::ID_Saline                          : ok = notify<Model::MTreatmentSaline             >(vMessage, vData, Gui::GuiActionType::ID_Saline                 ); break;
-    case Gui::GuiActionType::ID_Heparin                         : ok = notify<Model::MTreatmentHeparin            >(vMessage, vData, Gui::GuiActionType::ID_Heparin                ); break;
+    case Gui::GuiActionType::ID_TreatmentTime                   : ok = notify<Model::MTreatmentTime                         >(vMessage, vData, Gui::GuiActionType::ID_TreatmentTime                 ); break;
+    case Gui::GuiActionType::ID_BloodFlow                       : ok = notify<Model::MBloodFlow                             >(vMessage, vData, Gui::GuiActionType::ID_BloodFlow                     ); break;
+    case Gui::GuiActionType::ID_DialysateInletFlow              : ok = notify<Model::MDialysateFlow                         >(vMessage, vData, Gui::GuiActionType::ID_DialysateInletFlow            ); break;
+    case Gui::GuiActionType::ID_DialysateOutletFlow             : ok = notify<Model::MOutletFlow                            >(vMessage, vData, Gui::GuiActionType::ID_DialysateOutletFlow           ); break;
+    case Gui::GuiActionType::ID_TreatmentRanges                 : ok = notify<Model::MTreatmentRanges                       >(vMessage, vData, Gui::GuiActionType::ID_TreatmentRanges               ); break;
+    case Gui::GuiActionType::ID_PressureOcclusion               : ok = notify<Model::MPressureOcclusion                     >(vMessage, vData, Gui::GuiActionType::ID_PressureOcclusion             ); break;
+    case Gui::GuiActionType::ID_TreatmentStates                 : ok = notify<Model::MTreatmentStates                       >(vMessage, vData, Gui::GuiActionType::ID_TreatmentStates               ); break;
+    case Gui::GuiActionType::ID_PrimingData                     : ok = notify<Model::MPrimingData                           >(vMessage, vData, Gui::GuiActionType::ID_PrimingData                   ); break;
+    case Gui::GuiActionType::ID_Saline                          : ok = notify<Model::MTreatmentSaline                       >(vMessage, vData, Gui::GuiActionType::ID_Saline                        ); break;
+    case Gui::GuiActionType::ID_Heparin                         : ok = notify<Model::MTreatmentHeparin                      >(vMessage, vData, Gui::GuiActionType::ID_Heparin                       ); break;
 
     // ----- Events
-    case Gui::GuiActionType::ID_HDOperationModeData             : ok = notify<Model::MHDOperationMode             >(vMessage, vData, Gui::GuiActionType::ID_HDOperationModeData    ); break;
-    case Gui::GuiActionType::ID_HDDebugText                     : ok = notify<Model::MHDDebugText                 >(vMessage, vData, Gui::GuiActionType::ID_HDDebugText            ); break;
+    case Gui::GuiActionType::ID_HDOperationModeData             : ok = notify<Model::MHDOperationMode                       >(vMessage, vData, Gui::GuiActionType::ID_HDOperationModeData           ); break;
+    case Gui::GuiActionType::ID_HDDebugText                     : ok = notify<Model::MHDDebugText                           >(vMessage, vData, Gui::GuiActionType::ID_HDDebugText                   ); break;
 
-    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_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_CreateTreatmentRsp              : ok = notify<Model::MTreatmentParametersResponse           >(vMessage, vData, Gui::GuiActionType::ID_CreateTreatmentRsp            ); 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_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
     case Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp    : ok = adjustUltrafiltrationEdit    (vMessage, vData); break; // TODO : implement notify<>()
     case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp : ok = adjustUltrafiltrationConfirm (vMessage, vData); break; // TODO : implement notify<>()
 
-    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;
+    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;
+    // coco begin validated: Manually tested. This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now.
+    case Gui::GuiActionType::ID_AlarmClearedConditionRsp        : ok = notify<Model::MAlarmClearedCondition                 >(vMessage, vData, Gui::GuiActionType::ID_AlarmClearedConditionRsp      ); break;
+    // coco end
+
     // unhandles messages: these will only be logged as received message
     // there has nothing been defined for these messages.
-    default                                                 :      printUnhandled                   (vMessage       ); break;
+    default                                                     : printUnhandled(vMessage); break;
     }
 
     return ok;