mirror of
https://github.com/PhotonVision/photonvision
synced 2026-06-24 01:31:44 +00:00
[NFC] Invert AprilTag family default (#2124)
## Description Switch default tag family used in AprilTag pipeline. We already functionally changed the default in https://github.com/PhotonVision/photonvision/pull/1333 but since 2024 FIRST appears to have been using 36h11 so switching here seems to make sense as well. ## Meta Merge checklist: - [ ] Pull Request title is [short, imperative summary](https://cbea.ms/git-commit/) of proposed changes - [x] The description documents the _what_ and _why_ - [x] If this PR changes behavior or adds a feature, user documentation is updated - [ ] If this PR touches photon-serde, all messages have been regenerated and hashes have not changed unexpectedly - [ ] If this PR touches configuration, this is backwards compatible with settings back to v2025.3.2 - [ ] If this PR touches pipeline settings or anything related to data exchange, the frontend typing is updated - [ ] If this PR addresses a bug, a regression test for it is added --------- Signed-off-by: Jade Turner <spacey-sooty@proton.me>
This commit is contained in:
@@ -73,13 +73,13 @@ public class AprilTagPipeline extends CVPipeline<CVPipelineResult, AprilTagPipel
|
||||
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();
|
||||
|
||||
@@ -109,7 +109,6 @@ public class AprilTagTest {
|
||||
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 =
|
||||
|
||||
Reference in New Issue
Block a user