Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update sim vision system #31

Merged
merged 4 commits into from
Feb 1, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public VisionSubsystem(PropertyFactory pf, XCameraElectricalContract electricalC
// we need to handle cases like not having the AprilTag data loaded.

try {
aprilTagFieldLayout = AprilTagFieldLayout.loadFromResource(AprilTagFields.k2024Crescendo.m_resourceFile);
aprilTagFieldLayout = AprilTagFieldLayout.loadFromResource(AprilTagFields.k2025Reefscape.m_resourceFile);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The AprilTagVision stuff we copied in from Maple-sim-skeleton was using the 2025, this is some of our ported over vision code from 2024 that isn't being used yet

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are you planning to eventually use this?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No current plans, the new maple skeleton stuff seems to be working well so far but maybe we have to revisit that later

aprilTagsLoaded = true;
log.info("Successfully loaded AprilTagFieldLayout");
} catch (IOException e) {
Expand Down
14 changes: 7 additions & 7 deletions vendordeps/photonlib.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"fileName": "photonlib.json",
"name": "photonlib",
"version": "v2025.0.0-beta-8",
"version": "v2025.1.1",
"uuid": "515fe07e-bfc6-11fa-b3de-0242ac130004",
"frcYear": "2025",
"mavenUrls": [
Expand All @@ -13,7 +13,7 @@
{
"groupId": "org.photonvision",
"artifactId": "photontargeting-cpp",
"version": "v2025.0.0-beta-8",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⭐ ⭐ ⭐ there's also a photonlib.json inside the SeriouslyCommonLib submodule repo you'll need to update at the same time

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just made this PR for SeriouslyCommonLib Team488/SeriouslyCommonLib#513

"version": "v2025.1.1",
"skipInvalidPlatforms": true,
"isJar": false,
"validPlatforms": [
Expand All @@ -28,7 +28,7 @@
{
"groupId": "org.photonvision",
"artifactId": "photonlib-cpp",
"version": "v2025.0.0-beta-8",
"version": "v2025.1.1",
"libName": "photonlib",
"headerClassifier": "headers",
"sharedLibrary": true,
Expand All @@ -43,7 +43,7 @@
{
"groupId": "org.photonvision",
"artifactId": "photontargeting-cpp",
"version": "v2025.0.0-beta-8",
"version": "v2025.1.1",
"libName": "photontargeting",
"headerClassifier": "headers",
"sharedLibrary": true,
Expand All @@ -60,12 +60,12 @@
{
"groupId": "org.photonvision",
"artifactId": "photonlib-java",
"version": "v2025.0.0-beta-8"
"version": "v2025.1.1"
},
{
"groupId": "org.photonvision",
"artifactId": "photontargeting-java",
"version": "v2025.0.0-beta-8"
"version": "v2025.1.1"
}
]
}
}