Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -rdc8969f6c7bbdb46d2de22622e58e457ceb37df4 -r4b86351821cd865f5d0383190a17b2137f79f9aa
--- sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision dc8969f6c7bbdb46d2de22622e58e457ceb37df4)
+++ sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 4b86351821cd865f5d0383190a17b2137f79f9aa)
@@ -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
@@ -103,15 +103,15 @@
     {Gui::GuiActionType::ID_DGAccelerometerData                     ,   9 * 4       }, //  9 parameters each 4bytes
     //DD Data Messages
     {Gui::GuiActionType::ID_DDValvesStatesData                      ,   4 * 1 + 28  }, //  1 parameter      32bits & 28 parameters each 1 byte
-    {Gui::GuiActionType::ID_DDPressuresData                         ,  14 * 4       }, // 14 parameters each 4bytes
+    {Gui::GuiActionType::ID_DDPressuresData                         ,   6 * 4       }, // 6 parameters each 4bytes
     {Gui::GuiActionType::ID_DDConductivityData                      ,   5 * 4       }, //  5 parameters each 4bytes
     {Gui::GuiActionType::ID_DDConcentratePumpData                   ,  25 * 4       }, // 25 parameters each 4bytes
-    {Gui::GuiActionType::ID_DDTemperaturesData                      ,  15 * 4       }, // 15 parameters each 4bytes
+    {Gui::GuiActionType::ID_DDTemperaturesData                      ,  23 * 4       }, // 23 parameters each 4bytes
     {Gui::GuiActionType::ID_DDDialysatePumpData                     ,  20 * 4       }, // 20 parameters each 4bytes
     {Gui::GuiActionType::ID_DDHeatersData                           ,   8 * 4       }, //  8 parameters each 4bytes // NOTE: may contain optional 9 parameters each 4bytes
-    {Gui::GuiActionType::ID_DDLevelData                             ,   3 * 4       }, //  3 parameters each 4bytes
+    {Gui::GuiActionType::ID_DDLevelData                             ,   5 * 4       }, //  5 parameters each 4bytes
     {Gui::GuiActionType::ID_DDGenDialysateData                      ,   4 * 4       }, //  4 parameters each 4bytes
-    {Gui::GuiActionType::ID_DDBloodLeakData                         ,   1 * 4       }, //  1 parameters each 4bytes
+    {Gui::GuiActionType::ID_DDBloodLeakData                         ,  10 * 4       }, //  10 parameters each 4bytes
     {Gui::GuiActionType::ID_DDOperationModeData                     ,   2 * 4       }, //  2 parameter  each 4bytes
 
     //FP Data Messages
@@ -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