diff --git a/photon-core/src/main/java/org/photonvision/vision/pipeline/AprilTagPipeline.java b/photon-core/src/main/java/org/photonvision/vision/pipeline/AprilTagPipeline.java index 3e98f7e9e1..87329ebf24 100644 --- a/photon-core/src/main/java/org/photonvision/vision/pipeline/AprilTagPipeline.java +++ b/photon-core/src/main/java/org/photonvision/vision/pipeline/AprilTagPipeline.java @@ -73,13 +73,13 @@ protected void setPipeParamsImpl() { settings.threads = Math.max(1, settings.threads); // for now, hard code tag width based on enum value - // 2023/other: best guess is 6in - double tagWidth = Units.inchesToMeters(6); - TargetModel tagModel = TargetModel.kAprilTag16h5; - if (settings.tagFamily == AprilTagFamily.kTag36h11) { - // 2024 tag, 6.5in - tagWidth = Units.inchesToMeters(6.5); - tagModel = TargetModel.kAprilTag36h11; + // From 2024 best guess is 6.5 + double tagWidth = Units.inchesToMeters(6.5); + TargetModel tagModel = TargetModel.kAprilTag36h11; + if (settings.tagFamily == AprilTagFamily.kTag16h5) { + // 2023 tag, 6in + tagWidth = Units.inchesToMeters(6); + tagModel = TargetModel.kAprilTag16h5; } var config = new AprilTagDetector.Config(); diff --git a/photon-core/src/test/java/org/photonvision/vision/pipeline/AprilTagTest.java b/photon-core/src/test/java/org/photonvision/vision/pipeline/AprilTagTest.java index 7a1fa96488..14cdf1767c 100644 --- a/photon-core/src/test/java/org/photonvision/vision/pipeline/AprilTagTest.java +++ b/photon-core/src/test/java/org/photonvision/vision/pipeline/AprilTagTest.java @@ -109,7 +109,6 @@ public void testApriltagDistorted() { pipeline.getSettings().solvePNPEnabled = true; pipeline.getSettings().cornerDetectionAccuracyPercentage = 4; pipeline.getSettings().cornerDetectionUseConvexHulls = true; - pipeline.getSettings().targetModel = TargetModel.kAprilTag6p5in_36h11; pipeline.getSettings().tagFamily = AprilTagFamily.kTag16h5; var frameProvider =