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

Add delay to version check (#466)

Browse Source 
Rate limits version check spam print

Co-authored-by: Chris Gerth <gerth2@users.noreply.github.com>
This commit is contained in:
Matt
2022-10-21 20:53:28 -04:00
committed by GitHub
parent aff163fc6a
commit def40484e3
3 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
photon-lib/src/main/native/cpp/photonlib/PhotonCamera.cpp
View File

@@ -25,11 +25,15 @@
#include "photonlib/PhotonCamera.h"
#include <frc/Errors.h>
#include <frc/Timer.h>
#include "PhotonVersion.h"
#include "photonlib/Packet.h"
namespace photonlib {
constexpr const units::second_t VERSION_CHECK_INTERVAL = 5_s;
PhotonCamera::PhotonCamera(std::shared_ptr<nt::NetworkTableInstance> instance,
const std::string& cameraName)
: mainTable(instance->GetTable("photonvision")),
@@ -48,7 +52,7 @@ PhotonCamera::PhotonCamera(const std::string& cameraName)
nt::NetworkTableInstance::GetDefault()),
cameraName) {}
PhotonPipelineResult PhotonCamera::GetLatestResult() const {
PhotonPipelineResult PhotonCamera::GetLatestResult() {
// Prints warning if not connected
VerifyVersion();
@@ -99,9 +103,14 @@ void PhotonCamera::SetLEDMode(LEDMode mode) {
ledModeEntry.SetDouble(static_cast<double>(static_cast<int>(mode)));
}
void PhotonCamera::VerifyVersion() const {
void PhotonCamera::VerifyVersion() {
if (!PhotonCamera::VERSION_CHECK_ENABLED) return;
if ((frc::Timer::GetFPGATimestamp() - lastVersionCheckTime) <
VERSION_CHECK_INTERVAL)
return;
this->lastVersionCheckTime = frc::Timer::GetFPGATimestamp();
const std::string& versionString = versionEntry.GetString("");
if (versionString.empty()) {
std::string path_ = path;

8
photon-lib/src/main/native/include/photonlib/PhotonCamera.h
View File

@@ -30,6 +30,7 @@
#include <networktables/NetworkTable.h>
#include <networktables/NetworkTableEntry.h>
#include <networktables/NetworkTableInstance.h>
#include <units/time.h>
#include <wpi/deprecated.h>
#include "photonlib/PhotonPipelineResult.h"
@@ -66,7 +67,7 @@ class PhotonCamera {
* Returns the latest pipeline result.
* @return The latest pipeline result.
*/
PhotonPipelineResult GetLatestResult() const;
PhotonPipelineResult GetLatestResult();
/**
* Toggles driver mode.
@@ -136,7 +137,7 @@ class PhotonCamera {
*/
WPI_DEPRECATED(
"This method should be replaced with PhotonPipelineResult::HasTargets()")
bool HasTargets() const { return GetLatestResult().HasTargets(); }
bool HasTargets() { return GetLatestResult().HasTargets(); }
inline static void SetVersionCheckEnabled(bool enabled) {
PhotonCamera::VERSION_CHECK_ENABLED = enabled;
@@ -158,9 +159,10 @@ class PhotonCamera {
mutable Packet packet;
private:
units::second_t lastVersionCheckTime = 0_s;
inline static bool VERSION_CHECK_ENABLED = true;
void VerifyVersion() const;
void VerifyVersion();
};
} // namespace photonlib