Index: sources/canbus/caninterface.cpp =================================================================== diff -u -re58b907a69d4ca7daa77d69791593b886d1b80e8 -r8c69137f18382bdc55a5678e6ed44a7683fe4dea --- sources/canbus/caninterface.cpp (.../caninterface.cpp) (revision e58b907a69d4ca7daa77d69791593b886d1b80e8) +++ sources/canbus/caninterface.cpp (.../caninterface.cpp) (revision 8c69137f18382bdc55a5678e6ed44a7683fe4dea) @@ -22,17 +22,21 @@ #include "messageglobals.h" #include "frameinterface.h" +// stl +#include + +#define FrameCount_MAX UINT64_MAX + // namespace using namespace Can; /*! - * \brief Caninterface Constructor - * \param parent object + * \brief CanInterface::CanInterface + * \details Constructor + * \param parent - QObject parent owner object. + * Qt handles the children destruction by their parent objects life-cycle. */ -CanInterface::CanInterface(QObject *parent) : QObject(parent) { - FrameCount _rxFrameCountMax = pow(2, 8 * sizeof(FrameCount)) - 1;; - FrameCount _txFrameCountMax = pow(2, 8 * sizeof(FrameCount)) - 1;; -} +CanInterface::CanInterface(QObject *parent) : QObject(parent) { } /*! * \brief CanInterface Initialization @@ -47,7 +51,6 @@ if ( ! initDevice() ) return false; if ( ! testDevice() ) return false; - _numberFramesWritten = 0; initConnections(); status(tr("Connected")); @@ -234,11 +237,11 @@ * for debugging purposes. * \param vFrame - The CANBUS frame to be sent out */ -void CanInterface::consoleOut(const QCanBusFrame &vFrame, QString vFrameCount) +void CanInterface::consoleOut(const QCanBusFrame &vFrame, const QString &vFrameCount) { if ( ! _enableConsoleOut ) return; - LOG_EVENT(QObject::tr("console out CanInterface Enabled")); + LOG_EVENT_ONCE(QObject::tr("console out CanInterface Enabled")); const QString time = QString::fromLatin1("%1.%2 ") .arg(vFrame.timeStamp().seconds(), 10, 10, QLatin1Char(' ')) @@ -251,7 +254,7 @@ else { view = vFrame.payload().toHex('.').replace(QByteArray("a5"),QByteArray("\033[1;33mA5\033[0m")); } - fprintf(stderr, "%s %s %s %i %s\n", vFrameCount.toLatin1(), time.toLatin1().constData(), flags.toLatin1().constData(), vFrame.frameId(), view.toLatin1().constData()); + fprintf(stderr, "%s %s %s %i %s\n", vFrameCount.toLatin1().constData(), time.toLatin1().constData(), flags.toLatin1().constData(), vFrame.frameId(), view.toLatin1().constData()); } /*! @@ -261,7 +264,7 @@ */ CanInterface::FrameCount CanInterface::rxCount() { - if ( _rxFrameCount <= _rxFrameCountMax) { + if ( _rxFrameCount <= FrameCount_MAX ) { ++_rxFrameCount; } else { _rxFrameCount = 1; @@ -276,7 +279,7 @@ */ CanInterface::FrameCount CanInterface::txCount() { - if ( _txFrameCount <= _rxFrameCountMax) { + if ( _txFrameCount <= FrameCount_MAX ) { ++_txFrameCount; } else { _txFrameCount = 1; @@ -335,7 +338,7 @@ */ void CanInterface::onFrameWrittern(qint64 /*vFramesCount*/) { - //_numberFramesWritten = vFramesCount; + //_txFrameCount = vFramesCount; //qDebug() << "onFrameWrittern::FramesCount : " << vFramesCount; } @@ -365,7 +368,7 @@ void CanInterface::onFrameTransmit(const QCanBusFrame &vFrame) { bool ok = transmit(vFrame); - rxCount(); + txCount(); if ( _enableConsoleOut ) consoleOut(vFrame, QString("Tx:%1").arg(_txFrameCount)); emit didFrameTransmit(ok);