Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r47baa703592f0e21098cb21c0ed267de4e958b2f -rbec9c9856c333399aa5abaf18d2799f6fbc95da3 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 47baa703592f0e21098cb21c0ed267de4e958b2f) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision bec9c9856c333399aa5abaf18d2799f6fbc95da3) @@ -185,6 +185,7 @@ .arg(int(vMessage.can_id), 3, 16, QChar('0')) .arg(mActionIdHexString) .arg(QString(vMessage.data.toHex('.'))).toUpper(); + //qDebug() << logMessage; LOG_DEBUG(logMessage); } @@ -254,6 +255,11 @@ if (vText) *vText = "DI"; return Can_Source::eCan_DI; + case eChlid_UI_TD : // 0x041, ///< UI for dry demo + if (vText) *vText = "UI"; + return Can_Source::eCan_UI; + // TODO why no break? + default: if (vText) *vText = "XX"; return Can_Source::eCan_Unknown; @@ -301,6 +307,10 @@ if (vText) *vText = "DI"; return Can_Id::eChlid_UI_Sync; + case eChlid_UI_TD : // 0x100, ///< UI for dry demo + if (vText) *vText = "TD"; + return Can_Id::eChlid_TD_UI; + default: if (vText) *vText = "XX"; return Can_Id::eChlid_UI_Sync; @@ -340,7 +350,7 @@ else { Q_UNUSED (vData ); printUnhandled (vMessage ); - //qDebug() << "1" <<__FUNCTION__ << vMessage.actionId; + // qDebug() << "1" <<__FUNCTION__ << vMessage.actionId; } return ok; } @@ -462,7 +472,7 @@ quint16 id = QString(group).toUInt(&ok,16); if (!ok) continue; _messageList[ id ] = _Settings.keys(category, group); - // DEBUG: qDebug() << _Settings.keys(group); + //qDebug() << "SETTINGS" << _Settings.keys(group); } } @@ -474,25 +484,28 @@ */ bool MessageInterpreter::logUnhandledMessage(const Message &vMessage) const { bool ok = false; - quint16 msg_id = vMessage.actionId; - QString logString = QString("%1,").arg(msg_id,4,16); - QString can_id; - QString item = ""; + quint16 id = vMessage.actionId; + QString logString = QString("%1,").arg(id,4,16); + QVariantList logVariant; + logVariant.append(id); - identifySource(vMessage.can_id, &can_id); // Message Can Channel. - logString += can_id + ","; - // qDebug() << __FUNCTION__ << logString; - - if (_messageList.contains(msg_id)) { + if (_messageList.contains(id)) { ok = true; - QStringList items = _messageList[msg_id]; + QStringList items = _messageList[id]; int index = 0; for ( int i = 0; i < items.count(); i++ ) { - item = items[i]; - if (i == 0) { // Message Name/Identifier - logString += "~" + item; + QString item = items[i]; + if (i == 0) { + QString ID; + switch (identifySource(vMessage.can_id, &ID)) { + //case Can_Source::eCan_HD: logString += ID + ",~" + item; break; + //case Can_Source::eCan_DG: logString += ID + ",~" + item; break; + case Can_Source::eCan_DI: logString += ID + ",~" + item; break; + default : logString += ID + ",~" + item; break; + } } - else { // Message payload data + else { + logVariant.append(vMessage.data); if ( item == "F32" ) { Types::F32 param; if (! GetValue(vMessage.data, index, param )) logString += ",?"; @@ -535,12 +548,19 @@ } } } + LOG_APPED(logString); + if ((id != 0x1000) && (id != 0xFFFF) ) { + // Message 0x0700 is UI check in. It is not needed to be processed for dry demo + // Message 0xFFFF is the ack message and it is not needed to be processed for dry demo + qDebug() << "Message" << logString; + emit didUnhandledMsgReady(logVariant); + } } else { if ( gDisableUnhandledReport ) { // if the unhandled message error has been disabled, return. - LOG_DEBUG(QString("Undefined unhandled message [%1]").arg(msg_id, 0, 16)); + LOG_DEBUG(QString("Undefined unhandled message [%1]").arg(id, 0, 16)); } } - LOG_APPED(logString + item); return ok; + }