Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r583d1953c783940c93f22c37b23daadb1ff3a09c -re125bd5cf13750eaf241d518b9c846139afaa81c --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 583d1953c783940c93f22c37b23daadb1ff3a09c) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision e125bd5cf13750eaf241d518b9c846139afaa81c) @@ -218,6 +218,8 @@ actionTransmit(vActionId, vData); } +// ---------------------------------------------------------------------------------------------------- + /*! * \brief MessageDispatcher::onAdjustment * \details This method transmits the Blood/Dialysate Adjustment Denali message. @@ -392,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); } @@ -502,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); } @@ -515,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); } @@ -528,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); } @@ -541,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); } @@ -567,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); } @@ -580,14 +576,102 @@ * \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); } /*! + * \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); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits the Disposables Removal Confirm Adjustment Denali message. + * \param vData - Data model contains Disposables Removal Confirm adjustment. + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustDisposablesRemovalConfirmRequestData &) +{ + QVariantList mData; + onActionTransmit(GuiActionType::ID_AdjustDisposablesRemovalConfirmReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits the Treatment Log Adjustment Denali message. + * \param vData - Data model contains Treatment Log adjustment. + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustTreatmentLogRequestData &) +{ + QVariantList mData; + onActionTransmit(GuiActionType::ID_AdjustTreatmentLogReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits the HD Set Date Time Denali message. + * \param vData - Data model contains the epoch time + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustHDDateTimeRequestData &vData) +{ + QVariantList mData; + mData += vData.mEpoch ; + onActionTransmit(GuiActionType::ID_AdjustHDDateTimeReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits the DG Set Date Time Denali message. + * \param vData - Data model contains the epoch time + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustDGDateTimeRequestData &vData) +{ + QVariantList mData; + mData += vData.mEpoch ; + 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 AdjustChemicalConfirmRequestData &) +{ + QVariantList mData; + onActionTransmit(GuiActionType::ID_AdjustChemicalConfirmReq, mData); +} + +// ---------------------------------------------------------------------------------------------------- + +/*! * \brief MessageDispatcher::actionTransmit * \details This method is called by slot MessageDispatcher::onActionTransmit * which emits didFrameTransmit on successful interpretation of the requested message