Index: sources/model/MModel.h
===================================================================
diff -u -r6cad9b004e904200b71de7431c745795256080df -rc241fc1d31be3e4958582dff94de8189f5bbba67
--- sources/model/MModel.h	(.../MModel.h)	(revision 6cad9b004e904200b71de7431c745795256080df)
+++ sources/model/MModel.h	(.../MModel.h)	(revision c241fc1d31be3e4958582dff94de8189f5bbba67)
@@ -40,7 +40,6 @@
 #include "MDGTemperaturesData.h"
 #include "MDGValvesStatesData.h"
 
-#include "MTreatmentParameters.h"
 #include "MTreatmentParametersResp.h"
 
 #include "MHDDebugText.h"
@@ -53,6 +52,9 @@
 #include "MTreatmentAdjustUltrafiltrationStateResponse.h"
 #include "MTreatmentAdjustUltrafiltrationEditResponse.h"
 #include "MTreatmentAdjustUltrafiltrationConfirmResponse.h"
+#include "MPrimingData.h"
+#include "MStartTreatmentResponse.h"
+#include "MEndTreatmentResponse.h"
 #include "MTreatmentAdjustSalineResponse.h"
 
 /*!
@@ -203,21 +205,33 @@
                                                                                                 \
     REGISTER_METATYPE(                                                        HDDebugTextData ) \
     REGISTER_METATYPE(                                                        DGDebugTextData ) \
+    REGISTER_METATYPE(                                                            PrimingData ) \
+                                                                                                \
     /*   Request    */                                                                          \
+    REGISTER_METATYPE(                                              StartTreatmentRequestData ) \
+    REGISTER_METATYPE(                                            ConfirmTreatmentRequestData ) \
+    REGISTER_METATYPE(                                                EndTreatmentRequestData ) \
+    REGISTER_METATYPE(                                            AlarmAcknowledgeRequestData ) \
+    REGISTER_METATYPE(                                                AlarmSilenceRequestData ) \
+                                                                                                \
     REGISTER_METATYPE(                                        AdjustBloodDialysateRequestData ) \
     REGISTER_METATYPE(                                              AdjustDurationRequestData ) \
     REGISTER_METATYPE(                                  AdjustUltrafiltrationStateRequestData ) \
     REGISTER_METATYPE(                                   AdjustUltrafiltrationEditRequestData ) \
     REGISTER_METATYPE(                                AdjustUltrafiltrationConfirmRequestData ) \
     REGISTER_METATYPE(                                                AdjustSalineRequestData ) \
     REGISTER_METATYPE(                                   AdjustTreatmentParametersRequestData ) \
-    /*   Response   */                                                                          \
+    /* Response     */                                                                          \
+    REGISTER_METATYPE(                                             StartTreatmentResponseData ) \
+    REGISTER_METATYPE(                                               EndTreatmentResponseData ) \
+                                                                                                \
     REGISTER_METATYPE(                                       AdjustBloodDialysateResponseData ) \
     REGISTER_METATYPE(                                             AdjustDurationResponseData ) \
     REGISTER_METATYPE(                                 AdjustUltrafiltrationStateResponseData ) \
     REGISTER_METATYPE(                                  AdjustUltrafiltrationEditResponseData ) \
     REGISTER_METATYPE(                               AdjustUltrafiltrationConfirmResponseData ) \
     REGISTER_METATYPE(                                               AdjustSalineResponseData ) \
+    REGISTER_METATYPE(                                  AdjustTreatmentParametersResponseData )
 
 //===============================================================================//
 /*!
@@ -261,13 +275,17 @@
                                                                                                 \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 HDDebugTextData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 DGDebugTextData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                     PrimingData ) \
     /*   Response   */                                                                          \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,          AdjustUltrafiltrationStateResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                AdjustBloodDialysateResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                      AdjustDurationResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,           AdjustUltrafiltrationEditResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,        AdjustUltrafiltrationConfirmResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                      StartTreatmentResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                        EndTreatmentResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                        AdjustSalineResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,           AdjustTreatmentParametersResponseData )
 
 //  /*   Request    */  ---------------------------------------------------------//
 #define ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(vSOURCE)                                        \
@@ -277,7 +295,13 @@
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,           AdjustUltrafiltrationStateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,            AdjustUltrafiltrationEditRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,         AdjustUltrafiltrationConfirmRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                       StartTreatmentRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                     ConfirmTreatmentRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                         EndTreatmentRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                         AdjustSalineRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,            AdjustTreatmentParametersRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                     AlarmAcknowledgeRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                         AlarmSilenceRequestData )
 
 //===============================================================================//
 /*!
@@ -324,33 +348,47 @@
                                                                                                 \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                         HDDebugTextData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                         DGDebugTextData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                             PrimingData ) \
     /*   Response   */                                                                          \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                  AdjustUltrafiltrationStateResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                        AdjustBloodDialysateResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                              AdjustDurationResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                   AdjustUltrafiltrationEditResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                AdjustUltrafiltrationConfirmResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                              StartTreatmentResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                EndTreatmentResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                AdjustSalineResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                   AdjustTreatmentParametersResponseData )
 
-
 #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS                                                 \
     /*   Request   --------------------------------------------------------- */                 \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                         AdjustBloodDialysateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                               AdjustDurationRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                   AdjustUltrafiltrationStateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                    AdjustUltrafiltrationEditRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                 AdjustUltrafiltrationConfirmRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                               StartTreatmentRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                             ConfirmTreatmentRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                                 EndTreatmentRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                                 AdjustSalineRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                    AdjustTreatmentParametersRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                             AlarmAcknowledgeRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                                 AlarmSilenceRequestData )
 
-
 #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_NOEMIT                                          \
     /*   Request   ----------------------- NoEmit -------------------------- */                 \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                  AdjustBloodDialysateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                        AdjustDurationRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(            AdjustUltrafiltrationStateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(             AdjustUltrafiltrationEditRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(          AdjustUltrafiltrationConfirmRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                        StartTreatmentRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                      ConfirmTreatmentRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                          EndTreatmentRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                          AdjustSalineRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(             AdjustTreatmentParametersRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                          AlarmSilenceRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                      AlarmAcknowledgeRequestData )
 
 #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_PUBLIC                                          \
     /*   Request   ----------------------- public --------------------------  */                \
@@ -359,7 +397,13 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(            AdjustUltrafiltrationStateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(             AdjustUltrafiltrationEditRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(          AdjustUltrafiltrationConfirmRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                          AdjustSalineRequestData )
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                        StartTreatmentRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                      ConfirmTreatmentRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                          EndTreatmentRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                          AdjustSalineRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(             AdjustTreatmentParametersRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                      AlarmAcknowledgeRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                          AlarmSilenceRequestData )
 //===============================================================================//
 #define ACTION_RECEIVE_SIGNALS                                                                  \
     /*   Received signals */                                                                    \
@@ -389,7 +433,11 @@
                                                                                                 \
     ACTION_RECEIVE_SIGNAL(                                                    HDDebugTextData ) \
     ACTION_RECEIVE_SIGNAL(                                                    DGDebugTextData ) \
-    /*   Response   */                                                                          \
+    ACTION_RECEIVE_SIGNAL(                                                        PrimingData ) \
+    /*   Response */                                                                            \
+    ACTION_RECEIVE_SIGNAL(                                         StartTreatmentResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                                           EndTreatmentResponseData ) \
+                                                                                                \
     ACTION_RECEIVE_SIGNAL(                             AdjustUltrafiltrationStateResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                   AdjustBloodDialysateResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                         AdjustDurationResponseData ) \