Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-21 01:01: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

24
wpilibcExamples/src/main/cpp/templates/robotbaseskeleton/cpp/Robot.cpp
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