Klagarge/SummerSchool2-Controller
Archived
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases 1 Activity

Merge remote-tracking branch 'origin/develop' into feature/watchdog-alive

Browse Source
This commit is contained in:
Rémi Heredero
2023-08-25 18:23:47 +02:00
parent 88096a007c 478b4f2ff9
commit 88390a294a
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
306-controller_interface.X/middleware/can_interface.c
View File

@@ -74,9 +74,13 @@ bool CAN_processEvent(Event* ev) {
CAN_4_BYTES tmpData; CAN_4_BYTES tmpData;
tmpData.full.bytes = data; tmpData.full.bytes = data;
uint8_t idMsg = 0x0F && (tmpData.separate.byte0>>4); uint8_t idMsg = tmpData.separate.byte0;
uint8_t idRecipient = 0x0F && tmpData.separate.byte1; idMsg = idMsg >> 4;
uint8_t idSender = (tmpData.separate.byte1>>4); idMsg = idMsg & 0xF;
uint8_t idRecipient = tmpData.separate.byte1;
idRecipient = idRecipient & 0xF;
uint8_t idSender = tmpData.separate.byte1;
idSender = idSender >> 4;
me->receiveCan(idSender, idMsg, canData); me->receiveCan(idSender, idMsg, canData);
} }