Skip to content

Commit f640d8d

Browse files
Gold856samfreund
authored andcommitted
Update to match new WPILib organization
1 parent 3a62eea commit f640d8d

264 files changed

Lines changed: 3440 additions & 3299 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import edu.wpi.first.toolchain.*
1+
import org.wpilib.toolchain.*
22

33
plugins {
44
id "cpp"
55
id "com.diffplug.spotless" version "8.1.0"
6-
id "edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin" version "2025.0"
7-
id "edu.wpi.first.GradleRIO2027" version "2027.0.0-alpha-2"
6+
id "org.wpilib.WPILibRepositoriesPlugin" version "2027.0.0"
7+
id "org.wpilib.GradleRIO" version "2027.0.0-alpha-2"
88
id 'org.photonvision.tools.WpilibTools' version '2.4.1-photon'
99
id 'com.google.protobuf' version '0.9.3' apply false
10-
id 'edu.wpi.first.GradleJni' version '1.1.0'
10+
id 'org.wpilib.GradleJni' version '2027.0.0'
1111
id "org.ysb33r.doxygen" version "2.0.0" apply false
1212
id 'com.gradleup.shadow' version '8.3.4' apply false
1313
id "com.github.node-gradle.node" version "7.0.1" apply false
@@ -33,7 +33,7 @@ ext.allOutputsFolder = file("$project.buildDir/outputs")
3333
apply from: "versioningHelper.gradle"
3434

3535
ext {
36-
wpilibVersion = "2027.0.0-alpha-2"
36+
wpilibVersion = "2027.0.0-alpha-3-203-g0001ddc7e"
3737
wpimathVersion = wpilibVersion
3838
openCVYear = "2025"
3939
openCVversion = "4.10.0-3"

docs/source/docs/apriltag-pipelines/multitag.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ This multi-target pose estimate can be accessed using PhotonLib. We suggest usin
4646
{
4747
auto multiTagResult = result.MultiTagResult();
4848
if (multiTagResult.has_value()) {
49-
frc::Transform3d fieldToCamera = multiTagResult->estimatedPose.best;
49+
wpi::math::Transform3d fieldToCamera = multiTagResult->estimatedPose.best;
5050
}
5151
}
5252

docs/source/docs/programming/photonlib/driver-mode-pipeline-index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ You can also get the pipeline latency from a pipeline result using the `getLaten
6060
.. code-block:: c++
6161
6262
// Get the pipeline latency.
63-
units::second_t latency = result.GetLatency();
63+
wpi::units::second_t latency = result.GetLatency();
6464
6565
.. code-block:: python
6666

docs/source/docs/programming/photonlib/getting-target-data.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ You can get a list of tracked targets using the `getTargets()`/`GetTargets()` (J
107107
.. code-block:: c++
108108
109109
// Get a list of currently tracked targets.
110-
wpi::ArrayRef<photonlib::PhotonTrackedTarget> targets = result.GetTargets();
110+
std::span<photonlib::PhotonTrackedTarget> targets = result.GetTargets();
111111
112112
.. code-block:: python
113113
@@ -166,8 +166,8 @@ You can get the {ref}`best target <docs/reflectiveAndShape/contour-filtering:Con
166166
double pitch = target.GetPitch();
167167
double area = target.GetArea();
168168
double skew = target.GetSkew();
169-
frc::Transform2d pose = target.GetCameraToTarget();
170-
wpi::SmallVector<std::pair<double, double>, 4> corners = target.GetCorners();
169+
wpi::math::Transform2d pose = target.GetCameraToTarget();
170+
wpi::util::SmallVector<std::pair<double, double>, 4> corners = target.GetCorners();
171171
172172
.. code-block:: python
173173
@@ -206,8 +206,8 @@ All of the data above (**except skew**) is available when using AprilTags.
206206
// Get information from target.
207207
int targetID = target.GetFiducialId();
208208
double poseAmbiguity = target.GetPoseAmbiguity();
209-
frc::Transform3d bestCameraToTarget = target.getBestCameraToTarget();
210-
frc::Transform3d alternateCameraToTarget = target.getAlternateCameraToTarget();
209+
wpi::math::Transform3d bestCameraToTarget = target.getBestCameraToTarget();
210+
wpi::math::Transform3d alternateCameraToTarget = target.getAlternateCameraToTarget();
211211
212212
.. code-block:: python
213213

docs/source/docs/programming/photonlib/using-target-data.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ You can get your robot's `Pose2D` on the field using various camera data, target
3838
.. code-block:: c++
3939
4040
// Calculate robot's field relative pose
41-
frc::Pose2D robotPose = photonlib::EstimateFieldToRobot(
42-
kCameraHeight, kTargetHeight, kCameraPitch, kTargetPitch, frc::Rotation2d(units::degree_t(-target.GetYaw())), frc::Rotation2d(units::degree_t(gyro.GetRotation2d)), targetPose, cameraToRobot);
41+
wpi::math::Pose2d robotPose = photonlib::EstimateFieldToRobot(
42+
kCameraHeight, kTargetHeight, kCameraPitch, kTargetPitch, wpi::math::Rotation2d(wpi::units::degree_t(-target.GetYaw())), wpi::math::Rotation2d(wpi::units::degree_t(gyro.GetRotation2d)), targetPose, cameraToRobot);
4343
4444
.. code-block:: python
4545
@@ -106,8 +106,8 @@ You can get a [translation](https://docs.wpilib.org/en/latest/docs/software/adva
106106
.. code-block:: c++
107107
108108
// Calculate a translation from the camera to the target.
109-
frc::Translation2d translation = photonlib::PhotonUtils::EstimateCameraToTargetTranslation(
110-
distance, frc::Rotation2d(units::degree_t(-target.GetYaw())));
109+
wpi::math::Translation2d translation = photonlib::PhotonUtils::EstimateCameraToTargetTranslation(
110+
distance, wpi::math::Rotation2d(wpi::units::degree_t(-target.GetYaw())));
111111
112112
.. code-block:: python
113113

docs/source/docs/quick-start/networking.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ If you would like to access your Ethernet-connected vision device from a compute
8181
8282
.. code-block:: c++
8383
84-
wpi::PortForwarder::GetInstance().Add(5800, "photonvision.local", 5800);
84+
wpi::net::PortForwarder::GetInstance().Add(5800, "photonvision.local", 5800);
8585
8686
.. code-block:: python
8787

photon-core/src/main/java/org/photonvision/common/configuration/CameraConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import com.fasterxml.jackson.annotation.JsonCreator;
2121
import com.fasterxml.jackson.annotation.JsonIgnore;
2222
import com.fasterxml.jackson.annotation.JsonProperty;
23-
import edu.wpi.first.cscore.UsbCameraInfo;
2423
import java.util.ArrayList;
2524
import java.util.List;
2625
import java.util.UUID;
@@ -35,6 +34,7 @@
3534
import org.photonvision.vision.pipeline.CVPipelineSettings;
3635
import org.photonvision.vision.pipeline.DriverModePipelineSettings;
3736
import org.photonvision.vision.processes.PipelineManager;
37+
import org.wpilib.vision.camera.UsbCameraInfo;
3838

3939
public class CameraConfiguration {
4040
private static final Logger logger = new Logger(CameraConfiguration.class, LogGroup.Camera);

photon-core/src/main/java/org/photonvision/common/configuration/LegacyConfigProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
package org.photonvision.common.configuration;
1919

2020
import com.fasterxml.jackson.core.JsonProcessingException;
21-
import edu.wpi.first.apriltag.AprilTagFieldLayout;
22-
import edu.wpi.first.apriltag.AprilTagFields;
2321
import java.io.File;
2422
import java.io.IOException;
2523
import java.io.UncheckedIOException;
@@ -40,6 +38,8 @@
4038
import org.photonvision.vision.pipeline.CVPipelineSettings;
4139
import org.photonvision.vision.pipeline.DriverModePipelineSettings;
4240
import org.photonvision.vision.processes.VisionSource;
41+
import org.wpilib.vision.apriltag.AprilTagFieldLayout;
42+
import org.wpilib.vision.apriltag.AprilTagFields;
4343
import org.zeroturnaround.zip.ZipUtil;
4444

4545
class LegacyConfigProvider extends ConfigProvider {

photon-core/src/main/java/org/photonvision/common/configuration/PhotonConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717

1818
package org.photonvision.common.configuration;
1919

20-
import edu.wpi.first.apriltag.AprilTagFieldLayout;
2120
import java.util.Collection;
2221
import java.util.HashMap;
2322
import java.util.List;
2423
import org.photonvision.vision.processes.VisionSource;
24+
import org.wpilib.vision.apriltag.AprilTagFieldLayout;
2525

2626
public class PhotonConfiguration {
2727
private final HardwareConfig hardwareConfig;

photon-core/src/main/java/org/photonvision/common/configuration/SqlConfigProvider.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717

1818
package org.photonvision.common.configuration;
1919

20-
import edu.wpi.first.apriltag.AprilTagFieldLayout;
21-
import edu.wpi.first.apriltag.AprilTagFields;
22-
import edu.wpi.first.cscore.UsbCameraInfo;
2320
import java.io.File;
2421
import java.io.IOException;
2522
import java.io.UncheckedIOException;
@@ -40,6 +37,9 @@
4037
import org.photonvision.common.util.file.JacksonUtils;
4138
import org.photonvision.vision.pipeline.CVPipelineSettings;
4239
import org.photonvision.vision.pipeline.DriverModePipelineSettings;
40+
import org.wpilib.vision.apriltag.AprilTagFieldLayout;
41+
import org.wpilib.vision.apriltag.AprilTagFields;
42+
import org.wpilib.vision.camera.UsbCameraInfo;
4343

4444
/**
4545
* Saves settings in a SQLite database file (called photon.sqlite).

0 commit comments

Comments
 (0)