Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -rc70815ad2b3beadf61832f2e4d12eb90d476e020 -r64d551143d898bf2ce79cb564e5a3389eb9be91e
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision c70815ad2b3beadf61832f2e4d12eb90d476e020)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 64d551143d898bf2ce79cb564e5a3389eb9be91e)
@@ -631,11 +631,7 @@
     case Gui::GuiActionType::ID_DGDrainPumpData             : ok = notify<Model::MDGDrainPump                   >(vMessage, vData, Gui::GuiActionType::ID_DGDrainPumpData               ); break;
     case Gui::GuiActionType::ID_DGReservoirData             : ok = notify<Model::MDGReservoir                   >(vMessage, vData, Gui::GuiActionType::ID_DGReservoirData               ); break;
     case Gui::GuiActionType::ID_DDValvesStatesData          : ok = notify<Model::MDDValvesStates                >(vMessage, vData, Gui::GuiActionType::ID_DDValvesStatesData            ); break;
-    case Gui::GuiActionType::ID_DDHeatersData               : ok = notify<Model::MDDHeaters                     >(vMessage, vData, Gui::GuiActionType::ID_DDHeatersData                 ); break;
     case Gui::GuiActionType::ID_DGLoadCellReadingsData      : ok = notify<Model::MDGLoadCellReadings            >(vMessage, vData, Gui::GuiActionType::ID_DGLoadCellReadingsData        ); break;
-    case Gui::GuiActionType::ID_DDConcentratePumpData       : ok = notify<Model::MDDConcentratePump             >(vMessage, vData, Gui::GuiActionType::ID_DDConcentratePumpData         ); break;
-    case Gui::GuiActionType::ID_DDTemperaturesData          : ok = notify<Model::MDDTemperatures                >(vMessage, vData, Gui::GuiActionType::ID_DDTemperaturesData            ); break;
-    case Gui::GuiActionType::ID_DDDialysatePumpData         : ok = notify<Model::MDDDialysatePump               >(vMessage, vData, Gui::GuiActionType::ID_DDDialysatePumpData           ); break;
     case Gui::GuiActionType::ID_DDDebugText                 : ok = notify<Model::MDGDebugText                   >(vMessage, vData, Gui::GuiActionType::ID_DDDebugText                   ); break;
     case Gui::GuiActionType::ID_DGGeneralEvent              : ok = notify<Model::MDGGeneralEvent                >(vMessage, vData, Gui::GuiActionType::ID_DGGeneralEvent                ); break;
     case Gui::GuiActionType::ID_DGAccelerometerData         : ok = notify<Model::MDGAccelerometer               >(vMessage, vData, Gui::GuiActionType::ID_DGAccelerometerData           ); break;
@@ -656,11 +652,17 @@
         ///////////////////////////////////////
         //// FIXME: RO LOOP TEST
         ///////////////////////////////////////
+        ///
+    // DD data messages
 
-
     case Gui::GuiActionType::ID_DDGenDialysateData          : ok = notify<Model::MDDGenDialysateData            >(vMessage, vData, Gui::GuiActionType::ID_DDGenDialysateData            ); break;
     case Gui::GuiActionType::ID_DDConductivityData          : ok = notify<Model::MDDConductivityData            >(vMessage, vData, Gui::GuiActionType::ID_DDConductivityData            ); break;
+    case Gui::GuiActionType::ID_DDConcentratePumpData       : ok = notify<Model::MDDConcentratePump             >(vMessage, vData, Gui::GuiActionType::ID_DDConcentratePumpData         ); break;
+    case Gui::GuiActionType::ID_DDDialysatePumpData         : ok = notify<Model::MDDDialysatePump               >(vMessage, vData, Gui::GuiActionType::ID_DDDialysatePumpData           ); break;
+    case Gui::GuiActionType::ID_DDHeatersData               : ok = notify<Model::MDDHeaters                     >(vMessage, vData, Gui::GuiActionType::ID_DDHeatersData                 ); break;
+    case Gui::GuiActionType::ID_DDTemperaturesData          : ok = notify<Model::MDDTemperatures                >(vMessage, vData, Gui::GuiActionType::ID_DDTemperaturesData            ); break;
 
+
     case Gui::GuiActionType::ID_AdjustDDDateTimeRsp         : ok = notify<Model::MAdjustDDDateTimeResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustDDDateTimeRsp           ); break;
     case Gui::GuiActionType::ID_DDOperationModeData         : ok = notify<Model::MDDOperationMode               >(vMessage, vData, Gui::GuiActionType::ID_DDOperationModeData           ); break;
     case Gui::GuiActionType::ID_AdjustVersionsDDRsp         : ok = notify<Model::MAdjustVersionsDDResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsDDRsp           ); break;