weird merge

diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
index 603c908188f2764661a6f52b383d62073d4885ee..296f8a7681d7aef86b6eda75b4b7d4ef173f2762 100644 (file)
--- a/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@ -111,12 +111,7 @@ public class RobotContainer {
 
       case Vertigo: // AKA "French Toast"
         drive = new Drivetrain(vision, new GyroIOPigeon2());
-        driver = new PS5ControllerDriverConfig(drive, linearClimb);
-        ((PS5ControllerDriverConfig)driver).setShooter(shooter);
-        ((PS5ControllerDriverConfig)driver).setTurret(turret);
-        ((PS5ControllerDriverConfig)driver).setHood(hood);
-        ((PS5ControllerDriverConfig)driver).setIntake(intake);
-        ((PS5ControllerDriverConfig)driver).setSpindexer(spindexer);
+        driver = new PS5ControllerDriverConfig(drive, shooter, turret, hood, intake, spindexer);
         operator = new Operator(drive);
         // added indexer here for now
 

diff --git a/src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java b/src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java
index 4f97cdbd8b9b151b613141a5f4d0dd526c98dc4e..4b6ddf753bd8daea56da486ed70b63a2dc508f02 100644 (file)
--- a/src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java
+++ b/src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java
@@ -37,28 +37,12 @@ public class PS5ControllerDriverConfig extends BaseDriverConfig {
     private Spindexer spindexer;
     private LinearClimb climb;
 
-    public PS5ControllerDriverConfig(Drivetrain drive, LinearClimb climb) {
+    public PS5ControllerDriverConfig(Drivetrain drive, Shooter shooter, Turret turret, Hood hood, Intake intake, Spindexer spindexer) {
         super(drive);
-        this.climb = climb;
-    }
-
-    public void setIntake(Intake intake) {
-        this.intake = intake;
-    }
-
-    public void setTurret(Turret turret) {
+        this.shooter = shooter;
         this.turret = turret;
-    }
-
-    public void setHood(Hood hood) {
         this.hood = hood;
-    }
-
-    public void setShooter(Shooter shooter) {
-        this.shooter = shooter;
-    }
-
-    public void setSpindexer(Spindexer spindexer) {
+        this.intake = intake;
         this.spindexer = spindexer;
     }