Mirrors_Framework/ODrive
1
0
Fork 0
mirror of https://github.com/odriverobotics/ODrive.git synced 2026-09-21 15:34:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix get_32bit_val call

Browse Source
This commit is contained in:
Paul Guenette
2019-03-08 19:40:21 +01:00
parent c38abbcc13
commit 9355444f07
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Firmware/communication/can_simple.cpp
+8 -2
View File
@@ -374,11 +374,17 @@ uint8_t CANSimple::get_cmd_id(uint32_t msgID) {
}
int16_t CANSimple::get_16bit_val(CAN_message_t& msg, uint8_t start_byte) {
return msg.buf[start_byte] + (msg.buf[start_byte + 1] << 8);
int16_t retVal = 0;
if(msg.len - start_byte >= sizeof(retVal))
retVal = std::memcpy(&retVal, &(msg.buf[start_byte]), sizeof(retVal));
return retVal;
}
int32_t CANSimple::get_32bit_val(CAN_message_t& msg, uint8_t start_byte) {
return get_16bit_val(msg, start_byte) + (get_16bit_val(msg, start_byte + 2) << 16);
int32_t retVal = 0;
if(msg.len - start_byte >= sizeof(retVal))
std::memcpy(&retVal, &(msg.buf[start_byte]), sizeof(retVal));
return retVal;
}
float CANSimple::get_float(CAN_message_t& msg, uint8_t start_byte) {