From 3e544282ffa3d5d65280506f2bb190f824db2b36 Mon Sep 17 00:00:00 2001 From: Prateek Machiraju Date: Thu, 12 Nov 2020 01:34:36 -0500 Subject: [PATCH] [hal] Use FPGA time in HAL_SendError (#2849) --- hal/src/main/native/sim/DriverStation.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/hal/src/main/native/sim/DriverStation.cpp b/hal/src/main/native/sim/DriverStation.cpp index d65f43b94f..aef85562c2 100644 --- a/hal/src/main/native/sim/DriverStation.cpp +++ b/hal/src/main/native/sim/DriverStation.cpp @@ -21,6 +21,7 @@ #include #include "HALInitializer.h" +#include "hal/cpp/fpga_clock.h" #include "hal/simulation/MockHooks.h" #include "mockdata/DriverStationDataInternal.h" @@ -66,18 +67,16 @@ int32_t HAL_SendError(HAL_Bool isError, int32_t errorCode, HAL_Bool isLVCode, static constexpr int KEEP_MSGS = 5; std::scoped_lock lock(msgMutex); static std::string prevMsg[KEEP_MSGS]; - static std::chrono::time_point - prevMsgTime[KEEP_MSGS]; + static fpga_clock::time_point prevMsgTime[KEEP_MSGS]; static bool initialized = false; if (!initialized) { for (int i = 0; i < KEEP_MSGS; i++) { - prevMsgTime[i] = - std::chrono::steady_clock::now() - std::chrono::seconds(2); + prevMsgTime[i] = fpga_clock::now() - std::chrono::seconds(2); } initialized = true; } - auto curTime = std::chrono::steady_clock::now(); + auto curTime = fpga_clock::now(); int i; for (i = 0; i < KEEP_MSGS; ++i) { if (prevMsg[i] == details) break;