Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -rfe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2 -r80b8371f1a93481e05302cef6e474db802fda153 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision fe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 80b8371f1a93481e05302cef6e474db802fda153) @@ -19,8 +19,6 @@ #include // Project -#include "Logger.h" -#include "ApplicationController.h" #include "FrameInterface.h" #include "MessageAcknowModel.h" @@ -48,7 +46,7 @@ // runs in the thread initConnections(); - LOG_DEBUG(tr("%1 Initialized").arg(metaObject()->className())); + //LOG_DEBUG(tr("%1 Initialized").arg(metaObject()->className())); // TODO is this needed? return true; } @@ -88,10 +86,6 @@ */ void MessageDispatcher::initConnections() { - // From GUI - connect(&_ApplicationController, SIGNAL(didActionTransmit(GuiActionType , const QVariantList &)), - this , SLOT( onActionTransmit(GuiActionType , const QVariantList &))); - // From HD connect(&_FrameInterface , SIGNAL(didFrameReceive (Can_Id , const QByteArray &)), this , SLOT( onFrameReceive (Can_Id , const QByteArray &))); @@ -102,14 +96,6 @@ connect(&_MessageAcknowModel , SIGNAL(didFailedTransmit( Sequence )), this , SLOT( onFailedTransmit( Sequence ))); - - // Application Settings are ready - connect(&_ApplicationController, SIGNAL(didSettingsDone ()), - this , SLOT( onSettingsDone ())); - - // ---- Signal/Slots - ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(_ApplicationController) - ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS(_interpreter ) } /*! @@ -217,9 +203,9 @@ * \param vActionId - The ActionID of the message * \param vData - The data of the Message */ -void MessageDispatcher::onActionTransmit(GuiActionType vActionId, const QVariantList &vData) +void MessageDispatcher::onActionTransmit(const QVariantList &vData) { - actionTransmit(vActionId, vData); + actionTransmit(vData); } /*! @@ -233,626 +219,6 @@ // ---------------------------------------------------------------------------------------------------- -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Blood/Dialysate Adjustment Denali message. - * \param vData - Data model contains Blood Flow Rate - and Dialysate Flow Rate - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustBloodDialysateRequestData &vData) -{ - QVariantList mData; - mData += vData.bloodFlow; - mData += vData.dialysateFlow; - onActionTransmit(GuiActionType::ID_AdjustBloodDialysateReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the treatment duration Adjustment Denali message. - * \param vData - Data model contains treatment duration adjustment value in minutes - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustDurationRequestData &vData) -{ - QVariantList mData; - mData += vData.duration; - onActionTransmit(GuiActionType::ID_AdjustDurationReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Ultrafiltration State Adjustment Denali message. - * \param vData - Data model contains treatment ultrafiltration state adjustment - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustUltrafiltrationStateRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - actionTransmit(GuiActionType::ID_AdjustUltrafiltrationStateReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Ultrafiltration Adjustment Denali message. - * \param vData - Data model contains treatment ultrafiltration adjustment volume - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustUltrafiltrationEditRequestData &vData) -{ - QVariantList mData; - mData += vData.volume; - onActionTransmit(GuiActionType::ID_AdjustUltrafiltrationEditReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Ultrafiltration Adjustment User Selected Option Denali message. - * \param vData - Data model contains treatment ultrafiltration adjustment volume and user selected option. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustUltrafiltrationConfirmRequestData &vData) -{ - QVariantList mData; - mData += vData.volume; - mData += vData.option; - onActionTransmit(GuiActionType::ID_AdjustUltrafiltrationConfirmReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Alarm Request Silence message. - * \param vData - Data model contains the silence request information. - * \return void - */ -void MessageDispatcher::onAdjustment(const AlarmSilenceRequestData &vData) -{ - QVariantList mData; - mData += vData.silence; - onActionTransmit(GuiActionType::ID_AlarmSilenceReq, mData); -} - -/** - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the User Action Denali message. - * \param vData - Data model contains User Action on the alarm dialog. - * \return void - */ -void MessageDispatcher::onAdjustment(const AlarmUserActionRequestData &vData) -{ - QVariantList mData; - mData += vData.action; - onActionTransmit(GuiActionType::ID_AlarmUserActionReq, mData); -} - -/** - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Alarm Active List Request denali message. - * \param vData - Data model contains Alarm Active List payload. - * \return void - */ -void MessageDispatcher::onAdjustment(const AlarmActiveListRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AlarmActiveListReq, mData); -} - -/*! - * \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.volume2HD(); - 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 - */ -/* // disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. -void MessageDispatcher::onAdjustment(const AlarmClearedConditionRequestData &vData) -{ - QVariantList mData; - mData += vData.alarmID; - onActionTransmit(GuiActionType::ID_AlarmClearedConditionReq, mData); -} -// disabled coco end */ - -/** - * \details This method transmits the Saline Bolus Adjustment Denali message. - * \param vData - Data model contains treatment Saline Bolus adjustment state. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustSalineRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustSalineReq, mData); -} - -/** - * \details This method transmits the Heparin Adjustment Denali message. - * \param vData - Data model contains treatment Heparin adjustment state. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustHeparinRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustHeparinReq, mData); -} - -/** - * \details This method transmits the Rinseback Adjustment Denali message. - * \param vData - Data model contains treatment Rinseback adjustment state. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustRinsebackRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustRinsebackReq, mData); -} - -/** - * \details This method transmits the Recirculate Adjustment Denali message. - * \param vData - Data model contains treatment Recirculate adjustment state. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustRecirculateRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustRecirculateReq, mData); -} - -/** - * \details This method transmits the Treatment End Adjustment Denali message. - * \param vData - Data model contains treatment end adjustment state. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustTreatmentEndRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustTreatmentEndReq, 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 AdjustVersionsRequestData &vData) -{ - QVariantList mData; - mData += QVariant::fromValue(vData.ver_major); - mData += QVariant::fromValue(vData.ver_minor); - mData += QVariant::fromValue(vData.ver_micro); - mData += QVariant::fromValue(vData.ver_revis); - mData += QVariant::fromValue(vData.ver_comp ); - onActionTransmit(GuiActionType::ID_AdjustVersionsUIReq, 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; - mData += QVariant::fromValue(vData.ver_major); - mData += QVariant::fromValue(vData.ver_minor); - mData += QVariant::fromValue(vData.ver_micro); - mData += QVariant::fromValue(vData.ver_revis); - mData += QVariant::fromValue(vData.ver_comp ); - onActionTransmit(GuiActionType::ID_AdjustVersionsUIRsp, 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 AdjustServiceDatesRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustServiceDatesReq, 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 AdjustServiceModeRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustServiceModeReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Pressures Limits Adjustment Denali message. - * \param vData - Data model contains treatment Pressures Limits adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustPressuresLimitsRequestData &vData) -{ - QVariantList mData; - mData += vData.mArterialPressureLimitWindow ; - mData += vData.mVenousPressureLimitWindow ; - mData += vData.mVenousPressureLimitAsymtrc ; - onActionTransmit(GuiActionType::ID_AdjustPressuresLimitsReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the InitTreatment request message. - * \param vData - Data model contains the init treatment request information. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustInitTreatmentRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustInitTreatmentReq, mData); -} - -/** - * \details This method transmits the Treatment Parameter request message. - * \param vData - Data model contains treatment parameter adjustment data structure - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustParametersValidationRequestData &vData) -{ - QVariantList mData; - mData += vData.mBloodFlowRate ; - mData += vData.mDialysateFlowRate ; - mData += vData.mTreatmentDuration ; - mData += vData.mHeparinStopTime ; - mData += vData.mSalineBolus ; - mData += vData.mAcidConcentrate ; - mData += vData.mBicarbonateConcentrate ; - mData += vData.mDialyzerType ; - mData += vData.mHeparinType ; - mData += vData.mBloodPressureMeasureInterval ; - mData += vData.mRinsebackFlowRate ; - mData += vData.mArterialPressureLimitWindow ; - mData += vData.mVenousPressureLimitWindow ; - mData += vData.mVenousPressureLimitAsymtrc ; - mData += vData.mHeparinDispensingRate ; - mData += vData.mHeparinBolusVolume ; - mData += vData.mDialysateTemp ; - - onActionTransmit(GuiActionType::ID_AdjustParametersValidationReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Confirm Treatment request message. - * \param vData - Data model contains the confirm treatment request - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustParametersConfirmRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustParametersConfirmReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Water Sample Adjustment Denali message. - * \param vData - Data model contains Water Sample adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustWaterSampleRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustWaterSampleReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Water Sample Result Adjustment Denali message. - * \param vData - Data model contains Water Sample Result adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustWaterSampleResultRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustWaterSampleResultReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Consumables Confirm Adjustment Denali message. - * \param vData - Data model contains Consumables Confirm adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustConsumablesConfirmRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustConsumablesConfirmReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Disposables Confirm Adjustment Denali message. - * \param vData - Data model contains Disposables Confirm adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustDisposablesConfirmRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustDisposablesConfirmReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Disposables Prime Adjustment Denali message. - * \param vData - Data model contains Disposables Prime adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustDisposablesPrimeRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustDisposablesPrimeReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Patient Connection Begin Adjustment Denali message. - * \param vData - Data model contains Patient Connection Begin adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustPatientConnectionBeginRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustPatientConnectionBeginReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Ultrafiltration Adjustment Denali message. - * \param vData - Data model contains treatment ultrafiltration adjustment volume - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustUltrafiltrationInitRequestData &vData) -{ - QVariantList mData; - mData += vData.volume; - onActionTransmit(GuiActionType::ID_AdjustUltrafiltrationInitReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Patient Connection Confirm Adjustment Denali message. - * \param vData - Data model contains Patient Connection Confirm adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustPatientConnectionConfirmRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustPatientConnectionConfirmReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Start Treatment Adjustment Denali message. - * \param vData - Data model contains Start Treatment adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustStartTreatmentRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustStartTreatmentReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Patient Disconnection Notify Adjustment Denali message. - * \param vData - Data model contains Patient Disconnection Notify adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustPatientDisconnectionNotifyRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustPatientDisconnectNotifyReq, 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_AdjustPatientDisconnectConfirmReq, 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 DG Cleaning Usage request message. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustDGCleaningUsageRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustDGCleaningUsageReq, 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 AdjustDisinfectStartRequestData &vData) -{ - QVariantList mData; - mData += vData.mState; - onActionTransmit(GuiActionType::ID_AdjustDisinfectStartReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Disinfect mode request Denali message. - * \param vData - Data model contains the initiate/cancel boolean disinfection mode - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustDisinfectModeRequestData &vData) -{ - QVariantList mData; - mData += vData.mInititate; - onActionTransmit(GuiActionType::ID_AdjustDisinfectModeReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the UI power on self test final result - * \param vData - Data model contains the final result of the UI POST - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustUIPostFinalResultRequestData &vData) -{ - QVariantList mData; - mData += vData.mResult; - onActionTransmit(GuiActionType::ID_UIPostFinalResultData, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the UI Generic User Confirmation result. - * \param vData - Data model contains the Generic User Confirmation result. - * \return void - */ -void MessageDispatcher::onAdjustment(const DuetConfirmUIrData &vData) -{ - QVariantList mData; - mData += vData.mId; - mData += vData.mConfirm; - onActionTransmit(GuiActionType::ID_DuetConfirmUIr, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the UI RO Water Mode adjustment request. - * \param vData - Data model contains the UI RO Water Mode adjustment request data. - * \return void - */ -void MessageDispatcher::onAdjustment(const DuetRoWaterModeUIiData &vData) -{ - QVariantList mData; - mData += vData.mStatus; - 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); -} // ---------------------------------------------------------------------------------------------------- /*! @@ -863,7 +229,7 @@ * \param vActionId - The ActionID of the message * \param vData - The data of the Message */ -void MessageDispatcher::actionTransmit(GuiActionType vActionId, const QVariantList &vData, Sequence vSequence, Can_Id vCanId) +void MessageDispatcher::actionTransmit(const QVariantList &vData, Sequence vSequence, Can_Id vCanId) { txCount(); if (vSequence == 0) { // initialize @@ -875,19 +241,19 @@ QByteArray mData; Can_Id canid = vCanId; - if (! _interpreter.interpretMessage(vActionId, vData, mData, canid)) { - LOG_DEBUG(QString("Incorrect Message, cannot be interpreted, %1").arg(Format::toHexString(vActionId))); // TODO : LogInfo Improvement + if (! _interpreter.interpretMessage(vData, mData, canid)) { + //LOG_DEBUG(QString("Incorrect Message, cannot be interpreted, %1").arg(Format::toHexString(vActionId))); // TODO : LogInfo Improvement // TODO is this needed? return; } // TODO : Create a buildFrames method FrameList frameList; Sequence mSequence = vSequence; - bool mNeedsAcknow = needsAcknow(vActionId); + bool mNeedsAcknow = needsAcknow(canid); if (mNeedsAcknow) { mSequence = -mSequence; if ( ! gDisableAcknowLog ) { - LOG_APPED_UI(tr("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))); // TODO is this needed? } #ifdef DEBUG_ACKBACK_HD_TO_UI qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ UI AckReq : %1 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(mSequence); @@ -896,8 +262,8 @@ // disabled coco begin validated: Has been tested manually but in this function this cannot be false because the message interpreter is doing the same validation. // still checking here in case the logic has changed therefore buildFrame should still validate the message for developer safety. - if ( ! _builder.buildFrames(vActionId, mData, frameList, mSequence) ) { - LOG_DEBUG(QString("Incorrect Message cannot be built")); // TODO : LogInfo Improvement + if ( ! _builder.buildFrames(mData, frameList, mSequence) ) { + //LOG_DEBUG(QString("Incorrect Message cannot be built")); // TODO : LogInfo Improvement // TODO is this needed? return; } // disabled coco end @@ -936,7 +302,7 @@ { if (vPayload.length() < eLenCanFrame) { // Each frame has to have exactly 8 (eLenCanFrame) bytes of data and unused bytes should be passed as 00. - LOG_DEBUG(QString("Incorrect frame length. Exp:%1,got:%2").arg(eLenCanFrame).arg(vPayload.length())); + //LOG_DEBUG(QString("Incorrect frame length. Exp:%1,got:%2").arg(eLenCanFrame).arg(vPayload.length())); return false; } if (! _builder.buildMessage(vPayload, _messageList[vCan_Id].last(), vCan_Id)) { @@ -955,13 +321,13 @@ */ bool MessageDispatcher::checkAcknowReceived(const Message &vMessage, const QString &vSrcText) { - GuiActionType mActionId = vMessage.actionId; + Q_UNUSED(vSrcText); Sequence mSequence = vMessage.sequence; bool ok = false; - if ( mActionId == GuiActionType::ID_Acknow ) { + if ( false ) { 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); @@ -980,8 +346,8 @@ */ bool MessageDispatcher::checkAcknowTransmit(const Message &vMessage, const QString &vSrcText) { + Q_UNUSED(vSrcText); bool ok = false; - GuiActionType mActionId = vMessage.actionId; Sequence mSequence = vMessage.sequence; // UI shall acknowledge the messages is intended for UI. @@ -990,17 +356,18 @@ 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); #endif // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ UI AckBak is immediately handled at the same place. QString dstText; Can_Id dstID = MessageInterpreter::identifyDestination(vMessage.can_id, &dstText); - actionTransmit(GuiActionType::ID_Acknow, {}, -mSequence, dstID); + Q_UNUSED(dstID); + //actionTransmit(GuiActionType::ID_Acknow, {}, -mSequence, dstID); // TODO is this needed? if ( ! gDisableAcknowLog ) { - LOG_APPED_UI(tr("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); @@ -1030,7 +397,7 @@ // disabled coco begin validated: Has been validated manually. If MessageInterpreter::interpretMessage fails, this also returns false if ( _interpreter.interpretMessage( vMessage, mData ) ) { ok = true; - emit didActionReceive(vMessage.actionId, mData); + emit didActionReceive(mData); } // disabled coco end @@ -1072,16 +439,6 @@ } // disabled coco end -/*! - * \brief MessageDispatcher::needsAcknow - * \details List of the Action types which need Acknow - * \param vActionId - Action Type id - * \return true if needs an Acknow - */ -bool MessageDispatcher::needsAcknow(GuiActionType vActionId) -{ - return _needsAcknow.contains(vActionId); -} /*! * \brief MessageDispatcher::needsAcknow