From 811a5d557ba3ba6fc47043e5cdfc04096adb1d15 Mon Sep 17 00:00:00 2001 From: aarav18 Date: Sat, 12 Mar 2022 19:02:37 -0700 Subject: [PATCH] bruh ryan @ryan123rudder --- src/main/java/frc4388/robot/Constants.java | 2 +- src/main/java/frc4388/robot/RobotContainer.java | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/frc4388/robot/Constants.java b/src/main/java/frc4388/robot/Constants.java index 54c4c01..5cc4947 100644 --- a/src/main/java/frc4388/robot/Constants.java +++ b/src/main/java/frc4388/robot/Constants.java @@ -164,7 +164,7 @@ public final class Constants { public static final class OIConstants { public static final int XBOX_DRIVER_ID = 0; public static final int XBOX_OPERATOR_ID = 1; - public static final int BUTTON_FOX_ID = 2; + public static final int BUTTON_BOX_ID = 2; public static final double LEFT_AXIS_DEADBAND = 0.1; public static final double RIGHT_AXIS_DEADBAND = 0.6; public static final boolean SKEW_STICKS = true; diff --git a/src/main/java/frc4388/robot/RobotContainer.java b/src/main/java/frc4388/robot/RobotContainer.java index d00505f..7766084 100644 --- a/src/main/java/frc4388/robot/RobotContainer.java +++ b/src/main/java/frc4388/robot/RobotContainer.java @@ -119,7 +119,7 @@ public class RobotContainer { /* Controllers */ private final XboxController m_driverXbox = new DeadbandedXboxController(OIConstants.XBOX_DRIVER_ID); private final XboxController m_operatorXbox = new DeadbandedXboxController(OIConstants.XBOX_OPERATOR_ID); - private final ButtonBox m_buttonFox = new ButtonBox(OIConstants.BUTTON_FOX_ID); + private final ButtonBox m_buttonBox = new ButtonBox(OIConstants.BUTTON_BOX_ID); /* Autonomous */ private PathPlannerTrajectory loadedPathTrajectory = null; @@ -293,20 +293,20 @@ public class RobotContainer { // .whenPressed(new TrackTarget(m_robotTurret, m_robotBoomBoom, m_robotHood, m_robotSwerveDrive, m_robotVisionOdometry)); /* Button Box Buttons */ - new JoystickButton(getButtonFox(), ButtonBox.Button.kLeftSwitch.value) + new JoystickButton(getButtonBox(), ButtonBox.Button.kLeftSwitch.value) .whileHeld(new RunCommand(() -> RunMiddleSwitch.setManual(true))) .whenReleased(new RunCommand(() -> RunMiddleSwitch.setManual(false))); - new JoystickButton(getButtonFox(), ButtonBox.Button.kMiddleSwitch.value) + new JoystickButton(getButtonBox(), ButtonBox.Button.kMiddleSwitch.value) .whileHeld(new RunMiddleSwitch()); - new JoystickButton(getButtonFox(), ButtonBox.Button.kRightSwitch.value) + new JoystickButton(getButtonBox(), ButtonBox.Button.kRightSwitch.value) .whileHeld(new RunCommand(() -> System.out.println("RightSwitch"))); - new JoystickButton(getButtonFox(), ButtonBox.Button.kLeftButton.value) + new JoystickButton(getButtonBox(), ButtonBox.Button.kLeftButton.value) .whileHeld(new RunCommand(() -> System.out.println("LeftButton"))); - new JoystickButton(getButtonFox(), ButtonBox.Button.kRightButton.value) + new JoystickButton(getButtonBox(), ButtonBox.Button.kRightButton.value) .whileHeld(new RunCommand(() -> System.out.println("RightButton"))); } @@ -346,8 +346,8 @@ public class RobotContainer { return m_operatorXbox; } - public ButtonBox getButtonFox() { - return m_buttonFox; + public ButtonBox getButtonBox() { + return m_buttonBox; } public void setManual(boolean set) {