From: mixxlto <maxtan0626@gmail.com>
Date: Tue, 10 Feb 2026 00:05:01 +0000 (-0800)
Subject: Merge branch 'main' into beta-bot
X-Git-Url: https://git.taranathan.com/?a=commitdiff_plain;h=492ee9f542863e2fe87d5b8a207576aad9b99329;p=FRC2026.git

Merge branch 'main' into beta-bot
---

492ee9f542863e2fe87d5b8a207576aad9b99329
diff --cc src/main/java/frc/robot/RobotContainer.java
index f60e7dc,86104d2..8c21abb
--- a/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();