Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r5f69bb944ed9b2186528f726def2630544bd0de6
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision a58f91b077c8131bea3dbde0fc338adb113fc9f3)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 5f69bb944ed9b2186528f726def2630544bd0de6)
@@ -461,9 +461,9 @@
 
     // ----- Settings
     case Gui::GuiActionType::ID_AdjustServiceModeRsp                : ok = notify<Model::MAdjustServiceModeResponse                 >(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceModeRsp              ); break;
-    case Gui::GuiActionType::ID_AdjustVersionsHDReq                 : ok = notify<Model::MAdjustVersionsHDRequest                   >(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsHDReq               ); break;
-    case Gui::GuiActionType::ID_AdjustVersionsHDRsp                 : ok = notify<Model::MAdjustVersionsHDResponse                  >(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsHDRsp               ); break;
-    case Gui::GuiActionType::ID_AdjustSerialHDRsp                   : ok = notify<Model::MAdjustSerialNumberHDResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialHDRsp                 ); break;
+    case Gui::GuiActionType::ID_AdjustVersionsTDReq                 : ok = notify<Model::MAdjustVersionsTDRequest                   >(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsTDReq               ); break;
+    case Gui::GuiActionType::ID_AdjustVersionsTDRsp                 : ok = notify<Model::MAdjustVersionsTDResponse                  >(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsTDRsp               ); break;
+    case Gui::GuiActionType::ID_AdjustSerialTDRsp                   : ok = notify<Model::MAdjustSerialNumberTDResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialTDRsp                 ); break;
     case Gui::GuiActionType::ID_AdjustServiceDatesHDRsp             : ok = notify<Model::MAdjustServiceDatesHDResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceDatesHDRsp           ); break;
     case Gui::GuiActionType::ID_AdjustHDDateTimeRsp                 : ok = notify<Model::MAdjustHDDateTimeResponse                  >(vMessage, vData, Gui::GuiActionType::ID_AdjustHDDateTimeRsp               ); break;
     case Gui::GuiActionType::ID_HDUsageInfoRsp                      : ok = notify<Model::MHDUsageInfoResponse                       >(vMessage, vData, Gui::GuiActionType::ID_HDUsageInfoRsp                    ); break;
@@ -478,7 +478,14 @@
     case Gui::GuiActionType::ID_HDAccelerometerData                 : ok = notify<Model::MHDAccelerometer                           >(vMessage, vData, Gui::GuiActionType::ID_HDAccelerometerData               ); break;
     case Gui::GuiActionType::ID_HDSyringePumpData                   : ok = notify<Model::MHDSyringePump                             >(vMessage, vData, Gui::GuiActionType::ID_HDSyringePumpData                 ); break;
     case Gui::GuiActionType::ID_HDAirBubbleData                     : ok = notify<Model::MHDAirBubbleData                           >(vMessage, vData, Gui::GuiActionType::ID_HDAirBubbleData                   ); break;
-    case Gui::GuiActionType::ID_HDAirTrapData                       : ok = notify<Model::MHDAirTrapData                             >(vMessage, vData, Gui::GuiActionType::ID_HDAirTrapData                     ); break;
+    case Gui::GuiActionType::ID_TDVoltageData                       : ok = notify<Model::MTDVoltageData                             >(vMessage, vData, Gui::GuiActionType::ID_TDVoltageData                     ); break;
+    case Gui::GuiActionType::ID_TDAirTrapData                       : ok = notify<Model::MTDAirTrapData                             >(vMessage, vData, Gui::GuiActionType::ID_TDAirTrapData                     ); break;
+    case Gui::GuiActionType::ID_TDBloodPumpData                     : ok = notify<Model::MTDBloodPumpData                           >(vMessage, vData, Gui::GuiActionType::ID_TDBloodPumpData                   ); break;
+    case Gui::GuiActionType::ID_TDValvesData                        : ok = notify<Model::MTDValvesData                              >(vMessage, vData, Gui::GuiActionType::ID_TDValvesData                      ); break;
+    case Gui::GuiActionType::ID_TDBatteryData                       : ok = notify<Model::MTDBatteryData                             >(vMessage, vData, Gui::GuiActionType::ID_TDBatteryData                     ); break;
+    case Gui::GuiActionType::ID_TDSwitchesData                      : ok = notify<Model::MTDSwitchesData                            >(vMessage, vData, Gui::GuiActionType::ID_TDSwitchesData                    ); break;
+    case Gui::GuiActionType::ID_TDEjectorData                       : ok = notify<Model::MTDEjectorData                             >(vMessage, vData, Gui::GuiActionType::ID_TDEjectorData                     ); break;
+    case Gui::GuiActionType::ID_TDTemperatureData                   : ok = notify<Model::MTDTemperatureData                         >(vMessage, vData, Gui::GuiActionType::ID_TDTemperatureData                 ); break;
     case Gui::GuiActionType::ID_HDBloodLeakData                     : ok = notify<Model::MHDBloodLeakData                           >(vMessage, vData, Gui::GuiActionType::ID_HDBloodLeakData                   ); break;
 
     // ----- Datum - Treatment
@@ -594,8 +601,8 @@
     // ----- Datum - Pre-Treatment progress
     case Gui::GuiActionType::ID_DGFilterFlushData           : ok = notify<Model::MDGFilterFlush                 >(vMessage, vData, Gui::GuiActionType::ID_DGFilterFlushData             ); break;
     // DG Response Messages
-    case Gui::GuiActionType::ID_AdjustVersionsDGRsp         : ok = notify<Model::MAdjustVersionsDGResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsDGRsp           ); break;
-    case Gui::GuiActionType::ID_AdjustSerialDGRsp           : ok = notify<Model::MAdjustSerialNumberDGResponse  >(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialDGRsp             ); 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_AdjustServiceDatesDGRsp     : ok = notify<Model::MAdjustServiceDatesDGResponse  >(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceDatesDGRsp       ); break;
     case Gui::GuiActionType::ID_AdjustDGDateTimeRsp         : ok = notify<Model::MAdjustDGDateTimeResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustDGDateTimeRsp           ); break;
     case Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp    : ok = notify<Model::MAdjustDGCleaningUsageResponse >(vMessage, vData, Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp      ); break;