diff --git a/src/main/java/frc4388/robot/RobotContainer.java b/src/main/java/frc4388/robot/RobotContainer.java index de5830a..46ac339 100644 --- a/src/main/java/frc4388/robot/RobotContainer.java +++ b/src/main/java/frc4388/robot/RobotContainer.java @@ -293,8 +293,8 @@ public class RobotContainer { new JoystickButton(getOperatorController(), XboxController.Button.kY.value) .whenPressed(new Shoot(m_robotSwerveDrive, m_robotBoomBoom, m_robotTurret, m_robotHood, m_robotVisionOdometry, false, false)); - // new JoystickButton(getDriverController(), XboxController.Button.kX.value) - // .whileHeld(new TrackTarget(m_robotTurret, m_robotBoomBoom, m_robotHood, m_robotVisionOdometry)); + new JoystickButton(getOperatorController(), XboxController.Button.kX.value) + .whileHeld(new TrackTarget(m_robotSwerveDrive, m_robotTurret, m_robotBoomBoom, m_robotHood, m_robotVisionOdometry)); new JoystickButton(getOperatorController(), XboxController.Button.kB.value) .whileHeld(new Seek(m_robotSwerveDrive, m_robotBoomBoom, m_robotTurret, m_robotHood, m_robotVisionOdometry)); @@ -317,8 +317,8 @@ public class RobotContainer { .whenReleased(new RunCommand(() -> m_robotStorage.runStorage(0.0), m_robotStorage)); //Toggles extender in and out - new JoystickButton(getOperatorController(), XboxController.Button.kX.value) - .whenPressed(new ExtenderIntakeGroup(m_robotIntake, m_robotExtender)); + // new JoystickButton(getOperatorController(), XboxController.Button.kX.value) + // .whenPressed(new ExtenderIntakeGroup(m_robotIntake, m_robotExtender)); // new JoystickButton(getOperatorController(), XboxController.Button.kX.value) // .whileHeld(new RunCommand(() -> m_robotTurret.gotoZero(), m_robotTurret)) diff --git a/src/main/java/frc4388/robot/commands/ShooterCommands/Seek.java b/src/main/java/frc4388/robot/commands/ShooterCommands/Seek.java index 310b77e..73f82d0 100644 --- a/src/main/java/frc4388/robot/commands/ShooterCommands/Seek.java +++ b/src/main/java/frc4388/robot/commands/ShooterCommands/Seek.java @@ -24,6 +24,6 @@ public class Seek extends SequentialCommandGroup { public Seek(SwerveDrive swerve, BoomBoom drum, Turret turret, Hood hood, VisionOdometry visionOdometry) { // Add your commands in the addCommands() call, e.g. // addCommands(new FooCommand(), new BarCommand()); - addCommands(new Shoot(swerve, drum, turret, hood, visionOdometry, false, false), new TrackTarget(turret, drum, hood, visionOdometry)); + addCommands(new Shoot(swerve, drum, turret, hood, visionOdometry, false, false), new TrackTarget(swerve, turret, drum, hood, visionOdometry)); } }