Merge branch 'getatomic-lib' of https://github.com/mcm001/photonvision …

…into getatomic-lib
PhotonVision · May 6, 2024 · 79fdbe9 · 79fdbe9
2 parents 07b0a58 + 000b424
commit 79fdbe9
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/photon-lib/src/main/native/cpp/photon/PhotonCamera.cpp b/photon-lib/src/main/native/cpp/photon/PhotonCamera.cpp
@@ -102,7 +102,7 @@ PhotonCamera::PhotonCamera(nt::NetworkTableInstance instance,
 PhotonCamera::PhotonCamera(const std::string_view cameraName)
     : PhotonCamera(nt::NetworkTableInstance::GetDefault(), cameraName) {}
 
-std::vector<PhotonPipelineResult> PhotonCamera::GetAllUnreadResult() {
+std::vector<PhotonPipelineResult> PhotonCamera::GetAllUnreadResults() {
   if (test) {
     return testResult;
   }

diff --git a/photon-lib/src/main/native/cpp/photon/PhotonPoseEstimator.cpp b/photon-lib/src/main/native/cpp/photon/PhotonPoseEstimator.cpp
@@ -113,7 +113,7 @@ std::optional<EstimatedRobotPose> PhotonPoseEstimator::Update() {
     return std::nullopt;
   }
 
-  auto results = camera->GetAllUnreadResult();
+  auto results = camera->GetAllUnreadResults();
 
   std::optional<EstimatedRobotPose> ret;
 

diff --git a/photon-lib/src/main/native/include/photon/PhotonCamera.h b/photon-lib/src/main/native/include/photon/PhotonCamera.h
@@ -79,17 +79,18 @@ class PhotonCamera {
 
   /**
    * The list of pipeline results sent by PhotonVision since the last call to
-   * GetAllUnreadResult(). Calling this function clears the internal FIFO queue,
-   * and multiple calls to GetAllUnreadResult() will return different
+   * GetAllUnreadResults(). Calling this function clears the internal FIFO
+   * queue, and multiple calls to GetAllUnreadResults() will return different
    * (potentially empty) result arrays. Be careful to call this exactly ONCE per
    * loop of your robot code! FIFO depth is limited to 20 changes, so make sure
    * to call this frequently enough to avoid old results being discarded, too!
    */
-  std::vector<PhotonPipelineResult> GetAllUnreadResult();
+  std::vector<PhotonPipelineResult> GetAllUnreadResults();
 
-  [[deprecated("Replace with GetAllUnreadResult")]]
-  inline const PhotonPipelineResult GetLatestResult() {
-    const auto ret = GetAllUnreadResult();
+  [[deprecated(
+      "Replace with GetAllUnreadResults")]] inline const PhotonPipelineResult
+  GetLatestResult() {
+    const auto ret = GetAllUnreadResults();
     if (!ret.size()) return PhotonPipelineResult();
     return ret.back();
   }

diff --git a/photon-lib/src/test/native/cpp/VisionSystemSimTest.cpp b/photon-lib/src/test/native/cpp/VisionSystemSimTest.cpp
@@ -22,10 +22,15 @@
  * SOFTWARE.
  */
 
+#include <wpi/deprecated.h>
+
 #include "gtest/gtest.h"
 #include "photon/PhotonUtils.h"
 #include "photon/simulation/VisionSystemSim.h"
 
+// Ignore GetLatestResult warnings
+WPI_IGNORE_DEPRECATED
+
 class VisionSystemSimTest : public ::testing::Test {
   void SetUp() override {
     nt::NetworkTableInstance::GetDefault().StartServer();

diff --git a/photon-targeting/src/main/native/include/photon/estimation/VisionEstimation.h b/photon-targeting/src/main/native/include/photon/estimation/VisionEstimation.h
@@ -32,6 +32,7 @@
 namespace photon {
 namespace VisionEstimation {
 
+[[maybe_unused]]
 static std::vector<frc::AprilTag> GetVisibleLayoutTags(
     const std::vector<PhotonTrackedTarget>& visTags,
     const frc::AprilTagFieldLayout& layout) {