Merge remote-tracking branch 'origin/main' into long-shot

frc1675 · Mar 12, 2024 · e7459ec · e7459ec
2 parents aed2d9c + 0732932
commit e7459ec
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
@@ -23,7 +23,7 @@
 import frc.robot.notification.LEDSubsystem;
 import frc.robot.poseScheduler.PoseScheduler;
 import frc.robot.shooter.ShooterSubsystem;
-import frc.robot.cmdGroup.SpinUpAndShoot;
+import frc.robot.shooter.commands.SpinUpAndShoot;
 import frc.robot.undertaker.UndertakerSubsystem;
 import frc.robot.util.RobotContext;
 import frc.robot.util.VersionFile;

diff --git a/src/main/java/frc/robot/auto/simple/SubwooferFrontScore.java b/src/main/java/frc/robot/auto/simple/SubwooferFrontScore.java
@@ -4,9 +4,9 @@
 import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
 import frc.robot.Constants;
 import frc.robot.cmdGroup.IntakeNote;
-import frc.robot.cmdGroup.SpinUpAndShoot;
 import frc.robot.drive.DriveSubsystem;
 import frc.robot.shooter.ShooterSubsystem;
+import frc.robot.shooter.commands.SpinUpAndShoot;
 import frc.robot.undertaker.UndertakerSubsystem;
 import frc.robot.util.RobotContext;
 

diff --git a/src/main/java/frc/robot/auto/simple/SubwooferLeftScore.java b/src/main/java/frc/robot/auto/simple/SubwooferLeftScore.java
@@ -4,9 +4,9 @@
 import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
 import frc.robot.Constants;
 import frc.robot.cmdGroup.IntakeNote;
-import frc.robot.cmdGroup.SpinUpAndShoot;
 import frc.robot.drive.DriveSubsystem;
 import frc.robot.shooter.ShooterSubsystem;
+import frc.robot.shooter.commands.SpinUpAndShoot;
 import frc.robot.undertaker.UndertakerSubsystem;
 import frc.robot.util.RobotContext;
 

diff --git a/src/main/java/frc/robot/auto/simple/SubwooferRightScore.java b/src/main/java/frc/robot/auto/simple/SubwooferRightScore.java
@@ -4,9 +4,9 @@
 import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
 import frc.robot.Constants;
 import frc.robot.cmdGroup.IntakeNote;
-import frc.robot.cmdGroup.SpinUpAndShoot;
 import frc.robot.drive.DriveSubsystem;
 import frc.robot.shooter.ShooterSubsystem;
+import frc.robot.shooter.commands.SpinUpAndShoot;
 import frc.robot.undertaker.UndertakerSubsystem;
 import frc.robot.util.RobotContext;
 

diff --git a/...va/frc/robot/cmdGroup/SpinUpAndShoot.java → ...obot/shooter/commands/SpinUpAndShoot.java b/...va/frc/robot/cmdGroup/SpinUpAndShoot.java → ...obot/shooter/commands/SpinUpAndShoot.java
@@ -1,11 +1,10 @@
-package frc.robot.cmdGroup;
+package frc.robot.shooter.commands;
 
 import java.util.function.BooleanSupplier;
 
 import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
 import frc.robot.Constants;
 import frc.robot.shooter.ShooterSubsystem;
-import frc.robot.shooter.commands.*;
 
 public class SpinUpAndShoot extends SequentialCommandGroup {
   public SpinUpAndShoot(ShooterSubsystem shooter, BooleanSupplier slowShoot) {