Update import statements to use frc.robot.util.Constants

CyberCoyotes · Mar 28, 2024 · 6f5700e · 6f5700e
1 parent 0835db9
commit 6f5700e
Show file tree

Hide file tree

Showing 23 changed files with 31 additions and 20 deletions.
diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
@@ -39,6 +39,7 @@
 import frc.robot.subsystems.Limelight;
 import frc.robot.subsystems.ShooterSubsystemVelocity;
 import frc.robot.subsystems.WinchSubsystem2;
+import frc.robot.util.Constants;
 import frc.robot.subsystems.ShooterSubsystem2;
 import frc.robot.subsystems.NoteSensorSubsystem;
 

diff --git a/src/main/java/frc/robot/commands/IntakeIndex.java b/src/main/java/frc/robot/commands/IntakeIndex.java
@@ -2,9 +2,9 @@
 
 import edu.wpi.first.wpilibj2.command.ParallelCommandGroup;
 import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
-import frc.robot.Constants;
 import frc.robot.subsystems.IndexSubsystem;
 import frc.robot.subsystems.IntakeSubsystem;
+import frc.robot.util.Constants;
 
 public class IntakeIndex extends SequentialCommandGroup {
     IndexSubsystem index;

diff --git a/src/main/java/frc/robot/commands/RevAndShootCommand.java b/src/main/java/frc/robot/commands/RevAndShootCommand.java
@@ -7,10 +7,10 @@
 import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
 
 import edu.wpi.first.wpilibj2.command.WaitUntilCommand;
-import frc.robot.Constants;
 import frc.robot.commands.IncrementIndex;
 import frc.robot.subsystems.IndexSubsystem;
 import frc.robot.subsystems.ShooterSubsystemVelocity;
+import frc.robot.util.Constants;
 
 @SuppressWarnings("unused")
 

diff --git a/src/main/java/frc/robot/commands/RevAndShootEndsCommand.java b/src/main/java/frc/robot/commands/RevAndShootEndsCommand.java
@@ -7,10 +7,10 @@
 import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
 import edu.wpi.first.wpilibj2.command.WaitCommand;
 import edu.wpi.first.wpilibj2.command.WaitUntilCommand;
-import frc.robot.Constants;
 // import frc.robot.experimental.IncrementIndex;
 import frc.robot.subsystems.IndexSubsystem;
 import frc.robot.subsystems.ShooterSubsystemVelocity;
+import frc.robot.util.Constants;
 
 @SuppressWarnings("unused")
 

diff --git a/src/main/java/frc/robot/commands/RunShooter.java b/src/main/java/frc/robot/commands/RunShooter.java
@@ -1,8 +1,8 @@
 package frc.robot.commands;
 
 import edu.wpi.first.wpilibj2.command.Command;
-import frc.robot.Constants;
 import frc.robot.subsystems.ShooterSubsystemVelocity;
+import frc.robot.util.Constants;
 
 public class RunShooter extends Command {
     private ShooterSubsystemVelocity shooter;

diff --git a/src/main/java/frc/robot/commands/ShootClose.java b/src/main/java/frc/robot/commands/ShootClose.java
@@ -2,11 +2,11 @@
 
 import edu.wpi.first.wpilibj2.command.InstantCommand;
 import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
-import frc.robot.Constants;
 import frc.robot.subsystems.ArmSubsystem;
 import frc.robot.subsystems.IndexSubsystem;
 import frc.robot.subsystems.IntakeSubsystem;
 import frc.robot.subsystems.ShooterSubsystemVelocity;
+import frc.robot.util.Constants;
 
 public class ShootClose extends SequentialCommandGroup {
     public ShootClose(ArmSubsystem arm, IndexSubsystem index, IntakeSubsystem intake, ShooterSubsystemVelocity shooter) {

diff --git a/src/main/java/frc/robot/commands/ShootFromStage.java b/src/main/java/frc/robot/commands/ShootFromStage.java
@@ -1,13 +1,13 @@
 package frc.robot.commands;
 
 import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
-import frc.robot.Constants;
 import frc.robot.experimental.ShootWhenReady;
 import frc.robot.subsystems.ArmSubsystem;
 import frc.robot.subsystems.IndexSubsystem;
 import frc.robot.subsystems.IntakeSubsystem;
 import frc.robot.subsystems.NoteSensorSubsystem;
 import frc.robot.subsystems.ShooterSubsystem2;
+import frc.robot.util.Constants;
 
 public class ShootFromStage extends SequentialCommandGroup {
     public ShootFromStage(ArmSubsystem arm, IndexSubsystem index, IntakeSubsystem intake, ShooterSubsystem2 shooter2, NoteSensorSubsystem notesensor) {

diff --git a/src/main/java/frc/robot/experimental/IntakeIndexTimer.java b/src/main/java/frc/robot/experimental/IntakeIndexTimer.java
@@ -2,11 +2,11 @@
 
 import edu.wpi.first.wpilibj2.command.ParallelCommandGroup;
 import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
-import frc.robot.Constants;
 import frc.robot.commands.SetIndex;
 import frc.robot.commands.SetIntake;
 import frc.robot.subsystems.IndexSubsystem;
 import frc.robot.subsystems.IntakeSubsystem;
+import frc.robot.util.Constants;
 
 public class IntakeIndexTimer extends ParallelCommandGroup {
     IndexSubsystem index;

diff --git a/src/main/java/frc/robot/experimental/ShootWhenReady.java b/src/main/java/frc/robot/experimental/ShootWhenReady.java
@@ -1,9 +1,9 @@
 package frc.robot.experimental;
 
 import edu.wpi.first.wpilibj2.command.Command;
-import frc.robot.Constants;
 import frc.robot.subsystems.IndexSubsystem;
 import frc.robot.subsystems.ShooterSubsystem2;
+import frc.robot.util.Constants;
 import frc.robot.subsystems.NoteSensorSubsystem;
 
 @SuppressWarnings("unused")

diff --git a/src/main/java/frc/robot/experimental/ShootWhenReady2.java b/src/main/java/frc/robot/experimental/ShootWhenReady2.java
@@ -1,9 +1,9 @@
 package frc.robot.experimental;
 
 import edu.wpi.first.wpilibj2.command.Command;
-import frc.robot.Constants;
 import frc.robot.subsystems.IndexSubsystem;
 import frc.robot.subsystems.ShooterSubsystem2;
+import frc.robot.util.Constants;
 import frc.robot.subsystems.NoteSensorSubsystem;
 
 @SuppressWarnings("unused")

diff --git a/src/main/java/frc/robot/experimental/ShootWhenReadyAuton.java b/src/main/java/frc/robot/experimental/ShootWhenReadyAuton.java
@@ -1,12 +1,12 @@
 package frc.robot.experimental;
 
 import edu.wpi.first.wpilibj2.command.Command;
-import frc.robot.Constants;
 import frc.robot.subsystems.ArmSubsystem;
 import frc.robot.subsystems.IndexSubsystem;
 import frc.robot.subsystems.IntakeSubsystem;
 import frc.robot.subsystems.ShooterSubsystem2;
 import frc.robot.subsystems.ShooterSubsystemVelocity;
+import frc.robot.util.Constants;
 import frc.robot.subsystems.NoteSensorSubsystem;
 
 @SuppressWarnings("unused")

diff --git a/src/main/java/frc/robot/subsystems/ArmSubsystem.java b/src/main/java/frc/robot/subsystems/ArmSubsystem.java
@@ -13,7 +13,7 @@
 import com.ctre.phoenix6.signals.GravityTypeValue;
 
 import edu.wpi.first.wpilibj2.command.SubsystemBase;
-import frc.robot.Constants;
+import frc.robot.util.Constants;
 
 public class ArmSubsystem extends SubsystemBase {
 

diff --git a/src/main/java/frc/robot/subsystems/IndexSubsystem.java b/src/main/java/frc/robot/subsystems/IndexSubsystem.java
@@ -4,7 +4,7 @@
 import com.ctre.phoenix.motorcontrol.can.TalonSRX;
 
 import edu.wpi.first.wpilibj2.command.SubsystemBase;
-import frc.robot.Constants;
+import frc.robot.util.Constants;
 
 /*For indexing cargo. That is, taking cargo from a stored position and proceeding it to the shooter.*/
 public class IndexSubsystem extends SubsystemBase {

diff --git a/src/main/java/frc/robot/subsystems/IntakeSubsystem.java b/src/main/java/frc/robot/subsystems/IntakeSubsystem.java
@@ -6,7 +6,7 @@
 // import com.playingwithfusion.TimeOfFlight.RangingMode;
 
 import edu.wpi.first.wpilibj2.command.SubsystemBase;
-import frc.robot.Constants;
+import frc.robot.util.Constants;
 
 /**
  * Using a ToF sensor and a single motor

diff --git a/src/main/java/frc/robot/subsystems/LedSubsystem.java b/src/main/java/frc/robot/subsystems/LedSubsystem.java
@@ -24,7 +24,7 @@ CANdle requires the Phoenix (v5) vendordep
 
 
 import edu.wpi.first.wpilibj2.command.SubsystemBase;
-import frc.robot.Constants;
+import frc.robot.util.Constants;
 
 @SuppressWarnings("unused")
 

diff --git a/src/main/java/frc/robot/subsystems/NoteSensorSubsystem.java b/src/main/java/frc/robot/subsystems/NoteSensorSubsystem.java
@@ -15,7 +15,7 @@
  */
 
 import edu.wpi.first.wpilibj2.command.SubsystemBase;
-import frc.robot.Constants;
+import frc.robot.util.Constants;
 
 public class NoteSensorSubsystem extends SubsystemBase {
 

diff --git a/src/main/java/frc/robot/subsystems/ShooterSubsystem2.java b/src/main/java/frc/robot/subsystems/ShooterSubsystem2.java
@@ -12,7 +12,7 @@
 
 import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
 import edu.wpi.first.wpilibj2.command.SubsystemBase;
-import frc.robot.Constants;
+import frc.robot.util.Constants;
 
 @SuppressWarnings("unused")
 

diff --git a/src/main/java/frc/robot/subsystems/ShooterSubsystemVelocity.java b/src/main/java/frc/robot/subsystems/ShooterSubsystemVelocity.java
@@ -11,7 +11,7 @@
 
 import edu.wpi.first.networktables.GenericEntry;
 import edu.wpi.first.wpilibj2.command.SubsystemBase;
-import frc.robot.Constants;
+import frc.robot.util.Constants;
 
 @SuppressWarnings("unused")
 

diff --git a/src/main/java/frc/robot/subsystems/WinchSubsystem.java b/src/main/java/frc/robot/subsystems/WinchSubsystem.java
@@ -6,7 +6,7 @@
 import com.ctre.phoenix6.hardware.TalonFX;
 
 import edu.wpi.first.wpilibj2.command.SubsystemBase;
-import frc.robot.Constants;
+import frc.robot.util.Constants;
 
 /**
  * Made of a motor, connected to a pulley. Contains manual drive for now.

diff --git a/src/main/java/frc/robot/subsystems/WinchSubsystem2.java b/src/main/java/frc/robot/subsystems/WinchSubsystem2.java
@@ -3,7 +3,7 @@
 import com.ctre.phoenix6.controls.DutyCycleOut;
 import com.ctre.phoenix6.hardware.TalonFX;
 import edu.wpi.first.wpilibj2.command.SubsystemBase;
-import frc.robot.Constants;
+import frc.robot.util.Constants;
 
 public class WinchSubsystem2 extends SubsystemBase {
 

diff --git a/src/main/java/frc/robot/util/ArmConfigs.java b/src/main/java/frc/robot/util/ArmConfigs.java
@@ -0,0 +1,5 @@
+package frc.robot.util;
+
+public class ArmConfigs {
+
+}
diff --git a/src/main/java/frc/robot/Constants.java → src/main/java/frc/robot/util/Constants.java b/src/main/java/frc/robot/Constants.java → src/main/java/frc/robot/util/Constants.java
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-package frc.robot;
+package frc.robot.util;
 
 import com.ctre.phoenix6.configs.CurrentLimitsConfigs;
 import com.ctre.phoenix6.configs.MotionMagicConfigs;

diff --git a/src/main/java/frc/robot/util/WinchConfigs.java b/src/main/java/frc/robot/util/WinchConfigs.java
@@ -0,0 +1,5 @@
+package frc.robot.util;
+
+public class WinchConfigs {
+
+}