Index: sources/model/MModel.h
===================================================================
diff -u -r4afc91856c00e01dfb5d84bc54d2d92faefec0db -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a
--- sources/model/MModel.h	(.../MModel.h)	(revision 4afc91856c00e01dfb5d84bc54d2d92faefec0db)
+++ sources/model/MModel.h	(.../MModel.h)	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -101,6 +101,15 @@
 #include "MPostTreatmentAdjustDisposablesRemovalConfirmResponse.h"
 #include "MPostTreatmentAdjustTreatmentLogResponse.h"
 
+// Disinfection
+#include "MDisinfectAdjustRequests.h"
+#include "MDisinfectAdjustResponse.h"
+#include "MDisinfectDGFlushData.h"
+#include "MDisinfectDGHeatTimeData.h"
+#include "MDisinfectDGHeatTemperatureData.h"
+#include "MDisinfectDGChemicalTimeData.h"
+#include "MDisinfectDGChemicalTBDData.h"
+
 /*!
  * \page MessageFlow Message interpretation Flow
  * \dot
@@ -264,6 +273,12 @@
     REGISTER_METATYPE(                                    PreTreatmentSelfTestNoCartridgeData ) \
     REGISTER_METATYPE(                                            PreTreatmentSelfTestDryData ) \
     REGISTER_METATYPE(                                       PreTreatmentDisposablesPrimeData ) \
+    /*                                      Disinfection                                     */ \
+    REGISTER_METATYPE(                                                   DisinfectDGFlushData ) \
+    REGISTER_METATYPE(                                                DisinfectDGHeatTimeData ) \
+    REGISTER_METATYPE(                                         DisinfectDGHeatTemperatureData ) \
+    REGISTER_METATYPE(                                            DisinfectDGChemicalTimeData ) \
+    REGISTER_METATYPE(                                             DisinfectDGChemicalTBDData ) \
                                                                                                 \
     /*   Request    */                                                                          \
     /*                                      Post-Treatment                                   */ \
@@ -283,6 +298,9 @@
     REGISTER_METATYPE(                                   AdjustUltrafiltrationInitRequestData ) \
     REGISTER_METATYPE(                              AdjustPatientConnectionConfirmRequestData ) \
     REGISTER_METATYPE(                                        AdjustStartTreatmentRequestData ) \
+    /*                                      Disinfection                                     */ \
+    REGISTER_METATYPE(                                             AdjustDisinfectRequestData ) \
+    REGISTER_METATYPE(                              AdjustDisinfectChemicalConfirmRequestData ) \
                                                                                                 \
     REGISTER_METATYPE(                                                AlarmSilenceRequestData ) \
     REGISTER_METATYPE(                                             AlarmUserActionRequestData ) \
@@ -317,6 +335,8 @@
     REGISTER_METATYPE(                                  AdjustUltrafiltrationInitResponseData ) \
     REGISTER_METATYPE(                             AdjustPatientConnectionConfirmResponseData ) \
     REGISTER_METATYPE(                                       AdjustStartTreatmentResponseData ) \
+    /*                                      Disinfect                                        */ \
+    REGISTER_METATYPE(                                            AdjustDisinfectResponseData ) \
                                                                                                 \
     REGISTER_METATYPE(                                       AdjustBloodDialysateResponseData ) \
     REGISTER_METATYPE(                                             AdjustDurationResponseData ) \
@@ -394,6 +414,12 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,             PreTreatmentSelfTestNoCartridgeData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                     PreTreatmentSelfTestDryData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                PreTreatmentDisposablesPrimeData ) \
+    /*                                      Disinfection                                     */ \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                            DisinfectDGFlushData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                         DisinfectDGHeatTimeData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                  DisinfectDGHeatTemperatureData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                     DisinfectDGChemicalTimeData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                      DisinfectDGChemicalTBDData ) \
     /*   Response   */                                                                          \
     /*                                     Post-Treatment                                    */ \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,     AdjustDisposablesRemovalConfirmResponseData ) \
@@ -407,6 +433,8 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,           AdjustUltrafiltrationInitResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,      AdjustPatientConnectionConfirmResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                AdjustStartTreatmentResponseData ) \
+    /*                                      Disinfect                                        */ \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                     AdjustDisinfectResponseData ) \
                                                                                                 \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                AdjustBloodDialysateResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                      AdjustDurationResponseData ) \
@@ -458,6 +486,9 @@
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,            AdjustUltrafiltrationInitRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,       AdjustPatientConnectionConfirmRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                 AdjustStartTreatmentRequestData ) \
+    /*                                      Disinfection                                     */ \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                      AdjustDisinfectRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,       AdjustDisinfectChemicalConfirmRequestData ) \
     /*                                         Alarms                                        */ \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                         AlarmSilenceRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                      AlarmUserActionRequestData ) \
@@ -527,6 +558,12 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                     PreTreatmentSelfTestNoCartridgeData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                             PreTreatmentSelfTestDryData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                        PreTreatmentDisposablesPrimeData ) \
+    /*                                      Disinfection                                     */ \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                    DisinfectDGFlushData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                 DisinfectDGHeatTimeData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                          DisinfectDGHeatTemperatureData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                             DisinfectDGChemicalTimeData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                              DisinfectDGChemicalTBDData ) \
     /*   Response   */                                                                          \
     /*                                     Post-Treatment                                    */ \
     ACTION_RECEIVE_BRIDGE_DEFINITION(             AdjustDisposablesRemovalConfirmResponseData ) \
@@ -540,6 +577,8 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                   AdjustUltrafiltrationInitResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(              AdjustPatientConnectionConfirmResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                        AdjustStartTreatmentResponseData ) \
+    /*                                      Disinfect                                        */ \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                             AdjustDisinfectResponseData ) \
                                                                                                 \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                        AdjustBloodDialysateResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                              AdjustDurationResponseData ) \
@@ -576,6 +615,9 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                    AdjustUltrafiltrationInitRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(               AdjustPatientConnectionConfirmRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                         AdjustStartTreatmentRequestData ) \
+    /*                                      Disinfection                                     */ \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                              AdjustDisinfectRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(               AdjustDisinfectChemicalConfirmRequestData ) \
                                                                                                 \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                         AdjustBloodDialysateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                               AdjustDurationRequestData ) \
@@ -617,6 +659,9 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(             AdjustUltrafiltrationInitRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(        AdjustPatientConnectionConfirmRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                  AdjustStartTreatmentRequestData ) \
+    /*                                      Disinfection                                     */ \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                       AdjustDisinfectRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(        AdjustDisinfectChemicalConfirmRequestData ) \
                                                                                                 \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                  AdjustBloodDialysateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                        AdjustDurationRequestData ) \
@@ -658,6 +703,9 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(             AdjustUltrafiltrationInitRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(        AdjustPatientConnectionConfirmRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                  AdjustStartTreatmentRequestData ) \
+    /*                                      Disinfection                                     */ \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                       AdjustDisinfectRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(        AdjustDisinfectChemicalConfirmRequestData ) \
                                                                                                 \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                  AdjustBloodDialysateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                        AdjustDurationRequestData ) \
@@ -725,6 +773,12 @@
     ACTION_RECEIVE_SIGNAL(                                PreTreatmentSelfTestNoCartridgeData ) \
     ACTION_RECEIVE_SIGNAL(                                        PreTreatmentSelfTestDryData ) \
     ACTION_RECEIVE_SIGNAL(                                   PreTreatmentDisposablesPrimeData ) \
+    /*                                      Disinfection                                     */ \
+    ACTION_RECEIVE_SIGNAL(                                               DisinfectDGFlushData ) \
+    ACTION_RECEIVE_SIGNAL(                                            DisinfectDGHeatTimeData ) \
+    ACTION_RECEIVE_SIGNAL(                                     DisinfectDGHeatTemperatureData ) \
+    ACTION_RECEIVE_SIGNAL(                                        DisinfectDGChemicalTimeData ) \
+    ACTION_RECEIVE_SIGNAL(                                         DisinfectDGChemicalTBDData ) \
     /*   Response */                                                                            \
     /*                                     Post-Treatment                                    */ \
     ACTION_RECEIVE_SIGNAL(                        AdjustDisposablesRemovalConfirmResponseData ) \
@@ -738,6 +792,8 @@
     ACTION_RECEIVE_SIGNAL(                              AdjustUltrafiltrationInitResponseData ) \
     ACTION_RECEIVE_SIGNAL(                         AdjustPatientConnectionConfirmResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                   AdjustStartTreatmentResponseData ) \
+    /*                                      Disinfect                                        */ \
+    ACTION_RECEIVE_SIGNAL(                                        AdjustDisinfectResponseData ) \
                                                                                                 \
     ACTION_RECEIVE_SIGNAL(                                   AdjustBloodDialysateResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                         AdjustDurationResponseData ) \