Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r8350b02fa06da7cb6d7f085f88f55bf505ae78df -r57fdcc6fcd4d91311544c2085cee41108293b6f6
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 8350b02fa06da7cb6d7f085f88f55bf505ae78df)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 57fdcc6fcd4d91311544c2085cee41108293b6f6)
@@ -232,8 +232,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;
-    case Gui::GuiActionType::ID_DDCalibrationPressureReq                : INTERPRET_TRANSMIT_MESSAGE(DDCalibrationPressureRequestData               ); break;
-    case Gui::GuiActionType::ID_AdjustDDCalibrationPressureReq          : INTERPRET_TRANSMIT_MESSAGE(AdjustDDCalibrationPressureRequestData         ); 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;