Index: sources/model/MModel.h
===================================================================
diff -u -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f -r88563177f10f20ced98750b2e40036201728131d
--- sources/model/MModel.h	(.../MModel.h)	(revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f)
+++ sources/model/MModel.h	(.../MModel.h)	(revision 88563177f10f20ced98750b2e40036201728131d)
@@ -24,10 +24,13 @@
 #include "MAlarmCleared.h"
 #include "MAlarmClearedCondition.h"
 
+// States Messages
 #include "MHDOperationModeData.h"
 #include "MPreTreatmentStatesData.h"
 #include "MTreatmentStatesData.h"
+#include "MPostTreatmentStatesData.h"
 
+// HD Data Messages
 #include "MTreatmentTimeData.h"
 #include "MTreatmentFlowsData.h"
 #include "MTreatmentOutletFlowData.h"
@@ -40,6 +43,10 @@
 #include "MTreatmentBloodPrimeData.h"
 #include "MHDAccelerometerData.h"
 
+// Debugging Messages
+#include "MHDDebugText.h"
+#include "MDGDebugText.h"
+
 // DG Data Messages
 #include "MDGDrainPumpData.h"
 #include "MDGHeatersData.h"
@@ -67,9 +74,6 @@
 #include "MPreTreatmentAdjustPatientConnectionConfirmResponse.h"
 #include "MPreTreatmentAdjustStartTreatmentResponse.h"
 
-// Debugging Messages
-#include "MHDDebugText.h"
-#include "MDGDebugText.h"
 // Treatment
 #include "MTreatmentAdjustRequests.h"
 #include "MTreatmentAdjustDurationResponse.h"
@@ -86,6 +90,10 @@
 #include "MAdjustHDVersionsResponse.h"
 #include "MAdjustDGVersionsResponse.h"
 
+// Post-Treatment
+#include "MPostTreatmentAdjustRequests.h"
+#include "MPostTreatmentAdjustDisposablesRemovalConfirmResponse.h"
+#include "MPostTreatmentAdjustTreatmentLogResponse.h"
 
 /*!
  * \page MessageFlow Message interpretation Flow
@@ -211,6 +219,7 @@
     REGISTER_METATYPE(                                                    HDOperationModeData ) \
     REGISTER_METATYPE(                                                 PreTreatmentStatesData ) \
     REGISTER_METATYPE(                                                    TreatmentStatesData ) \
+    REGISTER_METATYPE(                                                PostTreatmentStatesData ) \
     REGISTER_METATYPE(                                                          BloodFlowData ) \
     REGISTER_METATYPE(                                                      DialysateFlowData ) \
     REGISTER_METATYPE(                                                         OutletFlowData ) \
@@ -251,6 +260,10 @@
     REGISTER_METATYPE(                                       PreTreatmentDisposablesPrimeData ) \
                                                                                                 \
     /*   Request    */                                                                          \
+    /*                                      Post-Treatment                                   */ \
+    REGISTER_METATYPE(                           AdjustPatientDisconnectionConfirmRequestData ) \
+    REGISTER_METATYPE(                                    AdjustDisposablesConfirmRequestData ) \
+    REGISTER_METATYPE(                                          AdjustTreatmentLogRequestData ) \
     /*                                      Pre-Treatment                                    */ \
     REGISTER_METATYPE(                                         AdjustInitTreatmentRequestData ) \
     REGISTER_METATYPE(                                  AdjustParametersValidationRequestData ) \
@@ -284,6 +297,9 @@
     REGISTER_METATYPE(                                              AdjustVersionsRequestData ) \
                                                                                                 \
     /* Response     */                                                                          \
+    /*                                      Post-Treatment                                   */ \
+    REGISTER_METATYPE(                                     AdjustDisposablesPrimeResponseData ) \
+    REGISTER_METATYPE(                                         AdjustTreatmentLogResponseData ) \
     /*                                      Pre-Treatment                                    */ \
     REGISTER_METATYPE(                                        AdjustInitTreatmentResponseData ) \
     REGISTER_METATYPE(                                 AdjustParametersValidationResponseData ) \
@@ -328,6 +344,7 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                             HDOperationModeData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                          PreTreatmentStatesData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                             TreatmentStatesData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                         PostTreatmentStatesData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                   BloodFlowData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                               DialysateFlowData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                  OutletFlowData ) \
@@ -367,6 +384,9 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                     PreTreatmentSelfTestDryData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                PreTreatmentDisposablesPrimeData ) \
     /*   Response   */                                                                          \
+    /*                                     Post-Treatment                                    */ \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,     AdjustDisposablesRemovalConfirmResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                  AdjustTreatmentLogResponseData ) \
     /*                                      Pre-Treatment                                    */ \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                 AdjustInitTreatmentResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,          AdjustParametersValidationResponseData ) \
@@ -407,6 +427,10 @@
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                   AdjustTreatmentEndRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                AdjustPressuresLimitsRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                       AdjustVersionsRequestData ) \
+    /*                                     Post-Treatment                                    */ \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,    AdjustPatientDisconnectionConfirmRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,      AdjustDisposablesRemovalConfirmRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                   AdjustTreatmentLogRequestData ) \
     /*                                      Pre-Treatment                                    */ \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                  AdjustInitTreatmentRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,           AdjustParametersValidationRequestData ) \
@@ -449,6 +473,7 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                     HDOperationModeData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                  PreTreatmentStatesData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                     TreatmentStatesData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                 PostTreatmentStatesData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                           BloodFlowData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                       DialysateFlowData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                          OutletFlowData ) \
@@ -488,6 +513,9 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                             PreTreatmentSelfTestDryData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                        PreTreatmentDisposablesPrimeData ) \
     /*   Response   */                                                                          \
+    /*                                     Post-Treatment                                    */ \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(             AdjustDisposablesRemovalConfirmResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                          AdjustTreatmentLogResponseData ) \
     /*                                      Pre-Treatment                                    */ \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                         AdjustInitTreatmentResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                  AdjustParametersValidationResponseData ) \
@@ -514,6 +542,10 @@
 
 #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS                                                 \
     /*   Request   --------------------------------------------------------- */                 \
+    /*                                     Post-Treatment                                    */ \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(            AdjustPatientDisconnectionConfirmRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(              AdjustDisposablesRemovalConfirmRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                           AdjustTreatmentLogRequestData ) \
     /*                                      Pre-Treatment                                    */ \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                          AdjustInitTreatmentRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                   AdjustParametersValidationRequestData ) \
@@ -549,6 +581,10 @@
 
 #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_NOEMIT                                          \
     /*   Request   ----------------------- NoEmit -------------------------- */                 \
+    /*                                     Post-Treatment                                    */ \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(     AdjustPatientDisconnectionConfirmRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(       AdjustDisposablesRemovalConfirmRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                    AdjustTreatmentLogRequestData ) \
     /*                                      Pre-Treatment                                    */ \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                   AdjustInitTreatmentRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(            AdjustParametersValidationRequestData ) \
@@ -584,6 +620,10 @@
 
 #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_PUBLIC                                          \
     /*   Request   ----------------------- public --------------------------  */                \
+    /*                                     Post-Treatment                                    */ \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(     AdjustPatientDisconnectionConfirmRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(       AdjustDisposablesRemovalConfirmRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                    AdjustTreatmentLogRequestData ) \
     /*                                      Pre-Treatment                                    */ \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                   AdjustInitTreatmentRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(            AdjustParametersValidationRequestData ) \
@@ -625,6 +665,7 @@
     ACTION_RECEIVE_SIGNAL(                                                HDOperationModeData ) \
     ACTION_RECEIVE_SIGNAL(                                             PreTreatmentStatesData ) \
     ACTION_RECEIVE_SIGNAL(                                                TreatmentStatesData ) \
+    ACTION_RECEIVE_SIGNAL(                                            PostTreatmentStatesData ) \
     ACTION_RECEIVE_SIGNAL(                                                      BloodFlowData ) \
     ACTION_RECEIVE_SIGNAL(                                                  DialysateFlowData ) \
     ACTION_RECEIVE_SIGNAL(                                                     OutletFlowData ) \
@@ -662,6 +703,9 @@
     ACTION_RECEIVE_SIGNAL(                                        PreTreatmentSelfTestDryData ) \
     ACTION_RECEIVE_SIGNAL(                                   PreTreatmentDisposablesPrimeData ) \
     /*   Response */                                                                            \
+    /*                                     Post-Treatment                                    */ \
+    ACTION_RECEIVE_SIGNAL(                        AdjustDisposablesRemovalConfirmResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                                     AdjustTreatmentLogResponseData ) \
     /*                                      Pre-Treatment                                    */ \
     ACTION_RECEIVE_SIGNAL(                                    AdjustInitTreatmentResponseData ) \
     ACTION_RECEIVE_SIGNAL(                             AdjustParametersValidationResponseData ) \