Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r9b81b18319ff46f1e48d5637a6a8938d2f7735c9 -rdbe55daa5838b4b8ee07037e78b393c296423cb3
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 9b81b18319ff46f1e48d5637a6a8938d2f7735c9)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision dbe55daa5838b4b8ee07037e78b393c296423cb3)
@@ -233,6 +233,27 @@
     case Gui::GuiActionType::ID_InstitutionalRecordReq                  : INTERPRET_TRSMT_MT_MESSAGE(InstitutionalRequestData                       ); break;
     case Gui::GuiActionType::ID_AdjustAdvancedInstitutionalRecordReq    : INTERPRET_TRANSMIT_MESSAGE(AdjustAdvancedInstitutionalRequestData         ); break;
     case Gui::GuiActionType::ID_AdvancedInstitutionalRecordReq          : INTERPRET_TRSMT_MT_MESSAGE(AdvancedInstitutionalRequestData               ); break;
+    // Calibration
+    case Gui::GuiActionType::ID_DDCalibrationPressureReq                : INTERPRET_TRANSMIT_MESSAGE(DDCalibrationPressureRequestData                   ); break;
+    case Gui::GuiActionType::ID_AdjustDDCalibrationPressureReq          : INTERPRET_TRANSMIT_MESSAGE(AdjustDDCalibrationPressureRequestData             ); break;
+    case Gui::GuiActionType::ID_DDCalibrationTemperatureReq             : INTERPRET_TRANSMIT_MESSAGE(DDCalibrationTemperatureRequestData                ); break;
+    case Gui::GuiActionType::ID_AdjustDDCalibrationTemperatureReq       : INTERPRET_TRANSMIT_MESSAGE(AdjustDDCalibrationTemperatureRequestData          ); break;
+    case Gui::GuiActionType::ID_DDCalibrationConcentratePumpReq         : INTERPRET_TRANSMIT_MESSAGE(DDCalibrationConcentratePumpRequestData            ); break;
+    case Gui::GuiActionType::ID_AdjustDDCalibrationConcentratePumpReq   : INTERPRET_TRANSMIT_MESSAGE(AdjustDDCalibrationConcentratePumpRequestData      ); break;
+    case Gui::GuiActionType::ID_DDCalibrationD12DialysatePumpReq        : INTERPRET_TRSMT_MT_MESSAGE(DDCalibrationD12DialysatePumpRequestData           ); break;
+    case Gui::GuiActionType::ID_AdjustDDCalibrationD12DialysatePumpReq  : INTERPRET_TRANSMIT_MESSAGE(AdjustDDCalibrationD12DialysatePumpRequestData     ); break;
+    case Gui::GuiActionType::ID_DDCalibrationD48DialysatePumpReq        : INTERPRET_TRSMT_MT_MESSAGE(DDCalibrationD48DialysatePumpRequestData           ); break;
+    case Gui::GuiActionType::ID_AdjustDDCalibrationD48DialysatePumpReq  : INTERPRET_TRANSMIT_MESSAGE(AdjustDDCalibrationD48DialysatePumpRequestData     ); break;
+    case Gui::GuiActionType::ID_DDCalibrationAcidConcentratesReq        : INTERPRET_TRANSMIT_MESSAGE(DDCalibrationAcidConcentratesRequestData           ); break;
+    case Gui::GuiActionType::ID_AdjustDDCalibrationAcidConcentratesReq  : INTERPRET_TRANSMIT_MESSAGE(AdjustDDCalibrationAcidConcentratesRequestData     ); break;
+    case Gui::GuiActionType::ID_DDCalibrationBicarbConcentratesReq      : INTERPRET_TRANSMIT_MESSAGE(DDCalibrationBicarbConcentratesRequestData         ); break;
+    case Gui::GuiActionType::ID_AdjustDDCalibrationBicarbConcentratesReq: INTERPRET_TRANSMIT_MESSAGE(AdjustDDCalibrationBicarbConcentratesRequestData   ); break;
+    case Gui::GuiActionType::ID_DDCalibrationAccelerometerSensorReq     : INTERPRET_TRSMT_MT_MESSAGE(DDCalibrationAccelerometerSensorRequestData        ); break;
+    case Gui::GuiActionType::ID_AdjustDDCalibrationAccelerometerSensorReq: INTERPRET_TRANSMIT_MESSAGE(AdjustDDCalibrationAccelerometerSensorRequestData ); break;
+    case Gui::GuiActionType::ID_DDCalibrationBloodLeakSensorReq         : INTERPRET_TRSMT_MT_MESSAGE(DDCalibrationBloodLeakSensorRequestData            ); break;
+    case Gui::GuiActionType::ID_AdjustDDCalibrationBloodLeakSensorReq   : INTERPRET_TRANSMIT_MESSAGE(AdjustDDCalibrationBloodLeakSensorRequestData      ); break;
+    case Gui::GuiActionType::ID_DDCalibrationConductivitySensorReq      : INTERPRET_TRANSMIT_MESSAGE(DDCalibrationConductivityRequestData               ); break;
+    case Gui::GuiActionType::ID_AdjustDDCalibrationConductivitySensorReq: INTERPRET_TRANSMIT_MESSAGE(AdjustDDCalibrationConductivityRequestData         ); break;
     // Pre-Treatment
     case Gui::GuiActionType::ID_AdjustInitTreatmentReq                  : INTERPRET_TRANSMIT_MESSAGE(AdjustInitTreatmentRequestData                 ); break;
     case Gui::GuiActionType::ID_AdjustParametersValidationReq           : INTERPRET_TRANSMIT_MESSAGE(AdjustParametersValidationRequestData          ); break;
@@ -489,8 +510,7 @@
     case Gui::GuiActionType::ID_AdjustAdvancedInstitutionalRecordRsp: ok = notify<Model::MAdjustAdvancedInstitutionalRecordResponse >(vMessage, vData, Gui::GuiActionType::ID_AdjustAdvancedInstitutionalRecordRsp); break;
     case Gui::GuiActionType::ID_AdvancedInstitutionalRecordRsp      : ok = notify<Model::MAdvancedInstitutionalRecordResponse       >(vMessage, vData, Gui::GuiActionType::ID_AdvancedInstitutionalRecordRsp    ); break;
 
-
-        // ----- States
+    // ----- States
     case Gui::GuiActionType::ID_TDOpModeData                        : ok = notify<Model::MTDOpMode                                  >(vMessage, vData, Gui::GuiActionType::ID_TDOpModeData                      ); break;
     case Gui::GuiActionType::ID_PreTreatmentStates                  : ok = notify<Model::MPreTreatmentStates                        >(vMessage, vData, Gui::GuiActionType::ID_PreTreatmentStates                ); break;
     case Gui::GuiActionType::ID_TreatmentStates                     : ok = notify<Model::MTreatmentStates                           >(vMessage, vData, Gui::GuiActionType::ID_TreatmentStates                   ); break;
@@ -658,24 +678,45 @@
         ///
     // DD data messages
 
-    case Gui::GuiActionType::ID_DDGenDialysateData          : ok = notify<Model::MDDGenDialysateData            >(vMessage, vData, Gui::GuiActionType::ID_DDGenDialysateData            ); break;
-    case Gui::GuiActionType::ID_DDConductivityData          : ok = notify<Model::MDDConductivityData            >(vMessage, vData, Gui::GuiActionType::ID_DDConductivityData            ); break;
-    case Gui::GuiActionType::ID_DDConcentratePumpData       : ok = notify<Model::MDDConcentratePump             >(vMessage, vData, Gui::GuiActionType::ID_DDConcentratePumpData         ); break;
-    case Gui::GuiActionType::ID_DDDialysatePumpData         : ok = notify<Model::MDDDialysatePump               >(vMessage, vData, Gui::GuiActionType::ID_DDDialysatePumpData           ); break;
-    case Gui::GuiActionType::ID_DDHeatersData               : ok = notify<Model::MDDHeaters                     >(vMessage, vData, Gui::GuiActionType::ID_DDHeatersData                 ); break;
-    case Gui::GuiActionType::ID_DDTemperaturesData          : ok = notify<Model::MDDTemperatures                >(vMessage, vData, Gui::GuiActionType::ID_DDTemperaturesData            ); break;
-    case Gui::GuiActionType::ID_DDPressuresData             : ok = notify<Model::MDDPressures                   >(vMessage, vData, Gui::GuiActionType::ID_DDPressuresData               ); break;
-    case Gui::GuiActionType::ID_DDLevelData                 : ok = notify<Model::MDDLevelData                   >(vMessage, vData, Gui::GuiActionType::ID_DDLevelData                   ); break;
-    case Gui::GuiActionType::ID_DDBloodLeakData             : ok = notify<Model::MDDBloodLeakData               >(vMessage, vData, Gui::GuiActionType::ID_DDBloodLeakData               ); break;
-    case Gui::GuiActionType::ID_DDValvesStatesData          : ok = notify<Model::MDDValvesStates                >(vMessage, vData, Gui::GuiActionType::ID_DDValvesStatesData            ); break;
+    case Gui::GuiActionType::ID_DDGenDialysateData                  : ok = notify<Model::MDDGenDialysateData                        >(vMessage, vData, Gui::GuiActionType::ID_DDGenDialysateData            ); break;
+    case Gui::GuiActionType::ID_DDConductivityData                  : ok = notify<Model::MDDConductivityData                        >(vMessage, vData, Gui::GuiActionType::ID_DDConductivityData            ); break;
+    case Gui::GuiActionType::ID_DDConcentratePumpData               : ok = notify<Model::MDDConcentratePump                         >(vMessage, vData, Gui::GuiActionType::ID_DDConcentratePumpData         ); break;
+    case Gui::GuiActionType::ID_DDDialysatePumpData                 : ok = notify<Model::MDDDialysatePump                           >(vMessage, vData, Gui::GuiActionType::ID_DDDialysatePumpData           ); break;
+    case Gui::GuiActionType::ID_DDHeatersData                       : ok = notify<Model::MDDHeaters                                 >(vMessage, vData, Gui::GuiActionType::ID_DDHeatersData                 ); break;
+    case Gui::GuiActionType::ID_DDTemperaturesData                  : ok = notify<Model::MDDTemperatures                            >(vMessage, vData, Gui::GuiActionType::ID_DDTemperaturesData            ); break;
+    case Gui::GuiActionType::ID_DDPressuresData                     : ok = notify<Model::MDDPressures                               >(vMessage, vData, Gui::GuiActionType::ID_DDPressuresData               ); break;
+    case Gui::GuiActionType::ID_DDLevelData                         : ok = notify<Model::MDDLevelData                               >(vMessage, vData, Gui::GuiActionType::ID_DDLevelData                   ); break;
+    case Gui::GuiActionType::ID_DDBloodLeakData                     : ok = notify<Model::MDDBloodLeakData                           >(vMessage, vData, Gui::GuiActionType::ID_DDBloodLeakData               ); break;
+    case Gui::GuiActionType::ID_DDValvesStatesData                  : ok = notify<Model::MDDValvesStates                            >(vMessage, vData, Gui::GuiActionType::ID_DDValvesStatesData            ); break;
 
-    case Gui::GuiActionType::ID_AdjustDDDateTimeRsp         : ok = notify<Model::MAdjustDDDateTimeResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustDDDateTimeRsp           ); break;
+    case Gui::GuiActionType::ID_AdjustDDDateTimeRsp                 : ok = notify<Model::MAdjustDDDateTimeResponse                  >(vMessage, vData, Gui::GuiActionType::ID_AdjustDDDateTimeRsp           ); break;
+    case Gui::GuiActionType::ID_DDOperationModeData                 : ok = notify<Model::MDDOperationMode                           >(vMessage, vData, Gui::GuiActionType::ID_DDOperationModeData           ); break;
+    case Gui::GuiActionType::ID_AdjustVersionsDDRsp                 : ok = notify<Model::MAdjustVersionsDDResponse                  >(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsDDRsp           ); break;
+    case Gui::GuiActionType::ID_AdjustSerialDDRsp                   : ok = notify<Model::MAdjustSerialNumberDDResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialDDRsp             ); break;
     case Gui::GuiActionType::ID_RoWaterModeRsp              : ok = notify<Model::MRoWaterModeResponse           >(vMessage, vData, Gui::GuiActionType::ID_RoWaterModeRsp                ); break;
     case Gui::GuiActionType::ID_AdjustRoWaterModeRsp        : ok = notify<Model::MAdjustRoWaterModeResponse     >(vMessage, vData, Gui::GuiActionType::ID_AdjustRoWaterModeRsp          ); break;
 
-    case Gui::GuiActionType::ID_DDOperationModeData         : ok = notify<Model::MDDOperationMode               >(vMessage, vData, Gui::GuiActionType::ID_DDOperationModeData           ); break;
-    case Gui::GuiActionType::ID_AdjustVersionsDDRsp         : ok = notify<Model::MAdjustVersionsDDResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsDDRsp           ); break;
-    case Gui::GuiActionType::ID_AdjustSerialDDRsp           : ok = notify<Model::MAdjustSerialNumberDDResponse  >(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialDDRsp             ); break;
+    // ----- Calibration
+    case Gui::GuiActionType::ID_DDCalibrationPressureRsp                    : ok = notify<Model::MDDCalibrationPressureRecordResponse                   >(vMessage, vData, Gui::GuiActionType::ID_DDCalibrationPressureRsp                  ); break;
+    case Gui::GuiActionType::ID_AdjustDDCalibrationPressureRsp              : ok = notify<Model::MAdjustDDCalibrationPressureRecordResponse             >(vMessage, vData, Gui::GuiActionType::ID_AdjustDDCalibrationPressureRsp            ); break;
+    case Gui::GuiActionType::ID_DDCalibrationTemperatureRsp                 : ok = notify<Model::MDDCalibrationTemperatureRecordResponse                >(vMessage, vData, Gui::GuiActionType::ID_DDCalibrationTemperatureRsp               ); break;
+    case Gui::GuiActionType::ID_AdjustDDCalibrationTemperatureRsp           : ok = notify<Model::MAdjustDDCalibrationTemperatureRecordResponse          >(vMessage, vData, Gui::GuiActionType::ID_AdjustDDCalibrationTemperatureRsp         ); break;
+    case Gui::GuiActionType::ID_DDCalibrationConcentratePumpRsp             : ok = notify<Model::MDDCalibrationConcentratePumpRecordResponse            >(vMessage, vData, Gui::GuiActionType::ID_DDCalibrationConcentratePumpRsp           ); break;
+    case Gui::GuiActionType::ID_AdjustDDCalibrationConcentratePumpRsp       : ok = notify<Model::MAdjustDDCalibrationConcentratePumpRecordResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustDDCalibrationConcentratePumpRsp     ); break;
+    case Gui::GuiActionType::ID_DDCalibrationD12DialysatePumpRsp            : ok = notify<Model::MDDCalibrationD12DialysatePumpRecordResponse           >(vMessage, vData, Gui::GuiActionType::ID_DDCalibrationD12DialysatePumpRsp          ); break;
+    case Gui::GuiActionType::ID_AdjustDDCalibrationD12DialysatePumpRsp      : ok = notify<Model::MAdjustDDCalibrationD12DialysatePumpRecordResponse     >(vMessage, vData, Gui::GuiActionType::ID_AdjustDDCalibrationD12DialysatePumpRsp    ); break;
+    case Gui::GuiActionType::ID_DDCalibrationD48DialysatePumpRsp            : ok = notify<Model::MDDCalibrationD48DialysatePumpRecordResponse           >(vMessage, vData, Gui::GuiActionType::ID_DDCalibrationD48DialysatePumpRsp          ); break;
+    case Gui::GuiActionType::ID_AdjustDDCalibrationD48DialysatePumpRsp      : ok = notify<Model::MAdjustDDCalibrationD48DialysatePumpRecordResponse     >(vMessage, vData, Gui::GuiActionType::ID_AdjustDDCalibrationD48DialysatePumpRsp    ); break;
+    case Gui::GuiActionType::ID_DDCalibrationAcidConcentratesRsp            : ok = notify<Model::MDDCalibrationAcidConcentratesRecordResponse           >(vMessage, vData, Gui::GuiActionType::ID_DDCalibrationAcidConcentratesRsp          ); break;
+    case Gui::GuiActionType::ID_AdjustDDCalibrationAcidConcentratesRsp      : ok = notify<Model::MAdjustDDCalibrationAcidConcentratesRecordResponse     >(vMessage, vData, Gui::GuiActionType::ID_AdjustDDCalibrationAcidConcentratesRsp    ); break;
+    case Gui::GuiActionType::ID_DDCalibrationBicarbConcentratesRsp          : ok = notify<Model::MDDCalibrationBicarbConcentratesRecordResponse         >(vMessage, vData, Gui::GuiActionType::ID_DDCalibrationBicarbConcentratesRsp        ); break;
+    case Gui::GuiActionType::ID_AdjustDDCalibrationBicarbConcentratesRsp    : ok = notify<Model::MAdjustDDCalibrationBicarbConcentratesRecordResponse   >(vMessage, vData, Gui::GuiActionType::ID_AdjustDDCalibrationBicarbConcentratesRsp  ); break;
+    case Gui::GuiActionType::ID_DDCalibrationAccelerometerSensorRsp         : ok = notify<Model::MDDCalibrationAccelerometerSensorRecordResponse        >(vMessage, vData, Gui::GuiActionType::ID_DDCalibrationAccelerometerSensorRsp       ); break;
+    case Gui::GuiActionType::ID_AdjustDDCalibrationAccelerometerSensorRsp   : ok = notify<Model::MAdjustDDCalibrationAccelerometerSensorRecordResponse  >(vMessage, vData, Gui::GuiActionType::ID_AdjustDDCalibrationAccelerometerSensorRsp ); break;
+    case Gui::GuiActionType::ID_DDCalibrationBloodLeakSensorRsp             : ok = notify<Model::MDDCalibrationBloodLeakSensorRecordResponse            >(vMessage, vData, Gui::GuiActionType::ID_DDCalibrationBloodLeakSensorRsp           ); break;
+    case Gui::GuiActionType::ID_AdjustDDCalibrationBloodLeakSensorRsp       : ok = notify<Model::MAdjustDDCalibrationBloodLeakSensorRecordResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustDDCalibrationBloodLeakSensorRsp     ); break;
+    case Gui::GuiActionType::ID_DDCalibrationConductivitySensorRsp          : ok = notify<Model::MDDCalibrationConductivitySensorRecordResponse         >(vMessage, vData, Gui::GuiActionType::ID_DDCalibrationConductivitySensorRsp        ); break;
+    case Gui::GuiActionType::ID_AdjustDDCalibrationConductivitySensorRsp    : ok = notify<Model::MAdjustDDCalibrationConductivitySensorRecordResponse   >(vMessage, vData, Gui::GuiActionType::ID_AdjustDDCalibrationConductivitySensorRsp  ); break;
 
     default: break; //FIXME later enabled
     }