From 5ccad2e8a47447d847bfa39cd61223662e116700 Mon Sep 17 00:00:00 2001 From: Thad House Date: Thu, 7 Nov 2019 20:02:27 -0800 Subject: [PATCH] Fix frc2::Timer returning incorrect timestamp values (#2057) --- wpilibc/src/main/native/cpp/frc2/Timer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wpilibc/src/main/native/cpp/frc2/Timer.cpp b/wpilibc/src/main/native/cpp/frc2/Timer.cpp index 126cfdda67..9ecab9f74f 100644 --- a/wpilibc/src/main/native/cpp/frc2/Timer.cpp +++ b/wpilibc/src/main/native/cpp/frc2/Timer.cpp @@ -129,7 +129,7 @@ bool Timer::HasPeriodPassed(units::second_t period) { units::second_t Timer::GetFPGATimestamp() { // FPGA returns the timestamp in microseconds - return units::second_t(frc::RobotController::GetFPGATime()) * 1.0e-6; + return units::second_t(frc::RobotController::GetFPGATime() * 1.0e-6); } units::second_t Timer::GetMatchTime() {