Index: denali.pro
===================================================================
diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a
--- denali.pro	(.../denali.pro)	(revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f)
+++ denali.pro	(.../denali.pro)	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -52,6 +52,7 @@
     sources/model \
     sources/model/settings \
     sources/model/hd/adjustment \
+    sources/model/hd/adjustment/disinfect \
     sources/model/hd/adjustment/settings \
     sources/model/hd/adjustment/pretreatment \
     sources/model/hd/adjustment/treatment \
@@ -62,20 +63,26 @@
     sources/model/hd/data/treatment \
     sources/model/hd/data/posttreatment \
     sources/model/dg/data \
+    sources/model/dg/data/pretreatment \
+    sources/model/dg/data/disinfect \
     sources/model/dg/adjustment \
     sources/model/dg/adjustment/settings \
     sources/view \
     sources/view/settings \
+    sources/view/pretreatment \
     sources/view/hd/adjustment \
     sources/view/hd/adjustment/pretreatment \
     sources/view/hd/adjustment/treatment \
     sources/view/hd/adjustment/posttreatment \
+    sources/view/hd/adjustment/disinfect \
     sources/view/hd/alarm \
     sources/view/hd/data \
     sources/view/hd/data/pretreatment \
     sources/view/hd/data/treatment \
     sources/view/hd/data/posttreatment \
-    sources/view/dg/data
+    sources/view/dg/data \
+    sources/view/dg/data/pretreatment \
+    sources/view/dg/data/disinfect
 
 HEADERS += \
     \ # common
@@ -90,8 +97,6 @@
     sources/AlarmGenerator.h \
     sources/ApplicationPost.h \
     \ # Controllers
-    sources/model/dg/adjustment/settings/MAdjustDGRequests.h \
-    sources/model/hd/adjustment/settings/MAdjustHDRequests.h \
     sources/storage/Settings.h \
     sources/ApplicationController.h \
     \ # ---------- Models ----------
@@ -107,6 +112,7 @@
     \ # ---------- Models - HD - Adjustment
     sources/model/hd/adjustment/MAdjustRequestsBase.h \
     sources/model/hd/adjustment/MAdjustPowerOff.h \
+    sources/model/hd/adjustment/settings/MAdjustHDRequests.h \
     \ # ---------- Models - HD - Adjustment - Settings
     sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.h \
     sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.h \
@@ -138,6 +144,9 @@
     sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustRequests.h \
     sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h \
     sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.h \
+    \ # ---------- Models - HD - Adjustment - Disinfeection
+    sources/model/hd/adjustment/disinfect/MDisinfectAdjustRequests.h \
+    sources/model/hd/adjustment/disinfect/MDisinfectAdjustResponse.h \
     \ # ---------- Models - HD - States Data
     sources/model/hd/data/MHDOperationModeData.h \
     sources/model/hd/data/pretreatment/MPreTreatmentStatesData.h \
@@ -161,11 +170,18 @@
     sources/model/hd/data/treatment/MTreatmentRecirculateData.h \
     sources/model/hd/data/treatment/MTreatmentBloodPrimeData.h \
     \ # ---------- Models - DG - Adjustment
+    sources/model/dg/adjustment/settings/MAdjustDGRequests.h \
     \ # ---------- Models - DG - Adjustment - Settings
     sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.h \
     sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.h \
     \ # ---------- Models - DG - Data - Pre-Treatment - Progress
-    sources/model/dg/data/MDGFilterFlushData.h \
+    sources/model/dg/data/pretreatment/MDGFilterFlushData.h \
+    \ # ---------- Models - DG - Data - Disinfect - Progress
+    sources/model/dg/data/disinfect/MDisinfectDGFlushData.h \
+    sources/model/dg/data/disinfect/MDisinfectDGHeatTimeData.h \
+    sources/model/dg/data/disinfect/MDisinfectDGHeatTemperatureData.h \
+    sources/model/dg/data/disinfect/MDisinfectDGChemicalTimeData.h \
+    sources/model/dg/data/disinfect/MDisinfectDGChemicalTBDData.h \
     \ # ---------- Models - DG - Data
     sources/model/dg/data/MDGDebugText.h \
     sources/model/dg/data/MDGDrainPumpData.h \
@@ -231,6 +247,8 @@
     sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h \
     sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h \
     sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.h \
+    \ # ---------- Views - HD - Adjustment - Disinfection
+    sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h \
     \ # ---------- Views - HD - Data - States
     sources/view/hd/data/VHDOperationModeData.h \
     sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h \
@@ -254,7 +272,9 @@
     sources/view/hd/data/treatment/VTreatmentRecirculateData.h \
     sources/view/hd/data/treatment/VTreatmentBloodPrimeData.h \
     \ # ---------- Views - DG - Data - Pre-Treatment - Progress
-    sources/view/dg/data/VDGFilterFlushData.h \
+    sources/view/dg/data/pretreatment/VDGFilterFlushData.h \
+    \ # ---------- Views - DG - Data - Disinfection - Progress
+    sources/view/dg/data/disinfect/VDisinfectDGData.h \
     \ # ---------- Views - DG - Data
     sources/view/dg/data/VDGOperationModeData.h \
     sources/view/dg/data/VDGDrainPumpData.h \
@@ -327,6 +347,8 @@
     \ # ---------- Models - HD - Adjustment - Post-Treatment
     sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp \
     sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.cpp \
+    \ # ---------- Models - HD - Adjustment - Disinfection
+    sources/model/hd/adjustment/disinfect/MDisinfectAdjustResponse.cpp \
     \ # ---------- Models - HD - Data
     \ # ---------- Models - HD - Data - Pre-Treatment
     sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp \
@@ -355,7 +377,13 @@
     sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.cpp \
     sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.cpp \
     \ # ---------- Models - DG - Data - Pre-Treatment - Progress
-    sources/model/dg/data/MDGFilterFlushData.cpp \
+    sources/model/dg/data/pretreatment/MDGFilterFlushData.cpp \
+    \ # ---------- Models - DG - Data - Disinfection - Progress
+    sources/model/dg/data/disinfect/MDisinfectDGFlushData.cpp \
+    sources/model/dg/data/disinfect/MDisinfectDGHeatTimeData.cpp \
+    sources/model/dg/data/disinfect/MDisinfectDGHeatTemperatureData.cpp \
+    sources/model/dg/data/disinfect/MDisinfectDGChemicalTimeData.cpp \
+    sources/model/dg/data/disinfect/MDisinfectDGChemicalTBDData.cpp \
     \ # ---------- Models - DG - Data
     sources/model/dg/data/MDGDebugText.cpp \
     sources/model/dg/data/MDGDrainPumpData.cpp \
@@ -419,6 +447,8 @@
     sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.cpp \
     sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp \
     sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.cpp \
+    \ # ---------- Views - HD - Adjustment - Disinfection
+    sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp \
     \ # ---------- Views - HD - States Data
     sources/view/hd/data/VHDOperationModeData.cpp \
     sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp \
@@ -444,7 +474,9 @@
     sources/view/hd/data/treatment/VTreatmentRinsebackData.cpp \
     sources/view/hd/data/treatment/VTreatmentRecirculateData.cpp \
     \ # ---------- Views - DG - Data - Pre-Treatment - Progress
-    sources/view/dg/data/VDGFilterFlushData.cpp \
+    sources/view/dg/data/pretreatment/VDGFilterFlushData.cpp \
+    \ # ---------- Views - DG - Data - Disinfect - Progress
+    sources/view/dg/data/disinfect/VDisinfectDGData.cpp \
     \ # ---------- Views - DG - Data
     sources/view/dg/data/VDGDrainPumpData.cpp \
     sources/view/dg/data/VDGHeatersData.cpp \
Index: denali.pro.user
===================================================================
diff -u -r9327fae7b109203ca698d361b113a81d139a0cf9 -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a
--- denali.pro.user	(.../denali.pro.user)	(revision 9327fae7b109203ca698d361b113a81d139a0cf9)
+++ denali.pro.user	(.../denali.pro.user)	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.10.0, 2021-04-18T15:48:58. -->
+<!-- Written by QtCreator 4.10.0, 2021-04-18T22:23:00. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
Index: en_US.udic
===================================================================
diff -u -r9327fae7b109203ca698d361b113a81d139a0cf9 -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a
--- en_US.udic	(.../en_US.udic)	(revision 9327fae7b109203ca698d361b113a81d139a0cf9)
+++ en_US.udic	(.../en_US.udic)	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -69,3 +69,10 @@
 MessageID
 unhandled
 VCreate
+MDisinfect
+DGFlush
+DGHeat
+Dst
+DGChemical
+VDisinfect
+DGData
Index: sources/canbus/MessageDispatcher.cpp
===================================================================
diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a
--- sources/canbus/MessageDispatcher.cpp	(.../MessageDispatcher.cpp)	(revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f)
+++ sources/canbus/MessageDispatcher.cpp	(.../MessageDispatcher.cpp)	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -394,9 +394,8 @@
  * \param   vData - Data model contains HD Version state.
  * \return  void
  */
-void MessageDispatcher::onAdjustment(const AdjustVersionsRequestData &vData)
+void MessageDispatcher::onAdjustment(const AdjustVersionsRequestData &)
 {
-    Q_UNUSED(vData);
     QVariantList mData;
     onActionTransmit(GuiActionType::ID_AdjustVersionsReq, mData);
 }
@@ -504,9 +503,8 @@
  * \param   vData - Data model contains Consumables Confirm adjustment.
  * \return  void
  */
-void MessageDispatcher::onAdjustment(const AdjustConsumablesConfirmRequestData &vData)
+void MessageDispatcher::onAdjustment(const AdjustConsumablesConfirmRequestData &)
 {
-    Q_UNUSED(vData)
     QVariantList mData;
     onActionTransmit(GuiActionType::ID_AdjustConsumablesConfirmReq, mData);
 }
@@ -517,9 +515,8 @@
  * \param   vData - Data model contains Disposables Confirm adjustment.
  * \return  void
  */
-void MessageDispatcher::onAdjustment(const AdjustDisposablesConfirmRequestData &vData)
+void MessageDispatcher::onAdjustment(const AdjustDisposablesConfirmRequestData &)
 {
-    Q_UNUSED(vData)
     QVariantList mData;
     onActionTransmit(GuiActionType::ID_AdjustDisposablesConfirmReq, mData);
 }
@@ -530,9 +527,8 @@
  * \param   vData - Data model contains Disposables Prime adjustment.
  * \return  void
  */
-void MessageDispatcher::onAdjustment(const AdjustDisposablesPrimeRequestData &vData)
+void MessageDispatcher::onAdjustment(const AdjustDisposablesPrimeRequestData &)
 {
-    Q_UNUSED(vData)
     QVariantList mData;
     onActionTransmit(GuiActionType::ID_AdjustDisposablesPrimeReq, mData);
 }
@@ -543,9 +539,8 @@
  * \param   vData - Data model contains Patient Connection Begin adjustment.
  * \return  void
  */
-void MessageDispatcher::onAdjustment(const AdjustPatientConnectionBeginRequestData &vData)
+void MessageDispatcher::onAdjustment(const AdjustPatientConnectionBeginRequestData &)
 {
-    Q_UNUSED(vData)
     QVariantList mData;
     onActionTransmit(GuiActionType::ID_AdjustPatientConnectionBeginReq, mData);
 }
@@ -569,9 +564,8 @@
  * \param   vData - Data model contains Patient Connection Confirm adjustment.
  * \return  void
  */
-void MessageDispatcher::onAdjustment(const AdjustPatientConnectionConfirmRequestData &vData)
+void MessageDispatcher::onAdjustment(const AdjustPatientConnectionConfirmRequestData &)
 {
-    Q_UNUSED(vData)
     QVariantList mData;
     onActionTransmit(GuiActionType::ID_AdjustPatientConnectionConfirmReq, mData);
 }
@@ -582,9 +576,8 @@
  * \param   vData - Data model contains Start Treatment adjustment.
  * \return  void
  */
-void MessageDispatcher::onAdjustment(const AdjustStartTreatmentRequestData &vData)
+void MessageDispatcher::onAdjustment(const AdjustStartTreatmentRequestData &)
 {
-    Q_UNUSED(vData)
     QVariantList mData;
     onActionTransmit(GuiActionType::ID_AdjustStartTreatmentReq, mData);
 }
@@ -595,9 +588,8 @@
  * \param   vData - Data model contains Patient Disconnection Confirm adjustment.
  * \return  void
  */
-void MessageDispatcher::onAdjustment(const AdjustPatientDisconnectionConfirmRequestData &vData)
+void MessageDispatcher::onAdjustment(const AdjustPatientDisconnectionConfirmRequestData &)
 {
-    Q_UNUSED(vData)
     QVariantList mData;
     onActionTransmit(GuiActionType::ID_AdjustPatientDisconnectionConfirmReq, mData);
 }
@@ -608,9 +600,8 @@
  * \param   vData - Data model contains Disposables Removal Confirm adjustment.
  * \return  void
  */
-void MessageDispatcher::onAdjustment(const AdjustDisposablesRemovalConfirmRequestData &vData)
+void MessageDispatcher::onAdjustment(const AdjustDisposablesRemovalConfirmRequestData &)
 {
-    Q_UNUSED(vData)
     QVariantList mData;
     onActionTransmit(GuiActionType::ID_AdjustDisposablesRemovalConfirmReq, mData);
 }
@@ -621,9 +612,8 @@
  * \param   vData - Data model contains Treatment Log adjustment.
  * \return  void
  */
-void MessageDispatcher::onAdjustment(const AdjustTreatmentLogRequestData &vData)
+void MessageDispatcher::onAdjustment(const AdjustTreatmentLogRequestData &)
 {
-    Q_UNUSED(vData)
     QVariantList mData;
     onActionTransmit(GuiActionType::ID_AdjustTreatmentLogReq, mData);
 }
@@ -654,6 +644,31 @@
     onActionTransmit(GuiActionType::ID_AdjustDGDateTimeReq, mData);
 }
 
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits the Disinfect request Denali message.
+ * \param   vData - Data model contains the epoch time
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const AdjustDisinfectRequestData &vData)
+{
+    QVariantList mData;
+    mData += vData.mState;
+    onActionTransmit(GuiActionType::ID_AdjustDisinfectReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits the Chemical Confirm request Denali message.
+ * \param   vData - Data model contains the epoch time
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const AdjustDisinfectChemicalConfirmRequestData &)
+{
+    QVariantList mData;
+    onActionTransmit(GuiActionType::ID_AdjustDisinfectChemicalConfirmReq, mData);
+}
+
 // ----------------------------------------------------------------------------------------------------
 
 /*!
Index: sources/canbus/MessageDispatcher.h
===================================================================
diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a
--- sources/canbus/MessageDispatcher.h	(.../MessageDispatcher.h)	(revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f)
+++ sources/canbus/MessageDispatcher.h	(.../MessageDispatcher.h)	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -139,6 +139,10 @@
         GuiActionType::ID_AdjustPatientDisconnectionConfirmReq  ,
         GuiActionType::ID_AdjustDisposablesRemovalConfirmReq    ,
         GuiActionType::ID_AdjustTreatmentLogReq                 ,
+        // Disinfect
+        GuiActionType::ID_AdjustDisinfectReq                    ,
+        GuiActionType::ID_AdjustDisinfectRsp                    ,
+        GuiActionType::ID_AdjustDisinfectChemicalConfirmReq     ,
         // Settings
         GuiActionType::ID_AdjustHDDateTimeReq                   ,
         GuiActionType::ID_AdjustDGDateTimeReq                   ,
Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -r4afc91856c00e01dfb5d84bc54d2d92faefec0db -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a
--- sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 4afc91856c00e01dfb5d84bc54d2d92faefec0db)
+++ sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -198,6 +198,15 @@
     {Gui::GuiActionType::ID_AdjustDGDateTimeReq                     ,   1 * 4       }, // 1 parameters each 4bytes
     {Gui::GuiActionType::ID_AdjustDGDateTimeRsp                     ,   2 * 4       }, // 2 parameters each 4bytes
 
+    // ---- Disinfect
+    {Gui::GuiActionType::ID_AdjustDisinfectReq                      ,   1 * 4       }, // 1 parameters each 4bytes
+    {Gui::GuiActionType::ID_AdjustDisinfectRsp                      ,   2 * 4       }, // 2 parameters each 4bytes
+    {Gui::GuiActionType::ID_AdjustDisinfectChemicalConfirmReq       ,   0 * 4       }, // 0 parameters each 4bytes
+    {Gui::GuiActionType::ID_DisinfectDGFlushData                    ,   2 * 4       }, // 2 parameters each 4bytes
+    {Gui::GuiActionType::ID_DisinfectDGHeatTimeData                 ,   2 * 4       }, // 2 parameters each 4bytes
+    {Gui::GuiActionType::ID_DisinfectDGHeatTempData                 ,   2 * 4       }, // 2 parameters each 4bytes
+    {Gui::GuiActionType::ID_DisinfectDGChemTimeData                 ,   2 * 4       }, // 2 parameters each 4bytes
+    {Gui::GuiActionType::ID_DisinfectDGChemTBDData                  ,   2 * 4       }, // 2 parameters each 4bytes
     // ----
     {Gui::GuiActionType::ID_CANBusFaultCount                        ,   1           },
     {Gui::GuiActionType::ID_RawData                                 , 255           },
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.
Index: sources/gui/GuiGlobals.cpp
===================================================================
diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a
--- sources/gui/GuiGlobals.cpp	(.../GuiGlobals.cpp)	(revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f)
+++ sources/gui/GuiGlobals.cpp	(.../GuiGlobals.cpp)	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -90,6 +90,9 @@
 #include "VPostTreatmentAdjustPatientDisconnectionConfirm.h"
 #include "VPostTreatmentAdjustDisposablesRemovalConfirm.h"
 #include "VPostTreatmentAdjustTreatmentLog.h"
+// ----- Disinfection
+#include "VDisinfectDGData.h"
+#include "VDisinfectAdjustDisinfect.h"
 // -----
 #include "VTreatmentAdjustmentEnd.h"
 
Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -r4afc91856c00e01dfb5d84bc54d2d92faefec0db -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 4afc91856c00e01dfb5d84bc54d2d92faefec0db)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -218,6 +218,15 @@
             ID_AdjustTreatmentLogReq                    = 0x7500, // 117
             ID_AdjustTreatmentLogRsp                    = 0x7600, // 118
 
+            // Disinfect
+            ID_AdjustDisinfectReq                       = 0x7F00, // 127
+            ID_AdjustDisinfectRsp                       = 0x8000, // 128
+            ID_AdjustDisinfectChemicalConfirmReq        = 0x8100, // 129 // there is no specific response message for this request and changing of the state in HDOpMode.subMode is used as the response
+            ID_DisinfectDGFlushData                     = 0x8200, // 130
+            ID_DisinfectDGHeatTimeData                  = 0x8300, // 131
+            ID_DisinfectDGHeatTempData                  = 0x8400, // 132
+            ID_DisinfectDGChemTimeData                  = 0x8500, // 133
+            ID_DisinfectDGChemTBDData                   = 0x8600, // 134
         };
 
         enum class GuiActionsData_Enum /*: quint8  QML doesn't support*/ {
Index: sources/gui/qml/main.qml
===================================================================
diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -86,6 +86,9 @@
 import VPostTreatmentAdjustmentPatientDisconnectionConfirm  0.1
 import VPostTreatmentAdjustmentDisposablesRemovalConfirm    0.1
 import VPostTreatmentAdjustmentTreatmentLog                 0.1
+// Disinfection
+import VDisinfectAdjustDisinfect                            0.1
+import VDisinfectDGData                                     0.1
 
 //  Qml imports
 import "qrc:/globals"
@@ -152,7 +155,6 @@
     VTreatmentAdjustmentFlows                           { id: vTreatmentAdjustmentFlows                             }
     VTreatmentCreate                                    { id: vTreatmentCreate                                      }
 
-
     VTreatmentRanges                                    { id: vTreatmentRanges                                      }
     VTreatmentAdjustmentSaline                          { id: vTreatmentAdjustmentSaline                            }
     VTreatmentAdjustmentUltrafiltrationState            { id: vTreatmentAdjustmentUltrafiltrationState              }
@@ -169,6 +171,10 @@
     VPostTreatmentAdjustmentDisposablesRemovalConfirm   { id: vPostTreatmentAdjustmentDisposablesRemovalConfirm     }
     VPostTreatmentAdjustmentTreatmentLog                { id: vPostTreatmentAdjustmentTreatmentLog                  }
 
+    // --- Disinfection
+    VDisinfectAdjustDisinfect                           { id: vDisinfectAdjustDisinfect                             }
+    VDisinfectDGData                                    { id: vDisinfectDGData                                      }
+
     Background {}
 
     GuiView { id: _GuiView }
Index: sources/gui/qml/pages/disinfect/DisinfectBase.qml
===================================================================
diff -u -r4afc91856c00e01dfb5d84bc54d2d92faefec0db -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a
--- sources/gui/qml/pages/disinfect/DisinfectBase.qml	(.../DisinfectBase.qml)	(revision 4afc91856c00e01dfb5d84bc54d2d92faefec0db)
+++ sources/gui/qml/pages/disinfect/DisinfectBase.qml	(.../DisinfectBase.qml)	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -67,7 +67,8 @@
         anchors.horizontalCenter : parent.horizontalCenter
         width           : _root.width
         confirmEnabled  : instruction ? instruction.lastStep : true
-        stepNames: []
+        stepNames       : []
+        stepLineLength  : 120
         onBackClicked   : _root.backClicked()
         onConfirmClicked: _root.confirmClicked()
     }
Index: sources/gui/qml/pages/disinfect/DisinfectStack.qml
===================================================================
diff -u -r4afc91856c00e01dfb5d84bc54d2d92faefec0db -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a
--- sources/gui/qml/pages/disinfect/DisinfectStack.qml	(.../DisinfectStack.qml)	(revision 4afc91856c00e01dfb5d84bc54d2d92faefec0db)
+++ sources/gui/qml/pages/disinfect/DisinfectStack.qml	(.../DisinfectStack.qml)	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -32,11 +32,12 @@
     signal disinfectionSkip             ()
     signal disinfectionHeatClicked      ()
     signal disinfectionChemicalClicked  ()
-    signal disinfectionChemicalTest     ()
+    signal disinfectionChemicalConfirm  ()
 
     DisinfectBase { id: _disinfection
         objectName: "_disinfection"
-        property int stackStepIndex : 3
+        property int stackStepIndex : 0
+        header.stepNames: [ qsTr("Disinfection") ]
         header.confirmVisible   : true
         header.confirmText.text : qsTr("SKIP")
         title.text              : qsTr("Disinfection")
@@ -56,30 +57,34 @@
 
     DisinfectBase { id: _disinfectionHeat
         objectName: "_disinfectionHeat"
-        property int stackStepIndex : 3
+        property int stackStepIndex : 1
+        header.stepNames: [ qsTr("Disinfection") , qsTr("Heat Disinfect")]
         title.text              : qsTr("Heat Disinfection")
         hasTimeCircle           : true
     }
 
     DisinfectBase { id: _disinfectionChemicalInstruction
         objectName: "_disinfectionChemicalInstruction"
-        property int stackStepIndex : 3
+        property int stackStepIndex : 1
+        header.stepNames: [ qsTr("Disinfection") , qsTr("Chemical Disinfect")]
         header.confirmVisible   : true
         title.text              : qsTr("Chemical Disinfection")
         instructionBased        : true
-        onConfirmClicked        : _root.disinfectionChemicalTest()
+        onConfirmClicked        : _root.disinfectionChemicalConfirm()
     }
 
     DisinfectBase { id: _disinfectionChemicalProgress
         objectName: "_disinfectionChemicalProgress"
-        property int stackStepIndex : 3
+        property int stackStepIndex : 1
+        header.stepNames: [ qsTr("Disinfection") , qsTr("Chemical Disinfect")]
         title.text              : qsTr("Chemical Disinfection")
         hasTimeCircle           : true
     }
 
     DisinfectBase { id: _flush
         objectName: "_flush"
-        property int stackStepIndex : 3
+        property int stackStepIndex : 1
+        header.stepNames: [ qsTr("Disinfection") , qsTr("Flush")]
         title.text              : qsTr("Flush")
         hasTimeCircle           : true
     }
@@ -91,17 +96,17 @@
     }
 
     Connections { target: vHDOperationMode
-        onStandbyWaitDisinfectChanged       : { console.debug("A"); page( _disinfection                 , vstandbyWaitDisinfect         )} // initialItem
+        onStandbyWaitDisinfectChanged       : { page( _disinfection                 , vstandbyWaitDisinfect         )} // initialItem
         onStandbyDGFlushChanged             : { page( _flush                        , vstandbyDGFlush               )}
         onStandbyDGDisinfectHeatChanged     : { page( _disinfectionHeat             , vstandbyDGDisinfectHeat       )}
         onStandbyDGDisinfectChemicalChanged : { page( _disinfectionChemicalProgress , vstandbyDGDisinfectChemical   )}
     }
 
-    onDisinfectionHeatClicked               : { /* shall send a command and wait for the state change */             }
-    onDisinfectionChemicalClicked           : { /* shall send a command and wait for the state change */
-    /* TODO-TEST: Needs an accepted response */ page( _disinfectionChemicalInstruction                              )}
-    onDisinfectionChemicalTest              : { /* shall send a command and wait for the state change */             }
-    onDisinfectionSkip                      : { /* shall send a command and wait for the state change */             }
+    onDisinfectionSkip                      : { vDisinfectAdjustDisinfect.doFlush                   (               )}
+    onDisinfectionHeatClicked               : { vDisinfectAdjustDisinfect.doDisinfectHeat           (               )}
+    onDisinfectionChemicalClicked           : { vDisinfectAdjustDisinfect.doDisinfectChemical       (               )
+                                                page( _disinfectionChemicalInstruction                              )}
+    onDisinfectionChemicalConfirm           : { vDisinfectAdjustDisinfect.doDisinfectChemicalConfirm(               )}
 
     onVisibleChanged: {
         if (visible) {
Index: sources/model/MModel.h
===================================================================
diff -u -r4afc91856c00e01dfb5d84bc54d2d92faefec0db -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a
--- sources/model/MModel.h	(.../MModel.h)	(revision 4afc91856c00e01dfb5d84bc54d2d92faefec0db)
+++ sources/model/MModel.h	(.../MModel.h)	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -101,6 +101,15 @@
 #include "MPostTreatmentAdjustDisposablesRemovalConfirmResponse.h"
 #include "MPostTreatmentAdjustTreatmentLogResponse.h"
 
+// Disinfection
+#include "MDisinfectAdjustRequests.h"
+#include "MDisinfectAdjustResponse.h"
+#include "MDisinfectDGFlushData.h"
+#include "MDisinfectDGHeatTimeData.h"
+#include "MDisinfectDGHeatTemperatureData.h"
+#include "MDisinfectDGChemicalTimeData.h"
+#include "MDisinfectDGChemicalTBDData.h"
+
 /*!
  * \page MessageFlow Message interpretation Flow
  * \dot
@@ -264,6 +273,12 @@
     REGISTER_METATYPE(                                    PreTreatmentSelfTestNoCartridgeData ) \
     REGISTER_METATYPE(                                            PreTreatmentSelfTestDryData ) \
     REGISTER_METATYPE(                                       PreTreatmentDisposablesPrimeData ) \
+    /*                                      Disinfection                                     */ \
+    REGISTER_METATYPE(                                                   DisinfectDGFlushData ) \
+    REGISTER_METATYPE(                                                DisinfectDGHeatTimeData ) \
+    REGISTER_METATYPE(                                         DisinfectDGHeatTemperatureData ) \
+    REGISTER_METATYPE(                                            DisinfectDGChemicalTimeData ) \
+    REGISTER_METATYPE(                                             DisinfectDGChemicalTBDData ) \
                                                                                                 \
     /*   Request    */                                                                          \
     /*                                      Post-Treatment                                   */ \
@@ -283,6 +298,9 @@
     REGISTER_METATYPE(                                   AdjustUltrafiltrationInitRequestData ) \
     REGISTER_METATYPE(                              AdjustPatientConnectionConfirmRequestData ) \
     REGISTER_METATYPE(                                        AdjustStartTreatmentRequestData ) \
+    /*                                      Disinfection                                     */ \
+    REGISTER_METATYPE(                                             AdjustDisinfectRequestData ) \
+    REGISTER_METATYPE(                              AdjustDisinfectChemicalConfirmRequestData ) \
                                                                                                 \
     REGISTER_METATYPE(                                                AlarmSilenceRequestData ) \
     REGISTER_METATYPE(                                             AlarmUserActionRequestData ) \
@@ -317,6 +335,8 @@
     REGISTER_METATYPE(                                  AdjustUltrafiltrationInitResponseData ) \
     REGISTER_METATYPE(                             AdjustPatientConnectionConfirmResponseData ) \
     REGISTER_METATYPE(                                       AdjustStartTreatmentResponseData ) \
+    /*                                      Disinfect                                        */ \
+    REGISTER_METATYPE(                                            AdjustDisinfectResponseData ) \
                                                                                                 \
     REGISTER_METATYPE(                                       AdjustBloodDialysateResponseData ) \
     REGISTER_METATYPE(                                             AdjustDurationResponseData ) \
@@ -394,6 +414,12 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,             PreTreatmentSelfTestNoCartridgeData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                     PreTreatmentSelfTestDryData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                PreTreatmentDisposablesPrimeData ) \
+    /*                                      Disinfection                                     */ \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                            DisinfectDGFlushData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                         DisinfectDGHeatTimeData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                  DisinfectDGHeatTemperatureData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                     DisinfectDGChemicalTimeData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                      DisinfectDGChemicalTBDData ) \
     /*   Response   */                                                                          \
     /*                                     Post-Treatment                                    */ \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,     AdjustDisposablesRemovalConfirmResponseData ) \
@@ -407,6 +433,8 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,           AdjustUltrafiltrationInitResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,      AdjustPatientConnectionConfirmResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                AdjustStartTreatmentResponseData ) \
+    /*                                      Disinfect                                        */ \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                     AdjustDisinfectResponseData ) \
                                                                                                 \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                AdjustBloodDialysateResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                      AdjustDurationResponseData ) \
@@ -458,6 +486,9 @@
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,            AdjustUltrafiltrationInitRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,       AdjustPatientConnectionConfirmRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                 AdjustStartTreatmentRequestData ) \
+    /*                                      Disinfection                                     */ \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                      AdjustDisinfectRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,       AdjustDisinfectChemicalConfirmRequestData ) \
     /*                                         Alarms                                        */ \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                         AlarmSilenceRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                      AlarmUserActionRequestData ) \
@@ -527,6 +558,12 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                     PreTreatmentSelfTestNoCartridgeData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                             PreTreatmentSelfTestDryData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                        PreTreatmentDisposablesPrimeData ) \
+    /*                                      Disinfection                                     */ \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                    DisinfectDGFlushData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                 DisinfectDGHeatTimeData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                          DisinfectDGHeatTemperatureData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                             DisinfectDGChemicalTimeData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                              DisinfectDGChemicalTBDData ) \
     /*   Response   */                                                                          \
     /*                                     Post-Treatment                                    */ \
     ACTION_RECEIVE_BRIDGE_DEFINITION(             AdjustDisposablesRemovalConfirmResponseData ) \
@@ -540,6 +577,8 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                   AdjustUltrafiltrationInitResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(              AdjustPatientConnectionConfirmResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                        AdjustStartTreatmentResponseData ) \
+    /*                                      Disinfect                                        */ \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                             AdjustDisinfectResponseData ) \
                                                                                                 \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                        AdjustBloodDialysateResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                              AdjustDurationResponseData ) \
@@ -576,6 +615,9 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                    AdjustUltrafiltrationInitRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(               AdjustPatientConnectionConfirmRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                         AdjustStartTreatmentRequestData ) \
+    /*                                      Disinfection                                     */ \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                              AdjustDisinfectRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(               AdjustDisinfectChemicalConfirmRequestData ) \
                                                                                                 \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                         AdjustBloodDialysateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                               AdjustDurationRequestData ) \
@@ -617,6 +659,9 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(             AdjustUltrafiltrationInitRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(        AdjustPatientConnectionConfirmRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                  AdjustStartTreatmentRequestData ) \
+    /*                                      Disinfection                                     */ \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                       AdjustDisinfectRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(        AdjustDisinfectChemicalConfirmRequestData ) \
                                                                                                 \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                  AdjustBloodDialysateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                        AdjustDurationRequestData ) \
@@ -658,6 +703,9 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(             AdjustUltrafiltrationInitRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(        AdjustPatientConnectionConfirmRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                  AdjustStartTreatmentRequestData ) \
+    /*                                      Disinfection                                     */ \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                       AdjustDisinfectRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(        AdjustDisinfectChemicalConfirmRequestData ) \
                                                                                                 \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                  AdjustBloodDialysateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                        AdjustDurationRequestData ) \
@@ -725,6 +773,12 @@
     ACTION_RECEIVE_SIGNAL(                                PreTreatmentSelfTestNoCartridgeData ) \
     ACTION_RECEIVE_SIGNAL(                                        PreTreatmentSelfTestDryData ) \
     ACTION_RECEIVE_SIGNAL(                                   PreTreatmentDisposablesPrimeData ) \
+    /*                                      Disinfection                                     */ \
+    ACTION_RECEIVE_SIGNAL(                                               DisinfectDGFlushData ) \
+    ACTION_RECEIVE_SIGNAL(                                            DisinfectDGHeatTimeData ) \
+    ACTION_RECEIVE_SIGNAL(                                     DisinfectDGHeatTemperatureData ) \
+    ACTION_RECEIVE_SIGNAL(                                        DisinfectDGChemicalTimeData ) \
+    ACTION_RECEIVE_SIGNAL(                                         DisinfectDGChemicalTBDData ) \
     /*   Response */                                                                            \
     /*                                     Post-Treatment                                    */ \
     ACTION_RECEIVE_SIGNAL(                        AdjustDisposablesRemovalConfirmResponseData ) \
@@ -738,6 +792,8 @@
     ACTION_RECEIVE_SIGNAL(                              AdjustUltrafiltrationInitResponseData ) \
     ACTION_RECEIVE_SIGNAL(                         AdjustPatientConnectionConfirmResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                   AdjustStartTreatmentResponseData ) \
+    /*                                      Disinfect                                        */ \
+    ACTION_RECEIVE_SIGNAL(                                        AdjustDisinfectResponseData ) \
                                                                                                 \
     ACTION_RECEIVE_SIGNAL(                                   AdjustBloodDialysateResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                         AdjustDurationResponseData ) \
Fisheye: Tag 2c3846821eda0903c34bb5fcf2aebcbde2d0343a refers to a dead (removed) revision in file `sources/model/dg/data/MDGFilterFlushData.cpp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2c3846821eda0903c34bb5fcf2aebcbde2d0343a refers to a dead (removed) revision in file `sources/model/dg/data/MDGFilterFlushData.h'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: sources/model/dg/data/disinfect/MDisinfectDGChemicalTBDData.cpp
===================================================================
diff -u
--- sources/model/dg/data/disinfect/MDisinfectDGChemicalTBDData.cpp	(revision 0)
+++ sources/model/dg/data/disinfect/MDisinfectDGChemicalTBDData.cpp	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -0,0 +1,45 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ *
+ * \file    MDisinfectDGChemicalTBDData.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      18-Apr-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  18-Apr-2021
+ *
+ */
+#include "MDisinfectDGChemicalTBDData.h"
+
+using namespace Model;
+
+QVariantList MDisinfectDGChemicalTBD::parameters() const {
+    return {
+        _data.mTarget .value,
+        _data.mValue  .value,
+    };
+}
+
+bool MDisinfectDGChemicalTBD::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
+    int index = 0; // message data start position
+    if (GetValue(vByteArray, index, _data.mTarget ))
+    if (GetValue(vByteArray, index, _data.mValue  ))
+        return true ;
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+}
+
+/*!
+ * \brief   MDisinfectDGChemicalTBD::data
+ * \details Provides model's Data from the received messages data values
+ * \return  Data
+ */
+MDisinfectDGChemicalTBD::Data MDisinfectDGChemicalTBD::data() const {
+    Data data;
+    data.mTarget = _data.mTarget .value;
+    data.mValue  = _data.mValue  .value;
+    return data;
+}
Index: sources/model/dg/data/disinfect/MDisinfectDGChemicalTBDData.h
===================================================================
diff -u
--- sources/model/dg/data/disinfect/MDisinfectDGChemicalTBDData.h	(revision 0)
+++ sources/model/dg/data/disinfect/MDisinfectDGChemicalTBDData.h	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -0,0 +1,82 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ *
+ * \file    MDisinfectDGChemicalTBDData.h
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      18-Apr-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  18-Apr-2021
+ *
+ */
+#pragma once
+
+// Qt
+#include <QString>
+
+// Project
+#include "MAbstract.h"
+#include "types.h"
+
+// forward declarations
+class tst_models;
+
+namespace Model {
+
+/*!
+ * \brief   The MDisinfectDGChemicalTBD class
+ * \details The progress time data model
+ *
+ * | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description |
+ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:|
+ * |0x8600| 0x020  | 7   | 1 Hz   | N   | HD  | All | Disinfect DG ChemicalTBD Progress |
+ *
+ * | Payload  ||
+ * |          ||
+ * | #1:(U32) | \ref Data::mTimeout     |
+ * | #2:(U32) | \ref Data::mCountDown   |
+ *
+ * \sa Data
+ *
+ * <h2 class="groupheader">Logging info</h2>
+ * |              ||
+ * |              ||
+ * | typeText     | Datum |
+ * | unitText     | DG    |
+ * | infoText     | DisinfectDGChemicalTBD |
+ *
+ */
+class MDisinfectDGChemicalTBD : public MAbstract {
+
+    // friends
+    friend class ::tst_models;
+
+    QVariantList parameters() const override;
+
+    struct {
+        Types::U32 mTarget  ;
+        Types::U32 mValue   ;
+    } _data;
+
+public:
+
+    Type_Enum    typeText  () const override { return Type_Enum::eDatum ; }
+    Unit_Enum    unitText  () const override { return Unit_Enum::eDG    ; }
+    QString      infoText  () const override { return QString("DisinfectDGChemicalTBD"); }
+
+    struct Data {
+        quint32    mTarget  = 0;
+        quint32    mValue   = 0;
+    };
+
+    MDisinfectDGChemicalTBD() {}
+
+    bool    fromByteArray   (const QByteArray   &vByteArray  , int *vIndex = nullptr)       override;
+    Data    data            (                                                       ) const         ;
+};
+}
+
+typedef Model::MDisinfectDGChemicalTBD::Data DisinfectDGChemicalTBDData;
Index: sources/model/dg/data/disinfect/MDisinfectDGChemicalTimeData.cpp
===================================================================
diff -u
--- sources/model/dg/data/disinfect/MDisinfectDGChemicalTimeData.cpp	(revision 0)
+++ sources/model/dg/data/disinfect/MDisinfectDGChemicalTimeData.cpp	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -0,0 +1,45 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ *
+ * \file    MDisinfectDGChemicalTimeData.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      18-Apr-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  18-Apr-2021
+ *
+ */
+#include "MDisinfectDGChemicalTimeData.h"
+
+using namespace Model;
+
+QVariantList MDisinfectDGChemicalTime::parameters() const {
+    return {
+        _data.mTimeout   .value,
+        _data.mCountdown .value,
+    };
+}
+
+bool MDisinfectDGChemicalTime::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
+    int index = 0; // message data start position
+    if (GetValue(vByteArray, index, _data.mTimeout   ))
+    if (GetValue(vByteArray, index, _data.mCountdown ))
+        return true ;
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+}
+
+/*!
+ * \brief   MDisinfectDGChemicalTime::data
+ * \details Provides model's Data from the received messages data values
+ * \return  Data
+ */
+MDisinfectDGChemicalTime::Data MDisinfectDGChemicalTime::data() const {
+    Data data;
+    data.mTimeout   = _data.mTimeout   .value;
+    data.mCountdown = _data.mCountdown .value;
+    return data;
+}
Index: sources/model/dg/data/disinfect/MDisinfectDGChemicalTimeData.h
===================================================================
diff -u
--- sources/model/dg/data/disinfect/MDisinfectDGChemicalTimeData.h	(revision 0)
+++ sources/model/dg/data/disinfect/MDisinfectDGChemicalTimeData.h	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -0,0 +1,82 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ *
+ * \file    MDisinfectDGChemicalTimeData.h
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      18-Apr-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  18-Apr-2021
+ *
+ */
+#pragma once
+
+// Qt
+#include <QString>
+
+// Project
+#include "MAbstract.h"
+#include "types.h"
+
+// forward declarations
+class tst_models;
+
+namespace Model {
+
+/*!
+ * \brief   The MDisinfectDGChemicalTime class
+ * \details The progress time data model
+ *
+ * | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description |
+ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:|
+ * |0x8500| 0x020  | 7   | 1 Hz   | N   | HD  | All | Disinfect DG ChemicalTime Progress |
+ *
+ * | Payload  ||
+ * |          ||
+ * | #1:(U32) | \ref Data::mTimeout     |
+ * | #2:(U32) | \ref Data::mCountDown   |
+ *
+ * \sa Data
+ *
+ * <h2 class="groupheader">Logging info</h2>
+ * |              ||
+ * |              ||
+ * | typeText     | Datum |
+ * | unitText     | DG    |
+ * | infoText     | DisinfectDGChemicalTime |
+ *
+ */
+class MDisinfectDGChemicalTime : public MAbstract {
+
+    // friends
+    friend class ::tst_models;
+
+    QVariantList parameters() const override;
+
+    struct {
+        Types::U32 mTimeout     ;
+        Types::U32 mCountdown   ;
+    } _data;
+
+public:
+
+    Type_Enum    typeText  () const override { return Type_Enum::eDatum ; }
+    Unit_Enum    unitText  () const override { return Unit_Enum::eDG    ; }
+    QString      infoText  () const override { return QString("DisinfectDGChemicalTime"); }
+
+    struct Data {
+        quint32    mTimeout     = 0;
+        quint32    mCountdown   = 0;
+    };
+
+    MDisinfectDGChemicalTime() {}
+
+    bool    fromByteArray   (const QByteArray   &vByteArray  , int *vIndex = nullptr)       override;
+    Data    data            (                                                       ) const         ;
+};
+}
+
+typedef Model::MDisinfectDGChemicalTime::Data DisinfectDGChemicalTimeData;
Index: sources/model/dg/data/disinfect/MDisinfectDGFlushData.cpp
===================================================================
diff -u
--- sources/model/dg/data/disinfect/MDisinfectDGFlushData.cpp	(revision 0)
+++ sources/model/dg/data/disinfect/MDisinfectDGFlushData.cpp	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -0,0 +1,45 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ *
+ * \file    MDisinfectDGFlushData.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      18-Apr-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  18-Apr-2021
+ *
+ */
+#include "MDisinfectDGFlushData.h"
+
+using namespace Model;
+
+QVariantList MDisinfectDGFlush::parameters() const {
+    return {
+        _data.mTimeout   .value,
+        _data.mCountdown .value,
+    };
+}
+
+bool MDisinfectDGFlush::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
+    int index = 0; // message data start position
+    if (GetValue(vByteArray, index, _data.mTimeout   ))
+    if (GetValue(vByteArray, index, _data.mCountdown ))
+        return true ;
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+}
+
+/*!
+ * \brief   MDisinfectDGFlush::data
+ * \details Provides model's Data from the received messages data values
+ * \return  Data
+ */
+MDisinfectDGFlush::Data MDisinfectDGFlush::data() const {
+    Data data;
+    data.mTimeout   = _data.mTimeout   .value;
+    data.mCountdown = _data.mCountdown .value;
+    return data;
+}
Index: sources/model/dg/data/disinfect/MDisinfectDGFlushData.h
===================================================================
diff -u
--- sources/model/dg/data/disinfect/MDisinfectDGFlushData.h	(revision 0)
+++ sources/model/dg/data/disinfect/MDisinfectDGFlushData.h	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -0,0 +1,82 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ *
+ * \file    MDisinfectDGFlushData.h
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      18-Apr-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  18-Apr-2021
+ *
+ */
+#pragma once
+
+// Qt
+#include <QString>
+
+// Project
+#include "MAbstract.h"
+#include "types.h"
+
+// forward declarations
+class tst_models;
+
+namespace Model {
+
+/*!
+ * \brief   The MDisinfectDGFlush class
+ * \details The progress time data model
+ *
+ * | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description |
+ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:|
+ * |0x8200| 0x020  | 7   | 1 Hz   | N   | HD  | All | Disinfect DG Flush Progress |
+ *
+ * | Payload  ||
+ * |          ||
+ * | #1:(U32) | \ref Data::mTimeout     |
+ * | #2:(U32) | \ref Data::mCountDown   |
+ *
+ * \sa Data
+ *
+ * <h2 class="groupheader">Logging info</h2>
+ * |              ||
+ * |              ||
+ * | typeText     | Datum            |
+ * | unitText     | DG               |
+ * | infoText     | DisinfectDGFlush |
+ *
+ */
+class MDisinfectDGFlush : public MAbstract {
+
+    // friends
+    friend class ::tst_models;
+
+    QVariantList parameters() const override;
+
+    struct {
+        Types::U32 mTimeout     ;
+        Types::U32 mCountdown   ;
+    } _data;
+
+public:
+
+    Type_Enum    typeText  () const override { return Type_Enum::eDatum ; }
+    Unit_Enum    unitText  () const override { return Unit_Enum::eDG    ; }
+    QString      infoText  () const override { return QString("DisinfectDGFlush"); }
+
+    struct Data {
+        quint32    mTimeout     = 0;
+        quint32    mCountdown   = 0;
+    };
+
+    MDisinfectDGFlush() {}
+
+    bool    fromByteArray   (const QByteArray   &vByteArray  , int *vIndex = nullptr)       override;
+    Data    data            (                                                       ) const         ;
+};
+}
+
+typedef Model::MDisinfectDGFlush::Data DisinfectDGFlushData;
Index: sources/model/dg/data/disinfect/MDisinfectDGHeatTemperatureData.cpp
===================================================================
diff -u
--- sources/model/dg/data/disinfect/MDisinfectDGHeatTemperatureData.cpp	(revision 0)
+++ sources/model/dg/data/disinfect/MDisinfectDGHeatTemperatureData.cpp	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -0,0 +1,45 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ *
+ * \file    MDisinfectDGHeatTemperatureData.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      18-Apr-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  18-Apr-2021
+ *
+ */
+#include "MDisinfectDGHeatTemperatureData.h"
+
+using namespace Model;
+
+QVariantList MDisinfectDGHeatTemperature::parameters() const {
+    return {
+        _data.mTarget .value,
+        _data.mValue  .value,
+    };
+}
+
+bool MDisinfectDGHeatTemperature::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
+    int index = 0; // message data start position
+    if (GetValue(vByteArray, index, _data.mTarget ))
+    if (GetValue(vByteArray, index, _data.mValue  ))
+        return true ;
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+}
+
+/*!
+ * \brief   MDisinfectDGHeatTemperature::data
+ * \details Provides model's Data from the received messages data values
+ * \return  Data
+ */
+MDisinfectDGHeatTemperature::Data MDisinfectDGHeatTemperature::data() const {
+    Data data;
+    data.mTarget = _data.mTarget .value;
+    data.mValue  = _data.mValue  .value;
+    return data;
+}
Index: sources/model/dg/data/disinfect/MDisinfectDGHeatTemperatureData.h
===================================================================
diff -u
--- sources/model/dg/data/disinfect/MDisinfectDGHeatTemperatureData.h	(revision 0)
+++ sources/model/dg/data/disinfect/MDisinfectDGHeatTemperatureData.h	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -0,0 +1,82 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ *
+ * \file    MDisinfectDGHeatTemperatureData.h
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      18-Apr-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  18-Apr-2021
+ *
+ */
+#pragma once
+
+// Qt
+#include <QString>
+
+// Project
+#include "MAbstract.h"
+#include "types.h"
+
+// forward declarations
+class tst_models;
+
+namespace Model {
+
+/*!
+ * \brief   The MDisinfectDGHeatTemperature class
+ * \details The progress time data model
+ *
+ * | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description |
+ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:|
+ * |0x8400| 0x020  | 7   | 1 Hz   | N   | HD  | All | Disinfect DG HeatTemperature Progress |
+ *
+ * | Payload  ||
+ * |          ||
+ * | #1:(U32) | \ref Data::mTarget |
+ * | #2:(U32) | \ref Data::mValue  |
+ *
+ * \sa Data
+ *
+ * <h2 class="groupheader">Logging info</h2>
+ * |              ||
+ * |              ||
+ * | typeText     | Datum |
+ * | unitText     | DG    |
+ * | infoText     | DisinfectDGHeatTemperature |
+ *
+ */
+class MDisinfectDGHeatTemperature : public MAbstract {
+
+    // friends
+    friend class ::tst_models;
+
+    QVariantList parameters() const override;
+
+    struct {
+        Types::U32 mTarget  ;
+        Types::U32 mValue   ;
+    } _data;
+
+public:
+
+    Type_Enum    typeText  () const override { return Type_Enum::eDatum ; }
+    Unit_Enum    unitText  () const override { return Unit_Enum::eDG    ; }
+    QString      infoText  () const override { return QString("DisinfectDGHeatTemperature"); }
+
+    struct Data {
+        quint32    mTarget  = 0;
+        quint32    mValue   = 0;
+    };
+
+    MDisinfectDGHeatTemperature() {}
+
+    bool    fromByteArray   (const QByteArray   &vByteArray  , int *vIndex = nullptr)       override;
+    Data    data            (                                                       ) const         ;
+};
+}
+
+typedef Model::MDisinfectDGHeatTemperature::Data DisinfectDGHeatTemperatureData;
Index: sources/model/dg/data/disinfect/MDisinfectDGHeatTimeData.cpp
===================================================================
diff -u
--- sources/model/dg/data/disinfect/MDisinfectDGHeatTimeData.cpp	(revision 0)
+++ sources/model/dg/data/disinfect/MDisinfectDGHeatTimeData.cpp	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -0,0 +1,45 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ *
+ * \file    MDisinfectDGHeatTimeData.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      18-Apr-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  18-Apr-2021
+ *
+ */
+#include "MDisinfectDGHeatTimeData.h"
+
+using namespace Model;
+
+QVariantList MDisinfectDGHeatTime::parameters() const {
+    return {
+        _data.mTimeout   .value,
+        _data.mCountdown .value,
+    };
+}
+
+bool MDisinfectDGHeatTime::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
+    int index = 0; // message data start position
+    if (GetValue(vByteArray, index, _data.mTimeout   ))
+    if (GetValue(vByteArray, index, _data.mCountdown ))
+        return true ;
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+}
+
+/*!
+ * \brief   MDisinfectDGHeatTime::data
+ * \details Provides model's Data from the received messages data values
+ * \return  Data
+ */
+MDisinfectDGHeatTime::Data MDisinfectDGHeatTime::data() const {
+    Data data;
+    data.mTimeout   = _data.mTimeout   .value;
+    data.mCountdown = _data.mCountdown .value;
+    return data;
+}
Index: sources/model/dg/data/disinfect/MDisinfectDGHeatTimeData.h
===================================================================
diff -u
--- sources/model/dg/data/disinfect/MDisinfectDGHeatTimeData.h	(revision 0)
+++ sources/model/dg/data/disinfect/MDisinfectDGHeatTimeData.h	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -0,0 +1,82 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ *
+ * \file    MDisinfectDGHeatTimeData.h
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      18-Apr-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  18-Apr-2021
+ *
+ */
+#pragma once
+
+// Qt
+#include <QString>
+
+// Project
+#include "MAbstract.h"
+#include "types.h"
+
+// forward declarations
+class tst_models;
+
+namespace Model {
+
+/*!
+ * \brief   The MDisinfectDGHeatTime class
+ * \details The progress time data model
+ *
+ * | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description |
+ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:|
+ * |0x8300| 0x020  | 7   | 1 Hz   | N   | HD  | All | Disinfect DG HeatTime Progress |
+ *
+ * | Payload  ||
+ * |          ||
+ * | #1:(U32) | \ref Data::mTimeout     |
+ * | #2:(U32) | \ref Data::mCountDown   |
+ *
+ * \sa Data
+ *
+ * <h2 class="groupheader">Logging info</h2>
+ * |              ||
+ * |              ||
+ * | typeText     | Datum |
+ * | unitText     | DG    |
+ * | infoText     | DisinfectDGHeatTime |
+ *
+ */
+class MDisinfectDGHeatTime : public MAbstract {
+
+    // friends
+    friend class ::tst_models;
+
+    QVariantList parameters() const override;
+
+    struct {
+        Types::U32 mTimeout     ;
+        Types::U32 mCountdown   ;
+    } _data;
+
+public:
+
+    Type_Enum    typeText  () const override { return Type_Enum::eDatum ; }
+    Unit_Enum    unitText  () const override { return Unit_Enum::eDG    ; }
+    QString      infoText  () const override { return QString("DisinfectDGHeatTime"); }
+
+    struct Data {
+        quint32    mTimeout     = 0;
+        quint32    mCountdown   = 0;
+    };
+
+    MDisinfectDGHeatTime() {}
+
+    bool    fromByteArray   (const QByteArray   &vByteArray  , int *vIndex = nullptr)       override;
+    Data    data            (                                                       ) const         ;
+};
+}
+
+typedef Model::MDisinfectDGHeatTime::Data DisinfectDGHeatTimeData;
Index: sources/model/dg/data/pretreatment/MDGFilterFlushData.cpp
===================================================================
diff -u
--- sources/model/dg/data/pretreatment/MDGFilterFlushData.cpp	(revision 0)
+++ sources/model/dg/data/pretreatment/MDGFilterFlushData.cpp	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -0,0 +1,45 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ *
+ * \file    MDGFilterFlushData.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      02-Mar-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  02-Mar-2021
+ *
+ */
+#include "MDGFilterFlushData.h"
+
+using namespace Model;
+
+QVariantList MDGFilterFlush::parameters() const {
+    return {
+        _data.mTimeout   .value,
+        _data.mCountdown .value,
+    };
+}
+
+bool MDGFilterFlush::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
+    int index = 0; // message data start position
+    if (GetValue(vByteArray, index, _data.mTimeout   ))
+    if (GetValue(vByteArray, index, _data.mCountdown ))
+        return true ;
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+}
+
+/*!
+ * \brief   MDGFilterFlush::data
+ * \details Provides model's Data from the received messages data values
+ * \return  Data
+ */
+MDGFilterFlush::Data MDGFilterFlush::data() const {
+    Data data;
+    data.mTimeout   = _data.mTimeout   .value;
+    data.mCountdown = _data.mCountdown .value;
+    return data;
+}
Index: sources/model/dg/data/pretreatment/MDGFilterFlushData.h
===================================================================
diff -u
--- sources/model/dg/data/pretreatment/MDGFilterFlushData.h	(revision 0)
+++ sources/model/dg/data/pretreatment/MDGFilterFlushData.h	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -0,0 +1,82 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ *
+ * \file    MDGFilterFlush.h
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      02-Mar-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  02-Mar-2021
+ *
+ */
+#pragma once
+
+// Qt
+#include <QString>
+
+// Project
+#include "MAbstract.h"
+#include "types.h"
+
+// forward declarations
+class tst_models;
+
+namespace Model {
+
+/*!
+ * \brief   The MDGFilterFlush class
+ * \details The progress time data model
+ *
+ * | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description          |
+ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:         |
+ * |0x6000| 0x020  | 7   | 1 Hz   | N   | HD  | All | Filter FlushProgress |
+ *
+ * | Payload  ||
+ * |          ||
+ * | #1:(U32) | \ref Data::mTimeout     |
+ * | #2:(U32) | \ref Data::mCountDown   |
+ *
+ * \sa Data
+ *
+ * <h2 class="groupheader">Logging info</h2>
+ * |              ||
+ * |              ||
+ * | typeText     | Datum       |
+ * | unitText     | DG          |
+ * | infoText     | FilterFlush |
+ *
+ */
+class MDGFilterFlush : public MAbstract {
+
+    // friends
+    friend class ::tst_models;
+
+    QVariantList parameters() const override;
+
+    struct {
+        Types::U32 mTimeout     ;
+        Types::U32 mCountdown   ;
+    } _data;
+
+public:
+
+    Type_Enum    typeText  () const override { return Type_Enum::eDatum ; }
+    Unit_Enum    unitText  () const override { return Unit_Enum::eDG    ; }
+    QString      infoText  () const override { return QString("FilterFlush"); }
+
+    struct Data {
+        quint32    mTimeout     = 0;
+        quint32    mCountdown   = 0;
+    };
+
+    MDGFilterFlush() {}
+
+    bool    fromByteArray   (const QByteArray   &vByteArray  , int *vIndex = nullptr)       override;
+    Data    data            (                                                       ) const         ;
+};
+}
+
+typedef Model::MDGFilterFlush::Data DGFilterFlushData;
Index: sources/model/hd/adjustment/disinfect/MDisinfectAdjustRequests.h
===================================================================
diff -u
--- sources/model/hd/adjustment/disinfect/MDisinfectAdjustRequests.h	(revision 0)
+++ sources/model/hd/adjustment/disinfect/MDisinfectAdjustRequests.h	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -0,0 +1,100 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ *
+ * \file    MDisinfectAdjustRequests.h
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      18-Apr-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  18-Apr-2021
+ *
+ */
+
+#pragma once
+
+// Qt
+#include <QtGlobal>
+
+//project
+#include "MAdjustRequestsBase.h"
+#include "GuiGlobals.h"
+#include "MessageGlobals.h"
+
+using namespace Gui;
+
+namespace Model {
+
+/*!
+ * Simple request models
+ * These are models to send the request for the doAdjustment
+ * The the only reason thy have been defined to help overloading the adjustment methods
+ * Otherwise the parameters are so tiny models.
+ */
+
+/*!
+ * \brief   The MAdjustDisinfectReq class
+ * \details The model to request heat/chemical disinfect
+ *
+ * | MSG  | CAN ID | Type | Ack | Src | Dest | Description |
+ * |:----:|:------:|:----:|:---:|:---:|:----:|:-----------:|
+ * |0x7F00| 0x100  | Req  | Y   | UI  | HD   | Flush, Heat/Chemical Disinfect Request |
+ *
+ * | Payload  ||
+ * |          ||
+ * | #1:(U32) | \ref mState |
+ *
+ */
+class MAdjustDisinfectReq : public MModel {
+public:
+    enum Options {
+        eUnknown    = -1,
+        eFlush      =  0,
+        eHeat       =  1,
+        eChemical   =  2,
+    };
+    Options mState = eUnknown;
+
+    // coco begin validated : Has been validated manually.
+    // This object is used statically for now, kept the logic for later usage.
+    QString toString() {
+        return toString({mState});
+    }
+    // coco end
+    static QString toString(const QVariantList &vParameters) {
+        return MModel::toString("Disinfect", vParameters);
+    }
+};
+
+/*!
+ * \brief   The MAdjustDisinfectChemicalConfirmReq class
+ * \details The model to Confirm Disposables Removal
+ *
+ * | MSG  | CAN ID | Type | Ack | Src | Dest | Description |
+ * |:----:|:------:|:----:|:---:|:---:|:----:|:-----------:|
+ * |0x8100| 0x100  | Req  | Y   | UI  | HD   | Chemical Disinfection User Confirm Request |
+ *
+ * | Payload  ||
+ * |          ||
+ * | None     ||
+ *
+ */
+class MAdjustDisinfectChemicalConfirmReq : public MModel {
+public:
+    // coco begin validated : Has been validated manually.
+    // This object is used statically for now, kept the logic for later usage.
+    QString toString() {
+        return toString({});
+    }
+    // coco end
+    static QString toString(const QVariantList &vParameters) {
+        return MModel::toString("DisinfectChemicalConfirm", vParameters);
+    }
+};
+
+}
+
+typedef Model::                MAdjustDisinfectReq                 AdjustDisinfectRequestData;
+typedef Model:: MAdjustDisinfectChemicalConfirmReq  AdjustDisinfectChemicalConfirmRequestData;
Index: sources/model/hd/adjustment/disinfect/MDisinfectAdjustResponse.cpp
===================================================================
diff -u
--- sources/model/hd/adjustment/disinfect/MDisinfectAdjustResponse.cpp	(revision 0)
+++ sources/model/hd/adjustment/disinfect/MDisinfectAdjustResponse.cpp	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -0,0 +1,45 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ *
+ * \file    MDisinfectAdjustResponse.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      18-Apr-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  18-Apr-2021
+ *
+ */
+#include "MDisinfectAdjustResponse.h"
+
+using namespace Model;
+
+QVariantList MAdjustDisinfectResponse::parameters() const {
+    return {
+        _data.mAccepted.value,
+        _data.mReason  .value,
+    };
+}
+
+bool MAdjustDisinfectResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
+    int index = 0; // message data start position
+    if (GetValue(vByteArray, index, _data.mAccepted ))
+    if (GetValue(vByteArray, index, _data.mReason   ))
+         return true ;
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+}
+
+/*!
+ * \brief   MAdjustDisinfectResponse::data
+ * \details Provides model's Data from the received messages data values
+ * \return  Data
+ */
+AdjustDisinfectResponseData MAdjustDisinfectResponse::data() const {
+    Data data;
+    data.mAccepted  = _data.mAccepted.value;
+    data.mReason    = _data.mReason  .value;
+    return data;
+}
Index: sources/model/hd/adjustment/disinfect/MDisinfectAdjustResponse.h
===================================================================
diff -u
--- sources/model/hd/adjustment/disinfect/MDisinfectAdjustResponse.h	(revision 0)
+++ sources/model/hd/adjustment/disinfect/MDisinfectAdjustResponse.h	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -0,0 +1,83 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ *
+ * \file    MDisinfectAdjustResponse.h
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      18-Apr-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  18-Apr-2021
+ *
+ */
+#pragma once
+
+// Qt
+#include <QString>
+
+// Project
+#include "MAbstract.h"
+#include "types.h"
+
+// forward declarations
+class tst_models;
+
+namespace Model {
+
+/*!
+ * \brief   The MAdjustDisinfectResponse class
+ * \details The Disinfect adjustment response model
+ *
+ * | MSG  | CAN ID | Type | Ack | Src | Dest | Description |
+ * |:----:|:------:|:----:|:---:|:---:|:----:|:---------:  |
+ * |0x8000| 0x020  | Rsp  | Y   | HD  | UI   | Flush, Heat/Chemical Disinfect Response |
+ *
+ * | Payload  ||
+ * |          ||
+ * | #1:(U32) | \ref Data::mAccepted |
+ * | #2:(U32) | \ref Data::mReason   |
+ *
+ * \sa Data
+ * \sa MAdjustDisinfectReq : Disinfect Request
+ *
+ * <h2 class="groupheader">Logging info</h2>
+ * |              ||
+ * |              ||
+ * | typeText     | Event           |
+ * | unitText     | HD              |
+ * | infoText     | AdjustDisinfect |
+ *
+ */
+class MAdjustDisinfectResponse : public MAbstract {
+
+    // friends
+    friend class ::tst_models;
+
+    QVariantList parameters() const override;
+
+    struct {
+        Types::U32 mAccepted;
+        Types::U32 mReason  ;
+    } _data;
+
+public:
+
+    Type_Enum    typeText  () const override { return Type_Enum::eEvent                   ; }
+    Unit_Enum    unitText  () const override { return Unit_Enum::eHD                      ; }
+    QString      infoText  () const override { return QString("AdjustDisinfect") ; }
+
+    struct Data {
+        bool       mAccepted = 0;  /*!< Accepted        value of type quint32 extracted out */
+        quint32    mReason   = 0;  /*!< Reason          value of type quint32 extracted out */
+    };
+
+    MAdjustDisinfectResponse () { }
+
+    bool    fromByteArray   (const QByteArray   &vByteArray  , int *vIndex = nullptr)       override;
+    Data    data            (                                                       ) const         ;
+};
+}
+
+typedef Model::MAdjustDisinfectResponse::Data AdjustDisinfectResponseData;
Index: sources/view/VView.h
===================================================================
diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a
--- sources/view/VView.h	(.../VView.h)	(revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f)
+++ sources/view/VView.h	(.../VView.h)	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -170,5 +170,8 @@
     REGISTER_TYPE( VPostTreatmentAdjustmentPatientDisconnectionConfirm  ) \
     REGISTER_TYPE( VPostTreatmentAdjustmentDisposablesRemovalConfirm    ) \
     REGISTER_TYPE( VPostTreatmentAdjustmentTreatmentLog                 ) \
+    /* Disinfection */                                                    \
+    REGISTER_TYPE( VDisinfectDGData                                     ) \
+    REGISTER_TYPE( VDisinfectAdjustDisinfect                            ) \
 
 //--------------------------------------------------------------------------------//
Fisheye: Tag 2c3846821eda0903c34bb5fcf2aebcbde2d0343a refers to a dead (removed) revision in file `sources/view/dg/data/VDGFilterFlushData.cpp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2c3846821eda0903c34bb5fcf2aebcbde2d0343a refers to a dead (removed) revision in file `sources/view/dg/data/VDGFilterFlushData.h'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: sources/view/dg/data/disinfect/VDisinfectDGData.cpp
===================================================================
diff -u
--- sources/view/dg/data/disinfect/VDisinfectDGData.cpp	(revision 0)
+++ sources/view/dg/data/disinfect/VDisinfectDGData.cpp	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -0,0 +1,86 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ *
+ * \file    VDisinfectDGData.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      02-Mar-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  02-Mar-2021
+ *
+ */
+#include "VDisinfectDGData.h"
+
+// Project
+#include "GuiController.h"
+
+VIEW_DEF_CLASS(VDisinfectDGData)
+
+void View::VDisinfectDGData::initConnections() {
+    ACTION_VIEW_CONNECTION(           DisinfectDGFlushData );
+    ACTION_VIEW_CONNECTION(        DisinfectDGHeatTimeData );
+    ACTION_VIEW_CONNECTION( DisinfectDGHeatTemperatureData );
+    ACTION_VIEW_CONNECTION(    DisinfectDGChemicalTimeData );
+    ACTION_VIEW_CONNECTION(     DisinfectDGChemicalTBDData );
+}
+
+/*!
+ * \brief   View::VDisinfectDGData::onActionReceive
+ * \details received response model data handler
+ * \param   vData - model data
+ */
+void View::VDisinfectDGData::onActionReceive(const DisinfectDGFlushData              &vData)
+{
+    flushTotal              (vData.mTimeout                         );
+    flushRemaining          (vData.mCountdown                       );
+    flushElapsed            (vData.mTimeout - vData.mCountdown      );
+}
+
+/*!
+ * \brief   View::VDisinfectDGData::onActionReceive
+ * \details received response model data handler
+ * \param   vData - model data
+ */
+void View::VDisinfectDGData::onActionReceive(const DisinfectDGHeatTimeData           &vData)
+{
+    heatTimeTotal           (vData.mTimeout                         );
+    heatTimeRemaining       (vData.mCountdown                       );
+    heatTimeElapsed         (vData.mTimeout - vData.mCountdown      );
+}
+
+/*!
+ * \brief   View::VDisinfectDGData::onActionReceive
+ * \details received response model data handler
+ * \param   vData - model data
+ */
+void View::VDisinfectDGData::onActionReceive(const DisinfectDGHeatTemperatureData    &vData)
+{
+    heatTemperatureTarget   (vData.mTarget                          );
+    heatTemperatureValue    (vData.mValue                           );
+}
+
+/*!
+ * \brief   View::VDisinfectDGData::onActionReceive
+ * \details received response model data handler
+ * \param   vData - model data
+ */
+void View::VDisinfectDGData::onActionReceive(const DisinfectDGChemicalTimeData       &vData)
+{
+    chemicalTimeTotal       (vData.mTimeout                         );
+    chemicalTimeRemaining   (vData.mCountdown                       );
+    chemicalTimeElapsed     (vData.mTimeout - vData.mCountdown      );
+}
+
+/*!
+ * \brief   View::VDisinfectDGData::onActionReceive
+ * \details received response model data handler
+ * \param   vData - model data
+ */
+void View::VDisinfectDGData::onActionReceive(const DisinfectDGChemicalTBDData        &vData)
+{
+    chemicalTBDTarget       (vData.mTarget                          );
+    chemicalTBDValue        (vData.mValue                           );
+}
Index: sources/view/dg/data/disinfect/VDisinfectDGData.h
===================================================================
diff -u
--- sources/view/dg/data/disinfect/VDisinfectDGData.h	(revision 0)
+++ sources/view/dg/data/disinfect/VDisinfectDGData.h	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -0,0 +1,72 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ *
+ * \file    VDisinfectDGData.h
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      18-Apr-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  18-Apr-2021
+ *
+ */
+#pragma once
+
+// Qt
+#include <QObject>
+
+// Project
+#include "main.h" // Doxygen : don't remove
+#include "VView.h"
+#include "MDisinfectDGFlushData.h"
+#include "MDisinfectDGHeatTimeData.h"
+#include "MDisinfectDGHeatTemperatureData.h"
+#include "MDisinfectDGChemicalTimeData.h"
+#include "MDisinfectDGChemicalTBDData.h"
+
+// namespace
+namespace View {
+
+/*!
+ * \brief   The VTreatmentTime class
+ * \details View for Model's data representation.
+ *
+ * \sa Model::MTreatmentTime
+ *
+ */
+class VDisinfectDGData : public QObject
+{
+    Q_OBJECT
+
+    // DisinfectDGFlushData
+    PROPERTY( quint32 , flushTotal              , 0)
+    PROPERTY( quint32 , flushRemaining          , 0)
+    PROPERTY( quint32 , flushElapsed            , 0)
+    // DisinfectDGHeatTimeData
+    PROPERTY( quint32 , heatTimeTotal           , 0)
+    PROPERTY( quint32 , heatTimeRemaining       , 0)
+    PROPERTY( quint32 , heatTimeElapsed         , 0)
+    // DisinfectDGHeatTemperatureData
+    PROPERTY( float   , heatTemperatureTarget   , 0)
+    PROPERTY( float   , heatTemperatureValue    , 0)
+    // DisinfectDGChemicalTimeData
+    PROPERTY( quint32 , chemicalTimeTotal       , 0)
+    PROPERTY( quint32 , chemicalTimeRemaining   , 0)
+    PROPERTY( quint32 , chemicalTimeElapsed     , 0)
+    // DisinfectDGChemicalTBDData
+    PROPERTY( float   , chemicalTBDTarget       , 0)
+    PROPERTY( float   , chemicalTBDValue        , 0)
+
+
+
+
+    VIEW_DEC_CLASS(VDisinfectDGData                 )
+    VIEW_DEC_SLOT (DisinfectDGFlushData             )
+    VIEW_DEC_SLOT (DisinfectDGHeatTimeData          )
+    VIEW_DEC_SLOT (DisinfectDGHeatTemperatureData   )
+    VIEW_DEC_SLOT (DisinfectDGChemicalTimeData      )
+    VIEW_DEC_SLOT (DisinfectDGChemicalTBDData       )
+};
+}
Index: sources/view/dg/data/pretreatment/VDGFilterFlushData.cpp
===================================================================
diff -u
--- sources/view/dg/data/pretreatment/VDGFilterFlushData.cpp	(revision 0)
+++ sources/view/dg/data/pretreatment/VDGFilterFlushData.cpp	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -0,0 +1,27 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ *
+ * \file    VDGFilterFlush.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      02-Mar-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  02-Mar-2021
+ *
+ */
+#include "VDGFilterFlushData.h"
+
+// Project
+#include "GuiController.h"
+
+VIEW_DEF(VDGFilterFlush, DGFilterFlushData)
+
+void VDGFilterFlush::onActionReceive(const DGFilterFlushData &vData)
+{
+    total     (vData.mTimeout                       );
+    remaining (vData.mCountdown                     );
+    elapsed   (vData.mTimeout - vData.mCountdown    );
+}
Index: sources/view/dg/data/pretreatment/VDGFilterFlushData.h
===================================================================
diff -u
--- sources/view/dg/data/pretreatment/VDGFilterFlushData.h	(revision 0)
+++ sources/view/dg/data/pretreatment/VDGFilterFlushData.h	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -0,0 +1,45 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ *
+ * \file    VDGFilterFlush.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      02-Mar-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  02-Mar-2021
+ *
+ */
+#pragma once
+
+// Qt
+#include <QObject>
+
+// Project
+#include "main.h" // Doxygen : don't remove
+#include "VView.h"
+#include "MDGFilterFlushData.h"
+
+// namespace
+namespace View {
+
+/*!
+ * \brief   The VTreatmentTime class
+ * \details View for Model's data representation.
+ *
+ * \sa Model::MTreatmentTime
+ *
+ */
+class VDGFilterFlush : public QObject
+{
+    Q_OBJECT
+
+    PROPERTY( quint32 , total     , 0)
+    PROPERTY( quint32 , remaining , 0)
+    PROPERTY( quint32 , elapsed   , 0)
+
+    VIEW_DEC(VDGFilterFlush, DGFilterFlushData)
+};
+}
Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp
===================================================================
diff -u
--- sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp	(revision 0)
+++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -0,0 +1,87 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ *
+ * \file    VDisinfectAdjustDisinfect.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      18-Apr-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  18-Apr-2021
+ *
+ */
+#include "VDisinfectAdjustDisinfect.h"
+
+// Project
+#include "GuiController.h"
+
+VIEW_DEF_CLASS_ADJUSTMENT(VDisinfectAdjustDisinfect)
+
+/*! \brief   Connection Initializer
+    \details All the class signal/slot connections are defined here.
+*/
+void View::VDisinfectAdjustDisinfect::initConnections() {
+    ADJUST_VIEW_CONNECTION(AdjustDisinfectRequestData);
+    ADJUST_VIEW_CONNECTION(AdjustDisinfectChemicalConfirmRequestData);
+    ACTION_VIEW_CONNECTION(AdjustDisinfectResponseData);
+}
+
+/*!
+ * \brief   VDisinfectAdjustDisinfect::onActionReceive
+ * \details received response model data handler
+ * \param   vData - model data
+ */
+void View::VDisinfectAdjustDisinfect::onActionReceive(const AdjustDisinfectResponseData &vData)
+{
+    adjustment_Accepted         ( vData.mAccepted      );
+    adjustment_Reason           ( vData.mReason        );
+
+    // *** has to be the last to let the information to be set and then emit the signal ***
+    // *** otherwise will use the Previous values before being set.                     ***
+    adjustment                  ( true );
+}
+
+/*!
+ * \brief   View::VDisinfectAdjustDisinfect::doDisinfectFlush
+ * \details the invocable slot to send user's Disinfect Flush Request
+ */
+void View::VDisinfectAdjustDisinfect::doFlush()
+{
+    AdjustDisinfectRequestData data;
+    data.mState = AdjustDisinfectRequestData::eFlush;
+    emit didAdjustment(data);
+}
+
+/*!
+ * \brief   View::VDisinfectAdjustDisinfect::doDisinfectHeat
+ * \details the invocable slot to send user's Disinfect Heat Request
+ */
+void View::VDisinfectAdjustDisinfect::doDisinfectHeat()
+{
+    AdjustDisinfectRequestData data;
+    data.mState = AdjustDisinfectRequestData::eHeat;
+    emit didAdjustment(data);
+}
+
+/*!
+ * \brief   View::VDisinfectAdjustDisinfect::doDisinfectChemical
+ * \details the invocable slot to send user's Disinfect Chemical Request
+ */
+void View::VDisinfectAdjustDisinfect::doDisinfectChemical()
+{
+    AdjustDisinfectRequestData data;
+    data.mState = AdjustDisinfectRequestData::eChemical;
+    emit didAdjustment(data);
+}
+
+/*!
+ * \brief   View::VDisinfectAdjustDisinfect::doDisinfectChemicalConfirm
+ * \details the invocable slot to send user's Disinfect Chemical Confirm
+ */
+void View::VDisinfectAdjustDisinfect::doDisinfectChemicalConfirm() {
+    AdjustDisinfectChemicalConfirmRequestData data;
+    emit didAdjustment(data);
+}
+
Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h
===================================================================
diff -u
--- sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h	(revision 0)
+++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -0,0 +1,71 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ *
+ * \file    VDisinfectAdjustDisinfect.h
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      18-Apr-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  18-Apr-2021
+ *
+ */
+#pragma once
+
+#include <QObject>
+
+// Project
+#include "main.h" // Doxygen : don't remove
+#include "VAdjustmentResponseBase.h"
+#include "MDisinfectAdjustRequests.h"
+#include "MDisinfectAdjustResponse.h"
+
+namespace View {
+
+/*!
+ * \brief   The VDisinfectAdjustDisinfect class
+ * \details View for Model's Data representation.
+ *
+ * \sa Model::MAdjustDisposablesRemovalConfirmResponse
+ *
+ */
+class VDisinfectAdjustDisinfect : public VAdjustmentResponseBase
+{
+    Q_OBJECT
+
+    // friends
+    friend class ::tst_views;
+
+    // coco begin validated:
+    // The property adjustment_Triggered has to be always true
+    // and to always trigger the change event to work as a notifier for GUI
+    // has been manually tested that it works perfectly fine
+    TRIGGER( bool      , adjustment     , 0)
+    // coco end
+
+    VIEW_DEC_CLASS_ADJUSTMENT(VDisinfectAdjustDisinfect, AdjustDisinfectResponseData)
+
+public slots:
+    void      doFlush                   ();
+    void      doDisinfectHeat           ();
+    void      doDisinfectChemical       ();
+    void      doDisinfectChemicalConfirm();
+
+signals:
+    /*!
+     * \brief   didAdjustment
+     * \details the notification signal to send the user's Disinfect Request
+     * \param   vData - data model includes request information
+     */
+    void     didAdjustment(const AdjustDisinfectRequestData &vData);
+
+    /*!
+     * \brief   didAdjustment
+     * \details the notification signal to send the user's Disinfect Chemical Confirm
+     * \param   vData - data model includes request information
+     */
+    void     didAdjustment(const AdjustDisinfectChemicalConfirmRequestData &vData);
+};
+}