Index: sources/model/MModel.h
===================================================================
diff -u -rdf61c476838011a343a6930fd5b30404629379bc -r5e5c936f26d0dd06c89e9fd32de5775a37b52493
--- sources/model/MModel.h	(.../MModel.h)	(revision df61c476838011a343a6930fd5b30404629379bc)
+++ sources/model/MModel.h	(.../MModel.h)	(revision 5e5c936f26d0dd06c89e9fd32de5775a37b52493)
@@ -103,6 +103,8 @@
 #include "MTDInstitutionalRecordResponse.h"
 #include "MAdjustTDAdvancedInstitutionalRecordResponse.h"
 #include "MTDAdvancedInstitutionalRecordResponse.h"
+#include "MDDCalibrationPressureRecordResponse.h"
+#include "MAdjustDDCalibrationPressureRecordResponse.h"
 
 // DD Data Messages
 #include "MDGDrainPumpData.h"
@@ -579,6 +581,28 @@
     REGISTER_METATYPE(                         AdjustAdvancedInstitutionalRecordResponseData  ) \
     REGISTER_METATYPE(                                      AdvancedInstitutionalRequestData  ) \
     REGISTER_METATYPE(                               AdvancedInstitutionalRecordResponseData  ) \
+    REGISTER_METATYPE(                                      DDCalibrationPressureRequestData  ) \
+    REGISTER_METATYPE(                                AdjustDDCalibrationPressureRequestData  ) \
+    REGISTER_METATYPE(                                   DDCalibrationTemperatureRequestData  ) \
+    REGISTER_METATYPE(                             AdjustDDCalibrationTemperatureRequestData  ) \
+    REGISTER_METATYPE(                               DDCalibrationConcentratePumpRequestData  ) \
+    REGISTER_METATYPE(                         AdjustDDCalibrationConcentratePumpRequestData  ) \
+    REGISTER_METATYPE(                              DDCalibrationD12DialysatePumpRequestData  ) \
+    REGISTER_METATYPE(                        AdjustDDCalibrationD12DialysatePumpRequestData  ) \
+    REGISTER_METATYPE(                              DDCalibrationD48DialysatePumpRequestData  ) \
+    REGISTER_METATYPE(                        AdjustDDCalibrationD48DialysatePumpRequestData  ) \
+    REGISTER_METATYPE(                              DDCalibrationAcidConcentratesRequestData  ) \
+    REGISTER_METATYPE(                        AdjustDDCalibrationAcidConcentratesRequestData  ) \
+    REGISTER_METATYPE(                            DDCalibrationBicarbConcentratesRequestData  ) \
+    REGISTER_METATYPE(                      AdjustDDCalibrationBicarbConcentratesRequestData  ) \
+    REGISTER_METATYPE(                           DDCalibrationAccelerometerSensorRequestData  ) \
+    REGISTER_METATYPE(                     AdjustDDCalibrationAccelerometerSensorRequestData  ) \
+    REGISTER_METATYPE(                               DDCalibrationBloodLeakSensorRequestData  ) \
+    REGISTER_METATYPE(                         AdjustDDCalibrationBloodLeakSensorRequestData  ) \
+    REGISTER_METATYPE(                                  DDCalibrationConductivityRequestData  ) \
+    REGISTER_METATYPE(                            AdjustDDCalibrationConductivityRequestData  ) \
+    REGISTER_METATYPE(                                     DDCalibrationPressureResponseData  ) \
+    REGISTER_METATYPE(                               AdjustDDCalibrationPressureResponseData  ) \
     /*                                 HD reset in service mode                              */ \
     REGISTER_METATYPE(                                         AdjustHDResetInSrvcRequestData ) \
 
@@ -761,6 +785,8 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                 InstitutionalRecordResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,   AdjustAdvancedInstitutionalRecordResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,         AdvancedInstitutionalRecordResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,               DDCalibrationPressureResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,         AdjustDDCalibrationPressureResponseData ) \
 //  /*   Request    */  ---------------------------------------------------------//
 #define ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(vSOURCE)                                        \
     /*                                     CONFIRM                                           */ \
@@ -782,6 +808,7 @@
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,              AdjustVitalsAlarmLimitsRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                  AdjustBloodFlowRateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,              AdjustDialysateFlowRateRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,           AdjustDialysateTemperatureRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                AdjustIsolatedUFStateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,           AdjustUltrafiltrationStateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,            AdjustUltrafiltrationEditRequestData ) \
@@ -836,6 +863,26 @@
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                        InstitutionalRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,          AdjustAdvancedInstitutionalRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                AdvancedInstitutionalRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                DDCalibrationPressureRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,          AdjustDDCalibrationPressureRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,              DDCalibrationTemperatureRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,        AdjustDDCalibrationTemperatureRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,          DDCalibrationConcentratePumpRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,    AdjustDDCalibrationConcentratePumpRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,         DDCalibrationD12DialysatePumpRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,   AdjustDDCalibrationD12DialysatePumpRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,         DDCalibrationD48DialysatePumpRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,   AdjustDDCalibrationD48DialysatePumpRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,         DDCalibrationAcidConcentratesRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,   AdjustDDCalibrationAcidConcentratesRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,       DDCalibrationBicarbConcentratesRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationBicarbConcentratesRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,      DDCalibrationAccelerometerSensorRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,AdjustDDCalibrationAccelerometerSensorRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,          DDCalibrationBloodLeakSensorRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,    AdjustDDCalibrationBloodLeakSensorRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,             DDCalibrationConductivityRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,       AdjustDDCalibrationConductivityRequestData ) \
     /*                                      HD reset in service mode                         */ \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                  AdjustHDResetInSrvcRequestData ) \
 
@@ -1021,6 +1068,8 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                         InstitutionalRecordResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(           AdjustAdvancedInstitutionalRecordResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                 AdvancedInstitutionalRecordResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                       DDCalibrationPressureResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                 AdjustDDCalibrationPressureResponseData ) \
 
 #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS                                                 \
     /*   Request   --------------------------------------------------------- */                 \
@@ -1098,6 +1147,26 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                                InstitutionalRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                  AdjustAdvancedInstitutionalRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                        AdvancedInstitutionalRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                        DDCalibrationPressureRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                  AdjustDDCalibrationPressureRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                     DDCalibrationTemperatureRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(               AdjustDDCalibrationTemperatureRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                 DDCalibrationConcentratePumpRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(           AdjustDDCalibrationConcentratePumpRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                DDCalibrationD12DialysatePumpRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(          AdjustDDCalibrationD12DialysatePumpRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                DDCalibrationD48DialysatePumpRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(          AdjustDDCalibrationD48DialysatePumpRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                DDCalibrationAcidConcentratesRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(          AdjustDDCalibrationAcidConcentratesRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(              DDCalibrationBicarbConcentratesRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(        AdjustDDCalibrationBicarbConcentratesRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(             DDCalibrationAccelerometerSensorRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(       AdjustDDCalibrationAccelerometerSensorRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                 DDCalibrationBloodLeakSensorRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(           AdjustDDCalibrationBloodLeakSensorRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                    DDCalibrationConductivityRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(              AdjustDDCalibrationConductivityRequestData ) \
     /*                                      HD reset in service mode                         */ \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                          AdjustHDResetInSrvcRequestData ) \
 
@@ -1177,6 +1246,26 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                         InstitutionalRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(           AdjustAdvancedInstitutionalRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                 AdvancedInstitutionalRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                 DDCalibrationPressureRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(           AdjustDDCalibrationPressureRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(              DDCalibrationTemperatureRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(        AdjustDDCalibrationTemperatureRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(          DDCalibrationConcentratePumpRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(    AdjustDDCalibrationConcentratePumpRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(         DDCalibrationD12DialysatePumpRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(   AdjustDDCalibrationD12DialysatePumpRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(         DDCalibrationD48DialysatePumpRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(   AdjustDDCalibrationD48DialysatePumpRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(         DDCalibrationAcidConcentratesRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(   AdjustDDCalibrationAcidConcentratesRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(       DDCalibrationBicarbConcentratesRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDDCalibrationBicarbConcentratesRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(      DDCalibrationAccelerometerSensorRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(AdjustDDCalibrationAccelerometerSensorRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(          DDCalibrationBloodLeakSensorRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(    AdjustDDCalibrationBloodLeakSensorRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(             DDCalibrationConductivityRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(       AdjustDDCalibrationConductivityRequestData ) \
     /*                                        HD reset in service mode                       */ \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                   AdjustHDResetInSrvcRequestData ) \
 
@@ -1256,6 +1345,26 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                         InstitutionalRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(           AdjustAdvancedInstitutionalRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                 AdvancedInstitutionalRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                 DDCalibrationPressureRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(           AdjustDDCalibrationPressureRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(              DDCalibrationTemperatureRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(        AdjustDDCalibrationTemperatureRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(          DDCalibrationConcentratePumpRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(    AdjustDDCalibrationConcentratePumpRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(         DDCalibrationD12DialysatePumpRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(   AdjustDDCalibrationD12DialysatePumpRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(         DDCalibrationD48DialysatePumpRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(   AdjustDDCalibrationD48DialysatePumpRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(         DDCalibrationAcidConcentratesRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(   AdjustDDCalibrationAcidConcentratesRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(       DDCalibrationBicarbConcentratesRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDDCalibrationBicarbConcentratesRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(      DDCalibrationAccelerometerSensorRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(AdjustDDCalibrationAccelerometerSensorRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(          DDCalibrationBloodLeakSensorRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(    AdjustDDCalibrationBloodLeakSensorRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(             DDCalibrationConductivityRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(       AdjustDDCalibrationConductivityRequestData ) \
     /*                                      HD reset in service mode                         */ \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                   AdjustHDResetInSrvcRequestData ) \
 
@@ -1425,6 +1534,8 @@
     ACTION_RECEIVE_SIGNAL(                                    InstitutionalRecordResponseData ) \
     ACTION_RECEIVE_SIGNAL(                      AdjustAdvancedInstitutionalRecordResponseData ) \
     ACTION_RECEIVE_SIGNAL(                            AdvancedInstitutionalRecordResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                                  DDCalibrationPressureResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                            AdjustDDCalibrationPressureResponseData ) \
 
 
 //--------------------------------------------------------------------------------//