diff --git a/PathWeaver/Groups/Sequential Testing b/PathWeaver/Groups/Sequential Testing new file mode 100644 index 0000000..cbdc21d --- /dev/null +++ b/PathWeaver/Groups/Sequential Testing @@ -0,0 +1,2 @@ +SequentialTesting0 +SequentialTesting0 diff --git a/PathWeaver/Paths/SequentialTesting0 b/PathWeaver/Paths/SequentialTesting0 new file mode 100644 index 0000000..0eb454a --- /dev/null +++ b/PathWeaver/Paths/SequentialTesting0 @@ -0,0 +1,3 @@ +X,Y,Tangent X,Tangent Y,Fixed Theta,Name +3.903415319203762,-2.4499063325388133,3.048,0.0,true, +7.181541969980028,-2.4808320556593437,0.9896231398569864,0.3896641113186887,true, diff --git a/PathWeaver/Paths/Unnamed.path b/PathWeaver/Paths/Unnamed.path new file mode 100644 index 0000000..bf73a40 --- /dev/null +++ b/PathWeaver/Paths/Unnamed.path @@ -0,0 +1,3 @@ +X,Y,Tangent X,Tangent Y,Fixed Theta,Name +1.3489505894479157,-2.3385737293049025,3.048,0.0,true, +3.934341042324292,-2.456091477162919,1.0100439348064159,0.07854151903626949,false, diff --git a/src/main/java/frc4388/robot/RobotContainer.java b/src/main/java/frc4388/robot/RobotContainer.java index 1fee142..1c49c23 100644 --- a/src/main/java/frc4388/robot/RobotContainer.java +++ b/src/main/java/frc4388/robot/RobotContainer.java @@ -38,6 +38,7 @@ import frc4388.robot.commands.auto.DriveOffLineBackward; import frc4388.robot.commands.auto.DriveOffLineForward; import frc4388.robot.commands.auto.EightBallAutoMiddle; import frc4388.robot.commands.auto.FiveBallAutoMiddle; +import frc4388.robot.commands.auto.SequentialTesting; import frc4388.robot.commands.auto.SixBallAutoMiddle; import frc4388.robot.commands.auto.Slalom; import frc4388.robot.commands.auto.TenBallAutoMiddle; @@ -132,6 +133,8 @@ public class RobotContainer { BarrelMany m_barrelMany; + SequentialTesting m_sequentialTesting; + /** * The container for the robot. Contains subsystems, OI devices, and commands. */ @@ -350,6 +353,12 @@ public class RobotContainer { }; m_tenBallAutoMiddle = new TenBallAutoMiddle(m_robotDrive, buildPaths(tenBallAutoMiddlePaths)); + + String[] sequentialTesting = new String[]{ + "SequentialTesting" + }; + + m_sequentialTesting = new SequentialTesting(m_robotDrive, buildPaths(sequentialTesting)); } /** @@ -375,8 +384,10 @@ public class RobotContainer { //return m_fiveBallAutoMiddle.andThen(() -> m_robotDrive.tankDriveVelocity(0, 0)); //return m_tenBallAutoMiddle.andThen(()-> m_robotDrive.tankDriveVelocity(0, 0)); //return m_slalom.andThen(()-> m_robotDrive.tankDriveVelocity(0, 0)); - return m_barrel.andThen(()-> m_robotDrive.tankDriveVelocity(0, 0)); + //return m_barrel.andThen(()-> m_robotDrive.tankDriveVelocity(0, 0)); //return m_barrelMany.andThen(()-> m_robotDrive.tankDriveVelocity(0, 0)); + return m_sequentialTesting.andThen(()-> m_robotDrive.tankDriveVelocity(0, 0)); + } catch (Exception e) { System.err.println("ERROR"); } diff --git a/src/main/java/frc4388/robot/SequentialTesting.java b/src/main/java/frc4388/robot/SequentialTesting.java new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/frc4388/robot/commands/auto/SequentialTesting.java b/src/main/java/frc4388/robot/commands/auto/SequentialTesting.java new file mode 100644 index 0000000..f1771a2 --- /dev/null +++ b/src/main/java/frc4388/robot/commands/auto/SequentialTesting.java @@ -0,0 +1,30 @@ +/*----------------------------------------------------------------------------*/ +/* Copyright (c) 2019 FIRST. All Rights Reserved. */ +/* Open Source Software - may be modified and shared by FRC teams. The code */ +/* must be accompanied by the FIRST BSD license file in the root directory of */ +/* the project. */ +/*----------------------------------------------------------------------------*/ + +package frc4388.robot.commands.auto; + +import edu.wpi.first.wpilibj2.command.RamseteCommand; +import edu.wpi.first.wpilibj2.command.SequentialCommandGroup; +import frc4388.robot.subsystems.Drive; + +// NOTE: Consider using this command inline, rather than writing a subclass. For more +// information, see: +// https://docs.wpilib.org/en/latest/docs/software/commandbased/convenience-features.html +public class SequentialTesting extends SequentialCommandGroup { + /** + * Creates a new SequentialTesting. + */ + public SequentialTesting(Drive drive, RamseteCommand[] paths) { + // Add your commands in the super() call, e.g. + // super(new FooCommand(), new BarCommand()); + addCommands( + paths[0], + new Wait(drive, 1, 1), + paths[1] + ); + } +}