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

Browse Source
This commit is contained in:
Бычков Андрей
2018-06-06 12:19:50 +00:00
parent 174ae74019
commit afee38f094
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src_main/io/pican.cpp
View File

@@ -78,12 +78,12 @@ 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
piCout << "PICAN read"; //piCout << "PICAN read";
can_frame frame; 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));
return max_size; return max_size;
#endif #endif
@@ -93,7 +93,7 @@ int PICAN::readDevice(void * read_to, int max_size) {
int PICAN::writeDevice(const void * data, int max_size) { int PICAN::writeDevice(const void * data, int max_size) {
#ifdef PIP_CAN #ifdef PIP_CAN
piCout << "PICAN write" << can_id << max_size; //piCout << "PICAN write" << can_id << max_size;
if (max_size > 8) {piCoutObj << "Can't send CAN frame bigger than 8 bytes (requested " << max_size << ")!"; return -1;} if (max_size > 8) {piCoutObj << "Can't send CAN frame bigger than 8 bytes (requested " << max_size << ")!"; return -1;}
can_frame frame; can_frame frame;
frame.can_id = can_id; frame.can_id = can_id;