summaryrefslogtreecommitdiff
path: root/src/org/mckenzierobotics/lib/robot/FeedForward.java
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-01-16 12:51:47 -0500
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-01-16 12:51:47 -0500
commit75c2407dd85a69b8f80e9b376da1bfb9ed0bb173 (patch)
tree09ef3a14f252bc2fd4cb9e8deb45da677383aff8 /src/org/mckenzierobotics/lib/robot/FeedForward.java
parent636cf0465605d9dd482e1fb75f8b81e509703403 (diff)
(mostly) update to new WPIlib.
PIDController has some TODOs in there
Diffstat (limited to 'src/org/mckenzierobotics/lib/robot/FeedForward.java')
-rw-r--r--src/org/mckenzierobotics/lib/robot/FeedForward.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/org/mckenzierobotics/lib/robot/FeedForward.java b/src/org/mckenzierobotics/lib/robot/FeedForward.java
index a275366..a18dccc 100644
--- a/src/org/mckenzierobotics/lib/robot/FeedForward.java
+++ b/src/org/mckenzierobotics/lib/robot/FeedForward.java
@@ -64,7 +64,7 @@ public abstract class FeedForward implements PIDOutput {
}
public void update(double pidResult) {
- if (pid.isEnable()) {
+ if (pid.isEnabled()) {
double ffResult = calculate(pid.getSetpoint());
pidOutput.pidWrite(ffResult+pidResult);
} else {