Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-05 03:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fixed the motor tests by reducing speed to within the limits of the encoders we use. Also fixed java pid tolerances since getAvgError() was broken. It is now fixed and works properly. Added tests for both java and cpp that test if pid tolerances are working using fake input output pairs."

Browse Source
This commit is contained in:
Brad Miller (WPI)
2016-01-31 09:48:51 -08:00
committed by Gerrit Code Review
parent f24c8b1b8d 7041cbc5eb
commit ae1171d1be
12 changed files with 207 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wpilibj/src/shared/java/edu/wpi/first/wpilibj/PIDController.java
View File

@@ -6,7 +6,8 @@
package edu.wpi.first.wpilibj;
import java.util.TimerTask;
import java.util.LinkedList;
import java.util.ArrayDeque;
import java.util.Queue;
import edu.wpi.first.wpilibj.Timer;
import edu.wpi.first.wpilibj.livewindow.LiveWindowSendable;
@@ -42,7 +43,7 @@ public class PIDController implements PIDInterface, LiveWindowSendable, Controll
private Tolerance m_tolerance; // the tolerance object used to check if on
// target
private int m_bufLength = 1;
private LinkedList<Double> m_buf;
private Queue<Double> m_buf;
private double m_bufTotal = 0.0;
private double m_setpoint = 0.0;
private double m_prevSetpoint = 0.0;
@@ -162,7 +163,7 @@ public class PIDController implements PIDInterface, LiveWindowSendable, Controll
HLUsageReporting.reportPIDController(instances);
m_tolerance = new NullTolerance();
m_buf = new LinkedList<Double>();
m_buf = new ArrayDeque<Double>(m_bufLength+1);
}
/**
@@ -311,11 +312,11 @@ public class PIDController implements PIDInterface, LiveWindowSendable, Controll
result = m_result;
// Update the buffer.
m_buf.push(m_error);
m_buf.add(m_error);
m_bufTotal += m_error;
// Remove old elements when the buffer is full.
if (m_buf.size() > m_bufLength) {
m_bufTotal -= m_buf.pop();
m_bufTotal -= m_buf.remove();
}
}
@@ -646,7 +647,7 @@ public class PIDController implements PIDInterface, LiveWindowSendable, Controll
// Cut the existing buffer down to size if needed.
while (m_buf.size() > bufLength) {
m_bufTotal -= m_buf.pop();
m_bufTotal -= m_buf.remove();
}
}