Skip to content

Conversation

julianallchin
Copy link
Contributor

Please fix the merge conflicts.

julianallchin and others added 30 commits February 5, 2020 10:44
* 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 <[email protected]>
Co-authored-by: Kavi Dey <[email protected]>
Co-authored-by: levisprung <[email protected]>

* ⬆️ 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 <[email protected]>
Co-authored-by: Zoe Carver <[email protected]>
Co-authored-by: levisprung <[email protected]>
Testing to see if this affects build status
* 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 <[email protected]>
Co-authored-by: Kavi Dey <[email protected]>
Co-authored-by: levisprung <[email protected]>
Co-authored-by: Luca Sandoval <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants