Kelder/obus
33
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity

Add util functions for byte (un)packing

Browse source
This commit is contained in:
Midgard 2020-09-11 21:32:23 +02:00
parent 1a1e993329
commit bc42820ca3
Signed by: midgard
GPG key ID: 511C112F1331BBB4
3 changed files with 46 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/obus_can.cpp
View file

@ -1,5 +1,6 @@
#include <mcp2515.h> #include <mcp2515.h>
#include <obus_util.h>
#include "obus_can.h" #include "obus_can.h"
// Chip select for the CAN module // Chip select for the CAN module
@ -116,11 +117,7 @@ bool receive(struct message *msg) {
Serial.println(F("W Received illegal gamestatus msg: payload <7")); Serial.println(F("W Received illegal gamestatus msg: payload <7"));
return false; return false;
} }
msg->gamestatus.time_left = msg->gamestatus.time_left = unpack_4b_into_u32(&(receive_frame.data[1]));
((uint32_t) receive_frame.data[1] << 0x18) |
((uint32_t) receive_frame.data[2] << 0x10) |
((uint32_t) receive_frame.data[3] << 0x08) |
((uint32_t) receive_frame.data[4]);
msg->gamestatus.strikes = receive_frame.data[5]; msg->gamestatus.strikes = receive_frame.data[5];
msg->gamestatus.max_strikes = receive_frame.data[6]; msg->gamestatus.max_strikes = receive_frame.data[6];
break; break;
@ -175,10 +172,7 @@ void send(struct message *msg) {
break; break;
case OBUS_PAYLDTYPE_GAMESTATUS: case OBUS_PAYLDTYPE_GAMESTATUS:
send_frame.data[1] = (uint8_t) ((msg->gamestatus.time_left & 0xFF000000) >> 0x18); pack_u32_into_4b(&(send_frame.data[1]), msg->gamestatus.time_left);
send_frame.data[2] = (uint8_t) ((msg->gamestatus.time_left & 0x00FF0000) >> 0x10);
send_frame.data[3] = (uint8_t) ((msg->gamestatus.time_left & 0x0000FF00) >> 0x08);
send_frame.data[4] = (uint8_t) (msg->gamestatus.time_left & 0x000000FF);
send_frame.data[5] = msg->gamestatus.strikes; send_frame.data[5] = msg->gamestatus.strikes;
send_frame.data[6] = msg->gamestatus.max_strikes; send_frame.data[6] = msg->gamestatus.max_strikes;
length = 7; length = 7;

29
lib/obus_util.cpp Normal file
View file

@ -0,0 +1,29 @@
#include "obus_util.h"
uint32_t unpack_4b_into_u32(uint8_t *data) {
return
((uint32_t) data[0] << 0x18) |
((uint32_t) data[1] << 0x10) |
((uint32_t) data[2] << 0x08) |
((uint32_t) data[3]);
}
void pack_u32_into_4b(uint8_t *dest, uint32_t data) {
dest[0] = (uint8_t) ((data & 0xFF000000) >> 0x18);
dest[1] = (uint8_t) ((data & 0x00FF0000) >> 0x10);
dest[2] = (uint8_t) ((data & 0x0000FF00) >> 0x08);
dest[3] = (uint8_t) (data & 0x000000FF);
}
uint16_t unpack_2b_into_u16(uint8_t *data) {
return
((uint16_t) data[0] << 0x08) |
((uint16_t) data[1]);
}
void pack_u16_into_2b(uint8_t *dest, uint16_t data) {
dest[0] = (uint8_t) ((data & 0xFF00) >> 0x08);
dest[1] = (uint8_t) (data & 0x00FF);
}

14
lib/obus_util.h Normal file
View file

@ -0,0 +1,14 @@
#ifndef OBUS_UTIL_H
#define OBUS_UTIL_H
#include "Arduino.h"
uint32_t unpack_4b_into_u32(uint8_t *data);
void pack_u32_into_4b(uint8_t *dest, uint32_t data);
uint16_t unpack_2b_into_u16(uint8_t *data);
void pack_u16_into_2b(uint8_t *dest, uint16_t data);
#endif /* end of include guard: OBUS_UTIL_H */