Index: sources/canbus/MessageDispatcher.cpp
===================================================================
diff -u -r16bd55822fa77e5bea6fdfa7b54abf123c1da8bb -r5687815256ae070a9a207107088e3f72dd464da0
--- sources/canbus/MessageDispatcher.cpp	(.../MessageDispatcher.cpp)	(revision 16bd55822fa77e5bea6fdfa7b54abf123c1da8bb)
+++ sources/canbus/MessageDispatcher.cpp	(.../MessageDispatcher.cpp)	(revision 5687815256ae070a9a207107088e3f72dd464da0)
@@ -1,13 +1,13 @@
 /*!
  *
- * Copyright (c) 2020-2022 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2020-2024 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    MessageDispatcher.cpp
  * \author  (last)      Behrouz NematiPour
- * \date    (last)      04-Oct-2022
+ * \date    (last)      31-Jul-2024
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  26-Aug-2020
  *
@@ -495,10 +495,9 @@
 void MessageDispatcher::onAdjustment(const AdjustPressuresLimitsRequestData &vData)
 {
     QVariantList mData;
-    mData += vData.mArterialLimitLow ;
-    mData += vData.mArterialLimitHigh;
-    mData += vData.mVenousLimitLow   ;
-    mData += vData.mVenousLimitHigh  ;
+    mData += vData.mArterialPressureLimitWindow ;
+    mData += vData.mVenousPressureLimitWindow   ;
+    mData += vData.mVenousPressureLimitAsymtrc  ;
     onActionTransmit(GuiActionType::ID_AdjustPressuresLimitsReq, mData);
 }
 
@@ -523,24 +522,23 @@
 void MessageDispatcher::onAdjustment(const AdjustParametersValidationRequestData &vData)
 {
     QVariantList mData;
-    mData += vData.bloodFlowRate                ;
-    mData += vData.dialysateFlowRate            ;
-    mData += vData.duration                     ;
-    mData += vData.heparinStopTime              ;
-    mData += vData.salineBolus                  ;
-    mData += vData.acidConcentrate              ;
-    mData += vData.bicarbonateConcentrate       ;
-    mData += vData.dialyzerType                 ;
-    mData += vData.heparinType                  ;
-    mData += vData.bloodPressureMeasureInterval ;
-    mData += vData.rinsebackFlowRate            ;
-    mData += vData.arterialPressureLimitLow     ;
-    mData += vData.arterialPressureLimitHigh    ;
-    mData += vData.venousPressureLimitLow       ;
-    mData += vData.venousPressureLimitHigh      ;
-    mData += vData.heparinDispensingRate        ;
-    mData += vData.heparinBolusVolume           ;
-    mData += vData.dialysateTemp                ;
+    mData += vData.mBloodFlowRate                   ;
+    mData += vData.mDialysateFlowRate               ;
+    mData += vData.mTreatmentDuration               ;
+    mData += vData.mHeparinStopTime                 ;
+    mData += vData.mSalineBolus                     ;
+    mData += vData.mAcidConcentrate                 ;
+    mData += vData.mBicarbonateConcentrate          ;
+    mData += vData.mDialyzerType                    ;
+    mData += vData.mHeparinType                     ;
+    mData += vData.mBloodPressureMeasureInterval    ;
+    mData += vData.mRinsebackFlowRate               ;
+    mData += vData.mArterialPressureLimitWindow     ;
+    mData += vData.mVenousPressureLimitWindow       ;
+    mData += vData.mVenousPressureLimitAsymtrc      ;
+    mData += vData.mHeparinDispensingRate           ;
+    mData += vData.mHeparinBolusVolume              ;
+    mData += vData.mDialysateTemp                   ;
 
     onActionTransmit(GuiActionType::ID_AdjustParametersValidationReq, mData);
 }
@@ -671,14 +669,26 @@
 
 /*!
  * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits the Patient Disconnection Notify Adjustment Denali message.
+ * \param   vData - Data model contains Patient Disconnection Notify adjustment.
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const AdjustPatientDisconnectionNotifyRequestData &)
+{
+    QVariantList mData;
+    onActionTransmit(GuiActionType::ID_AdjustPatientDisconnectNotifyReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
  * \details This method transmits the Patient Disconnection Confirm Adjustment Denali message.
  * \param   vData - Data model contains Patient Disconnection Confirm adjustment.
  * \return  void
  */
 void MessageDispatcher::onAdjustment(const AdjustPatientDisconnectionConfirmRequestData &)
 {
     QVariantList mData;
-    onActionTransmit(GuiActionType::ID_AdjustPatientDisconnectionConfirmReq, mData);
+    onActionTransmit(GuiActionType::ID_AdjustPatientDisconnectConfirmReq, mData);
 }
 
 /*!
@@ -733,6 +743,17 @@
 
 /*!
  * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits the DG Cleaning Usage request message.
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const AdjustDGCleaningUsageRequestData &)
+{
+    QVariantList mData;
+    onActionTransmit(GuiActionType::ID_AdjustDGCleaningUsageReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
  * \details This method transmits the Disinfect request Denali message.
  * \param   vData - Data model contains the epoch time
  * \return  void
@@ -784,6 +805,54 @@
     onActionTransmit(GuiActionType::ID_DuetConfirmUIr, mData);
 }
 
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits the UI RO Water Mode adjustment request.
+ * \param   vData - Data model contains the UI RO Water Mode adjustment request data.
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const DuetRoWaterModeUIiData &vData)
+{
+    QVariantList mData;
+    mData += vData.mStatus;
+    onActionTransmit(GuiActionType::ID_DuetRoWaterModeUIi, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits the HD Usage Info Denali message.
+ * \param   vData -
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const HDUsageInfoRequestData &)
+{
+    QVariantList mData;
+    onActionTransmit(GuiActionType::ID_HDUsageInfoReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits the HD institutional record request to HD.
+ * \param   vData -
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const AdjustInstitutionalRequestData &)
+{
+    QVariantList mData;
+    onActionTransmit(GuiActionType::ID_AdjustInstitutionalRecordReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits the Disposables Removal Confirm Adjustment Denali message.
+ * \param   vData - Data model contains Service Mode adjustment.
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const AdjustHDResetInSrvcRequestData &)
+{
+    QVariantList mData;
+    onActionTransmit(GuiActionType::ID_ResetHDInServiceModeReq, mData);
+}
 // ----------------------------------------------------------------------------------------------------
 
 /*!
@@ -817,8 +886,8 @@
     bool mNeedsAcknow = needsAcknow(vActionId);
     if (mNeedsAcknow) {
         mSequence = -mSequence;
-        if ( gEnableAcknowLog ) {
-            LOG_APPED(tr("UI,Ack Req, Sq:%1, ID:%2").arg(mSequence).arg(Format::toHexString(vActionId)));
+        if ( ! gDisableAcknowLog ) {
+            LOG_APPED_UI(tr("Ack Req, Sq:%1, ID:%2").arg(mSequence).arg(Format::toHexString(vActionId)));
         }
 #ifdef DEBUG_ACKBACK_HD_TO_UI
                 qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ UI AckReq : %1 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(mSequence);
@@ -891,8 +960,8 @@
     bool ok = false;
     if ( mActionId == GuiActionType::ID_Acknow ) {
         ok = true;
-        if ( gEnableAcknowLog ) {
-            LOG_APPED(tr("%1,Ack Bak, Sq:%2").arg(vSrcText).arg(mSequence));
+        if ( ! gDisableAcknowLog ) {
+            LOG_APPED(tr("    ,%1,Ack Bak, Sq:%2").arg(vSrcText).arg(mSequence));
         }
         #ifdef DEBUG_ACKBACK_HD_TO_UI
             qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ HD AckBak : %1 %2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(mSequence).arg(vMessage.actionId);
@@ -920,8 +989,8 @@
 
     if (mSequence < 0) {
         ok = true;
-        if ( gEnableAcknowLog ) {
-            LOG_APPED(tr("%1,Ack Req, Sq:%2, ID:%3").arg(vSrcText).arg(mSequence).arg(Format::toHexString(mActionId)));
+        if ( ! gDisableAcknowLog ) {
+            LOG_APPED(tr("    ,%1,Ack Req, Sq:%2, ID:%3").arg(vSrcText).arg(mSequence).arg(Format::toHexString(mActionId)));
         }
         #ifdef DEBUG_ACKBACK_HD_TO_UI
             qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ HD AckReq : %1 %2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(mSequence).arg(vMessage.actionId);
@@ -930,8 +999,8 @@
         QString dstText;
         Can_Id dstID = MessageInterpreter::identifyDestination(vMessage.can_id, &dstText);
         actionTransmit(GuiActionType::ID_Acknow, {}, -mSequence, dstID);
-        if ( gEnableAcknowLog ) {
-            LOG_APPED(tr("UI,Ack Bak, Sq:%1, Dst:%2").arg(-mSequence).arg(dstText));
+        if ( ! gDisableAcknowLog ) {
+            LOG_APPED_UI(tr("Ack Bak, Sq:%1, Dst:%2").arg(-mSequence).arg(dstText));
         }
         #ifdef DEBUG_ACKBACK_HD_TO_UI
             qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ UI AckBak : %1 %2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(-mSequence).arg(vMessage.actionId);