From 9f04b79580776d87534e161a09edc1725ec90cd1 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Sun, 11 Jan 2015 01:55:33 -0800 Subject: [PATCH] Fix Timer.hasPeriodPassed(). It was incorrectly using seconds instead of milliseconds. Change-Id: Iecd2802c548caee4a5185f00a2b785143d6b1b16 --- .../main/java/edu/wpi/first/wpilibj/internal/HardwareTimer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/internal/HardwareTimer.java b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/internal/HardwareTimer.java index 0ba6339930..e0e83e5e15 100644 --- a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/internal/HardwareTimer.java +++ b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/internal/HardwareTimer.java @@ -133,7 +133,7 @@ public class HardwareTimer implements Timer.StaticInterface { if (get() > period) { // Advance the start time by the period. // Don't set it to the current time... we want to avoid drift. - m_startTime += period; + m_startTime += period * 1000; return true; } return false;