From dde139285a778a513152b9b4906d3aa434e5c3a0 Mon Sep 17 00:00:00 2001 From: Bradley Bickford Date: Sat, 17 Feb 2024 13:32:47 -0500 Subject: [PATCH] Indentation fixed --- gradlew | 0 src/main/java/frc/robot/RobotContainer.java | 86 ++++++++++----------- 2 files changed, 43 insertions(+), 43 deletions(-) mode change 100644 => 100755 gradlew diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index 01694de..1a2fa2e 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -101,13 +101,13 @@ public class RobotContainer { Optional alliance = DriverStation.getAlliance(); if (alliance.isEmpty() || alliance.get() == DriverStation.Alliance.Red) { - ampTagID = 5; - sourceTagID = 9; - speakerTag = 4; + ampTagID = 5; + sourceTagID = 9; + speakerTag = 4; } else { - ampTagID = 6; - sourceTagID = 1; - speakerTag = 8; + ampTagID = 6; + sourceTagID = 1; + speakerTag = 8; } configureBindings(); @@ -124,12 +124,12 @@ public class RobotContainer { isTeleopTrigger.onTrue(new InstantCommand(() -> Shuffleboard.selectTab(kTeleopTabName))); drivetrain.setDefaultCommand( - drivetrain.teleopCommand( - driver::getLeftY, - driver::getLeftX, - driver::getRightX, - OIConstants.kTeleopDriveDeadband - ) + drivetrain.teleopCommand( + driver::getLeftY, + driver::getLeftX, + driver::getRightX, + OIConstants.kTeleopDriveDeadband + ) ); intake.setDefaultCommand(intake.intakeUpCommand()); @@ -141,49 +141,49 @@ public class RobotContainer { indexer.setDefaultCommand(indexer.autoIndexing()); driver.povCenter().onFalse( - drivetrain.driveCardinal( - driver::getLeftY, - driver::getLeftX, - driver.getHID()::getPOV, - OIConstants.kTeleopDriveDeadband).until( - () -> MathUtil.applyDeadband(driver.getRightX(), OIConstants.kTeleopDriveDeadband) != 0 - ) + drivetrain.driveCardinal( + driver::getLeftY, + driver::getLeftX, + driver.getHID()::getPOV, + OIConstants.kTeleopDriveDeadband).until( + () -> MathUtil.applyDeadband(driver.getRightX(), OIConstants.kTeleopDriveDeadband) != 0 + ) ); // Lock on to the appropriate Amp AprilTag while still being able to strafe and drive forward and back driver.a().onTrue( - drivetrain.driveAprilTagLock( - driver::getLeftY, - driver::getLeftX, - OIConstants.kTeleopDriveDeadband, - ampTagID - ).until( - () -> MathUtil.applyDeadband(driver.getRightX(), OIConstants.kTeleopDriveDeadband) != 0 - ) + drivetrain.driveAprilTagLock( + driver::getLeftY, + driver::getLeftX, + OIConstants.kTeleopDriveDeadband, + ampTagID + ).until( + () -> MathUtil.applyDeadband(driver.getRightX(), OIConstants.kTeleopDriveDeadband) != 0 + ) ); // Lock on to the appropriate Source AprilTag while still being able to strafe and drive forward and back driver.b().onTrue( - drivetrain.driveAprilTagLock( - driver::getLeftY, - driver::getLeftX, - OIConstants.kTeleopDriveDeadband, - sourceTagID - ).until( - () -> MathUtil.applyDeadband(driver.getRightX(), OIConstants.kTeleopDriveDeadband) != 0 - ) + drivetrain.driveAprilTagLock( + driver::getLeftY, + driver::getLeftX, + OIConstants.kTeleopDriveDeadband, + sourceTagID + ).until( + () -> MathUtil.applyDeadband(driver.getRightX(), OIConstants.kTeleopDriveDeadband) != 0 + ) ); // Lock on to the appropriate Speaker AprilTag while still being able to strafe and drive forward and back driver.x().onTrue( - drivetrain.driveAprilTagLock( - driver::getLeftY, - driver::getLeftX, - OIConstants.kTeleopDriveDeadband, - speakerTag - ).until( - () -> MathUtil.applyDeadband(driver.getRightX(), OIConstants.kTeleopDriveDeadband) != 0 - ) + drivetrain.driveAprilTagLock( + driver::getLeftY, + driver::getLeftX, + OIConstants.kTeleopDriveDeadband, + speakerTag + ).until( + () -> MathUtil.applyDeadband(driver.getRightX(), OIConstants.kTeleopDriveDeadband) != 0 + ) ); // This was originally a run while held, not sure that's really necessary, change it if need be