Fix header bit translation

2022-02-19 12:59:05 +01:00
parent e26751d5d4
commit 7190dbcdf9
5 changed files with 37 additions and 16 deletions
@@ -2,12 +2,23 @@
 #include "mmr_can_util.h"
 #include "mmr_can_optimize.h"

-uint32_t *MMR_CAN_HeaderToBits(MmrCanHeader *header) {
-  return (uint32_t*)header;
+uint32_t MMR_CAN_HeaderToBits(MmrCanHeader header) {
+  return 0
+    | ((uint32_t)header.priority << 26)
+	| ((uint32_t)header.messageId << 23)
+    | ((uint32_t)header.senderId << 13)
+    | ((uint32_t)header.seqNumber << 3)
+    | ((uint32_t)header.messageType);
 }

-MmrCanHeader *MMR_CAN_HeaderFromBits(uint32_t *bits) {
-  return (MmrCanHeader*)bits;
+MmrCanHeader MMR_CAN_HeaderFromBits(uint32_t bits) {
+  return (MmrCanHeader) {
+	.priority = bits >> 26,
+    .messageId = bits >> 23,
+	.senderId = bits >> 13,
+	.seqNumber = bits >> 3,
+	.messageType = bits,
+  };
 }