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.

Sign up for GitHub

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

Jump to bottom

27 handoff command #96

Merged
merged 122 commits into from
Jan 31, 2024
Merged

27 handoff command #96

merged 122 commits into from
Jan 31, 2024

Conversation

Jacob1010-h
Copy link
Member

@Jacob1010-h Jacob1010-h commented Jan 31, 2024 •
edited
Loading

This PR references all of the this we've been doing, which references:

derp00monsta and others added 30 commits January 21, 2024 15:19
@derp00monsta @Hadizah454
Make shooter folder & add pivot subsystem
1795436 
Co-authored-by: Hadizah454 <Hadizah454@users.noreply.github.com>
@derp00monsta
fix errors
4dbaa02
@BredPerson
Shooter Works NOW!!!
00410b9
@rin-star @frighthunt
this might be working
c1cdffa 
Co-authored-by: frighthunt <frighthunt@users.noreply.github.com>
@BredPerson
Claw Soon
373dc93
@Oliver-Cushman
added pivot and shooter
beb7716 
yay
@Oliver-Cushman
Merge branch 'ShooterCalc' of https://github.com/Patribots4738/Cresce…
c01bb57 
…ndo2024 into ShooterCalc
@RudyG252
ElevatorCommand and Claw Subsystem and Elevator Subsystem
0f85e61 
Climb is bad and need fix with man for chain curve
@RudyG252
ElevatorCommand and Claw Subsystem and Elevator Subsystem
443e8c1 
Climb is bad and need fix with man for chain curve
@Jacob1010-h
add handoff basics
f9b309d
@Jacob1010-h
Merge remote-tracking branch 'origin/ElevatorCommand' into 27-handoff…
8baab9b 
…-command

adds the shooterCalc branch to the handoff branch
@Jacob1010-h
Merge remote-tracking branch 'origin/ShooterCalc' into 27-handoff-com…
1acc7c9 
…mand
@Jacob1010-h
Merge remote-tracking branch 'origin/claw-subsystem' into 27-handoff-…
eaf520f 
…command
@Jacob1010-h
Merge remote-tracking branch 'origin/Trigger' into 27-handoff-command
9861f67
@Jacob1010-h
Merge remote-tracking branch 'origin/shooter-subystem' into 27-handof…
22fd539 
…f-command
@Jacob1010-h
Merge remote-tracking branch 'origin/pivot-subsystem' into 27-handoff…
da30c84 
…-command
@Jacob1010-h
Edit Constants
3dfb911 
(this will finish adding all changes currently on origin for all subsystem branches
@Jacob1010-h
update shooter with ShooterCalc
ff6b2f4
@Jacob1010-h
update Pivot with ShooterCalc
93d9eb9
@Jacob1010-h
add back trigger wheel
f2b44bb
@Jacob1010-h
add correct syntax for triggerwheel
b0dc755
@Jacob1010-h
Merge branch 'Trigger' into 27-handoff-command
5a9cf63
@Jacob1010-h
fix merge conflicts
478c7b6
@Jacob1010-h
resolve Claw conflicts
5fb4f3f
@Jacob1010-h
complete refactoring of handoff to be up to date with branches
542fa93 
The branches are as follows:
Shooting Calc Comand #33
Shooter Subystem #31
Trigger Subsystem #30
Claw Subsystem #29
Elevator Command #28
Elevator Subsystem #26
Pivot Subsystem #25
@Jacob1010-h
remove unused handler file
a5753af
@Jacob1010-h
formatting :DD
11da1a0
@Oliver-Cushman
added various commands that use pivot and shooter
e393c02
@Oliver-Cushman
Merge branch 'ShooterCalc' of https://github.com/Patribots4738/Cresce…
996d7a1 
…ndo2024 into ShooterCalc
@Jacob1010-h
Merge branch 'ShooterCalc' of https://github.com/Patribots4738/Cresce…
f22e4db 
…ndo2024 into 27-handoff-command
@Jacob1010-h Jacob1010-h added enhancement New feature or request help wanted Extra attention is needed logic A logic problem or solution complicated It's as shrimple as that 🦐 labels Jan 31, 2024
@Jacob1010-h Jacob1010-h added this to the Teleop milestone Jan 31, 2024
@Jacob1010-h Jacob1010-h self-assigned this Jan 31, 2024
This was linked to issues Jan 31, 2024
Intake Subsystem #24
Closed
Elevator Command #28
Closed
Claw Subsystem #29
Closed
PieceControl Command - was Handoff Command #27
Closed
Pivot Subsystem #25
Closed
Shooter Subystem #31
Closed
Shooting Calc Comand #33
Closed
Elevator Subsystem #6
Closed
Elevator Subsystem #26
Closed
Trigger Subsystem #30
Closed
@Jacob1010-h Jacob1010-h removed a link to an issue Jan 31, 2024
Elevator Subsystem #6
Closed
@Jacob1010-h Jacob1010-h linked an issue Jan 31, 2024 that may be closed by this pull request
PieceControl parameters rather than making new subsystems #48
Closed
@Jacob1010-h Jacob1010-h removed a link to an issue Jan 31, 2024
PieceControl parameters rather than making new subsystems #48
Closed
@Jacob1010-h Jacob1010-h linked an issue Jan 31, 2024 that may be closed by this pull request
Driving 3D components in sim #89
Closed
6 tasks
Xander228 and others added 6 commits January 30, 2024 19:27
@Xander228 @GalexY727
@rin-star @derp00monsta
Shrimply move the mechanisms using pose3d 🦐
e766807 
Co-authored-by: Alexander Hamilton <a.hamilton72006@gmail.com>
Co-authored-by: rin-star <hyunrin.ryu@gmail.com>
Co-authored-by: Tina H <tina.hague42@gmail.com>
@Xander228
only update pivot desired when we change it
2a05772
@GalexY727
Fix up desired position when it shouldve been non desired (thanks fra…
c3b3260 
…nk!)
@Oliver-Cushman
Add mechanisms to the 27 branch (#88)
5a1b226
@Xander228 @Oliver-Cushman
@GalexY727 @Jacob1010-h @HHQB @BredPerson @rin-star @derp00monsta
Merge branch 'main' into 27-handoff-command into MAIN
2374676 
Co-authored-by: Oliver M. Cushman <148410925+Oliver-Cushman@users.noreply.github.com>
Co-authored-by: Alexander Hamilton <65139378+GalexY727@users.noreply.github.com>
Co-authored-by: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Co-authored-by: HHQB <145621751+HHQB@users.noreply.github.com>
Co-authored-by: Alexander Hamilton <a.hamilton72006@gmail.com>
Co-authored-by: BredPerson <155865812+BredPerson@users.noreply.github.com>
Co-authored-by: rin-star <hyunrin.ryu@gmail.com>
Co-authored-by: Tina H <tina.hague42@gmail.com>
@Xander228 @Oliver-Cushman
@GalexY727 @Jacob1010-h @HHQB @BredPerson @rin-star @derp00monsta
🦐🦐🦐
2bebc02 
Additional changes to soothe the catastrophies that just happened with that merge.

Co-authored-by: Oliver M. Cushman <148410925+Oliver-Cushman@users.noreply.github.com>
Co-authored-by: Alexander Hamilton <65139378+GalexY727@users.noreply.github.com>
Co-authored-by: Jacob Hotz <77470805+Jacob1010-h@users.noreply.github.com>
Co-authored-by: HHQB <145621751+HHQB@users.noreply.github.com>
Co-authored-by: Alexander Hamilton <a.hamilton72006@gmail.com>
Co-authored-by: BredPerson <155865812+BredPerson@users.noreply.github.com>
Co-authored-by: rin-star <hyunrin.ryu@gmail.com>
Co-authored-by: Tina H <tina.hague42@gmail.com>
@GalexY727 GalexY727 merged commit 891d8d2 into main Jan 31, 2024
1 check passed
@GalexY727 GalexY727 deleted the 27-handoff-command branch January 31, 2024 03:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PatribotsProgramming PatribotsProgramming Awaiting requested review from PatribotsProgramming

Assignees

@Jacob1010-h Jacob1010-h

Labels
complicated It's as shrimple as that 🦐 enhancement New feature or request help wanted Extra attention is needed logic A logic problem or solution
Projects
Crescendo 2024
Status: Done
Milestone
Teleop
10 participants
@Jacob1010-h @GalexY727 @Oliver-Cushman @derp00monsta @BredPerson @rin-star @RudyG252 @PatribotsProgramming @HHQB @Xander228