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

9
wpilibc/src/main/native/include/frc/RobotBase.h
View File

@@ -74,15 +74,18 @@ int StartRobot() {
HAL_RunMain();
// signal loop to exit
if (robot) robot->EndCompetition();
if (robot) {
robot->EndCompetition();
}
// prefer to join, but detach to exit if it doesn't exit in a timely manner
using namespace std::chrono_literals;
std::unique_lock lock{m};
if (cv.wait_for(lock, 1s, [] { return exited; }))
if (cv.wait_for(lock, 1s, [] { return exited; })) {
thr.join();
else
} else {
thr.detach();
}
} else {
impl::RunRobot<Robot>(m, &robot);
}

16
wpilibc/src/main/native/include/frc/RobotDrive.h
View File

@@ -442,10 +442,18 @@ class RobotDrive : public MotorSafety {
private:
int GetNumMotors() {
int motors = 0;
if (m_frontLeftMotor) motors++;
if (m_frontRightMotor) motors++;
if (m_rearLeftMotor) motors++;
if (m_rearRightMotor) motors++;
if (m_frontLeftMotor) {
motors++;
}
if (m_frontRightMotor) {
motors++;
}
if (m_rearLeftMotor) {
motors++;
}
if (m_rearRightMotor) {
motors++;
}
return motors;
}
};

3
wpilibc/src/main/native/include/frc/shuffleboard/SendableCameraWrapper.h
View File

@@ -83,8 +83,9 @@ inline SendableCameraWrapper& SendableCameraWrapper::Wrap(
inline SendableCameraWrapper& SendableCameraWrapper::Wrap(CS_Source source) {
auto& wrapper = detail::GetSendableCameraWrapper(source);
if (!wrapper)
if (!wrapper) {
wrapper = std::make_shared<SendableCameraWrapper>(source, private_init{});
}
return *wrapper;
}
#endif

3
wpilibc/src/main/native/include/frc/smartdashboard/SendableBuilderImpl.h
View File

@@ -180,8 +180,9 @@ class SendableBuilderImpl : public SendableBuilder {
~Property() { StopListener(); }
void StartListener() {
if (entry && listener == 0 && createListener)
if (entry && listener == 0 && createListener) {
listener = createListener(entry);
}
}
void StopListener() {

6
wpilibc/src/main/native/include/frc/smartdashboard/SendableChooser.inc
View File

@@ -31,7 +31,8 @@ auto SendableChooser<T>::GetSelected()
std::string selected = m_defaultChoice;
{
std::scoped_lock lock(m_mutex);
if (m_haveSelected) selected = m_selected;
if (m_haveSelected)
selected = m_selected;
}
if (selected.empty()) {
return decltype(_unwrap_smart_ptr(m_choices[""])){};
@@ -85,7 +86,8 @@ void SendableChooser<T>::InitSendable(SendableBuilder& builder) {
std::scoped_lock lock(m_mutex);
m_haveSelected = true;
m_selected = val;
for (auto& entry : m_activeEntries) entry.SetString(val);
for (auto& entry : m_activeEntries)
entry.SetString(val);
});
}

4
wpilibc/src/main/native/include/frc/util/Color.h
View File

@@ -806,7 +806,9 @@ inline bool operator==(const Color& c1, const Color& c2) {
return c1.red == c2.red && c1.green == c2.green && c1.blue == c2.blue;
}
inline bool operator!=(const Color& c1, const Color& c2) { return !(c1 == c2); }
inline bool operator!=(const Color& c1, const Color& c2) {
return !(c1 == c2);
}
/*
* FIRST Colors