Index: sources/canbus/MessageDispatcher.cpp
===================================================================
diff -u -r0b8e00869ef81ef0a834c03c13049f4c281870d2 -r583d1953c783940c93f22c37b23daadb1ff3a09c
--- sources/canbus/MessageDispatcher.cpp	(.../MessageDispatcher.cpp)	(revision 0b8e00869ef81ef0a834c03c13049f4c281870d2)
+++ sources/canbus/MessageDispatcher.cpp	(.../MessageDispatcher.cpp)	(revision 583d1953c783940c93f22c37b23daadb1ff3a09c)
@@ -248,19 +248,6 @@
 
 /*!
  * \brief   MessageDispatcher::onAdjustment
- * \details This method transmits the Ultrafiltration Adjustment Denali message.
- * \param   vData - Data model contains treatment ultrafiltration adjustment volume
- * \return  void
- */
-void MessageDispatcher::onAdjustment(const AdjustUltrafiltrationInitRequestData &vData)
-{
-    QVariantList mData;
-    mData += vData.volume;
-    onActionTransmit(GuiActionType::ID_AdjustUltrafiltrationInitReq, mData);
-}
-
-/*!
- * \brief   MessageDispatcher::onAdjustment
  * \details This method transmits the Ultrafiltration State Adjustment Denali message.
  * \param   vData - Data model contains treatment ultrafiltration state adjustment
  * \return  void
@@ -301,19 +288,6 @@
 
 /*!
  * \brief   MessageDispatcher::onAdjustment
- * \details This method transmits the StartTreatment request message.
- * \param   vData - Data model contains the start treatment request information.
- * \return  void
- */
-void MessageDispatcher::onAdjustment(const StartTreatmentRequestData &vData)
-{
-    QVariantList mData;
-    mData += vData.request;
-    onActionTransmit(GuiActionType::ID_StartTreatmentReq, mData);
-}
-
-/*!
- * \brief   MessageDispatcher::onAdjustment
  * \details This method transmits the Alarm Request Silence message.
  * \param   vData - Data model contains the silence request information.
  * \return  void
@@ -352,19 +326,6 @@
 }
 // coco end */
 
-/*!
- * \brief   MessageDispatcher::onAdjustment
- * \details This method transmits the Confirm Treatment request message.
- * \param   vData - Data model contains the confirm treatment request
- * \return  void
- */
-void MessageDispatcher::onAdjustment(const ConfirmTreatmentRequestData &vData)
-{
-    QVariantList mData;
-    mData += vData.request;
-    onActionTransmit(GuiActionType::ID_ConfirmTreatmentReq, mData);
-}
-
 /**
  * \details This method transmits the Saline Bolus Adjustment Denali message.
  * \param   vData - Data model contains treatment Saline Bolus adjustment state.
@@ -454,12 +415,25 @@
     onActionTransmit(GuiActionType::ID_AdjustPressuresLimitsReq, mData);
 }
 
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits the InitTreatment request message.
+ * \param   vData - Data model contains the init treatment request information.
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const AdjustInitTreatmentRequestData &vData)
+{
+    QVariantList mData;
+    mData += vData.requestedState;
+    onActionTransmit(GuiActionType::ID_AdjustInitTreatmentReq, mData);
+}
+
 /**
  * \details This method transmits the Treatment Parameter request message.
  * \param   vData - Data model contains treatment parameter adjustment data structure
  * \return  void
  */
-void MessageDispatcher::onAdjustment(const AdjustTreatmentParametersRequestData &vData)
+void MessageDispatcher::onAdjustment(const AdjustParametersValidationRequestData &vData)
 {
     QVariantList mData;
     mData += vData.bloodFlowRate                ;
@@ -480,11 +454,140 @@
     mData += vData.heparinBolusVolume           ;
     mData += vData.dialysateTemp                ;
 
-    onActionTransmit(GuiActionType::ID_CreateTreatmentReq, mData);
+    onActionTransmit(GuiActionType::ID_AdjustParametersValidationReq, mData);
 }
 
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits the Confirm Treatment request message.
+ * \param   vData - Data model contains the confirm treatment request
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const AdjustParametersConfirmRequestData &vData)
+{
+    QVariantList mData;
+    mData += vData.requestedState;
+    onActionTransmit(GuiActionType::ID_AdjustParametersConfirmReq, mData);
+}
 
 /*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits the Water Sample Adjustment Denali message.
+ * \param   vData - Data model contains Water Sample adjustment.
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const AdjustWaterSampleRequestData &vData)
+{
+    QVariantList mData;
+    mData += vData.requestedState;
+    onActionTransmit(GuiActionType::ID_AdjustWaterSampleReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits the Water Sample Result Adjustment Denali message.
+ * \param   vData - Data model contains Water Sample Result adjustment.
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const AdjustWaterSampleResultRequestData &vData)
+{
+    QVariantList mData;
+    mData += vData.requestedState;
+    onActionTransmit(GuiActionType::ID_AdjustWaterSampleResultReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits the Consumables Confirm Adjustment Denali message.
+ * \param   vData - Data model contains Consumables Confirm adjustment.
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const AdjustConsumablesConfirmRequestData &vData)
+{
+    Q_UNUSED(vData)
+    QVariantList mData;
+    onActionTransmit(GuiActionType::ID_AdjustConsumablesConfirmReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits the Disposables Confirm Adjustment Denali message.
+ * \param   vData - Data model contains Disposables Confirm adjustment.
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const AdjustDisposablesConfirmRequestData &vData)
+{
+    Q_UNUSED(vData)
+    QVariantList mData;
+    onActionTransmit(GuiActionType::ID_AdjustDisposablesConfirmReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits the Disposables Prime Adjustment Denali message.
+ * \param   vData - Data model contains Disposables Prime adjustment.
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const AdjustDisposablesPrimeRequestData &vData)
+{
+    Q_UNUSED(vData)
+    QVariantList mData;
+    onActionTransmit(GuiActionType::ID_AdjustDisposablesPrimeReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits the Patient Connection Begin Adjustment Denali message.
+ * \param   vData - Data model contains Patient Connection Begin adjustment.
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const AdjustPatientConnectionBeginRequestData &vData)
+{
+    Q_UNUSED(vData)
+    QVariantList mData;
+    onActionTransmit(GuiActionType::ID_AdjustPatientConnectionBeginReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits the Ultrafiltration Adjustment Denali message.
+ * \param   vData - Data model contains treatment ultrafiltration adjustment volume
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const AdjustUltrafiltrationInitRequestData &vData)
+{
+    QVariantList mData;
+    mData += vData.volume;
+    onActionTransmit(GuiActionType::ID_AdjustUltrafiltrationInitReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits the Patient Connection Confirm Adjustment Denali message.
+ * \param   vData - Data model contains Patient Connection Confirm adjustment.
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const AdjustPatientConnectionConfirmRequestData &vData)
+{
+    Q_UNUSED(vData)
+    QVariantList mData;
+    onActionTransmit(GuiActionType::ID_AdjustPatientConnectionConfirmReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits the Start Treatment Adjustment Denali message.
+ * \param   vData - Data model contains Start Treatment adjustment.
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const AdjustStartTreatmentRequestData &vData)
+{
+    Q_UNUSED(vData)
+    QVariantList mData;
+    onActionTransmit(GuiActionType::ID_AdjustStartTreatmentReq, mData);
+}
+
+/*!
  * \brief   MessageDispatcher::actionTransmit
  * \details This method is called by slot MessageDispatcher::onActionTransmit
  *          which emits didFrameTransmit on successful interpretation of the requested message
@@ -515,7 +618,9 @@
     bool mNeedsAcknow = needsAcknow(vActionId);
     if (mNeedsAcknow) {
         mSequence = -mSequence;
+        #ifndef DISABLE_ACKNOW_CHECKIN_MESSAGE_LOG
         LOG_EVENT(tr("UI,Ack Req, Sq:%1, ID:%2").arg(mSequence).arg(Format::toHexString(vActionId)));
+        #endif
 #ifdef DEBUG_ACKBACK_HD_TO_UI
                 qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ UI AckReq : %1 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(mSequence);
 #endif
@@ -593,7 +698,9 @@
         GuiActionType mActionId = vMessage.actionId;
         switch (mActionId) {
         case GuiActionType::ID_Acknow:
+            #ifndef DISABLE_ACKNOW_CHECKIN_MESSAGE_LOG
             LOG_EVENT(tr("HD,Ack Bak, Sq:%1").arg(mSequence));
+            #endif
             #ifdef DEBUG_ACKBACK_HD_TO_UI
                 qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ HD AckBak : %1 %2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(mSequence).arg(vMessage.actionId);
             #endif
@@ -602,13 +709,17 @@
 
         default:
             if (mSequence < 0) {
+                #ifndef DISABLE_ACKNOW_CHECKIN_MESSAGE_LOG
                 LOG_EVENT(tr("HD,Ack Req, Sq:%1, ID:%2").arg(mSequence).arg(Format::toHexString(mActionId)));
+                #endif
                 #ifdef DEBUG_ACKBACK_HD_TO_UI
                     qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ HD AckReq : %1 %2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(mSequence).arg(vMessage.actionId);
                 #endif
                 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ UI AckBak is immediately handled at the same place.
                 actionTransmit(GuiActionType::ID_Acknow, {}, -mSequence);
+                #ifndef DISABLE_ACKNOW_CHECKIN_MESSAGE_LOG
                 LOG_EVENT(tr("UI,Ack Bak, Sq:%1").arg(-mSequence));
+                #endif
                 #ifdef DEBUG_ACKBACK_HD_TO_UI
                     qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ UI AckBak : %1 %2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(-mSequence).arg(vMessage.actionId);
                 #endif