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

Removes workarounds for issues in image 10 (#816)

Browse Source
This commit is contained in:
Thad House
2017-12-06 21:20:03 -08:00
committed by Peter Johnson
parent 5078f6c92a
commit 4e3af0756d
2 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);

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

@@ -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);