From 33dc1ea3cbf29616f45f636e7d76b31e7a2c1f79 Mon Sep 17 00:00:00 2001 From: aarav18 Date: Fri, 18 Mar 2022 19:29:55 -0600 Subject: [PATCH] clean --- src/main/java/frc4388/robot/RobotContainer.java | 4 ++-- .../ButtonBoxCommands/RunTurretOrClimberAuto.java | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/frc4388/robot/RobotContainer.java b/src/main/java/frc4388/robot/RobotContainer.java index 4793fd8..7d46cbf 100644 --- a/src/main/java/frc4388/robot/RobotContainer.java +++ b/src/main/java/frc4388/robot/RobotContainer.java @@ -155,8 +155,8 @@ public class RobotContainer { public static boolean softLimits = true; // control mode switching - public static enum ControlMode { SHOOTER, CLIMBER }; - public static ControlMode currentControlMode = ControlMode.SHOOTER; + private enum ControlMode { SHOOTER, CLIMBER }; + private ControlMode currentControlMode = ControlMode.SHOOTER; // turret mode switching private enum TurretMode { MANUAL, AUTONOMOUS }; diff --git a/src/main/java/frc4388/robot/commands/ButtonBoxCommands/RunTurretOrClimberAuto.java b/src/main/java/frc4388/robot/commands/ButtonBoxCommands/RunTurretOrClimberAuto.java index 87be8e6..7030e24 100644 --- a/src/main/java/frc4388/robot/commands/ButtonBoxCommands/RunTurretOrClimberAuto.java +++ b/src/main/java/frc4388/robot/commands/ButtonBoxCommands/RunTurretOrClimberAuto.java @@ -45,12 +45,12 @@ public class RunTurretOrClimberAuto extends CommandBase { @Override public void execute() { // check control mode here. if shooter control mode, run turret auto command. if climber control mode, run climber auto command. - if (RobotContainer.currentControlMode.equals(RobotContainer.ControlMode.SHOOTER)) { - new AimToCenter(this.turret, this.swerveDrive, this.visionOdometry); - } - if (RobotContainer.currentControlMode.equals(RobotContainer.ControlMode.CLIMBER)) { - new RunClimberPath(this.climber, this.claws, new Point[] {new Point()}); - } + // if (RobotContainer.currentControlMode.equals(RobotContainer.ControlMode.SHOOTER)) { + // new AimToCenter(this.turret, this.swerveDrive, this.visionOdometry); + // } + // if (RobotContainer.currentControlMode.equals(RobotContainer.ControlMode.CLIMBER)) { + // new RunClimberPath(this.climber, this.claws, new Point[] {new Point()}); + // } } // Called once the command ends or is interrupted.