Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r5335f246461dfd5b9a48dcc8c01aa97778ae773b -r9b81b18319ff46f1e48d5637a6a8938d2f7735c9 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 5335f246461dfd5b9a48dcc8c01aa97778ae773b) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 9b81b18319ff46f1e48d5637a6a8938d2f7735c9) @@ -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 @@ -371,6 +385,19 @@ /*! * \brief MessageDispatcher::onAdjustment + * \details This method transmits the Isolated Ultrafiltration State Adjustment Denali message. + * \param vData - Data model contains treatment ultrafiltration state adjustment + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustIsolatedUFStateRequestData &vData) +{ + QVariantList mData; + mData += vData.requestedState; + actionTransmit(GuiActionType::ID_AdjustIsoUFStateReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment * \details This method transmits the Ultrafiltration Adjustment Denali message. * \param vData - Data model contains treatment ultrafiltration adjustment volume * \return void @@ -480,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(); @@ -657,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 @@ -665,6 +732,7 @@ { QVariantList mData; mData += vData.requestedState; + mData += vData.modality; actionTransmit(GuiActionType::ID_AdjustInitTreatmentReq, mData); } @@ -948,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 @@ -1108,6 +1188,8 @@ QVariantList mData; actionTransmit(GuiActionType::ID_ResetHDInServiceModeReq, mData); } + + // ---------------------------------------------------------------------------------------------------- /*!