-
Notifications
You must be signed in to change notification settings - Fork 78
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add standalone operational mode #17
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
07b1793
add standalone operation mode
HotelCalifornia 1037628
(optionally) fix makefile
HotelCalifornia 7f84207
swap svSynchronize logic
HotelCalifornia 7dd4001
bump copyright year to include 2017
HotelCalifornia 22fbc8d
Standalone mode implemented and tested
baylessj 76c1d49
Revert svSynchronize and simplify logic
edjubuh 966ec8e
Merge remote-tracking branch 'origin/master' into standalone-mode
edjubuh File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
* supervisor.c - Functions for interfacing with the NXP supervisor processor responsible for | ||
* handling the gory details of VEXnet | ||
* | ||
* Copyright (c) 2011-2016, Purdue University ACM SIGBots. | ||
* Copyright (c) 2011-2017, Purdue University ACM SIGBots. | ||
* All rights reserved. | ||
* | ||
* This Source Code Form is subject to the terms of the Mozilla Public | ||
|
@@ -133,6 +133,12 @@ void _svNextByte() { | |
SPI1->DR = spiBufferTX[idx]; | ||
} | ||
|
||
// standaloneModeEnable - enable standalone operation | ||
void standaloneModeEnable() { | ||
// set flag in outgoing SPI buffer to enable standlone mode | ||
SV_OUT->flags |= 1; | ||
} | ||
|
||
// svInit - Initialize supervisor communications | ||
void svInit() { | ||
uint8_t i; | ||
|
@@ -154,6 +160,7 @@ void svInit() { | |
spiBufferTX[i] = (uint16_t)0x0000; | ||
SV_OUT->key = SV_MAGIC; | ||
SV_OUT->mode = 2; | ||
SV_OUT->flags = 0; | ||
SV_OUT->version = 1; | ||
// Load in empty motor values | ||
svSetAllData((uint8_t)0x7F); | ||
|
@@ -186,7 +193,7 @@ void svSynchronize() { | |
// HELLO message! | ||
kwait(50); | ||
print("\r\nPowered by PROS " FW_VERSION "\r\n" FW_DISCLAIMER | ||
"\r\nPROS (C)2011-2014 Purdue ACM SIGBOTS\r\n"); | ||
"\r\nPROS (C)2011-2017 Purdue ACM SIGBOTS\r\n"); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I know it's not strictly related, but while we're here and editing |
||
print("This program has ABSOLUTELY NO WARRANTY, not even an implied\r\n" | ||
"warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\r\n\r\n"); | ||
} | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are we aware currently of what the remaining bits of this
flags
byte (I assume it to beuint8_t
) do?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, we'll have to take a look at the other bit values during the fall semester.