mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-21 01:01:43 +00:00
[wpilib] Fix ProfiledPIDController continuous input (#2652)
There were three bugs: 1. The input range variables used in ProfiledPIDController::Calculate() weren't being updated 2. The modulus error calculation was incorrect. 3. The setpoint wasn't being wrapped like the goal, so the invariant that the error remains less than half the input range was violated. (Thanks to @CptJJ for pointing this out and suggesting a fix.)
This commit is contained in:
@@ -18,6 +18,9 @@ class ControllerUtilTest {
|
||||
assertEquals(-20.0, ControllerUtil.getModulusError(170.0, -170.0, -180.0, 180.0));
|
||||
assertEquals(-20.0, ControllerUtil.getModulusError(170.0 + 360.0, -170.0, -180.0, 180.0));
|
||||
assertEquals(-20.0, ControllerUtil.getModulusError(170.0, -170.0 + 360.0, -180.0, 180.0));
|
||||
assertEquals(20.0, ControllerUtil.getModulusError(-170.0, 170.0, -180.0, 180.0));
|
||||
assertEquals(20.0, ControllerUtil.getModulusError(-170.0 + 360.0, 170.0, -180.0, 180.0));
|
||||
assertEquals(20.0, ControllerUtil.getModulusError(-170.0, 170.0 + 360.0, -180.0, 180.0));
|
||||
|
||||
// Test range start at zero
|
||||
assertEquals(-20.0, ControllerUtil.getModulusError(170.0, 190.0, 0.0, 360.0));
|
||||
|
||||
@@ -0,0 +1,103 @@
|
||||
/*----------------------------------------------------------------------------*/
|
||||
/* Copyright (c) 2018-2020 FIRST. All Rights Reserved. */
|
||||
/* Open Source Software - may be modified and shared by FRC teams. The code */
|
||||
/* must be accompanied by the FIRST BSD license file in the root directory of */
|
||||
/* the project. */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
package edu.wpi.first.wpilibj.controller;
|
||||
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import edu.wpi.first.wpilibj.trajectory.TrapezoidProfile;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
class ProfiledPIDInputOutputTest {
|
||||
private ProfiledPIDController m_controller;
|
||||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
m_controller = new ProfiledPIDController(0, 0, 0,
|
||||
new TrapezoidProfile.Constraints(360, 180));
|
||||
}
|
||||
|
||||
@Test
|
||||
void continuousInputTest1() {
|
||||
m_controller.setP(1);
|
||||
m_controller.enableContinuousInput(-180, 180);
|
||||
|
||||
final double kSetpoint = -179.0;
|
||||
final double kMeasurement = -179.0;
|
||||
final double kGoal = 179.0;
|
||||
|
||||
m_controller.reset(kSetpoint);
|
||||
assertTrue(m_controller.calculate(kMeasurement, kGoal) < 0.0);
|
||||
|
||||
// Error must be less than half the input range at all times
|
||||
assertTrue(Math.abs(m_controller.getSetpoint().position - kMeasurement) < 180.0);
|
||||
}
|
||||
|
||||
@Test
|
||||
void continuousInputTest2() {
|
||||
m_controller.setP(1);
|
||||
m_controller.enableContinuousInput(-Math.PI, Math.PI);
|
||||
|
||||
final double kSetpoint = -3.4826633343199735;
|
||||
final double kMeasurement = -3.1352207333939606;
|
||||
final double kGoal = -3.534162788601621;
|
||||
|
||||
m_controller.reset(kSetpoint);
|
||||
assertTrue(m_controller.calculate(kMeasurement, kGoal) < 0.0);
|
||||
|
||||
// Error must be less than half the input range at all times
|
||||
assertTrue(Math.abs(m_controller.getSetpoint().position - kMeasurement) < Math.PI);
|
||||
}
|
||||
|
||||
@Test
|
||||
void continuousInputTest3() {
|
||||
m_controller.setP(1);
|
||||
m_controller.enableContinuousInput(-Math.PI, Math.PI);
|
||||
|
||||
final double kSetpoint = -3.5176604690006377;
|
||||
final double kMeasurement = 3.1191729343822456;
|
||||
final double kGoal = 2.709680418117445;
|
||||
|
||||
m_controller.reset(kSetpoint);
|
||||
assertTrue(m_controller.calculate(kMeasurement, kGoal) < 0.0);
|
||||
|
||||
// Error must be less than half the input range at all times
|
||||
assertTrue(Math.abs(m_controller.getSetpoint().position - kMeasurement) < Math.PI);
|
||||
}
|
||||
|
||||
@Test
|
||||
void proportionalGainOutputTest() {
|
||||
m_controller.setP(4);
|
||||
|
||||
assertEquals(-0.1, m_controller.calculate(0.025, 0), 1e-5);
|
||||
}
|
||||
|
||||
@Test
|
||||
void integralGainOutputTest() {
|
||||
m_controller.setI(4);
|
||||
|
||||
double out = 0;
|
||||
|
||||
for (int i = 0; i < 5; i++) {
|
||||
out = m_controller.calculate(0.025, 0);
|
||||
}
|
||||
|
||||
assertEquals(-0.5 * m_controller.getPeriod(), out, 1e-5);
|
||||
}
|
||||
|
||||
@Test
|
||||
void derivativeGainOutputTest() {
|
||||
m_controller.setD(4);
|
||||
|
||||
m_controller.calculate(0, 0);
|
||||
|
||||
assertEquals(-0.01 / m_controller.getPeriod(), m_controller.calculate(0.0025, 0), 1e-5);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user