From bf00f64737d9b8122642d3ebeff8334f69ea5766 Mon Sep 17 00:00:00 2001 From: 66945 <54561572+66945@users.noreply.github.com> Date: Sat, 25 Feb 2023 21:04:40 -0700 Subject: [PATCH] added defaults --- .../java/frc4388/robot/RobotContainer.java | 26 +++++++++---------- .../robot/commands/PlaybackChooser.java | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/frc4388/robot/RobotContainer.java b/src/main/java/frc4388/robot/RobotContainer.java index 06ba4be..1644231 100644 --- a/src/main/java/frc4388/robot/RobotContainer.java +++ b/src/main/java/frc4388/robot/RobotContainer.java @@ -69,17 +69,17 @@ public class RobotContainer { private Command noAuto = new InstantCommand(); - private Command balance = new AutoBalance(m_robotMap.gyro, m_robotSwerveDrive); + // private Command balance = new AutoBalance(m_robotMap.gyro, m_robotSwerveDrive); - private Command blue1Path = new JoystickPlayback(m_robotSwerveDrive, "Blue1Path.txt"); - private Command blue1PathWithBalance = new JoystickPlayback(m_robotSwerveDrive, "Blue1Path.txt").andThen(new AutoBalance(m_robotMap.gyro, m_robotSwerveDrive)); + // private Command blue1Path = new JoystickPlayback(m_robotSwerveDrive, "Blue1Path.txt"); + // private Command blue1PathWithBalance = new JoystickPlayback(m_robotSwerveDrive, "Blue1Path.txt").andThen(new AutoBalance(m_robotMap.gyro, m_robotSwerveDrive)); - private Command red1Path = new JoystickPlayback(m_robotSwerveDrive, "Blue1Path.txt", -1); - private Command red1PathWithBalance = new JoystickPlayback(m_robotSwerveDrive, "Blue1Path.txt", -1).andThen(new AutoBalance(m_robotMap.gyro, m_robotSwerveDrive)); + // private Command red1Path = new JoystickPlayback(m_robotSwerveDrive, "Blue1Path.txt", -1); + // private Command red1PathWithBalance = new JoystickPlayback(m_robotSwerveDrive, "Blue1Path.txt", -1).andThen(new AutoBalance(m_robotMap.gyro, m_robotSwerveDrive)); - private Command taxi = new JoystickPlayback(m_robotSwerveDrive, "Taxi.txt"); + // private Command taxi = new JoystickPlayback(m_robotSwerveDrive, "Taxi.txt"); - PlaybackChooser playbackChooser; + private PlaybackChooser playbackChooser; /** * The container for the robot. Contains subsystems, OI devices, and commands. */ @@ -95,15 +95,15 @@ public class RobotContainer { .withName("SwerveDrive DefaultCommand")); // * Auto Commands - chooser.setDefaultOption("NoAuto", noAuto); + // chooser.setDefaultOption("NoAuto", noAuto); - chooser.addOption("Blue1Path", blue1Path); - chooser.addOption("Blue1PathWithBalance", blue1PathWithBalance); + // chooser.addOption("Blue1Path", blue1Path); + // chooser.addOption("Blue1PathWithBalance", blue1PathWithBalance); - chooser.addOption("Red1Path", red1Path); - chooser.addOption("Red1PathWithBalance", red1PathWithBalance); + // chooser.addOption("Red1Path", red1Path); + // chooser.addOption("Red1PathWithBalance", red1PathWithBalance); - chooser.addOption("Taxi", taxi); + // chooser.addOption("Taxi", taxi); playbackChooser = new PlaybackChooser(m_robotSwerveDrive, "Balance", new AutoBalance(m_robotMap.gyro, m_robotSwerveDrive)); diff --git a/src/main/java/frc4388/robot/commands/PlaybackChooser.java b/src/main/java/frc4388/robot/commands/PlaybackChooser.java index b039067..1a94efc 100644 --- a/src/main/java/frc4388/robot/commands/PlaybackChooser.java +++ b/src/main/java/frc4388/robot/commands/PlaybackChooser.java @@ -47,13 +47,13 @@ public class PlaybackChooser { public void appendCommand() { var chooser = new SendableChooser(); + chooser.setDefaultOption("No Auto", m_noAuto); for (String auto : m_dir.list()) { m_playback.addOption(auto, new JoystickPlayback(m_swerve, auto)); } for (var cmd_name : m_commandPool.keySet()) { chooser.addOption(cmd_name, m_commandPool.get(cmd_name)); } - chooser.addOption("No Auto", m_noAuto); m_choosers.add(chooser); Shuffleboard.getTab("Auto Chooser")