Index: sources/canbus/MessageDispatcher.cpp
===================================================================
diff -u -ra83697952c42b32904752417c50f1391ea768d5f -rdbe55daa5838b4b8ee07037e78b393c296423cb3
--- sources/canbus/MessageDispatcher.cpp	(.../MessageDispatcher.cpp)	(revision a83697952c42b32904752417c50f1391ea768d5f)
+++ sources/canbus/MessageDispatcher.cpp	(.../MessageDispatcher.cpp)	(revision dbe55daa5838b4b8ee07037e78b393c296423cb3)
@@ -222,8 +222,22 @@
 
 // ----------------------------------------------------------------------------------------------------
 
+
 /*!
  * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits the Dry Bicart DisconnectCommand message.
+ * \param   vData - Data model contains Dry Bicart Disconnect Command
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const AdjustDryBicartDisconnectRequestData &vData)
+{
+    QVariantList mData;
+    mData += vData.command;
+    actionTransmit(GuiActionType::ID_AdjustDryBicartDisconnectReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
  * \details This method transmits the Blood Prime Command message.
  * \param   vData - Data model contains Blood Prime Command
  * \return  void
@@ -493,7 +507,7 @@
  * \param   vData - Data model contains the alarm volume
  * \return  void
  */
-void MessageDispatcher::onAdjustment(const AdjustHDAlarmVolumeRequestData &vData)
+void MessageDispatcher::onAdjustment(const AdjustTDAlarmVolumeRequestData &vData)
 {
     QVariantList mData;
     mData += vData.volume2HD();
@@ -670,6 +684,46 @@
 
 /*!
  * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits the HDF state
+ * \param   vData - Data model contains hdf state adjustment.
+ * \return  void
+ */
+    void MessageDispatcher::onAdjustment(const AdjustHDFStateRequestData &vData)
+{
+    QVariantList mData;
+    mData += vData.state ;
+    actionTransmit(GuiActionType::ID_AdjustHDFStateReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits the HDF auto sub state
+ * \param   vData - Data model contains hdf auto sub state adjustment.
+ * \return  void
+ */
+    void MessageDispatcher::onAdjustment(const AdjustAutoSubRequestData &vData)
+{
+    QVariantList mData;
+    mData += vData.state ;
+    actionTransmit(GuiActionType::ID_AdjustAutoSubReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits the HDF adjustment
+ * \param   vData - Data model contains hdf adjustment.
+ * \return  void
+ */
+    void MessageDispatcher::onAdjustment(const AdjustHDFRequestData &vData)
+{
+    QVariantList mData;
+    mData += vData.treatmentMode ;
+    mData += vData.subFluidVolume ;
+    actionTransmit(GuiActionType::ID_AdjustHDFReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
  * \details This method transmits the InitTreatment request message.
  * \param   vData - Data model contains the init treatment request information.
  * \return  void
@@ -962,15 +1016,27 @@
  * \param   vData - Data model contains the UI RO Water Mode adjustment request data.
  * \return  void
  */
-void MessageDispatcher::onAdjustment(const DuetRoWaterModeUIiData &vData)
+void MessageDispatcher::onAdjustment(const AdjustRoWaterModeRequestData &vData)
 {
     QVariantList mData;
     mData += vData.mStatus;
-    actionTransmit(GuiActionType::ID_DuetRoWaterModeUIi, mData);
+    actionTransmit(GuiActionType::ID_AdjustRoWaterModeReq, mData);
 }
 
 /*!
  * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits the UI RO Water Mode request.
+ * \param   vData - Data model contains the UI RO Water Mode request data.
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const RoWaterModeRequestData &)
+{
+    QVariantList mData;
+    actionTransmit(GuiActionType::ID_RoWaterModeReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
  * \details This method transmits the HD Usage Info Denali message.
  * \param   vData -
  * \return  void
@@ -1122,6 +1188,322 @@
     QVariantList mData;
     actionTransmit(GuiActionType::ID_ResetHDInServiceModeReq, mData);
 }
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits the DD DD Calibration Pressure record request to DD.
+ * \param   vData -
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const DDCalibrationPressureRequestData &vData)
+{
+    QVariantList mData;
+    mData += vData.mIndex;
+    actionTransmit(GuiActionType::ID_DDCalibrationPressureReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits adjusting the DD Calibration Pressure record request to DD.
+ * \param   vData -
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const AdjustDDCalibrationPressureRequestData &vData)
+{
+    QVariantList mData              ;
+    mData += vData.mIndex           ;
+    mData += vData.mGain            ;
+    mData += vData.mOffset          ;
+    mData += vData.mCalibrationTime ;
+
+    actionTransmit(GuiActionType::ID_AdjustDDCalibrationPressureReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits adjusting the DD Calibration Pressure record request to DD.
+ * \param   vData -
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const DDCalibrationTemperatureRequestData &vData)
+{
+    QVariantList mData              ;
+    mData += vData.mIndex           ;
+
+    actionTransmit(GuiActionType::ID_DDCalibrationTemperatureReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits adjusting the DD Calibration Pressure record request to DD.
+ * \param   vData -
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const AdjustDDCalibrationTemperatureRequestData &vData)
+{
+    QVariantList mData              ;
+    mData += vData.mIndex           ;
+    mData += vData.mGain            ;
+    mData += vData.mOffset          ;
+    mData += vData.mCalibrationTime ;
+
+    actionTransmit(GuiActionType::ID_AdjustDDCalibrationTemperatureReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits adjusting the DD Calibration Pressure record request to DD.
+ * \param   vData -
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const DDCalibrationConcentratePumpRequestData &vData)
+{
+    QVariantList mData              ;
+    mData += vData.mIndex           ;
+
+    actionTransmit(GuiActionType::ID_DDCalibrationConcentratePumpReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits adjusting the DD Calibration Pressure record request to DD.
+ * \param   vData -
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const AdjustDDCalibrationConcentratePumpRequestData &vData)
+{
+    QVariantList mData              ;
+    mData += vData.mIndex           ;
+    mData += vData.mGain            ;
+    mData += vData.mOffset          ;
+    mData += vData.mCalibrationTime ;
+
+    actionTransmit(GuiActionType::ID_AdjustDDCalibrationConcentratePumpReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits adjusting the DD Calibration Pressure record request to DD.
+ * \param   vData -
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const DDCalibrationD12DialysatePumpRequestData &)
+{
+    QVariantList mData              ;
+
+    actionTransmit(GuiActionType::ID_DDCalibrationD12DialysatePumpReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits adjusting the DD Calibration Pressure record request to DD.
+ * \param   vData -
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const AdjustDDCalibrationD12DialysatePumpRequestData &vData)
+{
+    QVariantList mData              ;
+    mData += vData.mTargetPumpSpeed ;
+    mData += vData.mCalibrationTime ;
+
+    actionTransmit(GuiActionType::ID_AdjustDDCalibrationD12DialysatePumpReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits adjusting the DD Calibration Pressure record request to DD.
+ * \param   vData -
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const DDCalibrationD48DialysatePumpRequestData &)
+{
+    QVariantList mData              ;
+
+    actionTransmit(GuiActionType::ID_DDCalibrationD48DialysatePumpReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits adjusting the DD Calibration Pressure record request to DD.
+ * \param   vData -
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const AdjustDDCalibrationD48DialysatePumpRequestData &vData)
+{
+    QVariantList mData              ;
+    mData += vData.mGain            ;
+    mData += vData.mOffset          ;
+    mData += vData.mCalibrationTime ;
+
+    actionTransmit(GuiActionType::ID_AdjustDDCalibrationD48DialysatePumpReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits adjusting the DD Calibration Pressure record request to DD.
+ * \param   vData -
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const DDCalibrationAcidConcentratesRequestData &vData)
+{
+    QVariantList mData              ;
+    mData += vData.mIndex           ;
+
+    actionTransmit(GuiActionType::ID_DDCalibrationAcidConcentratesReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits adjusting the DD Calibration Pressure record request to DD.
+ * \param   vData -
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const AdjustDDCalibrationAcidConcentratesRequestData &vData)
+{
+    QVariantList mData                      ;
+    mData += vData.mIndex                   ;
+    mData += vData.mAcidConcMixRatio        ;
+    mData += vData.mAcidFullBottleVolumeML  ;
+    mData += vData.mAcidConductivityUSPerCM ;
+    mData += vData.mAcidBottleTemperature   ;
+    mData += vData.mCalibrationTime         ;
+
+    actionTransmit(GuiActionType::ID_AdjustDDCalibrationAcidConcentratesReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits adjusting the DD Calibration Pressure record request to DD.
+ * \param   vData -
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const DDCalibrationBicarbConcentratesRequestData &vData)
+{
+    QVariantList mData              ;
+    mData += vData.mIndex           ;
+
+    actionTransmit(GuiActionType::ID_DDCalibrationBicarbConcentratesReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits adjusting the DD Calibration Pressure record request to DD.
+ * \param   vData -
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const AdjustDDCalibrationBicarbConcentratesRequestData &vData)
+{
+    QVariantList mData                          ;
+    mData += vData.mIndex                       ;
+    mData += vData.mBicarbConcMixRatio          ;
+    mData += vData.mBicarbStartVolumeML         ;
+    mData += vData.mBicarbConductivityUSPerCM   ;
+    mData += vData.mBicarbBottleTemperature     ;
+    mData += vData.mCalibrationTime             ;
+
+    actionTransmit(GuiActionType::ID_AdjustDDCalibrationBicarbConcentratesReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits adjusting the DD Calibration Pressure record request to DD.
+ * \param   vData -
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const DDCalibrationAccelerometerSensorRequestData &)
+{
+    QVariantList mData              ;
+
+    actionTransmit(GuiActionType::ID_DDCalibrationAccelerometerSensorReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits adjusting the DD Calibration Pressure record request to DD.
+ * \param   vData -
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const AdjustDDCalibrationAccelerometerSensorRequestData &vData)
+{
+    QVariantList mData              ;
+    mData += vData.mAccelXOffset    ;
+    mData += vData.mAccelYOffset    ;
+    mData += vData.mAccelZOffset    ;
+    mData += vData.mCalibrationTime ;
+
+    actionTransmit(GuiActionType::ID_AdjustDDCalibrationAccelerometerSensorReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits adjusting the DD Calibration Pressure record request to DD.
+ * \param   vData -
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const DDCalibrationBloodLeakSensorRequestData &)
+{
+    QVariantList mData              ;
+
+    actionTransmit(GuiActionType::ID_DDCalibrationBloodLeakSensorReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits adjusting the DD Calibration Pressure record request to DD.
+ * \param   vData -
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const AdjustDDCalibrationBloodLeakSensorRequestData &vData)
+{
+    QVariantList mData              ;
+    mData += vData.mSetPoint        ;
+    mData += vData.mCalibrationTime ;
+
+    actionTransmit(GuiActionType::ID_AdjustDDCalibrationBloodLeakSensorReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits adjusting the DD Calibration Pressure record request to DD.
+ * \param   vData -
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const DDCalibrationConductivityRequestData &vData)
+{
+    QVariantList mData              ;
+    mData += vData.mIndex           ;
+
+    actionTransmit(GuiActionType::ID_DDCalibrationConductivitySensorReq, mData);
+}
+
+/*!
+ * \brief   MessageDispatcher::onAdjustment
+ * \details This method transmits adjusting the DD Calibration Pressure record request to DD.
+ * \param   vData -
+ * \return  void
+ */
+void MessageDispatcher::onAdjustment(const AdjustDDCalibrationConductivityRequestData &vData)
+{
+    QVariantList mData              ;
+    mData += vData.mIndex           ;
+    mData += vData.mKHigh           ;
+    mData += vData.mAlphaHigh       ;
+    mData += vData.mEtaHigh         ;
+    mData += vData.mZetahigh        ;
+    mData += vData.mKLow            ;
+    mData += vData.mAlphaLow        ;
+    mData += vData.mEtaLow          ;
+    mData += vData.mZetaLow         ;
+    mData += vData.mBeta            ;
+    mData += vData.mDelta           ;
+    mData += vData.mReserved1       ;
+    mData += vData.mReserved2       ;
+    mData += vData.mCalibrationTime ;
+
+    actionTransmit(GuiActionType::ID_AdjustDDCalibrationConductivitySensorReq, mData);
+}
+
+
 // ----------------------------------------------------------------------------------------------------
 
 /*!