Index: sources/model/MModel.h
===================================================================
diff -u -r5e5c936f26d0dd06c89e9fd32de5775a37b52493 -r10f525ba53f0248265eaaee6c511444a0c4cc495
--- sources/model/MModel.h	(.../MModel.h)	(revision 5e5c936f26d0dd06c89e9fd32de5775a37b52493)
+++ sources/model/MModel.h	(.../MModel.h)	(revision 10f525ba53f0248265eaaee6c511444a0c4cc495)
@@ -103,8 +103,26 @@
 #include "MTDInstitutionalRecordResponse.h"
 #include "MAdjustTDAdvancedInstitutionalRecordResponse.h"
 #include "MTDAdvancedInstitutionalRecordResponse.h"
+#include "MDDCalibrationAccelerometerSensorRecordResponse.h"
+#include "MDDCalibrationAcidConcentratesRecordResponse.h"
+#include "MDDCalibrationBicarbConcentratesRecordResponse.h"
+#include "MDDCalibrationBloodLeakSensorRecordResponse.h"
+#include "MDDCalibrationConcentratePumpRecordResponse.h"
+#include "MDDCalibrationConductivitySensorRecordResponse.h"
+#include "MDDCalibrationD12DialysatePumpRecordResponse.h"
+#include "MDDCalibrationD48DialysatePumpRecordResponse.h"
 #include "MDDCalibrationPressureRecordResponse.h"
+#include "MDDCalibrationTemperatureRecordResponse.h"
+#include "MAdjustDDCalibrationAccelerometerSensorRecordResponse.h"
+#include "MAdjustDDCalibrationAcidConcentratesRecordResponse.h"
+#include "MAdjustDDCalibrationBicarbConcentratesRecordResponse.h"
+#include "MAdjustDDCalibrationBloodLeakSensorRecordResponse.h"
+#include "MAdjustDDCalibrationConcentratePumpRecordResponse.h"
+#include "MAdjustDDCalibrationConductivitySensorRecordResponse.h"
+#include "MAdjustDDCalibrationD12DialysatePumpRecordResponse.h"
+#include "MAdjustDDCalibrationD48DialysatePumpRecordResponse.h"
 #include "MAdjustDDCalibrationPressureRecordResponse.h"
+#include "MAdjustDDCalibrationTemperatureRecordResponse.h"
 
 // DD Data Messages
 #include "MDGDrainPumpData.h"
@@ -601,8 +619,26 @@
     REGISTER_METATYPE(                         AdjustDDCalibrationBloodLeakSensorRequestData  ) \
     REGISTER_METATYPE(                                  DDCalibrationConductivityRequestData  ) \
     REGISTER_METATYPE(                            AdjustDDCalibrationConductivityRequestData  ) \
+    REGISTER_METATYPE(                          DDCalibrationAccelerometerSensorResponseData  ) \
+    REGISTER_METATYPE(                             DDCalibrationAcidConcentratesResponseData  ) \
+    REGISTER_METATYPE(                           DDCalibrationBicarbConcentratesResponseData  ) \
+    REGISTER_METATYPE(                              DDCalibrationBloodLeakSensorResponseData  ) \
+    REGISTER_METATYPE(                              DDCalibrationConcentratePumpResponseData  ) \
+    REGISTER_METATYPE(                           DDCalibrationConductivitySensorResponseData  ) \
+    REGISTER_METATYPE(                             DDCalibrationD12DialysatePumpResponseData  ) \
+    REGISTER_METATYPE(                             DDCalibrationD48DialysatePumpResponseData  ) \
     REGISTER_METATYPE(                                     DDCalibrationPressureResponseData  ) \
+    REGISTER_METATYPE(                                  DDCalibrationTemperatureResponseData  ) \
+    REGISTER_METATYPE(                    AdjustDDCalibrationAccelerometerSensorResponseData  ) \
+    REGISTER_METATYPE(                       AdjustDDCalibrationAcidConcentratesResponseData  ) \
+    REGISTER_METATYPE(                     AdjustDDCalibrationBicarbConcentratesResponseData  ) \
+    REGISTER_METATYPE(                        AdjustDDCalibrationBloodLeakSensorResponseData  ) \
+    REGISTER_METATYPE(                        AdjustDDCalibrationConcentratePumpResponseData  ) \
+    REGISTER_METATYPE(                     AdjustDDCalibrationConductivitySensorResponseData  ) \
+    REGISTER_METATYPE(                       AdjustDDCalibrationD12DialysatePumpResponseData  ) \
+    REGISTER_METATYPE(                       AdjustDDCalibrationD48DialysatePumpResponseData  ) \
     REGISTER_METATYPE(                               AdjustDDCalibrationPressureResponseData  ) \
+    REGISTER_METATYPE(                            AdjustDDCalibrationTemperatureResponseData  ) \
     /*                                 HD reset in service mode                              */ \
     REGISTER_METATYPE(                                         AdjustHDResetInSrvcRequestData ) \
 
@@ -785,8 +821,26 @@
     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 ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,      DDCalibrationAccelerometerSensorResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,         DDCalibrationAcidConcentratesResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,       DDCalibrationBicarbConcentratesResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,          DDCalibrationBloodLeakSensorResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,          DDCalibrationConcentratePumpResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,       DDCalibrationConductivitySensorResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,         DDCalibrationD12DialysatePumpResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,         DDCalibrationD48DialysatePumpResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                 DDCalibrationPressureResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,              DDCalibrationTemperatureResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,AdjustDDCalibrationAccelerometerSensorResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,   AdjustDDCalibrationAcidConcentratesResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationBicarbConcentratesResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,    AdjustDDCalibrationBloodLeakSensorResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,    AdjustDDCalibrationConcentratePumpResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationConductivitySensorResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,   AdjustDDCalibrationD12DialysatePumpResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,   AdjustDDCalibrationD48DialysatePumpResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,           AdjustDDCalibrationPressureResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,        AdjustDDCalibrationTemperatureResponseData  ) \
 //  /*   Request    */  ---------------------------------------------------------//
 #define ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(vSOURCE)                                        \
     /*                                     CONFIRM                                           */ \
@@ -1068,8 +1122,26 @@
     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 ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(           DDCalibrationAccelerometerSensorResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(              DDCalibrationAcidConcentratesResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(            DDCalibrationBicarbConcentratesResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(               DDCalibrationBloodLeakSensorResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(               DDCalibrationConcentratePumpResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(            DDCalibrationConductivitySensorResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(              DDCalibrationD12DialysatePumpResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(              DDCalibrationD48DialysatePumpResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                      DDCalibrationPressureResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                   DDCalibrationTemperatureResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(     AdjustDDCalibrationAccelerometerSensorResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(        AdjustDDCalibrationAcidConcentratesResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(      AdjustDDCalibrationBicarbConcentratesResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(         AdjustDDCalibrationBloodLeakSensorResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(         AdjustDDCalibrationConcentratePumpResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(      AdjustDDCalibrationConductivitySensorResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(        AdjustDDCalibrationD12DialysatePumpResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(        AdjustDDCalibrationD48DialysatePumpResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                AdjustDDCalibrationPressureResponseData  ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(             AdjustDDCalibrationTemperatureResponseData  ) \
 
 #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS                                                 \
     /*   Request   --------------------------------------------------------- */                 \
@@ -1534,8 +1606,26 @@
     ACTION_RECEIVE_SIGNAL(                                    InstitutionalRecordResponseData ) \
     ACTION_RECEIVE_SIGNAL(                      AdjustAdvancedInstitutionalRecordResponseData ) \
     ACTION_RECEIVE_SIGNAL(                            AdvancedInstitutionalRecordResponseData ) \
-    ACTION_RECEIVE_SIGNAL(                                  DDCalibrationPressureResponseData ) \
-    ACTION_RECEIVE_SIGNAL(                            AdjustDDCalibrationPressureResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                      DDCalibrationAccelerometerSensorResponseData  ) \
+    ACTION_RECEIVE_SIGNAL(                         DDCalibrationAcidConcentratesResponseData  ) \
+    ACTION_RECEIVE_SIGNAL(                       DDCalibrationBicarbConcentratesResponseData  ) \
+    ACTION_RECEIVE_SIGNAL(                          DDCalibrationBloodLeakSensorResponseData  ) \
+    ACTION_RECEIVE_SIGNAL(                          DDCalibrationConcentratePumpResponseData  ) \
+    ACTION_RECEIVE_SIGNAL(                       DDCalibrationConductivitySensorResponseData  ) \
+    ACTION_RECEIVE_SIGNAL(                         DDCalibrationD12DialysatePumpResponseData  ) \
+    ACTION_RECEIVE_SIGNAL(                         DDCalibrationD48DialysatePumpResponseData  ) \
+    ACTION_RECEIVE_SIGNAL(                                 DDCalibrationPressureResponseData  ) \
+    ACTION_RECEIVE_SIGNAL(                              DDCalibrationTemperatureResponseData  ) \
+    ACTION_RECEIVE_SIGNAL(                AdjustDDCalibrationAccelerometerSensorResponseData  ) \
+    ACTION_RECEIVE_SIGNAL(                   AdjustDDCalibrationAcidConcentratesResponseData  ) \
+    ACTION_RECEIVE_SIGNAL(                 AdjustDDCalibrationBicarbConcentratesResponseData  ) \
+    ACTION_RECEIVE_SIGNAL(                    AdjustDDCalibrationBloodLeakSensorResponseData  ) \
+    ACTION_RECEIVE_SIGNAL(                    AdjustDDCalibrationConcentratePumpResponseData  ) \
+    ACTION_RECEIVE_SIGNAL(                 AdjustDDCalibrationConductivitySensorResponseData  ) \
+    ACTION_RECEIVE_SIGNAL(                   AdjustDDCalibrationD12DialysatePumpResponseData  ) \
+    ACTION_RECEIVE_SIGNAL(                   AdjustDDCalibrationD48DialysatePumpResponseData  ) \
+    ACTION_RECEIVE_SIGNAL(                           AdjustDDCalibrationPressureResponseData  ) \
+    ACTION_RECEIVE_SIGNAL(                        AdjustDDCalibrationTemperatureResponseData  ) \
 
 
 //--------------------------------------------------------------------------------//