Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-21 01:01:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only return lower 32 bits of FPGA time (#741)

Browse Source 
Works around an NI bug in image 10.
This commit is contained in:
Thad House
2017-11-16 20:52:50 -08:00
committed by Peter Johnson
parent e5e6d6a193
commit f56ec10bcf
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hal/src/main/native/athena/HAL.cpp
View File

@@ -219,6 +219,9 @@ 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);
uint64_t upper2 = global->readLocalTimeUpper(status);