sven
/
libicsneo
mirror of https://github.com/intrepidcs/libicsneo.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #27 from pierreluctg/icsneolegacy-ExtraDataPrtEnabled 

Setting ExtraDataPtrEnabled when ExtraDataPtr is use
pull/32/head
Paul Hollinsky 2020-09-23 12:40:56 -04:00 committed by GitHub
parent 66d7c2f390 2cd074cf13
commit dfe2d23d85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/icsneolegacy/icsneolegacy.cpp
View File

@ -42,6 +42,7 @@ static void NeoMessageToSpyMessage(const neodevice_t* device, const neomessage_t
oldmsg.NumberBytesData = (uint8_t)std::min(newmsg.length, (size_t)255); oldmsg.NumberBytesData = (uint8_t)std::min(newmsg.length, (size_t)255);
oldmsg.NumberBytesHeader = 4; oldmsg.NumberBytesHeader = 4;
oldmsg.ExtraDataPtr = (void*)newmsg.data; oldmsg.ExtraDataPtr = (void*)newmsg.data;
oldmsg.ExtraDataPtrEnabled = newmsg.length > 8 ? 1 :0;
memcpy(oldmsg.Data, newmsg.data, std::min(newmsg.length, (size_t)8)); memcpy(oldmsg.Data, newmsg.data, std::min(newmsg.length, (size_t)8));
oldmsg.ArbIDOrHeader = *(uint32_t*)newmsg.header; oldmsg.ArbIDOrHeader = *(uint32_t*)newmsg.header;
oldmsg.NetworkID = (uint8_t)newmsg.netid; // Note: NetID remapping from the original API is not supported oldmsg.NetworkID = (uint8_t)newmsg.netid; // Note: NetID remapping from the original API is not supported