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

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

View File

@@ -17,7 +17,9 @@ void Robot::RobotInit() {}
* <p> This runs after the mode specific periodic functions, but before
* LiveWindow and SmartDashboard integrated updating.
*/
void Robot::RobotPeriodic() { frc2::CommandScheduler::GetInstance().Run(); }
void Robot::RobotPeriodic() {
frc2::CommandScheduler::GetInstance().Run();
}
/**
* This function is called once each time the robot enters Disabled mode. You
@@ -64,5 +66,7 @@ void Robot::TeleopPeriodic() {}
void Robot::TestPeriodic() {}
#ifndef RUNNING_FRC_TESTS
int main() { return frc::StartRobot<Robot>(); }
int main() {
return frc::StartRobot<Robot>();
}
#endif

View File

@@ -33,7 +33,9 @@ void Robot::RobotPeriodic() {}
*/
void Robot::DisabledInit() {}
void Robot::DisabledPeriodic() { frc::Scheduler::GetInstance()->Run(); }
void Robot::DisabledPeriodic() {
frc::Scheduler::GetInstance()->Run();
}
/**
* This autonomous (along with the chooser code above) shows how to select
@@ -62,7 +64,9 @@ void Robot::AutonomousInit() {
}
}
void Robot::AutonomousPeriodic() { frc::Scheduler::GetInstance()->Run(); }
void Robot::AutonomousPeriodic() {
frc::Scheduler::GetInstance()->Run();
}
void Robot::TeleopInit() {
// This makes sure that the autonomous stops running when
@@ -75,10 +79,14 @@ void Robot::TeleopInit() {
}
}
void Robot::TeleopPeriodic() { frc::Scheduler::GetInstance()->Run(); }
void Robot::TeleopPeriodic() {
frc::Scheduler::GetInstance()->Run();
}
void Robot::TestPeriodic() {}
#ifndef RUNNING_FRC_TESTS
int main() { return frc::StartRobot<Robot>(); }
int main() {
return frc::StartRobot<Robot>();
}
#endif

View File

@@ -18,7 +18,9 @@ void ExampleCommand::Initialize() {}
void ExampleCommand::Execute() {}
// Make this return true when this Command no longer needs to run execute()
bool ExampleCommand::IsFinished() { return false; }
bool ExampleCommand::IsFinished() {
return false;
}
// Called once after isFinished returns true
void ExampleCommand::End() {}

View File

@@ -18,7 +18,9 @@ void MyAutoCommand::Initialize() {}
void MyAutoCommand::Execute() {}
// Make this return true when this Command no longer needs to run execute()
bool MyAutoCommand::IsFinished() { return false; }
bool MyAutoCommand::IsFinished() {
return false;
}
// Called once after isFinished returns true
void MyAutoCommand::End() {}

View File

@@ -33,32 +33,44 @@ void Robot::StartCompetition() {
m_ds.InDisabled(true);
Disabled();
m_ds.InDisabled(false);
while (IsDisabled()) m_ds.WaitForData();
while (IsDisabled()) {
m_ds.WaitForData();
}
} else if (IsAutonomous()) {
m_ds.InAutonomous(true);
Autonomous();
m_ds.InAutonomous(false);
while (IsAutonomousEnabled()) m_ds.WaitForData();
while (IsAutonomousEnabled()) {
m_ds.WaitForData();
}
} else if (IsTest()) {
lw.SetEnabled(true);
frc::Shuffleboard::EnableActuatorWidgets();
m_ds.InTest(true);
Test();
m_ds.InTest(false);
while (IsTest() && IsEnabled()) m_ds.WaitForData();
while (IsTest() && IsEnabled()) {
m_ds.WaitForData();
}
lw.SetEnabled(false);
frc::Shuffleboard::DisableActuatorWidgets();
} else {
m_ds.InOperatorControl(true);
Teleop();
m_ds.InOperatorControl(false);
while (IsOperatorControlEnabled()) m_ds.WaitForData();
while (IsOperatorControlEnabled()) {
m_ds.WaitForData();
}
}
}
}
void Robot::EndCompetition() { m_exit = true; }
void Robot::EndCompetition() {
m_exit = true;
}
#ifndef RUNNING_FRC_TESTS
int main() { return frc::StartRobot<Robot>(); }
int main() {
return frc::StartRobot<Robot>();
}
#endif

View File

@@ -69,5 +69,7 @@ void Robot::TestInit() {}
void Robot::TestPeriodic() {}
#ifndef RUNNING_FRC_TESTS
int main() { return frc::StartRobot<Robot>(); }
int main() {
return frc::StartRobot<Robot>();
}
#endif

View File

@@ -20,5 +20,7 @@ void Robot::TestInit() {}
void Robot::TestPeriodic() {}
#ifndef RUNNING_FRC_TESTS
int main() { return frc::StartRobot<Robot>(); }
int main() {
return frc::StartRobot<Robot>();
}
#endif