Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -266,7 +266,10 @@
     // Post-Treatment
     case Gui::GuiActionType::ID_AdjustPatientDisconnectionConfirmReq    : INTERPRET_TRSMT_MT_MESSAGE(AdjustPatientDisconnectionConfirmRequestData   ); break;
     case Gui::GuiActionType::ID_AdjustDisposablesRemovalConfirmReq      : INTERPRET_TRSMT_MT_MESSAGE(AdjustDisposablesRemovalConfirmRequestData     ); break;
-    case Gui::GuiActionType::ID_AdjustTreatmentLogRsp                   : INTERPRET_TRSMT_MT_MESSAGE(AdjustTreatmentLogRequestData                  ); break;
+    case Gui::GuiActionType::ID_AdjustTreatmentLogReq                   : INTERPRET_TRSMT_MT_MESSAGE(AdjustTreatmentLogRequestData                  ); break;
+    // Disinfection
+    case Gui::GuiActionType::ID_AdjustDisinfectReq                      : INTERPRET_TRANSMIT_MESSAGE(AdjustDisinfectRequestData                     ); break;
+    case Gui::GuiActionType::ID_AdjustDisinfectChemicalConfirmReq       : INTERPRET_TRSMT_MT_MESSAGE(AdjustDisinfectChemicalConfirmRequestData      ); break;
     // alarms
     case Gui::GuiActionType::ID_AlarmSilenceReq                         : INTERPRET_TRANSMIT_MESSAGE(AlarmSilenceRequestData                        ); break;
     case Gui::GuiActionType::ID_AlarmUserActionReq                      : INTERPRET_TRANSMIT_MESSAGE(AlarmUserActionRequestData                     ); break;
@@ -394,10 +397,13 @@
     case Gui::GuiActionType::ID_AdjustRecirculateRsp                : ok = notify<Model::MAdjustRecirculateResponse                 >(vMessage, vData, Gui::GuiActionType::ID_AdjustRecirculateRsp              ); break;
     case Gui::GuiActionType::ID_AdjustTreatmentEndRsp               : ok = notify<Model::MAdjustTreatmentEndResponse                >(vMessage, vData, Gui::GuiActionType::ID_AdjustTreatmentEndRsp             ); break;
 
-    // ----- In-Treatment Adjust
+    // ----- Post-Treatment Adjust
     case Gui::GuiActionType::ID_AdjustDisposableRemovalConfirmRsp   : ok = notify<Model::MAdjustDisposablesRemovalConfirmResponse   >(vMessage, vData, Gui::GuiActionType::ID_AdjustDisposableRemovalConfirmRsp ); break;
     case Gui::GuiActionType::ID_AdjustTreatmentLogRsp               : ok = notify<Model::MAdjustTreatmentLogResponse                >(vMessage, vData, Gui::GuiActionType::ID_AdjustTreatmentLogRsp             ); break;
 
+    // ----- Disinfection - Adjust
+    case Gui::GuiActionType::ID_AdjustDisinfectRsp                  : ok = notify<Model::MAdjustDisinfectResponse                   >(vMessage, vData, Gui::GuiActionType::ID_AdjustDisinfectRsp                ); break;
+
     // these need to be standard and use notify as well
     case Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp        : ok = adjustUltrafiltrationEdit    (vMessage, vData); break; // TODO : implement notify<>()
     case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp     : ok = adjustUltrafiltrationConfirm (vMessage, vData); break; // TODO : implement notify<>()
@@ -410,7 +416,7 @@
     case Gui::GuiActionType::ID_AlarmClearedConditionRsp            : ok = notify<Model::MAlarmClearedCondition                 >(vMessage, vData, Gui::GuiActionType::ID_AlarmClearedConditionRsp      ); break;
     // coco end
 
-    // unhandles messages: these will only be logged as received message
+    // unhandled messages: these will only be logged as received message
     // there has nothing been defined for these messages.
     default                                                     : printUnhandled(vMessage); break;
     }
@@ -441,23 +447,29 @@
         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;
+    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;
 
     // 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.