-
Notifications
You must be signed in to change notification settings - Fork 22
Fix consistency across component and vendor naming #163
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
Open
reniejoshi
wants to merge
6
commits into
frcsoftware:main
Choose a base branch
from
reniejoshi:fix-consistency-across-component-and-vendor-naming
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
693b021
Fix Spark Max and SystemCore casing and spacing
reniejoshi 4d49381
Merge branch 'main' into fix-consistency-across-component-and-vendor-…
reniejoshi 59be241
Fix Spark Flex spacing
reniejoshi a250f7a
Merge branch 'main' into fix-consistency-across-component-and-vendor-…
reniejoshi 3798136
Merge branch 'main' into fix-consistency-across-component-and-vendor-…
reniejoshi 0900e5d
Merge branch 'main' into fix-consistency-across-component-and-vendor-…
reniejoshi 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 | ||||
|---|---|---|---|---|---|---|
|
|
@@ -54,7 +54,7 @@ Then, create a new file in the `mechanisms` package named `Feeder.java`. | |||||
| Define a class named `Feeder` that implements `Mechanism`, then add the following: | ||||||
|
|
||||||
| 1. A private `TalonFX` motor controller object, named `motor`, with an ID of 5. | ||||||
| It is connected to a systemcore CANBus with ID 0. | ||||||
| It is connected to a SystemCore CANBus with ID 0. | ||||||
|
Member
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.
Suggested change
|
||||||
| 2. A `feed()` command that sets the throttle of the motor to 0.75 forever. | ||||||
| 3. An `intake()` command that sets the throttle of the motor to -1 forever. | ||||||
| 4. An `outtake()` command that sets the throttle of the motor to 1 forever. | ||||||
|
|
@@ -113,7 +113,7 @@ Create a file named `IntakeLauncher.java` in the `mechanisms` package. | |||||
| Define a class named `IntakeLauncher` that implements `Mechanism`; then, add the following: | ||||||
|
|
||||||
| 1. A private `TalonFX` motor controller object, named `motor`, with an ID of 4. | ||||||
| It is connected to a systemcore CANBus with ID 0. | ||||||
| It is connected to a SystemCore CANBus with ID 0. | ||||||
|
Member
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.
Suggested change
|
||||||
| 2. A `shoot()` command that waits 2 seconds, then sets the throttle of the motor to 0.9 forever. | ||||||
| 3. A `intake()` command that sets throttle to 0.8 forever. | ||||||
| 4. A `outtake()` command that sets throttle to -0.8 forever. | ||||||
|
|
||||||
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.
Sorry for taking a while to take another look at this. It looks like we define them as Spark MAX and Talon FX in our Vale glossary. Should we match that for consistency?
cc @zachwaffle4 maybe?
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.
REV calls them "SPARK MAX" So it should probably be changed to that?