Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-24 01:31:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

artf4107: clang-modernize was run on WPILib

Browse Source 
Loops were converted to their range-based equivalents, variable types were replaced with auto where the type was already specified on the same line, the override keyword was added, and instances of NULL and assignments of 0 to pointers were replaced with nullptr.

Change-Id: If281e46a2e2e1c37f278d56df9915236d4b2c864
This commit is contained in:
Tyler Veness
2015-06-23 04:49:51 -07:00
parent 7a711a21f9
commit b1befed14f
113 changed files with 604 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
wpilibc/wpilibC++Devices/src/PIDController.cpp
View File

@@ -58,7 +58,7 @@ PIDController::PIDController(float Kp, float Ki, float Kd, float Kf,
void PIDController::Initialize(float Kp, float Ki, float Kd, float Kf,
PIDSource *source, PIDOutput *output,
float period) {
m_table = NULL;
m_table = nullptr;
m_semaphore = initializeMutexNormal();
@@ -140,8 +140,8 @@ void PIDController::Calculate() {
}
END_REGION;
if (pidInput == NULL) return;
if (pidOutput == NULL) return;
if (pidInput == nullptr) return;
if (pidOutput == nullptr) return;
if (enabled) {
{
@@ -205,7 +205,7 @@ void PIDController::SetPID(double p, double i, double d) {
}
END_REGION;
if (m_table != NULL) {
if (m_table != nullptr) {
m_table->PutNumber("p", m_P);
m_table->PutNumber("i", m_I);
m_table->PutNumber("d", m_D);
@@ -229,7 +229,7 @@ void PIDController::SetPID(double p, double i, double d, double f) {
}
END_REGION;
if (m_table != NULL) {
if (m_table != nullptr) {
m_table->PutNumber("p", m_P);
m_table->PutNumber("i", m_I);
m_table->PutNumber("d", m_D);
@@ -346,7 +346,7 @@ void PIDController::SetSetpoint(float setpoint) {
}
END_REGION;
if (m_table != NULL) {
if (m_table != nullptr) {
m_table->PutNumber("setpoint", m_setpoint);
}
}
@@ -451,7 +451,7 @@ void PIDController::Enable() {
CRITICAL_REGION(m_semaphore) { m_enabled = true; }
END_REGION;
if (m_table != NULL) {
if (m_table != nullptr) {
m_table->PutBoolean("enabled", true);
}
}
@@ -466,7 +466,7 @@ void PIDController::Disable() {
}
END_REGION;
if (m_table != NULL) {
if (m_table != nullptr) {
m_table->PutBoolean("enabled", false);
}
}
@@ -500,9 +500,9 @@ std::string PIDController::GetSmartDashboardType() const {
}
void PIDController::InitTable(ITable *table) {
if (m_table != NULL) m_table->RemoveTableListener(this);
if (m_table != nullptr) m_table->RemoveTableListener(this);
m_table = table;
if (m_table != NULL) {
if (m_table != nullptr) {
m_table->PutNumber(kP, GetP());
m_table->PutNumber(kI, GetI());
m_table->PutNumber(kD, GetD());