Upgrade to wpiformat 2025.48 (#2186)

2026-06-20 00:51:41 +00:00 · 2025-11-10 21:28:28 -08:00
parent def3b9faa8
commit a2b19c080e
31 changed files with 115 additions and 136 deletions
--- a/photon-lib/src/main/native/cpp/photon/PhotonCamera.cpp
+++ b/photon-lib/src/main/native/cpp/photon/PhotonCamera.cpp
@@ -24,9 +24,6 @@

 #include "photon/PhotonCamera.h"

-#include <hal/FRCUsageReporting.h>
-#include <net/TimeSyncServer.h>
-
 #include <stdexcept>
 #include <string>
 #include <string_view>
@@ -36,6 +33,8 @@
 #include <frc/Errors.h>
 #include <frc/RobotController.h>
 #include <frc/Timer.h>
+#include <hal/FRCUsageReporting.h>
+#include <net/TimeSyncServer.h>
 #include <opencv2/core.hpp>
 #include <opencv2/core/mat.hpp>
 #include <wpi/json.h>
--- a/photon-lib/src/main/native/cpp/photon/PhotonPoseEstimator.cpp
+++ b/photon-lib/src/main/native/cpp/photon/PhotonPoseEstimator.cpp
@@ -24,8 +24,6 @@

 #include "photon/PhotonPoseEstimator.h"

-#include <hal/FRCUsageReporting.h>
-
 #include <cmath>
 #include <iostream>
 #include <limits>
@@ -41,6 +39,7 @@
 #include <frc/geometry/Pose3d.h>
 #include <frc/geometry/Rotation3d.h>
 #include <frc/geometry/Transform3d.h>
+#include <hal/FRCUsageReporting.h>
 #include <opencv2/calib3d.hpp>
 #include <opencv2/core/mat.hpp>
 #include <opencv2/core/types.hpp>
--- a/photon-lib/src/main/native/include/photon/simulation/PhotonCameraSim.h
+++ b/photon-lib/src/main/native/include/photon/simulation/PhotonCameraSim.h
@@ -24,7 +24,16 @@

 #pragma once

+#include <algorithm>
+#include <limits>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include <cameraserver/CameraServer.h>
+#include <frc/Timer.h>
+#include <frc/apriltag/AprilTagFieldLayout.h>
+#include <frc/apriltag/AprilTagFields.h>
 #include <photon/PhotonCamera.h>
 #include <photon/PhotonTargetSortMode.h>
 #include <photon/estimation/CameraTargetRelation.h>
@@ -33,16 +42,6 @@
 #include <photon/simulation/SimCameraProperties.h>
 #include <photon/simulation/VideoSimUtil.h>
 #include <photon/simulation/VisionTargetSim.h>
-
-#include <algorithm>
-#include <limits>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include <frc/Timer.h>
-#include <frc/apriltag/AprilTagFieldLayout.h>
-#include <frc/apriltag/AprilTagFields.h>
 #include <units/math.h>
 #include <wpi/timestamp.h>

--- a/photon-lib/src/main/native/include/photon/simulation/SimCameraProperties.h
+++ b/photon-lib/src/main/native/include/photon/simulation/SimCameraProperties.h
@@ -24,8 +24,6 @@

 #pragma once

-#include <photon/estimation/OpenCVHelp.h>
-
 #include <algorithm>
 #include <random>
 #include <string>
@@ -37,6 +35,7 @@
 #include <frc/MathUtil.h>
 #include <frc/geometry/Rotation2d.h>
 #include <frc/geometry/Translation3d.h>
+#include <photon/estimation/OpenCVHelp.h>
 #include <units/frequency.h>
 #include <units/time.h>

--- a/photon-lib/src/main/native/include/photon/simulation/VideoSimUtil.h
+++ b/photon-lib/src/main/native/include/photon/simulation/VideoSimUtil.h
@@ -24,8 +24,6 @@

 #pragma once

-#include <cscore_cv.h>
-
 #include <algorithm>
 #include <numeric>
 #include <string>
@@ -33,6 +31,7 @@
 #include <utility>
 #include <vector>

+#include <cscore_cv.h>
 #include <frc/apriltag/AprilTag.h>
 #include <opencv2/core.hpp>
 #include <opencv2/imgcodecs.hpp>
--- a/photon-lib/src/test/native/cpp/PhotonCameraTest.cpp
+++ b/photon-lib/src/test/native/cpp/PhotonCameraTest.cpp
@@ -22,20 +22,19 @@
 * SOFTWARE.
 */

+#include <string>
+#include <vector>
+
 #include <fmt/ranges.h>
+#include <frc/smartdashboard/SmartDashboard.h>
 #include <gtest/gtest.h>
 #include <hal/HAL.h>
 #include <net/TimeSyncClient.h>
 #include <net/TimeSyncServer.h>
+#include <networktables/NetworkTableInstance.h>
 #include <photon/PhotonCamera.h>
 #include <photon/simulation/PhotonCameraSim.h>

-#include <string>
-#include <vector>
-
-#include <frc/smartdashboard/SmartDashboard.h>
-#include <networktables/NetworkTableInstance.h>
-
 TEST(TimeSyncProtocolTest, Smoketest) {
  using namespace wpi::tsp;
  using namespace std::chrono_literals;
--- a/photon-lib/src/test/native/cpp/PhotonPoseEstimatorTest.cpp
+++ b/photon-lib/src/test/native/cpp/PhotonPoseEstimatorTest.cpp
@@ -22,6 +22,8 @@
 * SOFTWARE.
 */

+#include "photon/PhotonPoseEstimator.h"
+
 #include <map>
 #include <utility>
 #include <vector>
@@ -30,13 +32,12 @@
 #include <frc/geometry/Pose3d.h>
 #include <frc/geometry/Rotation3d.h>
 #include <frc/geometry/Transform3d.h>
+#include <gtest/gtest.h>
 #include <units/angle.h>
 #include <units/length.h>
 #include <wpi/SmallVector.h>

-#include "gtest/gtest.h"
 #include "photon/PhotonCamera.h"
-#include "photon/PhotonPoseEstimator.h"
 #include "photon/dataflow/structures/Packet.h"
 #include "photon/simulation/PhotonCameraSim.h"
 #include "photon/simulation/SimCameraProperties.h"
--- a/photon-lib/src/test/native/cpp/PhotonUtilsTest.cpp
+++ b/photon-lib/src/test/native/cpp/PhotonUtilsTest.cpp
@@ -22,7 +22,8 @@
 * SOFTWARE.
 */

-#include "gtest/gtest.h"
 #include "photon/PhotonUtils.h"

+#include <gtest/gtest.h>
+
 TEST(PhotonUtilsTest, Include) {}
--- a/photon-lib/src/test/native/cpp/VersionTest.cpp
+++ b/photon-lib/src/test/native/cpp/VersionTest.cpp
@@ -24,8 +24,9 @@

 #include <iostream>

+#include <gtest/gtest.h>
+
 #include "PhotonVersion.h"
-#include "gtest/gtest.h"

 TEST(VersionTest, PrintVersion) {
  std::cout << photon::PhotonVersion::versionString << std::endl;
--- a/photon-lib/src/test/native/cpp/VisionSystemSimTest.cpp
+++ b/photon-lib/src/test/native/cpp/VisionSystemSimTest.cpp
@@ -22,16 +22,17 @@
 * SOFTWARE.
 */

+#include "photon/simulation/VisionSystemSim.h"
+
 #include <chrono>
 #include <thread>
 #include <tuple>
 #include <vector>

+#include <gtest/gtest.h>
 #include <wpi/deprecated.h>

-#include "gtest/gtest.h"
 #include "photon/PhotonUtils.h"
-#include "photon/simulation/VisionSystemSim.h"

 // Ignore GetLatestResult warnings
 WPI_IGNORE_DEPRECATED