Upgrade to wpiformat 2025.48 (#2186)

photon-targeting/src/main/native/cpp/net/TimeSyncClient.cpp

@@ -17,9 +17,6 @@
 
 #include "net/TimeSyncClient.h"
 
-#include <wpinet/UDPClient.h>
-#include <wpinet/uv/util.h>
-
 #include <atomic>
 #include <chrono>
 #include <cstdlib>
@@ -33,6 +30,8 @@
 #include <wpi/Logger.h>
 #include <wpi/print.h>
 #include <wpi/struct/Struct.h>
+#include <wpinet/UDPClient.h>
+#include <wpinet/uv/util.h>
 
 #include "ntcore_cpp.h"
 

photon-targeting/src/main/native/cpp/net/TimeSyncServer.cpp

@@ -17,9 +17,6 @@
 
 #include "net/TimeSyncServer.h"
 
-#include <wpinet/UDPClient.h>
-#include <wpinet/uv/util.h>
-
 #include <atomic>
 #include <chrono>
 #include <cstdlib>
@@ -32,6 +29,8 @@
 #include <wpi/Logger.h>
 #include <wpi/print.h>
 #include <wpi/struct/Struct.h>
+#include <wpinet/UDPClient.h>
+#include <wpinet/uv/util.h>
 
 #include "ntcore_cpp.h"
 

photon-targeting/src/main/native/cpp/photon/constrained_solvepnp/wrap/casadi_wrapper.cpp

@@ -17,8 +17,6 @@
 
 #include "photon/constrained_solvepnp/wrap/casadi_wrapper.h"
 
-#include <fmt/core.h>
-
 #include <chrono>
 #include <cstdio>
 #include <iostream>
@@ -28,6 +26,7 @@
 #include <Eigen/Cholesky>
 #include <Eigen/Core>
 #include <Eigen/LU>
+#include <fmt/core.h>
 #include <frc/fmt/Eigen.h>
 #include <wpi/timestamp.h>
 

photon-targeting/src/main/native/include/net/TimeSyncClient.h

@@ -17,12 +17,6 @@
 
 #pragma once
 
-#include <wpinet/EventLoopRunner.h>
-#include <wpinet/UDPClient.h>
-#include <wpinet/uv/Buffer.h>
-#include <wpinet/uv/Timer.h>
-#include <wpinet/uv/Udp.h>
-
 #include <atomic>
 #include <chrono>
 #include <cstdlib>
@@ -40,6 +34,11 @@
 #include <wpi/print.h>
 #include <wpi/static_circular_buffer.h>
 #include <wpi/struct/Struct.h>
+#include <wpinet/EventLoopRunner.h>
+#include <wpinet/UDPClient.h>
+#include <wpinet/uv/Buffer.h>
+#include <wpinet/uv/Timer.h>
+#include <wpinet/uv/Udp.h>
 
 #include "TimeSyncStructs.h"
 #include "ntcore_cpp.h"

photon-targeting/src/main/native/include/net/TimeSyncServer.h

@@ -17,12 +17,6 @@
 
 #pragma once
 
-#include <wpinet/EventLoopRunner.h>
-#include <wpinet/UDPClient.h>
-#include <wpinet/uv/Buffer.h>
-#include <wpinet/uv/Timer.h>
-#include <wpinet/uv/Udp.h>
-
 #include <atomic>
 #include <chrono>
 #include <cstdlib>
@@ -38,6 +32,11 @@
 #include <wpi/Logger.h>
 #include <wpi/print.h>
 #include <wpi/struct/Struct.h>
+#include <wpinet/EventLoopRunner.h>
+#include <wpinet/UDPClient.h>
+#include <wpinet/uv/Buffer.h>
+#include <wpinet/uv/Timer.h>
+#include <wpinet/uv/Udp.h>
 
 #include "TimeSyncStructs.h"
 #include "ntcore_cpp.h"

photon-targeting/src/main/native/include/photon/estimation/OpenCVHelp.h

@@ -29,9 +29,9 @@
 
 #define OPENCV_DISABLE_EIGEN_TENSOR_SUPPORT
 #include <opencv2/core/eigen.hpp>
-#include "photon/targeting/PnpResult.h"
-#include "photon/targeting/MultiTargetPNPResult.h"
 
+#include "photon/targeting/MultiTargetPNPResult.h"
+#include "photon/targeting/PnpResult.h"
 #include "photon/targeting/TargetCorner.h"
 
 namespace photon {

photon-targeting/src/main/native/jni/ConstrainedSolvepnpJNI.cpp

@@ -15,13 +15,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include <fmt/core.h>
-#include <fmt/ranges.h>
-
 #include <iostream>
 #include <span>
 #include <vector>
 
+#include <fmt/core.h>
+#include <fmt/ranges.h>
+
 #include "org_photonvision_jni_ConstrainedSolvepnpJni.h"
 #include "photon/constrained_solvepnp/wrap/casadi_wrapper.h"
 

photon-targeting/src/main/native/jni/TimeSyncClientJNI.cpp

@@ -15,11 +15,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include <org_photonvision_jni_TimeSyncClient.h>
-
 #include <cstdio>
 #include <string>
 
+#include <org_photonvision_jni_TimeSyncClient.h>
+
 #include "jni_utils.h"
 #include "net/TimeSyncClient.h"
 

photon-targeting/src/main/native/jni/TimeSyncServerJNI.cpp

@@ -15,11 +15,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include <cstdio>
+
 #include <org_photonvision_jni_TimeSyncClient.h>
 #include <org_photonvision_jni_TimeSyncServer.h>
 
-#include <cstdio>
-
 #include "jni_utils.h"
 #include "net/TimeSyncServer.h"
 

photon-targeting/src/test/native/cpp/CasadiWrapperTest.cpp

@@ -15,13 +15,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include <gtest/gtest.h>
-
 #include <chrono>
 #include <cstdio>
 #include <iostream>
 #include <vector>
 
+#include <gtest/gtest.h>
 #include <wpi/timestamp.h>
 
 #include "photon/constrained_solvepnp/wrap/casadi_wrapper.h"

photon-targeting/src/test/native/cpp/PacketTest.cpp

@@ -15,6 +15,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include "photon/dataflow/structures/Packet.h"
+
 #include <chrono>
 #include <vector>
 
@@ -22,7 +24,6 @@
 #include <wpi/print.h>
 
 #include "gtest/gtest.h"
-#include "photon/dataflow/structures/Packet.h"
 #include "photon/targeting/MultiTargetPNPResult.h"
 #include "photon/targeting/PhotonPipelineResult.h"
 #include "photon/targeting/PhotonTrackedTarget.h"