Skip to content

Commit 9afcee7

Browse files
auto fix
1 parent 823c34a commit 9afcee7

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

src/main/deploy/pathplanner/autos/Preload1Center.auto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
{
1515
"type": "named",
1616
"data": {
17-
"name": "Shoot"
17+
"name": "ShootSubwoofer"
1818
}
1919
}
2020
]

src/main/deploy/pathplanner/autos/Preload1Left.auto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
{
1515
"type": "named",
1616
"data": {
17-
"name": "Shoot"
17+
"name": "ShootSubwoofer"
1818
}
1919
}
2020
]

src/main/deploy/pathplanner/autos/Preload1Right.auto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
{
1515
"type": "named",
1616
"data": {
17-
"name": "Shoot"
17+
"name": "ShootSubwoofer"
1818
}
1919
}
2020
]

src/main/java/org/carlmontrobotics/RobotContainer.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -376,9 +376,10 @@ private void registerAutoCommands() {
376376
new PassToOuttake(intakeShooter),
377377
new ArmToPos(arm, GROUND_INTAKE_POS)))));
378378
NamedCommands.registerCommand("ShootSubwoofer",
379-
new SequentialCommandGroup(
380-
new ArmToPos(arm, Armc.SUBWOOFER_ANGLE_RAD),
381-
new RampRPMAuton(intakeShooter),
379+
new SequentialCommandGroup(new ParallelCommandGroup(
380+
new ArmToPos(arm,
381+
Armc.SUBWOOFER_ANGLE_RAD),
382+
new RampRPMAuton(intakeShooter)),
382383
new PassToOuttake(intakeShooter),
383384
new ArmToPos(arm, GROUND_INTAKE_POS)));
384385
NamedCommands.registerCommand("Limelight Intake CCW",

src/main/java/org/carlmontrobotics/commands/PassToOuttake.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public void end(boolean interrupted) {
4242
@Override
4343
public boolean isFinished() {
4444
return (!intakeShooter.intakeDetectsNote()
45-
&& !intakeShooter.outtakeDetectsNote()) || LimelightHelpers.getTV(SHOOTER_LL_NAME);
45+
&& !intakeShooter.outtakeDetectsNote());
46+
// || !LimelightHelpers.getTV(SHOOTER_LL_NAME);
4647
}
4748
}

0 commit comments

Comments
 (0)