Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -r54dac829fccaf4646e2e21c18226893afd3d8e73 -r4a751578dd768d849e6ee6dfa1521f5f1597090d
--- sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 54dac829fccaf4646e2e21c18226893afd3d8e73)
+++ sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 4a751578dd768d849e6ee6dfa1521f5f1597090d)
@@ -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