mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-07-03 03:01:44 +00:00
[wpimath] Fix case and order of HolonomicDriveController PID getters (#7342)
This commit is contained in:
@@ -143,15 +143,6 @@ public class HolonomicDriveController {
|
||||
m_enabled = enabled;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the heading controller.
|
||||
*
|
||||
* @return heading ProfiledPIDController
|
||||
*/
|
||||
public ProfiledPIDController getThetaController() {
|
||||
return m_thetaController;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the x controller.
|
||||
*
|
||||
@@ -169,4 +160,13 @@ public class HolonomicDriveController {
|
||||
public PIDController getYController() {
|
||||
return m_yController;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the heading controller.
|
||||
*
|
||||
* @return heading ProfiledPIDController
|
||||
*/
|
||||
public ProfiledPIDController getThetaController() {
|
||||
return m_thetaController;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -80,11 +80,6 @@ void HolonomicDriveController::SetEnabled(bool enabled) {
|
||||
m_enabled = enabled;
|
||||
}
|
||||
|
||||
ProfiledPIDController<units::radian>&
|
||||
HolonomicDriveController::getThetaController() {
|
||||
return m_thetaController;
|
||||
}
|
||||
|
||||
PIDController& HolonomicDriveController::getXController() {
|
||||
return m_xController;
|
||||
}
|
||||
@@ -92,3 +87,21 @@ PIDController& HolonomicDriveController::getXController() {
|
||||
PIDController& HolonomicDriveController::getYController() {
|
||||
return m_yController;
|
||||
}
|
||||
|
||||
ProfiledPIDController<units::radian>&
|
||||
HolonomicDriveController::getThetaController() {
|
||||
return m_thetaController;
|
||||
}
|
||||
|
||||
PIDController& HolonomicDriveController::GetXController() {
|
||||
return m_xController;
|
||||
}
|
||||
|
||||
PIDController& HolonomicDriveController::GetYController() {
|
||||
return m_yController;
|
||||
}
|
||||
|
||||
ProfiledPIDController<units::radian>&
|
||||
HolonomicDriveController::GetThetaController() {
|
||||
return m_thetaController;
|
||||
}
|
||||
|
||||
@@ -104,19 +104,43 @@ class WPILIB_DLLEXPORT HolonomicDriveController {
|
||||
void SetEnabled(bool enabled);
|
||||
|
||||
/**
|
||||
* Returns the rotation ProfiledPIDController
|
||||
* Returns the X PIDController
|
||||
*
|
||||
* @deprecated Use GetXController() instead.
|
||||
*/
|
||||
[[deprecated("Use GetXController() instead")]]
|
||||
PIDController& getXController();
|
||||
|
||||
/**
|
||||
* Returns the Y PIDController
|
||||
*
|
||||
* @deprecated Use GetYController() instead.
|
||||
*/
|
||||
[[deprecated("Use GetYController() instead")]]
|
||||
PIDController& getYController();
|
||||
|
||||
/**
|
||||
* Returns the rotation ProfiledPIDController
|
||||
*
|
||||
* @deprecated Use GetThetaController() instead.
|
||||
*/
|
||||
[[deprecated("Use GetThetaController() instead")]]
|
||||
ProfiledPIDController<units::radian>& getThetaController();
|
||||
|
||||
/**
|
||||
* Returns the X PIDController
|
||||
*/
|
||||
PIDController& getXController();
|
||||
PIDController& GetXController();
|
||||
|
||||
/**
|
||||
* Returns the Y PIDController
|
||||
*/
|
||||
PIDController& getYController();
|
||||
PIDController& GetYController();
|
||||
|
||||
/**
|
||||
* Returns the rotation ProfiledPIDController
|
||||
*/
|
||||
ProfiledPIDController<units::radian>& GetThetaController();
|
||||
|
||||
private:
|
||||
Pose2d m_poseError;
|
||||
|
||||
Reference in New Issue
Block a user