From febe122aee5889e61d86982a751c09fabb89369f Mon Sep 17 00:00:00 2001 From: Aarav Shah Date: Tue, 2 Mar 2021 17:27:38 -0700 Subject: [PATCH] Removed errors lol Co-Authored-By: Nirvan Bhalala <78400306+nbhalala27@users.noreply.github.com> --- .../java/frc4388/robot/RobotContainer.java | 37 ++--------------- .../java/frc4388/robot/SequentialTesting.java | 0 .../robot/commands/auto/BarrelEnd.java | 40 ------------------- .../robot/commands/auto/BarrelMany.java | 27 ------------- .../robot/commands/auto/BarrelStart.java | 28 ------------- .../commands/auto/SequentialTesting.java | 30 -------------- 6 files changed, 4 insertions(+), 158 deletions(-) delete mode 100644 src/main/java/frc4388/robot/SequentialTesting.java delete mode 100644 src/main/java/frc4388/robot/commands/auto/BarrelEnd.java delete mode 100644 src/main/java/frc4388/robot/commands/auto/BarrelMany.java delete mode 100644 src/main/java/frc4388/robot/commands/auto/BarrelStart.java delete mode 100644 src/main/java/frc4388/robot/commands/auto/SequentialTesting.java diff --git a/src/main/java/frc4388/robot/RobotContainer.java b/src/main/java/frc4388/robot/RobotContainer.java index 6a14690..d0099aa 100644 --- a/src/main/java/frc4388/robot/RobotContainer.java +++ b/src/main/java/frc4388/robot/RobotContainer.java @@ -38,15 +38,12 @@ 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; import frc4388.robot.commands.InterruptSubystem; import frc4388.robot.commands.auto.AutoPath1FromCenter; import frc4388.robot.commands.auto.Barrel; -import frc4388.robot.commands.auto.BarrelMany; -import frc4388.robot.commands.auto.BarrelStart; import frc4388.robot.commands.auto.Wait; import frc4388.robot.commands.climber.DisengageRachet; import frc4388.robot.commands.climber.RunClimberWithTriggers; @@ -132,12 +129,6 @@ public class RobotContainer { Barrel m_barrel; - BarrelStart m_barrelStart; - - BarrelMany m_barrelMany; - - SequentialTesting m_sequentialTesting; - /** * The container for the robot. Contains subsystems, OI devices, and commands. */ @@ -168,7 +159,7 @@ public class RobotContainer { // runs the turret with joystick m_robotShooterAim.setDefaultCommand(new RunCommand(() -> m_robotShooterAim.runShooterWithInput(-m_operatorXbox.getLeftXAxis()), m_robotShooterAim)); // moves the drum not - m_robotShooter.setDefaultCommand(new RunCommand(() -> m_robotShooter.runDrumShooterVelocityPID(1500), m_robotShooter)); + m_robotShooter.setDefaultCommand(new RunCommand(() -> m_robotShooter.runDrumShooterVelocityPID(0), m_robotShooter)); // drives climber with input from triggers on the opperator controller m_robotClimber.setDefaultCommand(new RunClimberWithTriggers(m_robotClimber, getDriverController())); // drives the leveler with an axis input from the driver controller @@ -321,23 +312,8 @@ public class RobotContainer { m_barrel = new Barrel(m_robotDrive, buildPaths(barrel)); - String[] barrelStart = new String[]{ - "BarrelStart" - }; - m_barrelStart = new BarrelStart(m_robotDrive, buildPaths(barrelStart)); - - String[] barrelMany = new String[]{ - "BarrelManyWaypoints" - }; - - m_barrelMany = new BarrelMany(m_robotDrive, buildPaths(barrelMany)); - - String[] eightBallAutoMiddlePaths = new String[]{ - "EightBallMidComplete" - }; - - m_eightBallAutoMiddle = new EightBallAutoMiddle(m_robotDrive, buildPaths(eightBallAutoMiddlePaths)); + //m_eightBallAutoMiddle = new EightBallAutoMiddle(m_robotDrive, buildPaths(eightBallAutoMiddlePaths)); String[] driveOffLineForwardPaths = new String[]{ "DriveOffLineForward" @@ -363,11 +339,6 @@ public class RobotContainer { m_tenBallAutoMiddle = new TenBallAutoMiddle(m_robotDrive, buildPaths(tenBallAutoMiddlePaths)); - String[] sequentialTesting = new String[]{ - "SequentialTesting" - }; - - m_sequentialTesting = new SequentialTesting(m_robotDrive, buildPaths(sequentialTesting)); } /** @@ -393,8 +364,8 @@ 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_barrelStart.andThen(()-> m_robotDrive.tankDriveVelocity(0, 0)); + return m_barrel.andThen(()-> m_robotDrive.tankDriveVelocity(0, 0)); + //return m_barrelStart.andThen(()-> m_robotDrive.tankDriveVelocity(0, 0)); //return m_barrelMany.andThen(()-> m_robotDrive.tankDriveVelocity(0, 0)); //return m_sequentialTesting.andThen(()-> m_robotDrive.tankDriveVelocity(0, 0)); diff --git a/src/main/java/frc4388/robot/SequentialTesting.java b/src/main/java/frc4388/robot/SequentialTesting.java deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/java/frc4388/robot/commands/auto/BarrelEnd.java b/src/main/java/frc4388/robot/commands/auto/BarrelEnd.java deleted file mode 100644 index f6f415e..0000000 --- a/src/main/java/frc4388/robot/commands/auto/BarrelEnd.java +++ /dev/null @@ -1,40 +0,0 @@ -/*----------------------------------------------------------------------------*/ -/* 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.CommandBase; - -public class BarrelEnd extends CommandBase { - /** - * Creates a new BarrelEnd. - */ - public BarrelEnd() { - // Use addRequirements() here to declare subsystem dependencies. - } - - // Called when the command is initially scheduled. - @Override - public void initialize() { - } - - // Called every time the scheduler runs while the command is scheduled. - @Override - public void execute() { - } - - // Called once the command ends or is interrupted. - @Override - public void end(boolean interrupted) { - } - - // Returns true when the command should end. - @Override - public boolean isFinished() { - return false; - } -} diff --git a/src/main/java/frc4388/robot/commands/auto/BarrelMany.java b/src/main/java/frc4388/robot/commands/auto/BarrelMany.java deleted file mode 100644 index 70fcf3c..0000000 --- a/src/main/java/frc4388/robot/commands/auto/BarrelMany.java +++ /dev/null @@ -1,27 +0,0 @@ -/*----------------------------------------------------------------------------*/ -/* 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 BarrelMany extends SequentialCommandGroup { - /** - * Creates a new BarrelMany. - */ - public BarrelMany(Drive drive, RamseteCommand[] paths) { - // Add your commands in the super() call, e.g. - addCommands( - paths[0] - ); - } -} diff --git a/src/main/java/frc4388/robot/commands/auto/BarrelStart.java b/src/main/java/frc4388/robot/commands/auto/BarrelStart.java deleted file mode 100644 index cc5c948..0000000 --- a/src/main/java/frc4388/robot/commands/auto/BarrelStart.java +++ /dev/null @@ -1,28 +0,0 @@ -/*----------------------------------------------------------------------------*/ -/* 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 BarrelStart extends SequentialCommandGroup { - /** - * Creates a new BarrelStart. - */ - public BarrelStart(Drive drive, RamseteCommand[] paths) { - // Add your commands in the super() call, e.g. - // super(new FooCommand(), new BarCommand()); - addCommands( - paths[0] - ); - } -} diff --git a/src/main/java/frc4388/robot/commands/auto/SequentialTesting.java b/src/main/java/frc4388/robot/commands/auto/SequentialTesting.java deleted file mode 100644 index dded12a..0000000 --- a/src/main/java/frc4388/robot/commands/auto/SequentialTesting.java +++ /dev/null @@ -1,30 +0,0 @@ -/*----------------------------------------------------------------------------*/ -/* 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] - ); - } -}