From 41f3d4cb1239d4fe8dde7c8ac1a337f1c6ce273f Mon Sep 17 00:00:00 2001 From: aarav18 Date: Sat, 25 Feb 2023 14:39:41 -0700 Subject: [PATCH] autos directory --- src/main/java/frc4388/robot/RobotContainer.java | 3 +-- src/main/java/frc4388/robot/commands/JoystickPlayback.java | 2 +- src/main/java/frc4388/robot/commands/JoystickRecorder.java | 2 +- .../java/frc4388/robot/{ => commands}/PlaybackChooser.java | 5 ++--- 4 files changed, 5 insertions(+), 7 deletions(-) rename src/main/java/frc4388/robot/{ => commands}/PlaybackChooser.java (95%) diff --git a/src/main/java/frc4388/robot/RobotContainer.java b/src/main/java/frc4388/robot/RobotContainer.java index d0c9329..d4411b3 100644 --- a/src/main/java/frc4388/robot/RobotContainer.java +++ b/src/main/java/frc4388/robot/RobotContainer.java @@ -37,6 +37,7 @@ import frc4388.robot.Constants.SwerveDriveConstants.PIDConstants; import frc4388.robot.commands.AutoBalance; import frc4388.robot.commands.JoystickPlayback; import frc4388.robot.commands.JoystickRecorder; +import frc4388.robot.commands.PlaybackChooser; import frc4388.robot.subsystems.SwerveDrive; import frc4388.utility.controller.DeadbandedXboxController; import frc4388.utility.controller.XboxController; @@ -103,8 +104,6 @@ public class RobotContainer { chooser.addOption("Taxi", taxi); - SmartDashboard.putData(chooser); - PlaybackChooser playbackChooser = new PlaybackChooser(m_robotSwerveDrive, "Balance", new AutoBalance(m_robotMap.gyro, m_robotSwerveDrive)); diff --git a/src/main/java/frc4388/robot/commands/JoystickPlayback.java b/src/main/java/frc4388/robot/commands/JoystickPlayback.java index c844abd..9519497 100644 --- a/src/main/java/frc4388/robot/commands/JoystickPlayback.java +++ b/src/main/java/frc4388/robot/commands/JoystickPlayback.java @@ -46,7 +46,7 @@ public class JoystickPlayback extends CommandBase { playbackTime = 0; lastIndex = 0; try { - input = new Scanner(new File("/home/lvuser/" + filename)); + input = new Scanner(new File("/home/lvuser/autos/" + filename)); String line = ""; while (input.hasNextLine()) { diff --git a/src/main/java/frc4388/robot/commands/JoystickRecorder.java b/src/main/java/frc4388/robot/commands/JoystickRecorder.java index 76e2464..d1bf047 100644 --- a/src/main/java/frc4388/robot/commands/JoystickRecorder.java +++ b/src/main/java/frc4388/robot/commands/JoystickRecorder.java @@ -70,7 +70,7 @@ public class JoystickRecorder extends CommandBase { // Called once the command ends or is interrupted. @Override public void end(boolean interrupted) { - File output = new File("/home/lvuser/" + filename); + File output = new File("/home/lvuser/autos/" + filename); try (PrintWriter writer = new PrintWriter(output)) { for (var input : outputs) { diff --git a/src/main/java/frc4388/robot/PlaybackChooser.java b/src/main/java/frc4388/robot/commands/PlaybackChooser.java similarity index 95% rename from src/main/java/frc4388/robot/PlaybackChooser.java rename to src/main/java/frc4388/robot/commands/PlaybackChooser.java index 77d20c1..2934e40 100644 --- a/src/main/java/frc4388/robot/PlaybackChooser.java +++ b/src/main/java/frc4388/robot/commands/PlaybackChooser.java @@ -1,4 +1,4 @@ -package frc4388.robot; +package frc4388.robot.commands; import java.io.File; import java.util.ArrayList; @@ -8,7 +8,6 @@ import edu.wpi.first.wpilibj.smartdashboard.SendableChooser; import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; import edu.wpi.first.wpilibj2.command.Command; import edu.wpi.first.wpilibj2.command.InstantCommand; -import frc4388.robot.commands.JoystickPlayback; import frc4388.robot.subsystems.SwerveDrive; public class PlaybackChooser { @@ -39,7 +38,7 @@ public class PlaybackChooser { } m_choosers.add(m_playback); - SmartDashboard.putData(m_playback); + SmartDashboard.putData("Command: 0", m_playback); } // This will be bound to a button for the time being