Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r0a4abcc41defc031ae20dd79f9550619bc6c9806 -r96854524927f212c24b9e4a253baeff2e672228f
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 0a4abcc41defc031ae20dd79f9550619bc6c9806)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -333,13 +333,16 @@
     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_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;
+    // ----- Datum - Pre-Treatment progress
+    case Gui::GuiActionType::ID_SelfTestNoCartridge             : ok = notify<Model::MPreTreatmentSelfTestNoCartridge       >(vMessage, vData, Gui::GuiActionType::ID_SelfTestNoCartridge           ); break;
+    case Gui::GuiActionType::ID_SelfTestDry                     : ok = notify<Model::MPreTreatmentSelfTestDry               >(vMessage, vData, Gui::GuiActionType::ID_SelfTestDry                   ); break;
+    case Gui::GuiActionType::ID_DisposablesPrime                : ok = notify<Model::MPreTreatmentPrime                     >(vMessage, vData, Gui::GuiActionType::ID_DisposablesPrime              ); break;
 
     // ----- Events
     case Gui::GuiActionType::ID_Acknow                          : ok = true;                                                     break; // TODO : implement notify<>()
@@ -416,9 +419,11 @@
     case Gui::GuiActionType::ID_DGTemperaturesData      : ok = notify<Model::MDGTemperatures     >(vMessage, vData, Gui::GuiActionType::ID_DGTemperaturesData    ); break;
     case Gui::GuiActionType::ID_DGDebugText             : ok = notify<Model::MDGDebugText        >(vMessage, vData, Gui::GuiActionType::ID_DGDebugText           ); break;
     case Gui::GuiActionType::ID_DGAccelerometerData     : ok = notify<Model::MDGAccelerometer    >(vMessage, vData, Gui::GuiActionType::ID_DGAccelerometerData   ); break;
+    // ----- Datum - Pre-Treatment progress
+    case Gui::GuiActionType::ID_DGFilterFlush           : ok = notify<Model::MDGFilterFlush      >(vMessage, vData, Gui::GuiActionType::ID_DGFilterFlush         ); break;
 
     // DG Response Messages
-    case Gui::GuiActionType::ID_AdjustDGVersionsRsp     : ok = notify<Model::MAdjustDGVersionsResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustDGVersionsRsp    ); break;
+    case Gui::GuiActionType::ID_AdjustDGVersionsRsp     : ok = notify<Model::MAdjustDGVersionsResponse  >(vMessage, vData, Gui::GuiActionType::ID_AdjustDGVersionsRsp    ); break;
 
     // unhandled messages: these will only be logged as received message
     // there has nothing been defined for these messages.