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

Java: Fix Timer.get() handling of accumulated time (#1531)

Browse Source 
Fixes #1530.
This commit is contained in:
Peter Johnson
2019-01-08 19:43:49 -08:00
committed by GitHub
parent f121ccff0d
commit 444b899a9f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/Timer.java
View File

@@ -70,7 +70,7 @@ public class Timer {
*/
public synchronized double get() {
if (m_running) {
return ((getMsClock() - m_startTime) + m_accumulatedTime) / 1000.0;
return m_accumulatedTime + (getMsClock() - m_startTime) / 1000.0;
} else {
return m_accumulatedTime;
}