Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r0b8e00869ef81ef0a834c03c13049f4c281870d2 -r0a4abcc41defc031ae20dd79f9550619bc6c9806
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 0b8e00869ef81ef0a834c03c13049f4c281870d2)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 0a4abcc41defc031ae20dd79f9550619bc6c9806)
@@ -320,26 +320,28 @@
     switch (vMessage.actionId) { // notice we are in receive mode
     // ----- Debug
     case Gui::GuiActionType::ID_CANBusFaultCount                : ok = canbusFaultCountData         (vMessage, vData); break; // TODO : implement notify<>()
+    case Gui::GuiActionType::ID_HDDebugText                     : ok = notify<Model::MHDDebugText                           >(vMessage, vData, Gui::GuiActionType::ID_HDDebugText                   ); break;
 
+    case Gui::GuiActionType::ID_HDOperationModeData             : ok = notify<Model::MHDOperationMode                       >(vMessage, vData, Gui::GuiActionType::ID_HDOperationModeData           ); break;
+    case Gui::GuiActionType::ID_PreTreatmentStates              : ok = notify<Model::MPreTreatmentStates                    >(vMessage, vData, Gui::GuiActionType::ID_PreTreatmentStates            ); break;
+    case Gui::GuiActionType::ID_TreatmentStates                 : ok = notify<Model::MTreatmentStates                       >(vMessage, vData, Gui::GuiActionType::ID_TreatmentStates               ); break;
+
     // ----- Datum
     case Gui::GuiActionType::ID_TreatmentTime                   : ok = notify<Model::MTreatmentTime                         >(vMessage, vData, Gui::GuiActionType::ID_TreatmentTime                 ); break;
     case Gui::GuiActionType::ID_BloodFlow                       : ok = notify<Model::MBloodFlow                             >(vMessage, vData, Gui::GuiActionType::ID_BloodFlow                     ); break;
     case Gui::GuiActionType::ID_DialysateInletFlow              : ok = notify<Model::MDialysateFlow                         >(vMessage, vData, Gui::GuiActionType::ID_DialysateInletFlow            ); break;
     case Gui::GuiActionType::ID_DialysateOutletFlow             : ok = notify<Model::MOutletFlow                            >(vMessage, vData, Gui::GuiActionType::ID_DialysateOutletFlow           ); break;
     case Gui::GuiActionType::ID_TreatmentRanges                 : ok = notify<Model::MTreatmentRanges                       >(vMessage, vData, Gui::GuiActionType::ID_TreatmentRanges               ); break;
     case Gui::GuiActionType::ID_PressureOcclusion               : ok = notify<Model::MPressureOcclusion                     >(vMessage, vData, Gui::GuiActionType::ID_PressureOcclusion             ); break;
-    case Gui::GuiActionType::ID_TreatmentStates                 : ok = notify<Model::MTreatmentStates                       >(vMessage, vData, Gui::GuiActionType::ID_TreatmentStates               ); break;
     case Gui::GuiActionType::ID_PrimingData                     : ok = notify<Model::MPrimingData                           >(vMessage, vData, Gui::GuiActionType::ID_PrimingData                   ); break;
     case Gui::GuiActionType::ID_Saline                          : ok = notify<Model::MTreatmentSaline                       >(vMessage, vData, Gui::GuiActionType::ID_Saline                        ); break;
     case Gui::GuiActionType::ID_Heparin                         : ok = notify<Model::MTreatmentHeparin                      >(vMessage, vData, Gui::GuiActionType::ID_Heparin                       ); break;
     case Gui::GuiActionType::ID_Rinseback                       : ok = notify<Model::MTreatmentRinseback                    >(vMessage, vData, Gui::GuiActionType::ID_Rinseback                     ); break;
     case Gui::GuiActionType::ID_Recirculate                     : ok = notify<Model::MTreatmentRecirculate                  >(vMessage, vData, Gui::GuiActionType::ID_Recirculate                   ); break;
     case Gui::GuiActionType::ID_BloodPrime                      : ok = notify<Model::MTreatmentBloodPrime                   >(vMessage, vData, Gui::GuiActionType::ID_BloodPrime                    ); break;
     case Gui::GuiActionType::ID_HDAccelerometerData             : ok = notify<Model::MHDAccelerometer                       >(vMessage, vData, Gui::GuiActionType::ID_HDAccelerometerData           ); break;
-    // ----- Events
-    case Gui::GuiActionType::ID_HDOperationModeData             : ok = notify<Model::MHDOperationMode                       >(vMessage, vData, Gui::GuiActionType::ID_HDOperationModeData           ); break;
-    case Gui::GuiActionType::ID_HDDebugText                     : ok = notify<Model::MHDDebugText                           >(vMessage, vData, Gui::GuiActionType::ID_HDDebugText                   ); break;
 
+    // ----- Events
     case Gui::GuiActionType::ID_Acknow                          : ok = true;                                                     break; // TODO : implement notify<>()
     case Gui::GuiActionType::ID_PowerOff                        : ok = notify<Model::MPowerOff                              >(vMessage, vData, Gui::GuiActionType::ID_PowerOff                      ); break;
     case Gui::GuiActionType::ID_ShuttingDown                    : ok = true; LOG_EVENT("HD,ShuttingDown");                       break; // TODO : implement notify<>()