Skip to content
Snippets Groups Projects
Commit 0c362b9a authored by jlKronos01's avatar jlKronos01
Browse files

Minor fixes

parent df897d30
No related branches found
No related tags found
No related merge requests found
......@@ -10,7 +10,6 @@
typedef enum {
LIVE_CHECK = 1, // no parameters
GIVE_TOKEN, // no parameters
BPM_COMMAND, // no parameters
POLL_REQUEST, // no parameters
SEND_DISTANCES, // 1 byte number of beacons (n), n * 2 bytes beacon address, n * sizeof(double) bytes beacon distance
......@@ -30,7 +29,6 @@ typedef enum {
RANGING_INITIATOR = 1,
RESPONDER,
AWAITING_SERIAL,
TAG_WAITING_FOR_TOKEN,
BEACON_POSITIONING_MODE
} deviceState;
......
......@@ -88,9 +88,9 @@ void setMacTxDataAndFCTRL(macHeader *mhr, size_t payloadLength, uint8_t *payload
}
// Copy receive buffer into mac header
void rxBufferToMacHeader(macHeader *mhr, uint8_t *rxBuffer, size_t length) {
memcpy((uint8_t *)mhr, rxBuffer, length);
}
// void rxBufferToMacHeader(macHeader *mhr, uint8_t *rxBuffer, size_t length) {
// memcpy((uint8_t *)mhr, rxBuffer, length);
// }
// Construct the 16-bit source address from the MHR
uint16_t getMacSrcAddr(macHeader *mhr) {
......
......@@ -5,7 +5,6 @@
typedef struct {
uint8_t frame_ctrl[2];
// uint8_t sequence_num;
uint8_t panID[2];
uint8_t destAddr[2];
uint8_t srcAddr[2];
......@@ -23,7 +22,7 @@ void initializeDataMHR(macHeader *mhr, bool AR, uint16_t panID, uint16_t srcAddr
void initializeEnhAckMHR(macHeader *mhr, uint16_t panID, uint16_t srcAddr, uint16_t destAddr = 0xFFFF);
void setMacTxDataAndFCTRL(macHeader *mhr, size_t payloadLength, uint8_t *payload, uint8_t ranging);
void rxBufferToMacHeader(macHeader *mhr, uint8_t *rxBuffer, size_t length);
// void rxBufferToMacHeader(macHeader *mhr, uint8_t *rxBuffer, size_t length);
uint16_t getMacSrcAddr(macHeader *mhr);
uint16_t getMacDestAddr(macHeader *mhr);
bool checkAckRequest(macHeader *mhr);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment