Update master with work done in drive #37
Conversation
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
# Conflicts: # src/main/java/org/usfirst/frc/team449/robot/Robot.java # src/main/java/org/usfirst/frc/team449/robot/commands/multiInterface/drive/UnidirectionalNavXDefaultDrive.java # src/main/java/org/usfirst/frc/team449/robot/jacksonWrappers/SlaveTalon.java
|
Instead of having conflicts with the formatted files, do you want me to separately format all branches and push? |
those aren't formatting issues, i removed the commands/subsystems |
…orExternalEncoder and added a method call to setSamplesToAverage Signed-off-by: ysthakur <[email protected]>
Robot.java also got formatted by IntelliJ
- Re-enable joystick simulation - Use simple drive map - Remove debug prints from CommandContainer
…tter _2020 packages
Changes from meeting; indexing timeout; improve other things
Also moves around logic so that can happen more cleanly. Feeder running due to shooting and feeder running due to indexing are now both in the feeder default command.
Untested other than deserialization.
- Cough button release now stops bumper/transition/feeder
- Feeder shooting logic moved into default command
- Default command now knows a lot more about the subsystems
- Made default command more robust
- Fixed race conditions when indexing/intaking/shooting occur
simultaneously
- Now stops both intake and feeder (including indexing) when
spinning up
- Indexing should resume properly after spin-up
- Button-activated states are not restored
- Tested in simulation
Signed-off-by: Lilian Palosky <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
(PR made by Yueqin)