SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/pip@835 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Бычков Андрей
2019-07-31 15:45:38 +00:00
parent e903798431
commit 0e153f12ca
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src_main/io_devices/pican.cpp
View File

@@ -51,6 +51,10 @@ bool PICAN::openDevice() {
piCoutObj << "Error! while determin the interface ioctl";
return false;
}
struct timeval tv;
tv.tv_sec = 1;
tv.tv_usec = 0;
setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (const char*)&tv, sizeof tv);
// bind socket to all CAN interface
sockaddr_can addr;
addr.can_family = AF_CAN;
@@ -83,7 +87,7 @@ int PICAN::readDevice(void * read_to, int max_size) {
can_frame frame;
int ret = 0;
ret = ::read(sock, &frame, sizeof(can_frame));
if(ret < 0) {piCoutObj << "Error while read CAN frame " << ret; return -1;}
if(ret < 0) {/*piCoutObj << "Error while read CAN frame " << ret;*/ return -1;}
//piCoutObj << "receive CAN frame Id =" << frame.can_id;
memcpy(read_to, frame.data, piMini(frame.can_dlc, max_size));
readed_id = frame.can_id;