From 05dcfa2a13cfa6a1805154bd044ce8ad46417c0b Mon Sep 17 00:00:00 2001
From: Matt <matthew.morley.ca@gmail.com>
Date: Sat, 16 Nov 2024 20:09:33 -0800
Subject: [PATCH] Remove time source override (#1582)

---
 .../src/main/native/cpp/net/TimeSyncClient.cpp           | 5 ++---
 .../src/main/native/cpp/net/TimeSyncServer.cpp           | 5 ++---
 .../src/main/native/include/net/TimeSyncClient.h         | 9 ++++-----
 .../src/main/native/include/net/TimeSyncServer.h         | 3 +--
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/photon-targeting/src/main/native/cpp/net/TimeSyncClient.cpp b/photon-targeting/src/main/native/cpp/net/TimeSyncClient.cpp
index 0640c90b1..69197b563 100644
--- a/photon-targeting/src/main/native/cpp/net/TimeSyncClient.cpp
+++ b/photon-targeting/src/main/native/cpp/net/TimeSyncClient.cpp
@@ -152,10 +152,9 @@ void wpi::tsp::TimeSyncClient::UdpCallback(uv::Buffer& buf, size_t nbytes,
 
 wpi::tsp::TimeSyncClient::TimeSyncClient(std::string_view server,
                                          int remote_port,
-                                         std::chrono::milliseconds ping_delay,
-                                         std::function<uint64_t()> timeProvider)
+                                         std::chrono::milliseconds ping_delay)
     : m_logger(::ClientLoggerFunc),
-      m_timeProvider(timeProvider),
+      m_timeProvider(nt::Now),
       m_udp{},
       m_pingTimer{},
       m_serverIP{server},
diff --git a/photon-targeting/src/main/native/cpp/net/TimeSyncServer.cpp b/photon-targeting/src/main/native/cpp/net/TimeSyncServer.cpp
index ddda5982e..41369d16c 100644
--- a/photon-targeting/src/main/native/cpp/net/TimeSyncServer.cpp
+++ b/photon-targeting/src/main/native/cpp/net/TimeSyncServer.cpp
@@ -97,10 +97,9 @@ void wpi::tsp::TimeSyncServer::UdpCallback(uv::Buffer& data, size_t n,
   //          pong.client_time, pong.server_time);
 }
 
-wpi::tsp::TimeSyncServer::TimeSyncServer(int port,
-                                         std::function<uint64_t()> timeProvider)
+wpi::tsp::TimeSyncServer::TimeSyncServer(int port)
     : m_logger{::ServerLoggerFunc},
-      m_timeProvider{timeProvider},
+      m_timeProvider{nt::Now},
       m_udp{},
       m_port(port) {}
 
diff --git a/photon-targeting/src/main/native/include/net/TimeSyncClient.h b/photon-targeting/src/main/native/include/net/TimeSyncClient.h
index 946b749c9..82e5b0ebc 100644
--- a/photon-targeting/src/main/native/include/net/TimeSyncClient.h
+++ b/photon-targeting/src/main/native/include/net/TimeSyncClient.h
@@ -74,11 +74,11 @@ class TimeSyncClient {
 
   std::chrono::milliseconds m_loopDelay;
 
-  std::mutex m_offsetMutex;
-  Metadata m_metadata;
+  std::mutex m_offsetMutex{};
+  Metadata m_metadata{};
 
   // We only allow the most recent ping to stay alive, so only keep track of it
-  TspPing m_lastPing;
+  TspPing m_lastPing{};
 
   // 30s is a reasonable guess
   frc::MedianFilter<int64_t> m_lastOffsets{30};
@@ -90,8 +90,7 @@ class TimeSyncClient {
 
  public:
   TimeSyncClient(std::string_view server, int remote_port,
-                 std::chrono::milliseconds ping_delay,
-                 std::function<uint64_t()> timeProvider = nt::Now);
+                 std::chrono::milliseconds ping_delay);
 
   void Start();
   void Stop();
diff --git a/photon-targeting/src/main/native/include/net/TimeSyncServer.h b/photon-targeting/src/main/native/include/net/TimeSyncServer.h
index 4d47f1469..3a85d390e 100644
--- a/photon-targeting/src/main/native/include/net/TimeSyncServer.h
+++ b/photon-targeting/src/main/native/include/net/TimeSyncServer.h
@@ -62,8 +62,7 @@ class TimeSyncServer {
                    unsigned flags);
 
  public:
-  explicit TimeSyncServer(int port = 5810,
-                          std::function<uint64_t()> timeProvider = nt::Now);
+  explicit TimeSyncServer(int port = 5810);
 
   /**
    * Start listening for pings