Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +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

29
wpilibc/src/main/native/cpp/Relay.cpp
View File

@@ -81,12 +81,18 @@ Relay::~Relay() {
HAL_SetRelay(m_forwardHandle, false, &status);
HAL_SetRelay(m_reverseHandle, false, &status);
// ignore errors, as we want to make sure a free happens.
if (m_forwardHandle != HAL_kInvalidHandle) HAL_FreeRelayPort(m_forwardHandle);
if (m_reverseHandle != HAL_kInvalidHandle) HAL_FreeRelayPort(m_reverseHandle);
if (m_forwardHandle != HAL_kInvalidHandle) {
HAL_FreeRelayPort(m_forwardHandle);
}
if (m_reverseHandle != HAL_kInvalidHandle) {
HAL_FreeRelayPort(m_reverseHandle);
}
}
void Relay::Set(Relay::Value value) {
if (StatusIsFatal()) return;
if (StatusIsFatal()) {
return;
}
int32_t status = 0;
@@ -170,9 +176,13 @@ Relay::Value Relay::Get() const {
wpi_setHALError(status);
}
int Relay::GetChannel() const { return m_channel; }
int Relay::GetChannel() const {
return m_channel;
}
void Relay::StopMotor() { Set(kOff); }
void Relay::StopMotor() {
Set(kOff);
}
void Relay::GetDescription(wpi::raw_ostream& desc) const {
desc << "Relay " << GetChannel();
@@ -197,13 +207,14 @@ void Relay::InitSendable(SendableBuilder& builder) {
}
},
[=](wpi::StringRef value) {
if (value == "Off")
if (value == "Off") {
Set(kOff);
else if (value == "Forward")
} else if (value == "Forward") {
Set(kForward);
else if (value == "Reverse")
} else if (value == "Reverse") {
Set(kReverse);
else if (value == "On")
} else if (value == "On") {
Set(kOn);
}
});
}