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

@@ -17,9 +17,13 @@ void DriveDistance::Initialize() {
m_drive->ArcadeDrive(m_speed, 0);
}
void DriveDistance::Execute() { m_drive->ArcadeDrive(m_speed, 0); }
void DriveDistance::Execute() {
m_drive->ArcadeDrive(m_speed, 0);
}
void DriveDistance::End(bool interrupted) { m_drive->ArcadeDrive(0, 0); }
void DriveDistance::End(bool interrupted) {
m_drive->ArcadeDrive(0, 0);
}
bool DriveDistance::IsFinished() {
return std::abs(m_drive->GetAverageEncoderDistance()) >= m_distance;

View File

@@ -8,6 +8,10 @@ GrabHatch::GrabHatch(HatchSubsystem* subsystem) : m_hatch(subsystem) {
AddRequirements({subsystem});
}
void GrabHatch::Initialize() { m_hatch->GrabHatch(); }
void GrabHatch::Initialize() {
m_hatch->GrabHatch();
}
bool GrabHatch::IsFinished() { return true; }
bool GrabHatch::IsFinished() {
return true;
}

View File

@@ -7,6 +7,10 @@
HalveDriveSpeed::HalveDriveSpeed(DriveSubsystem* subsystem)
: m_drive(subsystem) {}
void HalveDriveSpeed::Initialize() { m_drive->SetMaxOutput(0.5); }
void HalveDriveSpeed::Initialize() {
m_drive->SetMaxOutput(0.5);
}
void HalveDriveSpeed::End(bool interrupted) { m_drive->SetMaxOutput(1); }
void HalveDriveSpeed::End(bool interrupted) {
m_drive->SetMaxOutput(1);
}

View File

@@ -8,6 +8,10 @@ ReleaseHatch::ReleaseHatch(HatchSubsystem* subsystem) : m_hatch(subsystem) {
AddRequirements({subsystem});
}
void ReleaseHatch::Initialize() { m_hatch->ReleaseHatch(); }
void ReleaseHatch::Initialize() {
m_hatch->ReleaseHatch();
}
bool ReleaseHatch::IsFinished() { return true; }
bool ReleaseHatch::IsFinished() {
return true;
}

View File

@@ -35,9 +35,13 @@ double DriveSubsystem::GetAverageEncoderDistance() {
return (m_leftEncoder.GetDistance() + m_rightEncoder.GetDistance()) / 2.0;
}
frc::Encoder& DriveSubsystem::GetLeftEncoder() { return m_leftEncoder; }
frc::Encoder& DriveSubsystem::GetLeftEncoder() {
return m_leftEncoder;
}
frc::Encoder& DriveSubsystem::GetRightEncoder() { return m_rightEncoder; }
frc::Encoder& DriveSubsystem::GetRightEncoder() {
return m_rightEncoder;
}
void DriveSubsystem::SetMaxOutput(double maxOutput) {
m_drive.SetMaxOutput(maxOutput);