Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-21 01:01:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Gradle 7.2 and WPILib 2022 (#316)

Browse Source
This commit is contained in:
Tyler Veness
2021-11-21 17:22:56 -08:00
committed by GitHub
parent ffe34f00fe
commit 5ca39e7f84
316 changed files with 671 additions and 1019 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
photon-lib/src/main/native/include/photonlib/PhotonPipelineResult.h
View File

@@ -19,10 +19,10 @@
#include <string>
#include <frc/DriverStation.h>
#include <frc/Errors.h>
#include <units/time.h>
#include <wpi/ArrayRef.h>
#include <wpi/SmallVector.h>
#include <wpi/span.h>
#include "photonlib/Packet.h"
#include "photonlib/PhotonTrackedTarget.h"
@@ -44,7 +44,7 @@ class PhotonPipelineResult {
* @param targets The list of targets identified by the pipeline.
*/
PhotonPipelineResult(units::second_t latency,
wpi::ArrayRef<PhotonTrackedTarget> targets);
wpi::span<const PhotonTrackedTarget> targets);
/**
* Returns the best target in this pipeline result. If there are no targets,
@@ -55,7 +55,8 @@ class PhotonPipelineResult {
*/
PhotonTrackedTarget GetBestTarget() const {
if (!HasTargets() && !HAS_WARNED) {
::frc::DriverStation::ReportError(
FRC_ReportError(
frc::warn::Warning, "{}",
"This PhotonPipelineResult object has no targets associated with it! "
"Please check HasTargets() before calling this method. For more "
"information, please review the PhotonLib documentation at "
@@ -81,7 +82,7 @@ class PhotonPipelineResult {
* Returns a reference to the vector of targets.
* @return A reference to the vector of targets.
*/
const wpi::ArrayRef<PhotonTrackedTarget> GetTargets() const {
const wpi::span<const PhotonTrackedTarget> GetTargets() const {
return targets;
}

4
photon-lib/src/main/native/include/photonlib/SimPhotonCamera.h
View File

@@ -21,8 +21,8 @@
#include <string>
#include <units/time.h>
#include <wpi/ArrayRef.h>
#include <wpi/SmallVector.h>
#include <wpi/span.h>
#include "photonlib/Packet.h"
#include "photonlib/PhotonCamera.h"
@@ -56,7 +56,7 @@ class SimPhotonCamera : public PhotonCamera {
* @param tgtList Set of targets detected
*/
void SubmitProcessedFrame(units::second_t latency,
wpi::ArrayRef<PhotonTrackedTarget> tgtList);
wpi::span<const PhotonTrackedTarget> tgtList);
private:
mutable Packet simPacket;

1
photon-lib/src/main/native/include/photonlib/SimVisionSystem.h
View File

@@ -25,7 +25,6 @@
#include <units/area.h>
#include <units/length.h>
#include <units/time.h>
#include <wpi/ArrayRef.h>
#include <wpi/SmallVector.h>
#include "photonlib/SimPhotonCamera.h"