diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index d600fd4..a7c0b04 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -79,17 +79,8 @@ public class RobotContainer { */ private void configureBindings() { // These let the driver set the shooter hood position using the controller. - // m_driverController.povDown().onTrue(new SetDeflectorCommand(turretSubsystem, Constants.ShooterConstants.DEFLECTOR_STORED_ANGLE)); - // m_driverController.povLeft().onTrue(new SetDeflectorCommand(turretSubsystem, Constants.ShooterConstants.DEFLECTOR_SET_ANGLE1)); - // m_driverController.povRight().onTrue(new SetDeflectorCommand(turretSubsystem, Constants.ShooterConstants.DEFLECTOR_SET_ANGLE3)); - // m_driverController.povUp().onTrue(new SetDeflectorCommand(turretSubsystem, Constants.ShooterConstants.DEFLECTOR_SET_ANGLE2)); - - //m_driverController.back().whileTrue(new AutoShootCommandChassisTurretPathPlanner(driveSubsystem, hopperSubsystem, turretSubsystem)); m_driverController.rightBumper().onTrue(Commands.parallel(intakeSubsystem.intake(m_driverController.getHID()))); m_driverController.start().whileTrue(intakeSubsystem.resetDeploy()); - // m_driverController.a().whileTrue((new AutoTurretShootCommand(hopperSubsystem, turretSubsystem, intakeSubsystem, driveSubsystem))); - // m_driverController.x().whileTrue((new AutoTurretShootCommand(hopperSubsystem, turretSubsystem, intakeSubsystem, driveSubsystem))); - //m_driverController.x().toggleOnTrue(getAutonomousCommand())((new UltraShooterCommand(hopperSubsystem, turretSubsystem, intakeSubsystem, driveSubsystem))); m_driverController.x().toggleOnTrue(new UltraShooterCommand(hopperSubsystem, turretSubsystem, driveSubsystem)); m_driverController.b().whileTrue(new Reverse(intakeSubsystem, hopperSubsystem, m_driverController.getHID())); m_driverController.y().onTrue(intakeSubsystem.deploy()); diff --git a/src/main/java/frc/robot/subsystems/IntakeSubsystem.java b/src/main/java/frc/robot/subsystems/IntakeSubsystem.java index fea92b7..322c59f 100644 --- a/src/main/java/frc/robot/subsystems/IntakeSubsystem.java +++ b/src/main/java/frc/robot/subsystems/IntakeSubsystem.java @@ -21,10 +21,6 @@ import frc.robot.Constants; public class IntakeSubsystem extends TestableSubsystem { - /** - * Creates a new ExampleSubsystem. - */ - private TalonFX intakeMotor; private WPI_TalonSRX deployMotor; @@ -40,16 +36,9 @@ public class IntakeSubsystem extends TestableSubsystem { public Command deploy() { return Commands.sequence( - Commands.deadline( - Commands.waitSeconds(2), - this.runOnce( - () -> { - deployMotor.set(1); - } // Bump this speed up if intake doesn't deploy - ) - ), - this.runOnce(() -> deployMotor.stopMotor()) - ); + Commands.deadline( + Commands.waitSeconds(2), + this.runOnce(() -> {deployMotor.set(1);})),this.runOnce(() -> deployMotor.stopMotor())); } public Command resetDeploy() {