Merge branch 'main' into beta-bot

diff --cc src/main/java/frc/robot/RobotContainer.java
index f60e7dc0d59ac2f0bbe32c5b1e1baa5de307513f,86104d20bf0f26e7b7827ac032d64247207ea9a4..8c21abb584fe67eb6c0f103a86268ff47480fbda
--- 1/src/main/java/frc/robot/RobotContainer.java
--- 2/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@@ -89,20 -74,21 +92,20 @@@ public class RobotContainer 
          // fall-through
  
        case Vivace:
-       case Phil:
-       case Vertigo:
-         // vision = new Vision(VisionConstants.APRIL_TAG_CAMERAS);
-         shooter = new Shooter();
-         hood = new Hood();
+ 
+       case Phil: // AKA "IHOP"
+ 
+       case PrimeJr:
+ 
+       case Vertigo: // AKA "French Toast"
          drive = new Drivetrain(vision, new GyroIOPigeon2());
 -        driver = new PS5ControllerDriverConfig(drive);
 +        driver = new PS5ControllerDriverConfig(drive, shooter, turret, hood);
          operator = new Operator(drive);
  
          // Detected objects need access to the drivetrain
          DetectedObject.setDrive(drive);
          
          // SignalLogger.start();
-         
 -
          driver.configureControls();
          operator.configureControls();
          

diff --cc src/main/java/frc/robot/subsystems/drivetrain/Module.java
Simple merge