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

Browse Source
This commit is contained in:
Бычков Андрей
2019-07-31 14:11:23 +00:00
parent 768902acd0
commit e903798431
2 changed files with 8 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

@@ -86,6 +86,7 @@ int PICAN::readDevice(void * read_to, int max_size) {
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));
readed_id = frame.can_id;
return max_size; return max_size;
#endif #endif
return 0; return 0;
@@ -119,6 +120,11 @@ int PICAN::CANID() const {
} }
int PICAN::readedCANID() const {
return readed_id;
}
PIString PICAN::constructFullPathDevice() const { PIString PICAN::constructFullPathDevice() const {
PIString ret; PIString ret;
ret << path() << ":" << PIString::fromNumber(CANID(),16); ret << path() << ":" << PIString::fromNumber(CANID(),16);

3
src_main/io_devices/pican.h
View File

@@ -13,6 +13,7 @@ public:
void setCANID(int id); void setCANID(int id);
int CANID() const; int CANID() const;
int readedCANID() const;
protected: protected:
bool openDevice(); bool openDevice();
@@ -28,7 +29,7 @@ protected:
private: private:
int sock; int sock;
int can_id; int can_id, readed_id;
}; };
#endif // PICAN_H #endif // PICAN_H