Skip to content

Merge yoonju's branches#3

Merged
michael-m-2983 merged 1 commit intoAutosfrom
autos
Jan 28, 2025
Merged

Merge yoonju's branches#3
michael-m-2983 merged 1 commit intoAutosfrom
autos

Conversation

@michael-m-2983
Copy link
Member

No description provided.

@michael-m-2983 michael-m-2983 merged commit e187d18 into Autos Jan 28, 2025
@michael-m-2983 michael-m-2983 deleted the autos branch January 28, 2025 18:57
michael-m-2983 added a commit that referenced this pull request Feb 27, 2025
* Autos basics

* added boilerplate manipulator code

* filled in elevatorsubsystem

renamed newelevatorsubsystem to elevatorsubsystem

* partially filled out algae subsystem

* partially filled in coral subsystem

* basic climber things

* Fixed FWERB code

* Fixed FWERB code (#3)

Co-authored-by: Yunju607 <yj207lee@gmail.com>

* setting.json and updates

* changed elevator to zero by motor feedback

* corrected some motors to sparkflex

* changed coral intake to talonfx

* Updates 2 :)

* updated coralarm logic

* typo

* add feedforward to algaearm

* coral position mirroring

* add algaeintake beambreak and update intake logic

* updated coralintake logic

* custom coral arm stuff i guess

* coral virtual representation

* Auto Works

* Improve code readability

* readded vision

* renamed subsystem files

i think this should work

* Update/Add theoretical manipulator constants. Fix building on windows.

* Add theoretical presets

* add coral wrist roll restrictions

* update coral subsystem setter getters

* put everything in robotcontainers and added bindings

some reorganization too

* reorganized commands

* coral simulation init

untested as usual

* refactored coral scoring/intaking command

* algae simulation init

* removed unused references

* AYAAYAYA

* fixed the minimum to get simulation working

* Revert "Merge branch 'Autos' into addManipulators"

This reverts commit ef4addf, reversing
changes made to 759031f.

* Add debugging, command based sequencing, update control loops, etc.

* Hopefully fix for analog wrist encoders.

* Update CAN IDs for comp bot.

* Add debugging facilities and more encoder configuration.

* Simple feedforwards for pitch/roll. Rough tuning of pitch (sim)

* Pivot, etc. simulation & rudimentary tuning.

* Rough elevator PID tuning.

* Sim pidtuning (#5)

* Pivot, etc. simulation & rudimentary tuning.

* Rough elevator PID tuning.

* cleanup code and reitegrate simulation objects

* Tuned roll, pitch, pivot, drives!

* Tuned elevator, pivot PIDs. intake working.

* Minor simulation fixes for pivot joint, analog encoders, etc.

* Fix motion commands, tweak operator controls, rumble, coral intaking simulation.

* Works, but flings coral.

* Scoring is OK, intake is OK. not perfect, but it works alright.

* Pitch tweak, move current limit too constants.

* Assisted scoring init, based on LL

* small tweaks type

* Accounting for intake

* mt1 implementation (still need to fix prelim pos!!!)

* pseudocode for left vs right

* Finn's constants

* minor error fixes

* Added apriltags (FIX PRELIM POSITION)

* odometry this prolly doesn't work

* Intaking and constants tweak

* Fixed odometry

* debugging

* tweaks for functionality

* Auto stuff, base climber (manual).

* Climber support

* Rudimentary support for ultrasonic auto-mirroring.

* Removed unstable climber code

* Removed (commented) limelight/odometry

* Updated limelight config

* After filler matches.

* Tweaks at the end of week 0

* Climber ready-ish for soft limits.

* Smoother constants, PID tuning utilities.

* just a tiny wee little thing

* Disabled auto set mirror (hopefully)

* Velocity display for debugging.

* V2 sequncnign????

* Climber stops, zeroing in TEST mode.

* Better intaking currenting.

* fix LL mt1

* Disable PID debugging.

* Should flip arm based on odometry

* Tweak command and auto mirror usage in RobotContainer.

* Switched LL To mode 0

* Working side detection

* Fixed.... things? Pushing now for debugging

* Remove comments from CoralIntake class

* Remove comments from Constants

---------

Co-authored-by: Yunju607 <yj207lee@gmail.com>
Co-authored-by: Spoopr <spoopr@users.noreply.github.com>
Co-authored-by: voidReq <jhanstedtas@gmail.com>
Co-authored-by: NifleySnifley <finnsbart@gmail.com>
Co-authored-by: Yunju607 <149122412+Yunju607@users.noreply.github.com>
Co-authored-by: Nifley <67334280+NifleySnifley@users.noreply.github.com>
Co-authored-by: voidReq <100312344+voidReq@users.noreply.github.com>
Co-authored-by: Colten Kiehne <cokiehne@gmail.com>
Co-authored-by: NetLockJ <96214113+NetLockJ@users.noreply.github.com>
This was referenced Mar 4, 2025
michael-m-2983 added a commit that referenced this pull request Mar 4, 2025
* Autos basics

* added boilerplate manipulator code

* filled in elevatorsubsystem

renamed newelevatorsubsystem to elevatorsubsystem

* partially filled out algae subsystem

* partially filled in coral subsystem

* basic climber things

* Fixed FWERB code

* Fixed FWERB code (#3)



* setting.json and updates

* changed elevator to zero by motor feedback

* corrected some motors to sparkflex

* changed coral intake to talonfx

* Updates 2 :)

* updated coralarm logic

* typo

* add feedforward to algaearm

* coral position mirroring

* add algaeintake beambreak and update intake logic

* updated coralintake logic

* custom coral arm stuff i guess

* coral virtual representation

* Auto Works

* Improve code readability

* readded vision

* renamed subsystem files

i think this should work

* Update/Add theoretical manipulator constants. Fix building on windows.

* Add theoretical presets

* add coral wrist roll restrictions

* update coral subsystem setter getters

* put everything in robotcontainers and added bindings

some reorganization too

* reorganized commands

* coral simulation init

untested as usual

* refactored coral scoring/intaking command

* algae simulation init

* removed unused references

* AYAAYAYA

* fixed the minimum to get simulation working

* Revert "Merge branch 'Autos' into addManipulators"

This reverts commit ef4addf, reversing
changes made to 759031f.

* Add debugging, command based sequencing, update control loops, etc.

* Hopefully fix for analog wrist encoders.

* Update CAN IDs for comp bot.

* Add debugging facilities and more encoder configuration.

* Simple feedforwards for pitch/roll. Rough tuning of pitch (sim)

* Pivot, etc. simulation & rudimentary tuning.

* Rough elevator PID tuning.

* Sim pidtuning (#5)

* Pivot, etc. simulation & rudimentary tuning.

* Rough elevator PID tuning.

* cleanup code and reitegrate simulation objects

* Tuned roll, pitch, pivot, drives!

* Tuned elevator, pivot PIDs. intake working.

* Minor simulation fixes for pivot joint, analog encoders, etc.

* Fix motion commands, tweak operator controls, rumble, coral intaking simulation.

* Works, but flings coral.

* Scoring is OK, intake is OK. not perfect, but it works alright.

* Pitch tweak, move current limit too constants.

* Assisted scoring init, based on LL

* small tweaks type

* Accounting for intake

* mt1 implementation (still need to fix prelim pos!!!)

* pseudocode for left vs right

* Finn's constants

* minor error fixes

* Added apriltags (FIX PRELIM POSITION)

* odometry this prolly doesn't work

* Intaking and constants tweak

* Fixed odometry

* debugging

* tweaks for functionality

* Auto stuff, base climber (manual).

* Climber support

* Rudimentary support for ultrasonic auto-mirroring.

* Removed unstable climber code

* Removed (commented) limelight/odometry

* Updated limelight config

* After filler matches.

* Tweaks at the end of week 0

* Climber ready-ish for soft limits.

* Smoother constants, PID tuning utilities.

* just a tiny wee little thing

* Disabled auto set mirror (hopefully)

* Velocity display for debugging.

* V2 sequncnign????

* Climber stops, zeroing in TEST mode.

* Better intaking currenting.

* fix LL mt1

* Disable PID debugging.

* Should flip arm based on odometry

* Tweak command and auto mirror usage in RobotContainer.

* Switched LL To mode 0

* Working side detection

* Fixed.... things? Pushing now for debugging

* Remove comments from CoralIntake class

* Remove comments from Constants

---------

Co-authored-by: Yunju607 <yj207lee@gmail.com>
Co-authored-by: Spoopr <spoopr@users.noreply.github.com>
Co-authored-by: voidReq <jhanstedtas@gmail.com>
Co-authored-by: NifleySnifley <finnsbart@gmail.com>
Co-authored-by: Yunju607 <149122412+Yunju607@users.noreply.github.com>
Co-authored-by: Nifley <67334280+NifleySnifley@users.noreply.github.com>
Co-authored-by: voidReq <100312344+voidReq@users.noreply.github.com>
Co-authored-by: Colten Kiehne <cokiehne@gmail.com>
Co-authored-by: NetLockJ <96214113+NetLockJ@users.noreply.github.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.

2 participants