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

Merge "Accumulators wait for the next sample after reset"

Browse Source
This commit is contained in:
Jonathan Leitschuh (WPI)
2014-07-31 12:54:26 -07:00
committed by Gerrit Code Review
parent 41bb0da4e6 8fe888dbc9
commit e0e2b498a5
3 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/AnalogInput.java
View File

@@ -310,6 +310,14 @@ public class AnalogInput extends SensorBase implements PIDSource,
status.order(ByteOrder.LITTLE_ENDIAN);
AnalogJNI.resetAccumulator(m_port, status.asIntBuffer());
HALUtil.checkStatus(status.asIntBuffer());
// Wait until the next sample, so the next call to getAccumulator*()
// won't have old values.
final double sampleTime = 1.0 / getGlobalSampleRate();
final double overSamples = 1 << getOversampleBits();
final double averageSamples = 1 << getAverageBits();
Timer.delay(sampleTime * overSamples * averageSamples);
}
/**