Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -r4ae0f0abdbe4edfcd93dbf5b0240417f1f079586 -rda02fd8302d1b82f17bda0f1fe96d0aa1926ee61
--- sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 4ae0f0abdbe4edfcd93dbf5b0240417f1f079586)
+++ sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision da02fd8302d1b82f17bda0f1fe96d0aa1926ee61)
@@ -49,12 +49,12 @@
     // but if the model still needs more the model will fail.
     // so it is better to keep them next to each other to make sure they are in sync.
     // ----
-    {Gui::GuiActionType::ID_PowerOff                                ,   1           }, // 1 byte
+    {Gui::GuiActionType::ID_PowerOff                                ,   1       }, // 1 parameters each 4bytes
     {Gui::GuiActionType::ID_ShuttingDown                            ,   0           },
     {Gui::GuiActionType::ID_TDCheckIn                               ,   0           }, //// ----- @LEAHIZED
 
     // Generic Confirm
-    {Gui::GuiActionType::ID_DuetConfirmHDi                          ,   3 * 4       }, // 3 parameters each 4bytes
+    {Gui::GuiActionType::ID_DuetConfirmTDi                          ,   3 * 4       }, // 3 parameters each 4bytes
     {Gui::GuiActionType::ID_DuetConfirmUIr                          ,   2 * 4       }, // 2 parameters each 4bytes
 
     // POST
@@ -86,8 +86,8 @@
     {Gui::GuiActionType::ID_BloodPrime                              ,   4 * 4       }, // 4 parameters each 4bytes
     {Gui::GuiActionType::ID_TreatmentStop                           ,   2 * 4       }, // 2 parameters each 4bytes
     {Gui::GuiActionType::ID_TDAirBubbleData                         ,   2 * 4       }, // 2 parameters each 4bytes
-    {Gui::GuiActionType::ID_TDAirPumpData                           ,   2 * 4       }, // 2 parameters each 4bytes
-    {Gui::GuiActionType::ID_TDAirTrapData                           ,   6 * 4       }, // 6 parameters each 4bytes
+    {Gui::GuiActionType::ID_TDAirPumpData                           ,   5 * 4       }, // 5 parameters each 4bytes
+    {Gui::GuiActionType::ID_TDAirTrapData                           ,  10 * 4       }, // 10 parameters each 4bytes
     {Gui::GuiActionType::ID_HDBloodLeakData                         ,   4 * 4       }, // 4 parameters each 4bytes
     // ----
     {Gui::GuiActionType::ID_TDOpModeData                            ,   2 * 4       }, // 2 parameter  each 4bytes
@@ -129,11 +129,11 @@
     {Gui::GuiActionType::ID_HDUsageInfoReq                          ,   0 * 4       }, // 0 parameters each 4bytes
     {Gui::GuiActionType::ID_HDUsageInfoRsp                          ,   4 * 4 + 2   }, // 4 parameters each 4bytes + 1 parameter 2 bytes
     //TD Data Messages
-    {Gui::GuiActionType::ID_TDVoltageData                           ,  11 * 4       }, //11 parameters each 4bytes
-    {Gui::GuiActionType::ID_TDValvesData                            ,   3 * 4 + 2*2 }, // 5 parameters each 4bytes + 2 parametres 2 bytes
-    {Gui::GuiActionType::ID_TDEjectorData                           ,   2 * 4       }, // 2 parameters each 4bytes
+    {Gui::GuiActionType::ID_TDVoltageData                           ,   8 * 4       }, // 8 parameters each 4bytes
+    {Gui::GuiActionType::ID_TDValvesData                            ,   3 * 4 + 7*2 }, // 5 parameters each 4bytes + 2 parametres 2 bytes
+    {Gui::GuiActionType::ID_TDEjectorData                           ,   4 * 4       }, // 4 parameters each 4bytes
     {Gui::GuiActionType::ID_TDSwitchesData                          ,   1 * 4       }, // 3 parameters each 4bytes
-    {Gui::GuiActionType::ID_TDBatteryData                           ,   2 * 4       }, // 2 parameters each 4bytes //// TODO: The payload is TBD (as indicated by the provided screen items)
+    {Gui::GuiActionType::ID_TDBatteryData                           ,   2 * 4       }, // 2 parameters each 4bytes
     {Gui::GuiActionType::ID_TDTemperatureData                       ,   1 * 4       }, // 1 parameters each 4bytes //// TODO: The payload is TBD (as indicated by the provided screen items)
     {Gui::GuiActionType::ID_TreatmentParametersSetPointData         ,   3 * 4       }, // 3 parameters each 4bytes
 
Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -rbf426741cb8398e3a8c7bbee5f57cb2f5de9a61f -rda02fd8302d1b82f17bda0f1fe96d0aa1926ee61
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision bf426741cb8398e3a8c7bbee5f57cb2f5de9a61f)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision da02fd8302d1b82f17bda0f1fe96d0aa1926ee61)
@@ -465,7 +465,7 @@
     case Gui::GuiActionType::ID_PowerOff                            : ok = notify<Model::MPowerOff                                  >(vMessage, vData, Gui::GuiActionType::ID_PowerOff                          ); break;
     case Gui::GuiActionType::ID_ShuttingDown                        : ok = true; LOG_APPED("HD,ShuttingDown");                                              /* TODO : implement notify<>() */                      break;
 
-    case Gui::GuiActionType::ID_DuetConfirmHDi                      : ok = notify<Model::MDuetConfirmHDi                            >(vMessage, vData, Gui::GuiActionType::ID_DuetConfirmHDi                    ); break;
+    case Gui::GuiActionType::ID_DuetConfirmTDi                      : ok = notify<Model::MDuetConfirmTDi                            >(vMessage, vData, Gui::GuiActionType::ID_DuetConfirmTDi                    ); break;
 
     // ----- POST
     case Gui::GuiActionType::ID_HDPostSingleResultData              : ok = notify<Model::MHDPostSingleResult                        >(vMessage, vData, Gui::GuiActionType::ID_HDPostSingleResultData            ); break;
@@ -526,7 +526,6 @@
     case Gui::GuiActionType::ID_AdjustPatientConnectionConfirmRsp   : ok = notify<Model::MAdjustPatientConnectionConfirmResponse    >(vMessage, vData, Gui::GuiActionType::ID_AdjustPatientConnectionConfirmRsp ); break;
     case Gui::GuiActionType::ID_AdjustStartTreatmentRsp             : ok = notify<Model::MAdjustStartTreatmentResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustStartTreatmentRsp           ); break;
     case Gui::GuiActionType::ID_AdjustWaterSampleData               : ok = notify<Model::MWaterSample                               >(vMessage, vData, Gui::GuiActionType::ID_AdjustWaterSampleData             ); break;
-//    case Gui::GuiActionType::ID_AdjustWaterSampleTimeout            : ok = notify<Model::MAdjustWaterSampleResponse                 >(vMessage, vData, Gui::GuiActionType::ID_AdjustWaterSampleTimeout          ); break;
 
     // ----- In-Treatment - Datum
     case Gui::GuiActionType::ID_TreatmentTime                       : ok = notify<Model::MTreatmentTime                             >(vMessage, vData, Gui::GuiActionType::ID_TreatmentTime                     ); break;