Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
Robobin
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
plw1g21
Robobin
Commits
0c362b9a
Commit
0c362b9a
authored
4 months ago
by
jlKronos01
Browse files
Options
Downloads
Patches
Plain Diff
Minor fixes
parent
df897d30
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Wireless_Communication/UWB/app.h
+0
-2
0 additions, 2 deletions
Wireless_Communication/UWB/app.h
Wireless_Communication/UWB/mac.cpp
+3
-3
3 additions, 3 deletions
Wireless_Communication/UWB/mac.cpp
Wireless_Communication/UWB/mac.h
+1
-2
1 addition, 2 deletions
Wireless_Communication/UWB/mac.h
with
4 additions
and
7 deletions
Wireless_Communication/UWB/app.h
+
0
−
2
View file @
0c362b9a
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
Wireless_Communication/UWB/mac.cpp
+
3
−
3
View file @
0c362b9a
...
...
@@ -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
)
{
...
...
This diff is collapsed.
Click to expand it.
Wireless_Communication/UWB/mac.h
+
1
−
2
View file @
0c362b9a
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment