Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r6816b783f50e08267aa016d64350bc020080d901 -ra89b5249df072be403141463d7d88728b66a848e --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 6816b783f50e08267aa016d64350bc020080d901) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision a89b5249df072be403141463d7d88728b66a848e) @@ -328,6 +328,20 @@ /*! * \brief MessageDispatcher::onAdjustment + * \details This method transmits the DG Set Date Time Denali message. + * \details This method transmits the request to set the alarm volume. + * \param vData - Data model contains the alarm volume + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustHDAlarmVolumeRequestData &vData) +{ + QVariantList mData; + mData += vData.volume; + onActionTransmit(GuiActionType::ID_AlarmVolumeSetReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment * \details This method transmits the Alarm Acknowledge Request message. * \param vData - Data model contains the user acknowledge request information. * \return void @@ -788,6 +802,8 @@ bool ok = false; QVariantList mData; Sequence mSequence = vMessage.sequence; + Can_Source src = MessageInterpreter::identifySource(vMessage.can_id); + QString ids = src == Can_Source::eCan_HD ? "HD" : src == Can_Source::eCan_DG ? "DG" : "XX"; // coco begin validated: Has been validated manually. If MessageInterpreter::interpretMessage fails, this also returns false if (_interpreter.interpretMessage(vMessage, mData)) { // coco end @@ -796,7 +812,7 @@ switch (mActionId) { case GuiActionType::ID_Acknow: #ifndef DISABLE_ACKNOW_CHECKIN_MESSAGE_LOG - LOG_EVENT(tr("HD,Ack Bak, Sq:%1").arg(mSequence)); + LOG_EVENT(tr("%1,Ack Bak, Sq:%2").arg(ids).arg(mSequence)); break; #endif #ifdef DEBUG_ACKBACK_HD_TO_UI qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ HD AckBak : %1 %2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(mSequence).arg(vMessage.actionId); @@ -807,7 +823,7 @@ 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))); + LOG_EVENT(tr("%1,Ack Req, Sq:%2, ID:%3").arg(ids).arg(mSequence).arg(Format::toHexString(mActionId))); #endif #ifdef DEBUG_ACKBACK_HD_TO_UI qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ HD AckReq : %1 %2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(mSequence).arg(vMessage.actionId);