Merge remote-tracking branch 'upstream/master' into 20240714_serde_pa…

…cket_gen
PhotonVision · Aug 4, 2024 · d93c6fc · d93c6fc
2 parents c6b7be6 + 37e9d40
commit d93c6fc
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -422,15 +422,21 @@ jobs:
           - os: ubuntu-latest
             artifact-name: LinuxArm64
             image_suffix: orangepi5
-            image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2024.0.10/photonvision_opi5.img.xz
+            image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.0-beta-2/photonvision_opi5.img.xz
             cpu: cortex-a8
-            image_additional_mb: 4096
+            image_additional_mb: 1024
           - os: ubuntu-latest
             artifact-name: LinuxArm64
             image_suffix: orangepi5plus
-            image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2024.0.10/photonvision_opi5plus.img.xz
+            image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.0-beta-2/photonvision_opi5plus.img.xz
             cpu: cortex-a8
-            image_additional_mb: 4096
+            image_additional_mb: 1024
+          - os: ubuntu-latest
+            artifact-name: LinuxArm64
+            image_suffix: orangepi5pro
+            image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.0-beta-2/photonvision_opi5pro.img.xz
+            cpu: cortex-a8
+            image_additional_mb: 1024
 
     runs-on: ${{ matrix.os }}
     name: "Build image - ${{ matrix.image_url }}"
@@ -443,7 +449,7 @@ jobs:
       - uses: actions/download-artifact@v4
         with:
           name: jar-${{ matrix.artifact-name }}
-      - uses: pguyot/arm-runner-action@v2
+      - uses: pguyot/arm-runner-action@HEAD
         name: Generate image
         id: generate_image
         with:

diff --git a/docs/source/docs/integration/simpleStrategies.rst b/docs/source/docs/integration/simpleStrategies.rst
@@ -24,7 +24,7 @@ See the  :ref:`Aiming at a Target <docs/examples/aimingatatarget:Knowledge and E
 Range Alignment
 ---------------
 
-By looking at the position of the target in the "vertical" direction in the image, and applying some trionometery, the distance between the robot and the camera can be deduced.
+By looking at the position of the target in the "vertical" direction in the image, and applying some trigonometry, the distance between the robot and the camera can be deduced.
 
 1. Read the current distance to the target from the vision coprocessor.
 2. If too far in one direction, command the drivetrain to travel in the opposite direction to compensate.

diff --git a/photon-lib/src/main/native/cpp/photon/PhotonCamera.cpp b/photon-lib/src/main/native/cpp/photon/PhotonCamera.cpp
@@ -26,7 +26,9 @@
 
 #include <hal/FRCUsageReporting.h>
 
+#include <string>
 #include <string_view>
+#include <vector>
 
 #include <frc/Errors.h>
 #include <frc/RobotController.h>

diff --git a/photon-lib/src/main/native/cpp/photon/PhotonPoseEstimator.cpp b/photon-lib/src/main/native/cpp/photon/PhotonPoseEstimator.cpp
@@ -30,6 +30,7 @@
 #include <iostream>
 #include <limits>
 #include <map>
+#include <memory>
 #include <span>
 #include <string>
 #include <utility>

diff --git a/photon-lib/src/test/native/cpp/SimVisionSystemTest.cpp b/photon-lib/src/test/native/cpp/SimVisionSystemTest.cpp
@@ -22,6 +22,8 @@
  * SOFTWARE.
  */
 
+#include <tuple>
+
 #include "gtest/gtest.h"
 #include "photon/PhotonUtils.h"
 #include "photon/simulation/SimVisionSystem.h"

diff --git a/photon-lib/src/test/native/cpp/VisionSystemSimTest.cpp b/photon-lib/src/test/native/cpp/VisionSystemSimTest.cpp
@@ -24,6 +24,8 @@
 
 #include <chrono>
 #include <thread>
+#include <tuple>
+#include <vector>
 
 #include "gtest/gtest.h"
 #include "photon/PhotonUtils.h"

diff --git a/photon-targeting/src/main/native/cpp/photon/dataflow/structures/Packet.cpp b/photon-targeting/src/main/native/cpp/photon/dataflow/structures/Packet.cpp
@@ -17,6 +17,8 @@
 
 #include "photon/dataflow/structures/Packet.h"
 
+#include <vector>
+
 using namespace photon;
 
 Packet::Packet(std::vector<uint8_t> data) : packetData(data) {}

diff --git a/photon-targeting/src/main/native/cpp/photon/targeting/PhotonTrackedTarget.cpp b/photon-targeting/src/main/native/cpp/photon/targeting/PhotonTrackedTarget.cpp
@@ -17,8 +17,10 @@
 
 #include "photon/targeting/PhotonTrackedTarget.h"
 
+#include <algorithm>
 #include <iostream>
 #include <utility>
+#include <vector>
 
 #include <frc/geometry/Translation2d.h>
 #include <wpi/SmallVector.h>

diff --git a/photon-targeting/src/main/native/cpp/photon/targeting/proto/PhotonPipelineResultProto.cpp b/photon-targeting/src/main/native/cpp/photon/targeting/proto/PhotonPipelineResultProto.cpp
@@ -17,6 +17,8 @@
 
 #include "photon/targeting/proto/PhotonPipelineResultProto.h"
 
+#include <vector>
+
 #include "photon.pb.h"
 #include "photon/targeting/proto/MultiTargetPNPResultProto.h"
 #include "photon/targeting/proto/PhotonTrackedTargetProto.h"

diff --git a/photon-targeting/src/main/native/cpp/photon/targeting/proto/PhotonTrackedTargetProto.cpp b/photon-targeting/src/main/native/cpp/photon/targeting/proto/PhotonTrackedTargetProto.cpp
@@ -17,6 +17,9 @@
 
 #include "photon/targeting/proto/PhotonTrackedTargetProto.h"
 
+#include <utility>
+#include <vector>
+
 #include "photon.pb.h"
 
 using photon::TargetCorner;

diff --git a/photonlib-cpp-examples/swervedriveposeestsim/src/main/cpp/subsystems/SwerveDrive.cpp b/photonlib-cpp-examples/swervedriveposeestsim/src/main/cpp/subsystems/SwerveDrive.cpp
@@ -25,6 +25,7 @@
 #include "subsystems/SwerveDrive.h"
 
 #include <iostream>
+#include <string>
 
 #include <frc/TimedRobot.h>
 #include <frc/smartdashboard/SmartDashboard.h>

diff --git a/photonlib-cpp-examples/swervedriveposeestsim/src/main/cpp/subsystems/SwerveModule.cpp b/photonlib-cpp-examples/swervedriveposeestsim/src/main/cpp/subsystems/SwerveModule.cpp
@@ -25,6 +25,7 @@
 #include "subsystems/SwerveModule.h"
 
 #include <iostream>
+#include <string>
 
 #include <frc/MathUtil.h>
 #include <frc/RobotController.h>