Fix vendordep

CrossTheRoadElec · Oct 22, 2024 · 3f85b89 · 3f85b89
1 parent 581497b
commit 3f85b89
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/cpp/SwerveWithPathPlanner/vendordeps/Phoenix6.json b/cpp/SwerveWithPathPlanner/vendordeps/Phoenix6.json
@@ -1,8 +1,8 @@
 {
-    "fileName": "Phoenix6.json",
+    "fileName": "Phoenix6-frc2025-beta-latest.json",
     "name": "CTRE-Phoenix (v6)",
     "version": "25.0.0-beta-1",
-    "frcYear": 2025,
+    "frcYear": "2025",
     "uuid": "e995de00-2c64-4df5-8831-c1441420ff19",
     "mavenUrls": [
         "https://maven.ctr-electronics.com/release/"
@@ -13,6 +13,11 @@
             "uuid": "3fcf3402-e646-4fa6-971e-18afe8173b1a",
             "errorMessage": "The combined Phoenix-6-And-5 vendordep is no longer supported. Please remove the vendordep and instead add both the latest Phoenix 6 vendordep and Phoenix 5 vendordep.",
             "offlineFileName": "Phoenix6And5.json"
+        },
+        {
+            "uuid": "e7900d8d-826f-4dca-a1ff-182f658e98af",
+            "errorMessage": "Users can not have both the replay and regular Phoenix 6 vendordeps in their robot program.",
+            "offlineFileName": "Phoenix6-replay-frc2025-beta-latest.json"
         }
     ],
     "javaDependencies": [

diff --git a/java/SwerveWithPathPlanner/src/main/java/frc/robot/RobotContainer.java b/java/SwerveWithPathPlanner/src/main/java/frc/robot/RobotContainer.java
@@ -43,6 +43,13 @@ public class RobotContainer {
     /* Path follower */
     private final SendableChooser<Command> autoChooser;
 
+    public RobotContainer() {
+        configureBindings();
+
+        autoChooser = AutoBuilder.buildAutoChooser("Tests");
+        SmartDashboard.putData("Auto Mode", autoChooser);
+    }
+
     private void configureBindings() {
         // Note that X is defined as forward according to WPILib convention,
         // and Y is defined as to the left according to WPILib convention.
@@ -80,13 +87,6 @@ private void configureBindings() {
         drivetrain.registerTelemetry(logger::telemeterize);
     }
 
-    public RobotContainer() {
-        configureBindings();
-
-        autoChooser = AutoBuilder.buildAutoChooser("Tests");
-        SmartDashboard.putData("Auto Mode", autoChooser);
-    }
-
     public Command getAutonomousCommand() {
         /* First put the drivetrain into auto run mode, then run the auto */
         return autoChooser.getSelected();