Update photonlib and fixed camera stream name

somecoderdude1 · Jan 14, 2024 · 8e7844d · 8e7844d
1 parent d22d65a
commit 8e7844d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -180,3 +180,5 @@ ctre_sim/
 networktables.json
 networktables.json.bck
 simgui*.json
+glass.json
+outlineviewer.json
diff --git a/src/main/java/frc/robot/subsystems/AprilTagSubsystem.java b/src/main/java/frc/robot/subsystems/AprilTagSubsystem.java
@@ -50,11 +50,12 @@ public class AprilTagSubsystem extends PhotonVisionSubsystemBase {
 
   /** Creates a new PhotonVisionSubsystem. */
   public AprilTagSubsystem() {
-    super("AprilTagCamera", RobotConstants.APRILTAG_CAMERA_TO_ROBOT);
+    super("948Mono001", RobotConstants.APRILTAG_CAMERA_TO_ROBOT);
 
     for (int i = 1; i <= 16; i++) {
       aprilTagIdChooser.addOption(String.valueOf(i), i);
     }
+    aprilTagIdChooser.setDefaultOption("1", 1);
   }
 
   @Override
@@ -142,7 +143,7 @@ public void addShuffleboardTab() {
     targetLayout.addDouble("Distance", () -> getDistanceToTarget(aprilTagIdChooser.getSelected()));
     targetLayout.addDouble("Angle", () -> getAngleToTarget(aprilTagIdChooser.getSelected()));
 
-    VideoSource video = new HttpCamera("photonvision_Port_1182_MJPEG_Server", "http://10.9.48.11:1182/?action=stream",
+    VideoSource video = new HttpCamera("photonvision_Port_1182_Output_MJPEG_Server", "http://photonvision.local:1182/?action=stream",
         HttpCameraKind.kMJPGStreamer);
     visionTab.add("April Tag", video)
         .withWidget(BuiltInWidgets.kCameraStream)

diff --git a/vendordeps/photonlib.json b/vendordeps/photonlib.json
@@ -1,7 +1,7 @@
 {
     "fileName": "photonlib.json",
     "name": "photonlib",
-    "version": "v2024.1.3",
+    "version": "v2024.1.4",
     "uuid": "515fe07e-bfc6-11fa-b3de-0242ac130004",
     "frcYear": "2024",
     "mavenUrls": [
@@ -14,7 +14,7 @@
         {
             "groupId": "org.photonvision",
             "artifactId": "photonlib-cpp",
-            "version": "v2024.1.3",
+            "version": "v2024.1.4",
             "libName": "photonlib",
             "headerClassifier": "headers",
             "sharedLibrary": true,
@@ -29,7 +29,7 @@
         {
             "groupId": "org.photonvision",
             "artifactId": "photontargeting-cpp",
-            "version": "v2024.1.3",
+            "version": "v2024.1.4",
             "libName": "photontargeting",
             "headerClassifier": "headers",
             "sharedLibrary": true,
@@ -46,12 +46,12 @@
         {
             "groupId": "org.photonvision",
             "artifactId": "photonlib-java",
-            "version": "v2024.1.3"
+            "version": "v2024.1.4"
         },
         {
             "groupId": "org.photonvision",
             "artifactId": "photontargeting-java",
-            "version": "v2024.1.3"
+            "version": "v2024.1.4"
         }
     ]
 }