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@611 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Бычков Андрей
2018-05-07 14:04:26 +00:00
parent d3fe190ccf
commit 0d1a584f56
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src_main/io/pican.cpp
View File

@@ -74,8 +74,9 @@ bool PICAN::closeDevice() {
int PICAN::readDevice(void * read_to, int max_size) { int PICAN::readDevice(void * read_to, int max_size) {
#ifdef PIP_CAN #ifdef PIP_CAN
can_frame frame;
int ret = 0; int ret = 0;
ret = read(sock, &frame, sizeof(can_frame)); 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; piCoutObj << "receive CAN frame Id =" << frame.can_id;
memcpy(read_to, frame.data, piMini(frame.can_dlc, max_size)); memcpy(read_to, frame.data, piMini(frame.can_dlc, max_size));
@@ -93,7 +94,7 @@ int PICAN::writeDevice(const void * data, int max_size) {
frame.can_dlc = max_size; frame.can_dlc = max_size;
memcpy(frame.data, data, max_size); memcpy(frame.data, data, max_size);
int ret = 0; int ret = 0;
ret = write(sock, &frame, sizeof(can_frame)); ret = ::write(sock, &frame, sizeof(can_frame));
if(ret < 0) {piCoutObj << "Error while send CAN frame " << ret; return -1;} if(ret < 0) {piCoutObj << "Error while send CAN frame " << ret; return -1;}
return max_size; return max_size;
#endif #endif