Skip to content

Manipulator - #1

Closed
DriverStationComputer wants to merge 9 commits into
masterfrom
outtake
Closed

Manipulator#1
DriverStationComputer wants to merge 9 commits into
masterfrom
outtake

Conversation

@DriverStationComputer

Copy link
Copy Markdown

No description provided.

@Niosocket11 Niosocket11 left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall all good but some things should be fixed

Comment thread src/main/java/org/carlmontrobotics/commands/ManipulatorCommands/IntakeBalls.java Outdated
Comment thread src/main/java/org/carlmontrobotics/commands/ManipulatorCommands/ShootBalls.java Outdated
Comment thread src/main/java/org/carlmontrobotics/subsystems/Intake.java Outdated
Comment thread src/main/java/org/carlmontrobotics/subsystems/Intake.java
Comment thread src/main/java/org/carlmontrobotics/subsystems/Outtake.java Outdated
Comment thread src/main/java/org/carlmontrobotics/subsystems/Outtake.java Outdated
Comment thread src/main/java/org/carlmontrobotics/subsystems/Outtake.java
Comment thread src/main/java/org/carlmontrobotics/Robot.java Outdated
Comment thread src/main/java/org/carlmontrobotics/RobotContainer.java Outdated
Comment thread src/main/java/org/carlmontrobotics/commands/ManipulatorCommands/ShootBalls.java Outdated
@Niosocket11

Copy link
Copy Markdown

Also for the future remember you still need to make a laterator for the intake, and a indexer for the shooter

@LoganCHS

Copy link
Copy Markdown

something weird happened with the branches so i hope the commit i just posted works

@LoganCHS

Copy link
Copy Markdown

oh the commit didnt show up here thats unfortunate, i think it got committed on the branch outtake instead out origin/outtake

@timtogan

Copy link
Copy Markdown
Member

@LoganCHS if you can send a link to the commit on github I can add it to this pr

@timtogan timtogan self-assigned this Feb 15, 2026
@timtogan

Copy link
Copy Markdown
Member

actually wait, do you mean it got commited to your local branch instead of the one on github? In that case all you need to do is push your commit.

@LoganCHS

Copy link
Copy Markdown

i cant figure this out it s trying to merge outtake with origin/outtake ill try to fix during next worksession

@LoganCHS

Copy link
Copy Markdown

ok i think it should be merged since the last commit branching off shouldnt have happened so the merge should fix everything but the build fails so ill fix that rq

Comment thread src/main/java/org/carlmontrobotics/subsystems/Outtake.java
Comment thread src/main/java/org/carlmontrobotics/subsystems/Drivetrain.java
@timtogan timtogan closed this Apr 17, 2026
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.

4 participants