Merge branch 'main' of https://github.com/team5115/Bunnybots-2024

team5115 · Dec 5, 2024 · bb3bc37 · bb3bc37
2 parents 6bb40f9 + 5a4389a
commit bb3bc37
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/photon_calibration/photon_calibration_FOV_75_Degrees_1280x720.json b/photon_calibration/photon_calibration_FOV_75_Degrees_1280x720.json
diff --git a/photon_calibration/photon_calibration_FOV_75_Degrees_960x720.json b/photon_calibration/photon_calibration_FOV_75_Degrees_960x720.json
diff --git a/src/main/java/frc/team5115/RobotContainer.java b/src/main/java/frc/team5115/RobotContainer.java
@@ -68,8 +68,8 @@ public RobotContainer() {
                                 new ModuleIOSparkMax(1),
                                 new ModuleIOSparkMax(2),
                                 new ModuleIOSparkMax(3));
-                vision = new PhotonVision(drivetrain);
-                // vision = null;
+                // vision = new PhotonVision(drivetrain);
+                vision = null;
                 canisterDetectedEntry =
                         Shuffleboard.getTab("SmartDashboard").add("Has Canister?", false).getEntry();
                 break;