Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -re7a8d5092cb499d6c6ed621eabde437bccbc1e0e -r8350b02fa06da7cb6d7f085f88f55bf505ae78df
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision e7a8d5092cb499d6c6ed621eabde437bccbc1e0e)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 8350b02fa06da7cb6d7f085f88f55bf505ae78df)
@@ -232,6 +232,8 @@
     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;
+    case Gui::GuiActionType::ID_DDCalibrationPressureReq                : INTERPRET_TRANSMIT_MESSAGE(DDCalibrationPressureRequestData               ); break;
+    case Gui::GuiActionType::ID_AdjustDDCalibrationPressureReq          : INTERPRET_TRANSMIT_MESSAGE(AdjustDDCalibrationPressureRequestData         ); break;
     // Pre-Treatment
     case Gui::GuiActionType::ID_AdjustInitTreatmentReq                  : INTERPRET_TRANSMIT_MESSAGE(AdjustInitTreatmentRequestData                 ); break;
     case Gui::GuiActionType::ID_AdjustParametersValidationReq           : INTERPRET_TRANSMIT_MESSAGE(AdjustParametersValidationRequestData          ); break;
@@ -482,8 +484,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;
@@ -647,22 +648,26 @@
         ///
     // 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_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_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;
 
+    // ----- 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;
+
     default: break; //FIXME later enabled
     }