Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -rc71946746586d5a4061ad866ce7dbbaf74b9798a -r65558208e4968de9a5470ff5fda1ee2a9d00c793
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision c71946746586d5a4061ad866ce7dbbaf74b9798a)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 65558208e4968de9a5470ff5fda1ee2a9d00c793)
@@ -447,29 +447,31 @@
         LOG_EVENT(QString("DG,CheckIn," + QVariant(vData).toStringList().join(',')));
         break;
     // DG data messages
-    case Gui::GuiActionType::ID_DGROPumpData                : ok = notify<Model::MDGROPump                      >(vMessage, vData, Gui::GuiActionType::ID_DGROPumpData              ); break;
-    case Gui::GuiActionType::ID_DGPressuresData             : ok = notify<Model::MDGPressures                   >(vMessage, vData, Gui::GuiActionType::ID_DGPressuresData           ); break;
-    case Gui::GuiActionType::ID_DGDrainPumpData             : ok = notify<Model::MDGDrainPump                   >(vMessage, vData, Gui::GuiActionType::ID_DGDrainPumpData           ); break;
-    case Gui::GuiActionType::ID_DGOperationModeData         : ok = notify<Model::MDGOperationMode               >(vMessage, vData, Gui::GuiActionType::ID_DGOperationModeData       ); break;
-    case Gui::GuiActionType::ID_DGReservoirData             : ok = notify<Model::MDGReservoir                   >(vMessage, vData, Gui::GuiActionType::ID_DGReservoirData           ); break;
-    case Gui::GuiActionType::ID_DGValvesStatesData          : ok = notify<Model::MDGValvesStates                >(vMessage, vData, Gui::GuiActionType::ID_DGValvesStatesData        ); break;
-    case Gui::GuiActionType::ID_DGHeatersData               : ok = notify<Model::MDGHeaters                     >(vMessage, vData, Gui::GuiActionType::ID_DGHeatersData             ); break;
-    case Gui::GuiActionType::ID_DGLoadCellReadingsData      : ok = notify<Model::MDGLoadCellReadings            >(vMessage, vData, Gui::GuiActionType::ID_DGLoadCellReadingsData    ); break;
-    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;
+    case Gui::GuiActionType::ID_DGROPumpData                : ok = notify<Model::MDGROPump                      >(vMessage, vData, Gui::GuiActionType::ID_DGROPumpData                  ); break;
+    case Gui::GuiActionType::ID_DGPressuresData             : ok = notify<Model::MDGPressures                   >(vMessage, vData, Gui::GuiActionType::ID_DGPressuresData               ); break;
+    case Gui::GuiActionType::ID_DGDrainPumpData             : ok = notify<Model::MDGDrainPump                   >(vMessage, vData, Gui::GuiActionType::ID_DGDrainPumpData               ); break;
+    case Gui::GuiActionType::ID_DGOperationModeData         : ok = notify<Model::MDGOperationMode               >(vMessage, vData, Gui::GuiActionType::ID_DGOperationModeData           ); break;
+    case Gui::GuiActionType::ID_DGReservoirData             : ok = notify<Model::MDGReservoir                   >(vMessage, vData, Gui::GuiActionType::ID_DGReservoirData               ); break;
+    case Gui::GuiActionType::ID_DGValvesStatesData          : ok = notify<Model::MDGValvesStates                >(vMessage, vData, Gui::GuiActionType::ID_DGValvesStatesData            ); break;
+    case Gui::GuiActionType::ID_DGHeatersData               : ok = notify<Model::MDGHeaters                     >(vMessage, vData, Gui::GuiActionType::ID_DGHeatersData                 ); break;
+    case Gui::GuiActionType::ID_DGLoadCellReadingsData      : ok = notify<Model::MDGLoadCellReadings            >(vMessage, vData, Gui::GuiActionType::ID_DGLoadCellReadingsData        ); break;
+    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_DGFilterFlushData           : ok = notify<Model::MDGFilterFlush                 >(vMessage, vData, Gui::GuiActionType::ID_DGFilterFlushData         ); break;
-    // ----- Disinfection - Datum
-    case Gui::GuiActionType::ID_DisinfectDGFlushData        : ok = notify<Model::MDisinfectDGFlush              >(vMessage, vData, Gui::GuiActionType::ID_DisinfectDGFlushData      ); break;
-    case Gui::GuiActionType::ID_DisinfectDGHeatTimeData     : ok = notify<Model::MDisinfectDGHeatTime           >(vMessage, vData, Gui::GuiActionType::ID_DisinfectDGHeatTimeData   ); break;
-    case Gui::GuiActionType::ID_DisinfectDGHeatTempData     : ok = notify<Model::MDisinfectDGHeatTemperature    >(vMessage, vData, Gui::GuiActionType::ID_DisinfectDGHeatTempData   ); break;
-    case Gui::GuiActionType::ID_DisinfectDGChemTimeData     : ok = notify<Model::MDisinfectDGChemicalTime       >(vMessage, vData, Gui::GuiActionType::ID_DisinfectDGChemTimeData   ); break;
-    case Gui::GuiActionType::ID_DisinfectDGChemTBDData      : ok = notify<Model::MDisinfectDGChemicalTBD        >(vMessage, vData, Gui::GuiActionType::ID_DisinfectDGChemTBDData    ); break;
+    case Gui::GuiActionType::ID_DGFilterFlushData           : ok = notify<Model::MDGFilterFlush                 >(vMessage, vData, Gui::GuiActionType::ID_DGFilterFlushData             ); break;
+    // ----- Datum - Disinfection
+    case Gui::GuiActionType::ID_DisinfectDGFlushData        : ok = notify<Model::MDisinfectDGFlush              >(vMessage, vData, Gui::GuiActionType::ID_DisinfectDGFlushData          ); break;
+    case Gui::GuiActionType::ID_DisinfectDGHeatTimeData     : ok = notify<Model::MDisinfectDGHeatTime           >(vMessage, vData, Gui::GuiActionType::ID_DisinfectDGHeatTimeData       ); break;
+    case Gui::GuiActionType::ID_DisinfectDGHeatTempData     : ok = notify<Model::MDisinfectDGHeatTemperature    >(vMessage, vData, Gui::GuiActionType::ID_DisinfectDGHeatTempData       ); break;
+    case Gui::GuiActionType::ID_DisinfectDGChemicalTimeData : ok = notify<Model::MDisinfectDGChemicalTime       >(vMessage, vData, Gui::GuiActionType::ID_DisinfectDGChemicalTimeData   ); break;
+    case Gui::GuiActionType::ID_DisinfectDGChemicalTBDData  : ok = notify<Model::MDisinfectDGChemicalTBD        >(vMessage, vData, Gui::GuiActionType::ID_DisinfectDGChemicalTBDData    ); break;
+    // ----- Datum - Disinfect States
+    case Gui::GuiActionType::ID_DisinfectStates             : ok = notify<Model::MDisinfectStates               >(vMessage, vData, Gui::GuiActionType::ID_DisinfectStates               ); break;
 
     // DG Response Messages
-    case Gui::GuiActionType::ID_AdjustDGVersionsRsp         : ok = notify<Model::MAdjustDGVersionsResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustDGVersionsRsp       ); break;
-    case Gui::GuiActionType::ID_AdjustDGDateTimeRsp         : ok = notify<Model::MAdjustDGDateTimeResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustDGDateTimeRsp       ); break;
+    case Gui::GuiActionType::ID_AdjustDGVersionsRsp         : ok = notify<Model::MAdjustDGVersionsResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustDGVersionsRsp           ); break;
+    case Gui::GuiActionType::ID_AdjustDGDateTimeRsp         : ok = notify<Model::MAdjustDGDateTimeResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustDGDateTimeRsp           ); break;
 
     // unhandled messages: these will only be logged as received message
     // there has nothing been defined for these messages.