Index: sources/model/MModel.h
===================================================================
diff -u -r28f3f8dd18981262995386d29d3c2ab31418bfc4 -re1821621effaef81c8d70f70c9524c024383f289
--- sources/model/MModel.h	(.../MModel.h)	(revision 28f3f8dd18981262995386d29d3c2ab31418bfc4)
+++ sources/model/MModel.h	(.../MModel.h)	(revision e1821621effaef81c8d70f70c9524c024383f289)
@@ -21,6 +21,7 @@
 #include "MAlarmStatusData.h"
 #include "MAlarmTriggered.h"
 #include "MAlarmCleared.h"
+#include "MAlarmClearedCondition.h"
 
 #include "MTreatmentTimeData.h"
 #include "MTreatmentFlowsData.h"
@@ -186,17 +187,18 @@
     REGISTER_METATYPE(                                                         OutletFlowData ) \
     REGISTER_METATYPE(                                                      TreatmentTimeData ) \
     REGISTER_METATYPE(                                                  PressureOcclusionData ) \
-    REGISTER_METATYPE(                                                        AlarmStatusData ) \
-    REGISTER_METATYPE(                                                        AlarmStatusFlag ) \
     REGISTER_METATYPE(                                                           PowerOffData ) \
     REGISTER_METATYPE(                                                    TreatmentRangesData ) \
-    REGISTER_METATYPE(                                                     AlarmTriggeredData ) \
-    REGISTER_METATYPE(                                                       AlarmClearedData ) \
     REGISTER_METATYPE(                                                    TreatmentStatesData ) \
     REGISTER_METATYPE(                                                    TreatmentSalineData ) \
     REGISTER_METATYPE(                                                   TreatmentHeparinData ) \
     REGISTER_METATYPE(                                                    HDOperationModeData ) \
                                                                                                 \
+    REGISTER_METATYPE(                                                        AlarmStatusData ) \
+    REGISTER_METATYPE(                                                     AlarmTriggeredData ) \
+    REGISTER_METATYPE(                                                       AlarmClearedData ) \
+    REGISTER_METATYPE(                                              AlarmClearedConditionData ) \
+                                                                                                \
     REGISTER_METATYPE(                                                           DGROPumpData ) \
     REGISTER_METATYPE(                                                        DGPressuresData ) \
     REGISTER_METATYPE(                                                        DGDrainPumpData ) \
@@ -215,8 +217,10 @@
     REGISTER_METATYPE(                                              StartTreatmentRequestData ) \
     REGISTER_METATYPE(                                            ConfirmTreatmentRequestData ) \
     REGISTER_METATYPE(                                                EndTreatmentRequestData ) \
-    REGISTER_METATYPE(                                            AlarmAcknowledgeRequestData ) \
+                                                                                                \
     REGISTER_METATYPE(                                                AlarmSilenceRequestData ) \
+    REGISTER_METATYPE(                                             AlarmUserActionRequestData ) \
+    REGISTER_METATYPE(                                       AlarmClearedConditionRequestData ) \
                                                                                                 \
     REGISTER_METATYPE(                                        AdjustBloodDialysateRequestData ) \
     REGISTER_METATYPE(                                              AdjustDurationRequestData ) \
@@ -264,16 +268,18 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                  OutletFlowData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                               TreatmentTimeData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                           PressureOcclusionData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 AlarmStatusData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                    PowerOffData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                             TreatmentRangesData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                              AlarmTriggeredData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                AlarmClearedData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                             TreatmentStatesData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                             TreatmentSalineData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                            TreatmentHeparinData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                             HDOperationModeData ) \
                                                                                                 \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 AlarmStatusData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                              AlarmTriggeredData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                AlarmClearedData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                       AlarmClearedConditionData ) \
+                                                                                                \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                    DGROPumpData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 DGPressuresData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 DGDrainPumpData ) \
@@ -317,8 +323,10 @@
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                        AdjustHeparinRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                AdjustPressuresLimitsRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,            AdjustTreatmentParametersRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                     AlarmAcknowledgeRequestData ) \
+                                                                                                \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                         AlarmSilenceRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                      AlarmUserActionRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                AlarmClearedConditionRequestData ) \
 
 //===============================================================================//
 /*!
@@ -344,16 +352,18 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                          OutletFlowData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                       TreatmentTimeData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                   PressureOcclusionData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                                         AlarmStatusData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                            PowerOffData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                     TreatmentRangesData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                                      AlarmTriggeredData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                                        AlarmClearedData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                     TreatmentStatesData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                     TreatmentSalineData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                    TreatmentHeparinData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                     HDOperationModeData ) \
                                                                                                 \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                         AlarmStatusData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                      AlarmTriggeredData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                        AlarmClearedData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                               AlarmClearedConditionData ) \
+                                                                                                \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                            DGROPumpData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                         DGPressuresData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                         DGDrainPumpData ) \
@@ -396,8 +406,10 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                                AdjustHeparinRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                        AdjustPressuresLimitsRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                    AdjustTreatmentParametersRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION(                             AlarmAcknowledgeRequestData ) \
+                                                                                                \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                                 AlarmSilenceRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                              AlarmUserActionRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                        AlarmClearedConditionRequestData ) \
 
 #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_NOEMIT                                          \
     /*   Request   ----------------------- NoEmit -------------------------- */                 \
@@ -414,8 +426,10 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                         AdjustHeparinRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                 AdjustPressuresLimitsRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(             AdjustTreatmentParametersRequestData ) \
+                                                                                                \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                          AlarmSilenceRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                      AlarmAcknowledgeRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                       AlarmUserActionRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                 AlarmClearedConditionRequestData ) \
 
 #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_PUBLIC                                          \
     /*   Request   ----------------------- public --------------------------  */                \
@@ -432,27 +446,32 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                      ConfirmTreatmentRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                          EndTreatmentRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(             AdjustTreatmentParametersRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                      AlarmAcknowledgeRequestData ) \
+                                                                                                \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                          AlarmSilenceRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                       AlarmUserActionRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                 AlarmClearedConditionRequestData ) \
     
 //===============================================================================//
 #define ACTION_RECEIVE_SIGNALS                                                                  \
-    /*   Received signals */                                                                    \
+    /* Received signals */                                                                      \
+    /* NO RESPONSE message model here */                                                        \
     ACTION_RECEIVE_SIGNAL(                                                      BloodFlowData ) \
     ACTION_RECEIVE_SIGNAL(                                                  DialysateFlowData ) \
     ACTION_RECEIVE_SIGNAL(                                                     OutletFlowData ) \
     ACTION_RECEIVE_SIGNAL(                                                  TreatmentTimeData ) \
     ACTION_RECEIVE_SIGNAL(                                              PressureOcclusionData ) \
-    ACTION_RECEIVE_SIGNAL(                                                    AlarmStatusData ) \
     ACTION_RECEIVE_SIGNAL(                                                       PowerOffData ) \
     ACTION_RECEIVE_SIGNAL(                                                TreatmentRangesData ) \
-    ACTION_RECEIVE_SIGNAL(                                                 AlarmTriggeredData ) \
-    ACTION_RECEIVE_SIGNAL(                                                   AlarmClearedData ) \
     ACTION_RECEIVE_SIGNAL(                                                TreatmentStatesData ) \
     ACTION_RECEIVE_SIGNAL(                                                TreatmentSalineData ) \
     ACTION_RECEIVE_SIGNAL(                                               TreatmentHeparinData ) \
     ACTION_RECEIVE_SIGNAL(                                                HDOperationModeData ) \
                                                                                                 \
+    ACTION_RECEIVE_SIGNAL(                                                    AlarmStatusData ) \
+    ACTION_RECEIVE_SIGNAL(                                                 AlarmTriggeredData ) \
+    ACTION_RECEIVE_SIGNAL(                                                   AlarmClearedData ) \
+    ACTION_RECEIVE_SIGNAL(                                          AlarmClearedConditionData ) \
+                                                                                                \
     ACTION_RECEIVE_SIGNAL(                                                       DGROPumpData ) \
     ACTION_RECEIVE_SIGNAL(                                                    DGPressuresData ) \
     ACTION_RECEIVE_SIGNAL(                                                    DGDrainPumpData ) \