From 0c362b9a48cae616f70f5450742a73ee86579147 Mon Sep 17 00:00:00 2001
From: jlKronos01 <joelleungyancheuk@gmail.com>
Date: Fri, 17 Jan 2025 22:55:29 +0000
Subject: [PATCH] Minor fixes
---
Wireless_Communication/UWB/app.h | 2 --
Wireless_Communication/UWB/mac.cpp | 6 +++---
Wireless_Communication/UWB/mac.h | 3 +--
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/Wireless_Communication/UWB/app.h b/Wireless_Communication/UWB/app.h
index b64d1aae..7f3fab31 100644
--- a/Wireless_Communication/UWB/app.h
+++ b/Wireless_Communication/UWB/app.h
@@ -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;
diff --git a/Wireless_Communication/UWB/mac.cpp b/Wireless_Communication/UWB/mac.cpp
index 333dcbf8..6efc4f3d 100644
--- a/Wireless_Communication/UWB/mac.cpp
+++ b/Wireless_Communication/UWB/mac.cpp
@@ -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) {
diff --git a/Wireless_Communication/UWB/mac.h b/Wireless_Communication/UWB/mac.h
index c87ca71f..41d997b9 100644
--- a/Wireless_Communication/UWB/mac.h
+++ b/Wireless_Communication/UWB/mac.h
@@ -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);
--
GitLab