Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -rba15fce14caf76166c286da95974c69f8a24d4b8 -rd7f70405a20319dd9f2dc93ee7f357cc88d0f84b --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision ba15fce14caf76166c286da95974c69f8a24d4b8) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision d7f70405a20319dd9f2dc93ee7f357cc88d0f84b) @@ -141,7 +141,6 @@ * \details Upon message has been received over CANBus this slot will be called * by FrameInterface::didFrameReceive signal to process the frame * Upon completion of collected all the required frames - * on successful interpretation of the message, emits didActionReceived signal. * The message will be removed from list of the channel vCan_Id messages. * \param vCan_Id - CANBus channel of the frame * \param vPayload - Payload of the frame @@ -564,6 +563,26 @@ * \param vData - Data model contains HD Version state. * \return void */ +void MessageDispatcher::onAdjustment(const AlarmTriggeredRequestData &vData) +{ + QVariantList mData; + mData += vData.mAlarmID ; + mData += vData.mFieldDescriptor1 ; + mData += vData.mDataField1 ; + mData += vData.mFieldDescriptor2 ; + mData += vData.mDataField2 ; + mData += vData.mPriority ; + mData += vData.mRank ; + mData += vData.mClearTop ; + actionTransmit(GuiActionType::ID_AlarmTriggered, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits the HD Version Denali message. + * \param vData - Data model contains HD Version state. + * \return void + */ void MessageDispatcher::onAdjustment(const AdjustVersionsResponseData &vData) { QVariantList mData; @@ -1046,6 +1065,16 @@ actionTransmit(GuiActionType::ID_AdvancedInstitutionalRecordReq, mData); } +/** + * \details This method transmits the Check In Leahi message. + * \return void + */ +void MessageDispatcher::onAdjustment(const CheckIn &) +{ + QVariantList mData; + actionTransmit(GuiActionType::ID_TDCheckIn, mData); +} + /*! * \brief MessageDispatcher::onAdjustment * \details This method transmits adjusting the TD advanced institutional record request to TD. @@ -1263,7 +1292,6 @@ if ( _interpreter.interpretMessage( vMessage, mData ) ) { ok = true; - emit didActionReceive(vMessage.actionId, mData); } _messageList[vMessage.can_id].removeLast();