From 4e3af0756dd00a5d7cf2c008be702ebda0b25568 Mon Sep 17 00:00:00 2001 From: Thad House Date: Wed, 6 Dec 2017 21:20:03 -0800 Subject: [PATCH] Removes workarounds for issues in image 10 (#816) --- hal/src/main/native/athena/HAL.cpp | 2 -- hal/src/main/native/athena/PWM.cpp | 3 --- 2 files changed, 5 deletions(-) diff --git a/hal/src/main/native/athena/HAL.cpp b/hal/src/main/native/athena/HAL.cpp index 0f5a65dd32..51f1c8e986 100644 --- a/hal/src/main/native/athena/HAL.cpp +++ b/hal/src/main/native/athena/HAL.cpp @@ -219,8 +219,6 @@ uint64_t HAL_GetFPGATime(int32_t* status) { *status = NiFpga_Status_ResourceNotInitialized; return 0; } - // Because of a bug in FPGA image 10, just return the lower 32 bits of time. - return global->readLocalTime(status); uint64_t upper1 = global->readLocalTimeUpper(status); uint32_t lower = global->readLocalTime(status); diff --git a/hal/src/main/native/athena/PWM.cpp b/hal/src/main/native/athena/PWM.cpp index 6e03cd3a8f..09f1b86fd7 100644 --- a/hal/src/main/native/athena/PWM.cpp +++ b/hal/src/main/native/athena/PWM.cpp @@ -473,9 +473,6 @@ int32_t HAL_GetPWMLoopTiming(int32_t* status) { uint64_t HAL_GetPWMCycleStartTime(int32_t* status) { initializeDigital(status); if (*status != 0) return 0; - // Because of a bug in FPGA image 10, just return the lower 32 bits of cycle - // time. - return pwmSystem->readCycleStartTime(status); uint64_t upper1 = pwmSystem->readCycleStartTimeUpper(status); uint32_t lower = pwmSystem->readCycleStartTime(status);