diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index ff2a138..b00c0f2 100644 --- 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 index f910a07..733fd13 100644 --- 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 index 4d60c55..83a8c90 100644 --- 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 index c75f27e..642fdc7 100644 --- 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 index e891773..b650868 100644 --- 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 index b3cfe4d..f79ee65 100644 --- 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 index 0ec0f48..f6d96f9 100644 --- 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 index 315249a..a647fb6 100644 --- 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 index 160b301..1467ff2 100644 --- 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 index 50ff9b8..07bc2c6 100644 --- 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 index f6ce749..c94e6c9 100644 --- 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 index 7121c30..fbc39a0 100644 --- 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 index bbaa4f6..d138156 100644 --- 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 index c7b9dbe..5227b8f 100644 --- 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 index 033f3bb..4c9e808 100644 --- 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 index 6a3c28a..8f6af9a 100644 --- 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 index 037e82f..74f6f32 100644 --- 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 index 9567d8f..5e78101 100644 --- 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 index 8fac624..58f7c3c 100644 --- 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 index bdd8bda..18e81ec 100644 --- 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 new file mode 100644 index 0000000..20bbcb6 --- /dev/null +++ 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 b/src/main/java/frc/robot/util/Constants.java similarity index 99% rename from src/main/java/frc/robot/Constants.java rename to src/main/java/frc/robot/util/Constants.java index 4ae2df3..bd2c34a 100644 --- a/src/main/java/frc/robot/Constants.java +++ b/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 new file mode 100644 index 0000000..9462eb8 --- /dev/null +++ b/src/main/java/frc/robot/util/WinchConfigs.java @@ -0,0 +1,5 @@ +package frc.robot.util; + +public class WinchConfigs { + +}