Index: sources/canbus/caninterface.cpp =================================================================== diff -u -r1732e83d2a0308b9c706f37d6d7724a364bbff2a -r460df093c4475816fc25d6b4c3ebfc50424ccca3 --- sources/canbus/caninterface.cpp (.../caninterface.cpp) (revision 1732e83d2a0308b9c706f37d6d7724a364bbff2a) +++ sources/canbus/caninterface.cpp (.../caninterface.cpp) (revision 460df093c4475816fc25d6b4c3ebfc50424ccca3) @@ -29,7 +29,7 @@ * \brief Caninterface Constructor * \param parent object */ -CanInterface::CanInterface(QObject *parent) : QObject(parent) {} +CanInterface::CanInterface(QObject *parent) : QObject(parent) { } /*! * \brief CanInterface Initialization @@ -126,13 +126,22 @@ return false; return _canDevice->writeFrame(vFrame);} -void CanInterface::consoleOut(const QCanBusFrame &vFrame, const QString &vView) +void CanInterface::consoleOut(const QCanBusFrame &vFrame) { + if ( ! _enableConsoleOut ) return; + const QString time = QString::fromLatin1("%1.%2 ") .arg(vFrame.timeStamp().seconds(), 10, 10, QLatin1Char(' ')) .arg(vFrame.timeStamp().microSeconds() / 100, 4, 10, QLatin1Char('0')); const QString flags = frameFlags(vFrame); - qDebug() << time + flags + vView; + QString view; + if (vFrame.frameType() == QCanBusFrame::ErrorFrame) { + view = _canDevice->interpretErrorFrame(vFrame); + } + else { + view = vFrame.payload().toHex('.').replace(QByteArray("a5"),QByteArray("\033[1;33mA5\033[0m")); + } + fprintf(stderr, "%s %s %i %s\n", time.toLatin1().constData(), flags.toLatin1().constData(), vFrame.frameId(), view.toLatin1().constData()); } /*! @@ -217,18 +226,7 @@ while (_canDevice->framesAvailable()) { const QCanBusFrame frame = _canDevice->readFrame(); - - if (_consoleOutEnabled) { - QString view; - if (frame.frameType() == QCanBusFrame::ErrorFrame) { - view = _canDevice->interpretErrorFrame(frame); - } - else { - view = frame.toString(); - } - consoleOut(frame, view); - } - + consoleOut(frame); emit didFrameReceive(frame); } }