Skip to content

Commit ca7f907

Browse files
author
Ethan Zonca
committed
Fix SocketCanInterface, missed during migration to qlist for rx
1 parent ccdcb64 commit ca7f907

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/driver/SocketCanDriver/SocketCanInterface.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ void SocketCanInterface::sendMessage(const CanMessage &msg) {
408408
::write(_fd, &frame, sizeof(struct can_frame));
409409
}
410410

411-
bool SocketCanInterface::readMessage(CanMessage &msg, unsigned int timeout_ms) {
411+
bool SocketCanInterface::readMessage(QList<CanMessage> &msglist, unsigned int timeout_ms) {
412412

413413
struct can_frame frame;
414414
struct timespec ts_rcv;
@@ -423,6 +423,7 @@ bool SocketCanInterface::readMessage(CanMessage &msg, unsigned int timeout_ms) {
423423
FD_ZERO(&fdset);
424424
FD_SET(_fd, &fdset);
425425

426+
CanMessage msg;
426427

427428
int rv = select(_fd+1, &fdset, NULL, NULL, &timeout);
428429
if (rv>0) {
@@ -463,6 +464,7 @@ bool SocketCanInterface::readMessage(CanMessage &msg, unsigned int timeout_ms) {
463464
msg.setByte(i, frame.data[i]);
464465
}
465466

467+
msglist.append(msg);
466468
return true;
467469
} else {
468470
return false;

0 commit comments

Comments
 (0)