Move small files.

diff --git a/src/main/java/frc/robot/commands/gpm/SimpleAutoShoot.java b/src/main/java/frc/robot/commands/gpm/SimpleAutoShoot.java
index ff801b941fdaf50ab2269454873502d10b272a91..7ea06b564da31133b365df59a792fcd06f183be3 100644 (file)
--- a/src/main/java/frc/robot/commands/gpm/SimpleAutoShoot.java
+++ b/src/main/java/frc/robot/commands/gpm/SimpleAutoShoot.java
@@ -1,7 +1,5 @@
 package frc.robot.commands.gpm;
 
-import java.lang.reflect.Field;
-
 import org.littletonrobotics.junction.Logger;
 
 import edu.wpi.first.math.MathUtil;
@@ -10,18 +8,13 @@ import edu.wpi.first.math.geometry.Rotation2d;
 import edu.wpi.first.math.geometry.Translation2d;
 import edu.wpi.first.math.kinematics.ChassisSpeeds;
 import edu.wpi.first.math.util.Units;
-import edu.wpi.first.units.Unit;
-import edu.wpi.first.wpilibj.DriverStation.Alliance;
 import edu.wpi.first.wpilibj2.command.Command;
-import frc.robot.Robot;
 import frc.robot.constants.Constants;
 import frc.robot.constants.FieldConstants;
+import frc.robot.constants.FieldConstants.FieldZone;
 import frc.robot.subsystems.drivetrain.Drivetrain;
 import frc.robot.subsystems.shooter.Shooter;
-import frc.robot.subsystems.turret.ShotInterpolation;
 import frc.robot.subsystems.turret.Turret;
-import frc.robot.util.FieldZone;
-import frc.robot.util.ShootingTarget;
 
 public class SimpleAutoShoot extends Command {
     private Turret turret;

diff --git a/src/main/java/frc/robot/constants/FieldConstants.java b/src/main/java/frc/robot/constants/FieldConstants.java
index ba562f4c5be05deb3bd8a5058aa58ab76692cd67..a5ec1db889b92f384e7055638678720ce5410d0a 100644 (file)
--- a/src/main/java/frc/robot/constants/FieldConstants.java
+++ b/src/main/java/frc/robot/constants/FieldConstants.java
@@ -7,7 +7,6 @@ import edu.wpi.first.math.geometry.Translation3d;
 import edu.wpi.first.math.util.Units;
 import edu.wpi.first.wpilibj.DriverStation.Alliance;
 import frc.robot.Robot;
-import frc.robot.util.FieldZone;
 
 public class FieldConstants {
   /** Width of the field [meters] */
@@ -52,6 +51,20 @@ public class FieldConstants {
   public static final double BLUE_ALLIANCE_LINE = BLUE_BORDER; // That's the distance from one side to the blue bump
   public static final double RED_ALLIANCE_LINE = RED_BORDER; // 
 
+       public enum ShootingTarget {
+               HUB,
+               NEUTRAL,
+               ALLIANCE,
+               OPPOSITION, // not sure why you'd ever do this :)
+       }
+
+       public enum FieldZone {
+               ALLIANCE,
+               NEUTRAL,
+               OPPOSITION,
+               TRENCH_BUMP
+       }
+
   public static Translation3d getHubTranslation() {
     if (Robot.getAlliance() == Alliance.Blue) {
       return HUB_BLUE;

diff --git a/src/main/java/frc/robot/util/FieldZone.java b/src/main/java/frc/robot/util/FieldZone.java
deleted file mode 100644 (file)
index 8614d67..0000000
--- a/src/main/java/frc/robot/util/FieldZone.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package frc.robot.util;
-
-public enum FieldZone {
-    ALLIANCE,
-    NEUTRAL,
-    OPPOSITION,
-    TRENCH_BUMP
-}

diff --git a/src/main/java/frc/robot/util/ShootingTarget.java b/src/main/java/frc/robot/util/ShootingTarget.java
deleted file mode 100644 (file)
index 547097e..0000000
--- a/src/main/java/frc/robot/util/ShootingTarget.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package frc.robot.util;
-
-public enum ShootingTarget {
-    HUB,
-    NEUTRAL,
-    ALLIANCE,
-    OPPOSITION, // not sure why you'd ever do this :)
-}