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

Get MatchTime from NetComms (fixes artf2538)

Browse Source 
Change-Id: I7ea438ce4610087bceac696a958e3c1e3ead238a
This commit is contained in:
Kevin O'Connor
2014-11-21 10:37:29 -05:00
parent 99dc3c90ed
commit 14a1e6ae8e
6 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wpilibc/wpilibC++Devices/src/DriverStation.cpp
View File

@@ -397,9 +397,9 @@ void DriverStation::WaitForData()
*/
double DriverStation::GetMatchTime()
{
if (m_approxMatchTimeOffset < 0.0)
return 0.0;
return Timer::GetFPGATimestamp() - m_approxMatchTimeOffset;
float matchTime;
HALGetMatchTime(&matchTime);
return (double)matchTime;
}
/**