Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r6abfb957108b171a8a5ab6770ad9b463235c210b -r584874a724b2d3e8c98247d3b0e42d6a34ce9478 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 6abfb957108b171a8a5ab6770ad9b463235c210b) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 584874a724b2d3e8c98247d3b0e42d6a34ce9478) @@ -107,8 +107,8 @@ connect(&_ApplicationController, SIGNAL(didSettingsDone ()), this , SLOT( onSettingsDone ())); - connect(&_interpreter, SIGNAL(onUnhandledMsgReady(QString)), - &_ApplicationController, SLOT(onUnhandledReceived(QString))); + connect(&_interpreter , SIGNAL(didUnhandledMsgReady(const QVariantList &)), + this , SLOT(doUnhandledMsgReady(const QVariantList &))); } /*! @@ -382,22 +382,6 @@ Q_UNUSED(vMessage); Q_UNUSED(vSrcText); return true; - /* - GuiActionType mActionId = vMessage.actionId; - Sequence mSequence = vMessage.sequence; - bool ok = false; - if ( mActionId == GuiActionType::ID_Acknow ) { - ok = true; - if ( ! gDisableAcknowLog ) { - 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); - #endif - emit didAcknowReceive(mSequence); - } - return ok; -*/ } /*! @@ -536,7 +520,8 @@ return ok; } -void MessageDispatcher::testInterp() +void MessageDispatcher::doUnhandledMsgReady(const QVariantList &msg) { qDebug() << "In interp"; + emit didUnhandledMsgDispatcher(msg); }