Index: sources/canbus/CanInterface.cpp =================================================================== diff -u -r79e076cece4ba503be6c3834eb68d1e5cb1b882f -r4a67c01045f365be38f1a12a8572c0070d343e1e --- sources/canbus/CanInterface.cpp (.../CanInterface.cpp) (revision 79e076cece4ba503be6c3834eb68d1e5cb1b882f) +++ sources/canbus/CanInterface.cpp (.../CanInterface.cpp) (revision 4a67c01045f365be38f1a12a8572c0070d343e1e) @@ -49,7 +49,7 @@ // disabled coco begin validated: Manually tested since required to disable and enable the CANBus if ( ! initDevice() ) return false; - // coco end + // disabled coco end if ( ! testDevice() ) return false; initConnections(); @@ -75,7 +75,7 @@ { // disabled coco begin validated: Manually tested since required to disable and enable the CANBus if ( ! init() ) return false; - // coco end + // disabled coco end initThread(vThread); return true; } @@ -91,7 +91,7 @@ // it has been tested and works perfectly fine in normal run. quitThread(); // verified } -// coco end +// disabled coco end /*! * \brief CanInterface status @@ -118,7 +118,7 @@ LOG_DEBUG("Console out CanInterface disabled"); } } -// coco end +// disabled coco end /*! * \brief CanInterface connections definition @@ -129,7 +129,7 @@ { // disabled coco begin validated: Manually tested since required to disable and enable the CANBus if (_canDevice) { - // coco end + // disabled coco end connect(_canDevice, SIGNAL( framesReceived()), this , SLOT (onFrameReceive ())); @@ -176,7 +176,7 @@ // runs in thread moveToThread(qApp->thread()); // verified } -// coco end +// disabled coco end /*! * \brief CanInterface::createDevice @@ -193,7 +193,7 @@ LOG_DEBUG(status()); return false; } - // coco end + // disabled coco end return true; } @@ -222,7 +222,7 @@ { // disabled coco begin validated: Manually tested since required to disable and enable the CANBus if (!_canDevice) return; - // coco end + // disabled coco end _canDevice->disconnectDevice(); delete _canDevice; _canDevice = nullptr; @@ -261,7 +261,7 @@ { // disabled coco begin validated: Manually tested since required to disable and enable the CANBus if( !_canDevice ) return false; - //coco end + //disabled coco end return _canDevice->writeFrame(vFrame); } @@ -290,7 +290,7 @@ // the fprintf is used for the colored output fprintf(stderr, "%s %s %s %i %s\n", vFrameCount.toLatin1().constData(), time.toLatin1().constData(), flags.toLatin1().constData(), vFrame.frameId(), view.toLatin1().constData()); } -// coco end +// disabled coco end /*! * \brief CanInterface::rxCount @@ -325,7 +325,7 @@ // since it requires massive can messages sent/received to catch the error Types::safeIncrement(_erFrameCount); return _erFrameCount; - // coco end + // disabled coco end } /*! @@ -348,7 +348,7 @@ result[3] = QLatin1Char('L'); return result; - // coco end + // disabled coco end } /*! @@ -380,7 +380,7 @@ } emit didFrameError(_canStatus); } -// coco end +// disabled coco end /*! * \brief CanInterface::onFrameWritten @@ -405,14 +405,14 @@ { // disabled coco begin validated: Manually tested since required to disable and enable the CANBus if (!_canDevice) return; - // coco end + // disabled coco end while (_canDevice->framesAvailable()) { const QCanBusFrame frame = _canDevice->readFrame(); rxCount(); // disabled coco begin validated: This code is only for debugging purposes and had been tested manually. if ( _enableConsoleOut ) consoleOut(frame, QString("Rx:%1").arg(_rxFrameCount)); - // coco end + // disabled coco end emit didFrameReceive(frame); } } @@ -430,6 +430,6 @@ // disabled coco begin validated: This code is only for debugging purposes and had been tested manually. if ( _enableConsoleOut ) consoleOut(vFrame, QString("Tx:%1").arg(_txFrameCount)); - // coco end + // disabled coco end emit didFrameTransmit(ok); }