t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:collin80/SavvyCAN

Browse Source
This commit is contained in:
Collin Kidder
2017-09-03 13:47:47 -04:00
parent 9f64eabd9f 5be89f8075
commit 08752f7d6f
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/socketcan.cpp
+7 -7
View File
@@ -115,8 +115,9 @@ bool SocketCan::piSendFrame(const CANFrame& pFrame)
/* fill frame */ /* fill frame */
QCanBusFrame frame; QCanBusFrame frame;
frame.setFrameId(pFrame.ID); frame.setFrameId(pFrame.ID);
frame.setExtendedFrameFormat(false); frame.setExtendedFrameFormat(pFrame.extended);
frame.setPayload(QByteArray((const char*)pFrame.data, pFrame.len)); frame.setPayload(QByteArray(reinterpret_cast<const char *>(pFrame.data),
static_cast<int>(pFrame.len)));
return mDev_p->writeFrame(frame); return mDev_p->writeFrame(frame);
} }
@@ -146,6 +147,7 @@ void SocketCan::errorReceived(QCanBusDevice::CanBusError error) const
case QCanBusDevice::ConfigurationError: case QCanBusDevice::ConfigurationError:
case QCanBusDevice::UnknownError: case QCanBusDevice::UnknownError:
qWarning() << mDev_p->errorString(); qWarning() << mDev_p->errorString();
break;
default: default:
break; break;
} }
@@ -179,15 +181,13 @@ void SocketCan::framesReceived()
continue; continue;
/* check frame */ /* check frame */
if( !recFrame.payload().isEmpty() && if (recFrame.payload().length() <= 8) {
recFrame.payload().length()<=8 )
{
CANFrame* frame_p = getQueue().get(); CANFrame* frame_p = getQueue().get();
if(frame_p) { if(frame_p) {
frame_p->len = recFrame.payload().length(); frame_p->len = static_cast<uint32_t>(recFrame.payload().length());
frame_p->bus = 0; frame_p->bus = 0;
memcpy(frame_p->data, recFrame.payload().data(), frame_p->len); memcpy(frame_p->data, recFrame.payload().data(), frame_p->len);
frame_p->extended = false; frame_p->extended = recFrame.hasExtendedFrameFormat();
frame_p->ID = recFrame.frameId(); frame_p->ID = recFrame.frameId();
frame_p->isReceived = true; frame_p->isReceived = true;
if (useSystemTime) { if (useSystemTime) {