Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add braces to C++ single-line loops and conditionals (NFC) (#2973)

Browse Source 
This makes code easier to read and more consistent between C++ and Java.
Also update clang-format settings to always add a line break (even if no braces are used).
This commit is contained in:
Peter Johnson
2020-12-28 12:58:06 -08:00
committed by GitHub
parent 0291a3ff56
commit 2aed432b4b
634 changed files with 10716 additions and 3938 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
wpilibc/src/main/native/cpp/controller/PIDController.cpp
View File

@@ -30,25 +30,41 @@ void PIDController::SetPID(double Kp, double Ki, double Kd) {
m_Kd = Kd;
}
void PIDController::SetP(double Kp) { m_Kp = Kp; }
void PIDController::SetP(double Kp) {
m_Kp = Kp;
}
void PIDController::SetI(double Ki) { m_Ki = Ki; }
void PIDController::SetI(double Ki) {
m_Ki = Ki;
}
void PIDController::SetD(double Kd) { m_Kd = Kd; }
void PIDController::SetD(double Kd) {
m_Kd = Kd;
}
double PIDController::GetP() const { return m_Kp; }
double PIDController::GetP() const {
return m_Kp;
}
double PIDController::GetI() const { return m_Ki; }
double PIDController::GetI() const {
return m_Ki;
}
double PIDController::GetD() const { return m_Kd; }
double PIDController::GetD() const {
return m_Kd;
}
units::second_t PIDController::GetPeriod() const {
return units::second_t(m_period);
}
void PIDController::SetSetpoint(double setpoint) { m_setpoint = setpoint; }
void PIDController::SetSetpoint(double setpoint) {
m_setpoint = setpoint;
}
double PIDController::GetSetpoint() const { return m_setpoint; }
double PIDController::GetSetpoint() const {
return m_setpoint;
}
bool PIDController::AtSetpoint() const {
double positionError;
@@ -72,9 +88,13 @@ void PIDController::EnableContinuousInput(double minimumInput,
m_maximumInput = maximumInput;
}
void PIDController::DisableContinuousInput() { m_continuous = false; }
void PIDController::DisableContinuousInput() {
m_continuous = false;
}
bool PIDController::IsContinuousInputEnabled() const { return m_continuous; }
bool PIDController::IsContinuousInputEnabled() const {
return m_continuous;
}
void PIDController::SetIntegratorRange(double minimumIntegral,
double maximumIntegral) {
@@ -88,9 +108,13 @@ void PIDController::SetTolerance(double positionTolerance,
m_velocityTolerance = velocityTolerance;
}
double PIDController::GetPositionError() const { return m_positionError; }
double PIDController::GetPositionError() const {
return m_positionError;
}
double PIDController::GetVelocityError() const { return m_velocityError; }
double PIDController::GetVelocityError() const {
return m_velocityError;
}
double PIDController::Calculate(double measurement) {
m_measurement = measurement;