Vision #109
Closed
Vision #109
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
|
/format |
Superbro525Alt
force-pushed
the
vision
branch
2 times, most recently
from
32d5650 to
2be82bf
Compare
Superbro525Alt
force-pushed
the
vision
branch
2 times, most recently
from
123e4e4 to
c28e2ff
Compare
|
This needs a rebase |
Superbro525Alt
force-pushed
the
vision
branch
from
c28e2ff to
29614ca
Compare
* fixed swerve * wrapping function
* added the state raw and changed voltage * test * added the state raw and changed voltage * added pid calculate loop, fixed indenting * added calculate function on a new line, changed the PID to not stable * Fixed the if condition so shooterSensor is not tripped * changed the functions so they start with a capital * changed the value for shooterMotor * added shuffleboard and networking tables * added shuffleboard and networking tables * added network tables * fixed merge conflicts and merge errors * fixed merge conflicts and merge errors * fixed merge conflicts and merge errors * fixed errors * ran wpiformat * fixed merge errors and conflicts * fixed github errors * Alpha Bot Shooter --------- Co-authored-by: Havish12 <[email protected]> Co-authored-by: Isaac Turner <[email protected]>
* First version Tank Drive * Intake draft * Intake draft fixed errors 1 * Intake draft fixed errors 2 * Intake draft fixed errors 3 * Intake draft fixed errors 4 * Intake draft fixed errors 5 * Network files 1 * Network files 2 * Network files 3 * Almost done i think * finished wpiformat errors * finished wpiformat errors 2 * finished wpiformat errors 3 * finished wpiformat errors 4 * ran wpiformat * finished wpiformat errors 5 * finished wpiformat errors 8 * finished wpiformat errors 9 * finished wpiformat errors 10 * Tested on robot * Fixed github build errors after modifying during robot tests * fixed more github build errors 2 * fixed more github build errors 3 * Tested on robot and works --------- Co-authored-by: Isaac Turner <[email protected]>
* Alpha Arm vers 1 * Alpha Arm ver 1 w/ explicit * Alpha arm v1 formatting * Alpha arm w/ wrist v1 * formatted * Alpha arm v1 with ports * Working alpha arm no encoders --------- Co-authored-by: Isaac Turner <[email protected]>
* added the state raw and changed voltage * test * added the state raw and changed voltage * added pid calculate loop, fixed indenting * added calculate function on a new line, changed the PID to not stable * Fixed the if condition so shooterSensor is not tripped * changed the functions so they start with a capital * changed the value for shooterMotor * added shuffleboard and networking tables * added shuffleboard and networking tables * added network tables * fixed merge conflicts and merge errors * fixed merge conflicts and merge errors * fixed merge conflicts and merge errors * fixed errors * ran wpiformat * fixed merge errors and conflicts * fixed github errors * Alpha Bot Shooter * shooter with pid loop * Fixed errors * Fixing pid loop control * fixing pid control * pid loop tuning * fixed PID control * ran wpiformat * ran wpiformat again; * fixed build * wpiformat --------- Co-authored-by: Havish12 <[email protected]> Co-authored-by: Isaac Turner <[email protected]>
* First version Tank Drive * Intake draft * Intake draft fixed errors 1 * Intake draft fixed errors 2 * Intake draft fixed errors 3 * Intake draft fixed errors 4 * Intake draft fixed errors 5 * Network files 1 * Network files 2 * Network files 3 * Almost done i think * finished wpiformat errors * finished wpiformat errors 2 * finished wpiformat errors 3 * finished wpiformat errors 4 * ran wpiformat * finished wpiformat errors 5 * finished wpiformat errors 8 * finished wpiformat errors 9 * finished wpiformat errors 10 * Tested on robot * Fixed github build errors after modifying during robot tests * fixed more github build errors 2 * fixed more github build errors 3 * Tested on robot and works * added beam break * [docs] Update README.md (CurtinFRC#107) * [docs] Update README.md * Update README.md * Added auto to intake * [ci] add comment command action (CurtinFRC#111) * [ci] add comment command action * fix * Tested on robot * fixed intake manual auto, has not been tested on robot * fixed github build errors * Added intake better manual and verfied on robot! * Bump actions/setup-python from 4 to 5 (CurtinFRC#116) Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](actions/setup-python@v4...v5) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/github-script from 6 to 7 (CurtinFRC#115) Bumps [actions/github-script](https://github.com/actions/github-script) from 6 to 7. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](actions/github-script@v6...v7) --- updated-dependencies: - dependency-name: actions/github-script dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fixed readme (CurtinFRC#118) * ran wpiformat * fix * fix line endings * builds --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Kingsley Wong <[email protected]> Co-authored-by: Isaac Turner <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Paul Hodges <[email protected]>
* fixed swerve * wrapping function
* added the state raw and changed voltage * test * added the state raw and changed voltage * added pid calculate loop, fixed indenting * added calculate function on a new line, changed the PID to not stable * Fixed the if condition so shooterSensor is not tripped * changed the functions so they start with a capital * changed the value for shooterMotor * added shuffleboard and networking tables * added shuffleboard and networking tables * added network tables * fixed merge conflicts and merge errors * fixed merge conflicts and merge errors * fixed merge conflicts and merge errors * fixed errors * ran wpiformat * fixed merge errors and conflicts * fixed github errors * Alpha Bot Shooter --------- Co-authored-by: Havish12 <[email protected]> Co-authored-by: Isaac Turner <[email protected]>
* First version Tank Drive * Intake draft * Intake draft fixed errors 1 * Intake draft fixed errors 2 * Intake draft fixed errors 3 * Intake draft fixed errors 4 * Intake draft fixed errors 5 * Network files 1 * Network files 2 * Network files 3 * Almost done i think * finished wpiformat errors * finished wpiformat errors 2 * finished wpiformat errors 3 * finished wpiformat errors 4 * ran wpiformat * finished wpiformat errors 5 * finished wpiformat errors 8 * finished wpiformat errors 9 * finished wpiformat errors 10 * Tested on robot * Fixed github build errors after modifying during robot tests * fixed more github build errors 2 * fixed more github build errors 3 * Tested on robot and works --------- Co-authored-by: Isaac Turner <[email protected]>
* Alpha Arm vers 1 * Alpha Arm ver 1 w/ explicit * Alpha arm v1 formatting * Alpha arm w/ wrist v1 * formatted * Alpha arm v1 with ports * Working alpha arm no encoders --------- Co-authored-by: Isaac Turner <[email protected]>
* added the state raw and changed voltage * test * added the state raw and changed voltage * added pid calculate loop, fixed indenting * added calculate function on a new line, changed the PID to not stable * Fixed the if condition so shooterSensor is not tripped * changed the functions so they start with a capital * changed the value for shooterMotor * added shuffleboard and networking tables * added shuffleboard and networking tables * added network tables * fixed merge conflicts and merge errors * fixed merge conflicts and merge errors * fixed merge conflicts and merge errors * fixed errors * ran wpiformat * fixed merge errors and conflicts * fixed github errors * Alpha Bot Shooter * shooter with pid loop * Fixed errors * Fixing pid loop control * fixing pid control * pid loop tuning * fixed PID control * ran wpiformat * ran wpiformat again; * fixed build * wpiformat --------- Co-authored-by: Havish12 <[email protected]> Co-authored-by: Isaac Turner <[email protected]>
* First version Tank Drive * Intake draft * Intake draft fixed errors 1 * Intake draft fixed errors 2 * Intake draft fixed errors 3 * Intake draft fixed errors 4 * Intake draft fixed errors 5 * Network files 1 * Network files 2 * Network files 3 * Almost done i think * finished wpiformat errors * finished wpiformat errors 2 * finished wpiformat errors 3 * finished wpiformat errors 4 * ran wpiformat * finished wpiformat errors 5 * finished wpiformat errors 8 * finished wpiformat errors 9 * finished wpiformat errors 10 * Tested on robot * Fixed github build errors after modifying during robot tests * fixed more github build errors 2 * fixed more github build errors 3 * Tested on robot and works * added beam break * [docs] Update README.md (CurtinFRC#107) * [docs] Update README.md * Update README.md * Added auto to intake * [ci] add comment command action (CurtinFRC#111) * [ci] add comment command action * fix * Tested on robot * fixed intake manual auto, has not been tested on robot * fixed github build errors * Added intake better manual and verfied on robot! * Bump actions/setup-python from 4 to 5 (CurtinFRC#116) Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](actions/setup-python@v4...v5) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/github-script from 6 to 7 (CurtinFRC#115) Bumps [actions/github-script](https://github.com/actions/github-script) from 6 to 7. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](actions/github-script@v6...v7) --- updated-dependencies: - dependency-name: actions/github-script dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fixed readme (CurtinFRC#118) * ran wpiformat * fix * fix line endings * builds --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Kingsley Wong <[email protected]> Co-authored-by: Isaac Turner <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Paul Hodges <[email protected]>
|
Open a new pr which isn't nuked with conflicts |
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.
What this PR does
Add vision