diff --git a/photon-targeting/src/main/native/cpp/photon/targeting/MultiTargetPNPResult.cpp b/photon-targeting/src/main/native/cpp/photon/targeting/MultiTargetPNPResult.cpp index 30ca56f559..d6e6c97319 100644 --- a/photon-targeting/src/main/native/cpp/photon/targeting/MultiTargetPNPResult.cpp +++ b/photon-targeting/src/main/native/cpp/photon/targeting/MultiTargetPNPResult.cpp @@ -22,10 +22,10 @@ namespace photon { bool MultiTargetPNPResult::operator==(const MultiTargetPNPResult& other) const { - return other.best == best && - other.bestReprojErr == bestReprojErr && other.alt == alt && - other.altReprojErr == altReprojErr && other.ambiguity == ambiguity - && other.fiducialIdsUsed == fiducialIdsUsed; + return other.best == best && other.bestReprojErr == bestReprojErr && + other.alt == alt && other.altReprojErr == altReprojErr && + other.ambiguity == ambiguity && + other.fiducialIdsUsed == fiducialIdsUsed; } } // namespace photon diff --git a/photon-targeting/src/main/native/cpp/photon/targeting/PhotonPipelineResult.cpp b/photon-targeting/src/main/native/cpp/photon/targeting/PhotonPipelineResult.cpp index f049702d16..cefc6426da 100644 --- a/photon-targeting/src/main/native/cpp/photon/targeting/PhotonPipelineResult.cpp +++ b/photon-targeting/src/main/native/cpp/photon/targeting/PhotonPipelineResult.cpp @@ -45,12 +45,14 @@ wpi::Protobuf::Unpack( targets.emplace_back(wpi::UnpackProtobuf(t)); } - if(m->has_multi_target_result()) { + if (m->has_multi_target_result()) { return photon::PhotonPipelineResult{ units::millisecond_t{m->latency_ms()}, targets, - wpi::UnpackProtobuf(m->multi_target_result())}; + wpi::UnpackProtobuf( + m->multi_target_result())}; } else { - return photon::PhotonPipelineResult{units::millisecond_t{m->latency_ms()}, targets}; + return photon::PhotonPipelineResult{units::millisecond_t{m->latency_ms()}, + targets}; } } @@ -65,7 +67,8 @@ void wpi::Protobuf::Pack( wpi::PackProtobuf(m->add_targets(), t); } - if(value.multitagResult.has_value()) { - wpi::PackProtobuf(m->mutable_multi_target_result(), value.multitagResult.value()); + if (value.multitagResult.has_value()) { + wpi::PackProtobuf(m->mutable_multi_target_result(), + value.multitagResult.value()); } } diff --git a/photon-targeting/src/main/native/include/photon/targeting/PhotonPipelineResult.h b/photon-targeting/src/main/native/include/photon/targeting/PhotonPipelineResult.h index b70d90b232..275d7430c8 100644 --- a/photon-targeting/src/main/native/include/photon/targeting/PhotonPipelineResult.h +++ b/photon-targeting/src/main/native/include/photon/targeting/PhotonPipelineResult.h @@ -17,9 +17,9 @@ #pragma once +#include #include #include -#include #include #include @@ -104,9 +104,12 @@ class PhotonPipelineResult { units::second_t GetTimestamp() const { return timestamp; } /** - * Return the MultiTarget Result. Empty if disabled or unable to create result. + * Return the MultiTarget Result. Empty if disabled or unable to create + * result. */ - std::optional MultiTagResult() { return multitagResult; } + std::optional MultiTagResult() { + return multitagResult; + } /** * Sets the timestamp in seconds