Rebase from staging - #36
Open
julianallchin wants to merge 54 commits into
Open
Conversation
* Added robot characterization config * Update testBuild.yml (#22) * Update testBuild.yml (#24) * Update .gitignore (#25) * Update .gitignore * fixed tests * Master rebase (#28) * stash * working encoders and can bus * updated code for robotpy 2020 * refactored * fix spelling of threshold * Update testBuild.yml * Update testBuild.yml * Update testBuild.yml * Update testBuild.yml Co-authored-by: Zoe Carver <z.zoelec2@gmail.com> Co-authored-by: Kavi Dey <kaviasher@gmail.com> Co-authored-by: levisprung <31974811+levisprung@users.noreply.github.com> * ⬆️ Upgrade dependencies * 💡 Documentation * Update testBuild.yml * Update testBuild.yml * Update requirements.txt * Create workflow-requirements.txt * Update testBuild.yml * Update workflow-requirements.txt Co-authored-by: Kavi Dey <kaviasher@gmail.com> Co-authored-by: Zoe Carver <z.zoelec2@gmail.com> Co-authored-by: levisprung <31974811+levisprung@users.noreply.github.com>
Testing to see if this affects build status
This reverts commit d763c3f.
…botics/8032 into alek/controller_class
* stash * working encoders and can bus * updated code for robotpy 2020 * refactored * fix spelling of threshold * Update testBuild.yml * Update testBuild.yml * Update testBuild.yml * ✨ Compressor/Piston * 🐛 Minor bug fixes * Add functionally for intake in teleop * Revert "Add functionally for intake in teleop" This reverts commit 0ddf97d. * Revert "Revert "Add functionally for intake in teleop"" This reverts commit 8587b05. * Add intake speed function * Update intakespeed functions * 🚑 Bug Update * 💩 Shit code Co-authored-by: Zoe Carver <z.zoelec2@gmail.com> Co-authored-by: Kavi Dey <kaviasher@gmail.com> Co-authored-by: levisprung <31974811+levisprung@users.noreply.github.com> Co-authored-by: Luca Sandoval <32229145+LucaSandoval@users.noreply.github.com>
…botics/8032 into alek/controller_class
Co-authored-by: Mark Betnel <itmeson@gmail.com>
feedback encoders are backwards
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
Please fix the merge conflicts.