Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r7f976c0ffdc727ddb89c1fe11ad250cb724cc4ce -r5687815256ae070a9a207107088e3f72dd464da0 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 7f976c0ffdc727ddb89c1fe11ad250cb724cc4ce) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 5687815256ae070a9a207107088e3f72dd464da0) @@ -1,13 +1,13 @@ /*! * - * Copyright (c) 2020-2023 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) 18-Jul-2023 + * \date (last) 31-Jul-2024 * \author (original) Behrouz NematiPour * \date (original) 26-Aug-2020 * @@ -818,6 +818,41 @@ 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); +} // ---------------------------------------------------------------------------------------------------- /*! @@ -852,7 +887,7 @@ if (mNeedsAcknow) { mSequence = -mSequence; if ( ! gDisableAcknowLog ) { - LOG_APPED(tr("UI,Ack Req, Sq:%1, ID:%2").arg(mSequence).arg(Format::toHexString(vActionId))); + 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); @@ -926,7 +961,7 @@ if ( mActionId == GuiActionType::ID_Acknow ) { ok = true; if ( ! gDisableAcknowLog ) { - LOG_APPED(tr("%1,Ack Bak, Sq:%2").arg(vSrcText).arg(mSequence)); + 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); @@ -955,7 +990,7 @@ if (mSequence < 0) { ok = true; if ( ! gDisableAcknowLog ) { - LOG_APPED(tr("%1,Ack Req, Sq:%2, ID:%3").arg(vSrcText).arg(mSequence).arg(Format::toHexString(mActionId))); + 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); @@ -965,7 +1000,7 @@ Can_Id dstID = MessageInterpreter::identifyDestination(vMessage.can_id, &dstText); actionTransmit(GuiActionType::ID_Acknow, {}, -mSequence, dstID); if ( ! gDisableAcknowLog ) { - LOG_APPED(tr("UI,Ack Bak, Sq:%1, Dst:%2").arg(-mSequence).arg(dstText)); + 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);