diff --git a/src/main/kotlin/frc/team449/robot2024/Robot.kt b/src/main/kotlin/frc/team449/robot2024/Robot.kt index 2d21fc3..68da32b 100644 --- a/src/main/kotlin/frc/team449/robot2024/Robot.kt +++ b/src/main/kotlin/frc/team449/robot2024/Robot.kt @@ -52,6 +52,5 @@ class Robot : RobotBase(), Logged { @Log.NT val feeder = createFeeder() -// val infrared = DigitalInput(RobotConstants.IR_CHANNEL) } diff --git a/src/main/kotlin/frc/team449/robot2024/subsystems/ControllerBindings.kt b/src/main/kotlin/frc/team449/robot2024/subsystems/ControllerBindings.kt index 286d89d..f0475ba 100644 --- a/src/main/kotlin/frc/team449/robot2024/subsystems/ControllerBindings.kt +++ b/src/main/kotlin/frc/team449/robot2024/subsystems/ControllerBindings.kt @@ -28,26 +28,26 @@ class ControllerBindings( private fun robotBindings() { driveController.rightBumper().onTrue( - if (!robot.infrared.get()) - ParallelCommandGroup( - robot.undertaker.intake(), - robot.feeder.intake(), - robot.shooter.duringIntake() - ) - else ParallelCommandGroup( - robot.undertaker.stop(), - robot.feeder.stop(), - robot.shooter.stop() - ) - ).onFalse( + if (!robot.infrared.get()) { + ParallelCommandGroup( + robot.undertaker.intake(), + robot.feeder.intake(), + robot.shooter.duringIntake() + ) + } else { ParallelCommandGroup( robot.undertaker.stop(), robot.feeder.stop(), robot.shooter.stop() ) + } + ).onFalse( + ParallelCommandGroup( + robot.undertaker.stop(), + robot.feeder.stop(), + robot.shooter.stop() ) - - + ) driveController.leftBumper().onTrue( ParallelCommandGroup( robot.undertaker.outtake(), @@ -59,7 +59,8 @@ class ControllerBindings( robot.undertaker.stop(), robot.feeder.stop(), robot.shooter.stop() - )) + ) + ) driveController.leftBumper().onTrue( robot.shooter.shootSubwoofer() @@ -91,18 +92,15 @@ class ControllerBindings( // ) mechanismController.x().onTrue( - PrintCommand("whats good chat").andThen( - robot.feeder.intake()) + PrintCommand("whats good chat").andThen(robot.feeder.intake()) ).onFalse( robot.feeder.stop() ) mechanismController.a().onTrue( - robot.feeder.intake().andThen( - robot.shooter.scoreAmp()) + robot.feeder.intake().andThen(robot.shooter.scoreAmp()) ).onFalse( - robot.feeder.stop().andThen( - robot.shooter.stop()) + robot.feeder.stop().andThen(robot.shooter.stop()) ) }