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

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

5
wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/DriverStation.java
View File

@@ -433,10 +433,7 @@ public class DriverStation implements RobotState.Interface {
* @return Match time in seconds since the beginning of autonomous
*/
public double getMatchTime() {
if (m_approxMatchTimeOffset < 0.0) {
return 0.0;
}
return Timer.getFPGATimestamp() - m_approxMatchTimeOffset;
return FRCNetworkCommunicationsLibrary.HALGetMatchTime();
}
/**

1
wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/communication/FRCNetworkCommunicationsLibrary.java
View File

@@ -468,6 +468,7 @@ public class FRCNetworkCommunicationsLibrary extends JNIWrapper {
return HALAllianceStationID.Blue2;
case 5:
return HALAllianceStationID.Blue3;
default:
return null;
}
}