From dd54b9b41cf049de4fe809177eaeaee00d19816f Mon Sep 17 00:00:00 2001 From: 66945 <54561572+66945@users.noreply.github.com> Date: Sat, 25 Feb 2023 20:50:51 -0700 Subject: [PATCH] added buttons and stuff --- src/main/java/frc4388/robot/RobotContainer.java | 3 +-- .../frc4388/robot/commands/PlaybackChooser.java | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main/java/frc4388/robot/RobotContainer.java b/src/main/java/frc4388/robot/RobotContainer.java index 7ae2f55..e619546 100644 --- a/src/main/java/frc4388/robot/RobotContainer.java +++ b/src/main/java/frc4388/robot/RobotContainer.java @@ -106,8 +106,7 @@ public class RobotContainer { chooser.addOption("Taxi", taxi); playbackChooser = new PlaybackChooser(m_robotSwerveDrive, - "Balance", new AutoBalance(m_robotMap.gyro, m_robotSwerveDrive), - "Balance2", new AutoBalance(m_robotMap.gyro, m_robotSwerveDrive)); + "Balance", new AutoBalance(m_robotMap.gyro, m_robotSwerveDrive)); new JoystickButton(getDeadbandedDriverController(), XboxController.X_BUTTON) .onTrue(new InstantCommand(() -> playbackChooser.appendCommand())); diff --git a/src/main/java/frc4388/robot/commands/PlaybackChooser.java b/src/main/java/frc4388/robot/commands/PlaybackChooser.java index 87b2c75..b039067 100644 --- a/src/main/java/frc4388/robot/commands/PlaybackChooser.java +++ b/src/main/java/frc4388/robot/commands/PlaybackChooser.java @@ -4,6 +4,9 @@ import java.io.File; import java.util.ArrayList; import java.util.HashMap; +import edu.wpi.first.wpilibj.shuffleboard.BuiltInWidgets; +import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard; +import edu.wpi.first.wpilibj.shuffleboard.WidgetType; import edu.wpi.first.wpilibj.smartdashboard.SendableChooser; import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; import edu.wpi.first.wpilibj2.command.Command; @@ -34,7 +37,10 @@ public class PlaybackChooser { appendCommand(); m_playback = m_choosers.get(0); - SmartDashboard.putData("Command: 0", m_playback); + + Shuffleboard.getTab("Auto Chooser") + .add("Add Sequence", new InstantCommand(() -> appendCommand())) + .withPosition(4, 0); } // This will be bound to a button for the time being @@ -50,7 +56,11 @@ public class PlaybackChooser { chooser.addOption("No Auto", m_noAuto); m_choosers.add(chooser); - SmartDashboard.putData("Command: " + m_choosers.size(), chooser); + Shuffleboard.getTab("Auto Chooser") + .add("Command: " + m_choosers.size(), chooser) + .withSize(4, 1) + .withPosition(0, 0) + .withWidget(BuiltInWidgets.kSplitButtonChooser); } public Command getCommand() {