diff --git a/src/main/java/frc/robot/Controls.java b/src/main/java/frc/robot/Controls.java index b82bea4c..1667f5bc 100644 --- a/src/main/java/frc/robot/Controls.java +++ b/src/main/java/frc/robot/Controls.java @@ -28,7 +28,6 @@ import frc.robot.subsystems.ArmPivot; import frc.robot.subsystems.ElevatorSubsystem; import frc.robot.subsystems.GroundArm; -import frc.robot.subsystems.SuperStructure; import frc.robot.subsystems.auto.AutoAlign; import frc.robot.subsystems.auto.BargeAlign; import frc.robot.util.AlgaeIntakeHeight; diff --git a/src/main/java/frc/robot/Robot.java b/src/main/java/frc/robot/Robot.java index a401ee3b..83ae2322 100644 --- a/src/main/java/frc/robot/Robot.java +++ b/src/main/java/frc/robot/Robot.java @@ -17,7 +17,6 @@ import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; import edu.wpi.first.wpilibj2.command.CommandScheduler; import frc.robot.Subsystems.SubsystemConstants; -import frc.robot.subsystems.SuperStructure; import frc.robot.subsystems.auto.AutoBuilderConfig; import frc.robot.subsystems.auto.AutoLogic; import frc.robot.subsystems.auto.AutonomousField; diff --git a/src/main/java/frc/robot/subsystems/SuperStructure.java b/src/main/java/frc/robot/SuperStructure.java similarity index 98% rename from src/main/java/frc/robot/subsystems/SuperStructure.java rename to src/main/java/frc/robot/SuperStructure.java index b6cc33cf..510c9675 100644 --- a/src/main/java/frc/robot/subsystems/SuperStructure.java +++ b/src/main/java/frc/robot/SuperStructure.java @@ -1,4 +1,4 @@ -package frc.robot.subsystems; +package frc.robot; import edu.wpi.first.wpilibj2.command.Command; import edu.wpi.first.wpilibj2.command.Commands; @@ -7,6 +7,11 @@ import frc.robot.sensors.BranchSensors; import frc.robot.sensors.ElevatorLight; import frc.robot.sensors.IntakeSensor; +import frc.robot.subsystems.ArmPivot; +import frc.robot.subsystems.ElevatorSubsystem; +import frc.robot.subsystems.GroundArm; +import frc.robot.subsystems.GroundSpinny; +import frc.robot.subsystems.SpinnyClaw; import java.util.function.BooleanSupplier; public class SuperStructure { diff --git a/src/main/java/frc/robot/subsystems/auto/BargeAlign.java b/src/main/java/frc/robot/subsystems/auto/BargeAlign.java index 65a3a7b3..b3a0e330 100644 --- a/src/main/java/frc/robot/subsystems/auto/BargeAlign.java +++ b/src/main/java/frc/robot/subsystems/auto/BargeAlign.java @@ -10,7 +10,7 @@ import edu.wpi.first.math.util.Units; import edu.wpi.first.wpilibj2.command.Command; import edu.wpi.first.wpilibj2.command.Commands; -import frc.robot.subsystems.SuperStructure; +import frc.robot.SuperStructure; import frc.robot.subsystems.drivebase.CommandSwerveDrivetrain; public class BargeAlign extends Command {