Skip to content
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

Shooter pid #117

Merged
merged 32 commits into from
Jan 30, 2024
Merged

Conversation

totallysomeoneyoudontknow
Copy link
Contributor

What this PR does

What does it fix/add?
Reference issues with "Fixes #10" or "Closes #10", where #10 is the number assigned to the issue

What does this depend on?
References pull requests or branches/forks that this pull request depends on

@spacey-sooty
Copy link
Member

/format

@spacey-sooty spacey-sooty changed the base branch from master to alpha January 30, 2024 05:20
@spacey-sooty spacey-sooty merged commit 4fff1bf into CurtinFRC:alpha Jan 30, 2024
2 checks passed
goanna247 added a commit that referenced this pull request Feb 10, 2024
* 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

* Alpha Arm vers 1

* Alpha Arm ver 1 w/ explicit

* Alpha arm v1 formatting

* Alpha arm w/ wrist v1

* formatted

* fixed merge conflicts and merge errors

* fixed merge conflicts and merge errors

* fixed merge conflicts and merge errors

* fixed errors

* ran wpiformat

* Alpha arm v1 with ports

* fixed merge errors and conflicts

* fixed github errors

* Working alpha arm no encoders

* Alpha Bot Shooter

* Swerve fix (#106)

* fixed swerve

* wrapping function

* Shooter - Implements Networking tables (#99)

* 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 <havishchopra10@gmail.com>
Co-authored-by: Isaac Turner <spacey_sooty@outlook.com>

* Intake (#100)

* 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 <spacey_sooty@outlook.com>

* Arm (#103)

* 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 <spacey_sooty@outlook.com>

* fix some formatting

* fix more stuff

* shooter with pid loop

* Fixed errors

* ':pensive:'

* shortest path in 1 direction

* Fixing pid loop control

* fixing swerve

* robot running well, field oriented, turning pretty good needs work in 1 direction i think it's fighting a PID loop, i put acceleration and speed limit all the way up be careful, also needs LOTS more current limiting

* fixing pid control

* turning and driving fixed swerve modules being ordered wrong

* pid loop tuning

* AlphaArm PID v1 probably unit issues

* fixed PID control

* Arm WomPID

* ran wpiformat

* ran wpiformat again;

* fixed build

* wpiformat

* Shooter pid (#117)

* 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 <havishchopra10@gmail.com>
Co-authored-by: Isaac Turner <spacey_sooty@outlook.com>

* Intake - Manual/Auto fixes (#114)

* 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 (#107)

* [docs] Update README.md

* Update README.md

* Added auto to intake

* [ci] add comment command action (#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 (#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] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump actions/github-script from 6 to 7 (#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] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Fixed readme (#118)

* ran wpiformat

* fix

* fix line endings

* builds

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Kingsley Wong <kingsley.wong@student.education.wa.edu.au>
Co-authored-by: Isaac Turner <spacey_sooty@outlook.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Paul Hodges <111325206+Superbro525Alt@users.noreply.github.com>

* arm with pid hold

* going to try frc PID loop

* Driver testing finished

* beta bot swerve working and tested, subsystems not vibing

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Havish12 <havishchopra10@gmail.com>
Co-authored-by: totallysomeoneyoudontknow <dev.renu@gmail.com>
Co-authored-by: JoystickMaster-race <foxlocks179@gmail.com>
Co-authored-by: Isaac Turner <spacey_sooty@outlook.com>
Co-authored-by: JoystickMaster-race <97269195+JoystickMaster-race@users.noreply.github.com>
Co-authored-by: totallysomeoneyoudontknow <155517980+totallysomeoneyoudontknow@users.noreply.github.com>
Co-authored-by: kill-shots <155516223+kill-shots@users.noreply.github.com>
Co-authored-by: prawny-boy <155516197+prawny-boy@users.noreply.github.com>
Co-authored-by: Kingsley Wong <kingsley.wong@student.education.wa.edu.au>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Paul Hodges <111325206+Superbro525Alt@users.noreply.github.com>
Superbro525Alt pushed a commit to Superbro525Alt/2024-Crescendo that referenced this pull request Feb 12, 2024
* 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 <havishchopra10@gmail.com>
Co-authored-by: Isaac Turner <spacey_sooty@outlook.com>
Superbro525Alt added a commit to Superbro525Alt/2024-Crescendo that referenced this pull request Feb 12, 2024
* 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

* Alpha Arm vers 1

* Alpha Arm ver 1 w/ explicit

* Alpha arm v1 formatting

* Alpha arm w/ wrist v1

* formatted

* fixed merge conflicts and merge errors

* fixed merge conflicts and merge errors

* fixed merge conflicts and merge errors

* fixed errors

* ran wpiformat

* Alpha arm v1 with ports

* fixed merge errors and conflicts

* fixed github errors

* Working alpha arm no encoders

* Alpha Bot Shooter

* Swerve fix (CurtinFRC#106)

* fixed swerve

* wrapping function

* Shooter - Implements Networking tables (CurtinFRC#99)

* 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 <havishchopra10@gmail.com>
Co-authored-by: Isaac Turner <spacey_sooty@outlook.com>

* Intake (CurtinFRC#100)

* 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 <spacey_sooty@outlook.com>

* Arm (CurtinFRC#103)

* 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 <spacey_sooty@outlook.com>

* fix some formatting

* fix more stuff

* shooter with pid loop

* Fixed errors

* ':pensive:'

* shortest path in 1 direction

* Fixing pid loop control

* fixing swerve

* robot running well, field oriented, turning pretty good needs work in 1 direction i think it's fighting a PID loop, i put acceleration and speed limit all the way up be careful, also needs LOTS more current limiting

* fixing pid control

* turning and driving fixed swerve modules being ordered wrong

* pid loop tuning

* AlphaArm PID v1 probably unit issues

* fixed PID control

* Arm WomPID

* ran wpiformat

* ran wpiformat again;

* fixed build

* wpiformat

* Shooter pid (CurtinFRC#117)

* 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 <havishchopra10@gmail.com>
Co-authored-by: Isaac Turner <spacey_sooty@outlook.com>

* Intake - Manual/Auto fixes (CurtinFRC#114)

* 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] <support@github.com>
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] <support@github.com>
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] <support@github.com>
Co-authored-by: Kingsley Wong <kingsley.wong@student.education.wa.edu.au>
Co-authored-by: Isaac Turner <spacey_sooty@outlook.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Paul Hodges <111325206+Superbro525Alt@users.noreply.github.com>

* arm with pid hold

* going to try frc PID loop

* Driver testing finished

* beta bot swerve working and tested, subsystems not vibing

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Havish12 <havishchopra10@gmail.com>
Co-authored-by: totallysomeoneyoudontknow <dev.renu@gmail.com>
Co-authored-by: JoystickMaster-race <foxlocks179@gmail.com>
Co-authored-by: Isaac Turner <spacey_sooty@outlook.com>
Co-authored-by: JoystickMaster-race <97269195+JoystickMaster-race@users.noreply.github.com>
Co-authored-by: totallysomeoneyoudontknow <155517980+totallysomeoneyoudontknow@users.noreply.github.com>
Co-authored-by: kill-shots <155516223+kill-shots@users.noreply.github.com>
Co-authored-by: prawny-boy <155516197+prawny-boy@users.noreply.github.com>
Co-authored-by: Kingsley Wong <kingsley.wong@student.education.wa.edu.au>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Paul Hodges <111325206+Superbro525Alt@users.noreply.github.com>
Superbro525Alt pushed a commit to Superbro525Alt/2024-Crescendo that referenced this pull request Feb 12, 2024
* 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 <havishchopra10@gmail.com>
Co-authored-by: Isaac Turner <spacey_sooty@outlook.com>
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.

Pathplanner
3 participants