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

4
simulation/halsim_ws_core/src/main/native/cpp/WSHalProviders.cpp
View File

@@ -16,7 +16,9 @@ void HALSimWSHalProvider::OnNetworkConnected(
RegisterCallbacks();
}
void HALSimWSHalProvider::OnNetworkDisconnected() { CancelCallbacks(); }
void HALSimWSHalProvider::OnNetworkDisconnected() {
CancelCallbacks();
}
void HALSimWSHalProvider::ProcessHalCallback(const wpi::json& payload) {
auto ws = m_ws.lock();

12
simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Analog.cpp
View File

@@ -42,7 +42,9 @@ void HALSimWSProviderAnalogIn::Initialize(WSRegisterFunc webRegisterFunc) {
webRegisterFunc);
}
HALSimWSProviderAnalogIn::~HALSimWSProviderAnalogIn() { DoCancelCallbacks(); }
HALSimWSProviderAnalogIn::~HALSimWSProviderAnalogIn() {
DoCancelCallbacks();
}
void HALSimWSProviderAnalogIn::RegisterCallbacks() {
m_initCbKey = REGISTER_AIN(Initialized, "<init", bool, boolean);
@@ -63,7 +65,9 @@ void HALSimWSProviderAnalogIn::RegisterCallbacks() {
REGISTER_AIN_ACCUM(Deadband, "<accum_deadband", int32_t, int);
}
void HALSimWSProviderAnalogIn::CancelCallbacks() { DoCancelCallbacks(); }
void HALSimWSProviderAnalogIn::CancelCallbacks() {
DoCancelCallbacks();
}
void HALSimWSProviderAnalogIn::DoCancelCallbacks() {
// Cancel callbacks
@@ -109,7 +113,9 @@ void HALSimWSProviderAnalogOut::Initialize(WSRegisterFunc webRegisterFunc) {
webRegisterFunc);
}
HALSimWSProviderAnalogOut::~HALSimWSProviderAnalogOut() { CancelCallbacks(); }
HALSimWSProviderAnalogOut::~HALSimWSProviderAnalogOut() {
CancelCallbacks();
}
void HALSimWSProviderAnalogOut::RegisterCallbacks() {
m_initCbKey = REGISTER_AOUT(Initialized, "<init", bool, boolean);

8
simulation/halsim_ws_core/src/main/native/cpp/WSProvider_DIO.cpp
View File

@@ -23,7 +23,9 @@ void HALSimWSProviderDIO::Initialize(WSRegisterFunc webRegisterFunc) {
webRegisterFunc);
}
HALSimWSProviderDIO::~HALSimWSProviderDIO() { DoCancelCallbacks(); }
HALSimWSProviderDIO::~HALSimWSProviderDIO() {
DoCancelCallbacks();
}
void HALSimWSProviderDIO::RegisterCallbacks() {
m_initCbKey = REGISTER(Initialized, "<init", bool, boolean);
@@ -32,7 +34,9 @@ void HALSimWSProviderDIO::RegisterCallbacks() {
m_inputCbKey = REGISTER(IsInput, "<input", bool, boolean);
}
void HALSimWSProviderDIO::CancelCallbacks() { DoCancelCallbacks(); }
void HALSimWSProviderDIO::CancelCallbacks() {
DoCancelCallbacks();
}
void HALSimWSProviderDIO::DoCancelCallbacks() {
HALSIM_CancelDIOInitializedCallback(m_channel, m_initCbKey);

8
simulation/halsim_ws_core/src/main/native/cpp/WSProvider_DriverStation.cpp
View File

@@ -92,7 +92,9 @@ void HALSimWSProviderDriverStation::RegisterCallbacks() {
m_matchTimeCbKey = REGISTER(MatchTime, ">match_time", double, double);
}
void HALSimWSProviderDriverStation::CancelCallbacks() { DoCancelCallbacks(); }
void HALSimWSProviderDriverStation::CancelCallbacks() {
DoCancelCallbacks();
}
void HALSimWSProviderDriverStation::DoCancelCallbacks() {
HALSIM_CancelDriverStationEnabledCallback(m_enabledCbKey);
@@ -118,7 +120,9 @@ void HALSimWSProviderDriverStation::DoCancelCallbacks() {
void HALSimWSProviderDriverStation::OnNetValueChanged(const wpi::json& json) {
// ignore if DS connected
if (gDSSocketConnected && *gDSSocketConnected) return;
if (gDSSocketConnected && *gDSSocketConnected) {
return;
}
wpi::json::const_iterator it;
if ((it = json.find(">enabled")) != json.end()) {

8
simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Encoder.cpp
View File

@@ -23,7 +23,9 @@ void HALSimWSProviderEncoder::Initialize(WSRegisterFunc webRegisterFunc) {
webRegisterFunc);
}
HALSimWSProviderEncoder::~HALSimWSProviderEncoder() { DoCancelCallbacks(); }
HALSimWSProviderEncoder::~HALSimWSProviderEncoder() {
DoCancelCallbacks();
}
void HALSimWSProviderEncoder::RegisterCallbacks() {
// Special case for initialization since we will need to send
@@ -72,7 +74,9 @@ void HALSimWSProviderEncoder::RegisterCallbacks() {
m_samplesCbKey = REGISTER(SamplesToAverage, "<samples_to_avg", int32_t, int);
}
void HALSimWSProviderEncoder::CancelCallbacks() { DoCancelCallbacks(); }
void HALSimWSProviderEncoder::CancelCallbacks() {
DoCancelCallbacks();
}
void HALSimWSProviderEncoder::DoCancelCallbacks() {
HALSIM_CancelEncoderInitializedCallback(m_channel, m_initCbKey);

12
simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Joystick.cpp
View File

@@ -18,7 +18,9 @@ void HALSimWSProviderJoystick::Initialize(WSRegisterFunc webregisterFunc) {
webregisterFunc);
}
HALSimWSProviderJoystick::~HALSimWSProviderJoystick() { DoCancelCallbacks(); }
HALSimWSProviderJoystick::~HALSimWSProviderJoystick() {
DoCancelCallbacks();
}
void HALSimWSProviderJoystick::RegisterCallbacks() {
m_dsNewDataCbKey = HALSIM_RegisterDriverStationNewDataCallback(
@@ -73,7 +75,9 @@ void HALSimWSProviderJoystick::RegisterCallbacks() {
this, true);
}
void HALSimWSProviderJoystick::CancelCallbacks() { DoCancelCallbacks(); }
void HALSimWSProviderJoystick::CancelCallbacks() {
DoCancelCallbacks();
}
void HALSimWSProviderJoystick::DoCancelCallbacks() {
HALSIM_CancelDriverStationNewDataCallback(m_dsNewDataCbKey);
@@ -83,7 +87,9 @@ void HALSimWSProviderJoystick::DoCancelCallbacks() {
void HALSimWSProviderJoystick::OnNetValueChanged(const wpi::json& json) {
// ignore if DS connected
if (gDSSocketConnected && *gDSSocketConnected) return;
if (gDSSocketConnected && *gDSSocketConnected) {
return;
}
wpi::json::const_iterator it;
if ((it = json.find(">axes")) != json.end()) {

8
simulation/halsim_ws_core/src/main/native/cpp/WSProvider_PWM.cpp
View File

@@ -22,7 +22,9 @@ void HALSimWSProviderPWM::Initialize(WSRegisterFunc webRegisterFunc) {
webRegisterFunc);
}
HALSimWSProviderPWM::~HALSimWSProviderPWM() { DoCancelCallbacks(); }
HALSimWSProviderPWM::~HALSimWSProviderPWM() {
DoCancelCallbacks();
}
void HALSimWSProviderPWM::RegisterCallbacks() {
m_initCbKey = REGISTER(Initialized, "<init", bool, boolean);
@@ -33,7 +35,9 @@ void HALSimWSProviderPWM::RegisterCallbacks() {
m_zeroLatchCbKey = REGISTER(ZeroLatch, "<zero_latch", bool, boolean);
}
void HALSimWSProviderPWM::CancelCallbacks() { DoCancelCallbacks(); }
void HALSimWSProviderPWM::CancelCallbacks() {
DoCancelCallbacks();
}
void HALSimWSProviderPWM::DoCancelCallbacks() {
HALSIM_CancelPWMInitializedCallback(m_channel, m_initCbKey);

8
simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Relay.cpp
View File

@@ -22,7 +22,9 @@ void HALSimWSProviderRelay::Initialize(WSRegisterFunc webRegisterFunc) {
webRegisterFunc);
}
HALSimWSProviderRelay::~HALSimWSProviderRelay() { DoCancelCallbacks(); }
HALSimWSProviderRelay::~HALSimWSProviderRelay() {
DoCancelCallbacks();
}
void HALSimWSProviderRelay::RegisterCallbacks() {
m_initFwdCbKey = REGISTER(InitializedForward, "<init_fwd", bool, boolean);
@@ -31,7 +33,9 @@ void HALSimWSProviderRelay::RegisterCallbacks() {
m_revCbKey = REGISTER(Reverse, "<rev", bool, boolean);
}
void HALSimWSProviderRelay::CancelCallbacks() { DoCancelCallbacks(); }
void HALSimWSProviderRelay::CancelCallbacks() {
DoCancelCallbacks();
}
void HALSimWSProviderRelay::DoCancelCallbacks() {
HALSIM_CancelRelayInitializedForwardCallback(m_channel, m_initFwdCbKey);

8
simulation/halsim_ws_core/src/main/native/cpp/WSProvider_RoboRIO.cpp
View File

@@ -21,7 +21,9 @@ void HALSimWSProviderRoboRIO::Initialize(WSRegisterFunc webRegisterFunc) {
CreateSingleProvider<HALSimWSProviderRoboRIO>("RoboRIO", webRegisterFunc);
}
HALSimWSProviderRoboRIO::~HALSimWSProviderRoboRIO() { DoCancelCallbacks(); }
HALSimWSProviderRoboRIO::~HALSimWSProviderRoboRIO() {
DoCancelCallbacks();
}
void HALSimWSProviderRoboRIO::RegisterCallbacks() {
m_fpgaCbKey = REGISTER(FPGAButton, ">fpga_button", bool, boolean);
@@ -44,7 +46,9 @@ void HALSimWSProviderRoboRIO::RegisterCallbacks() {
m_3v3FaultsCbKey = REGISTER(UserFaults3V3, ">3v3_faults", int32_t, int);
}
void HALSimWSProviderRoboRIO::CancelCallbacks() { DoCancelCallbacks(); }
void HALSimWSProviderRoboRIO::CancelCallbacks() {
DoCancelCallbacks();
}
void HALSimWSProviderRoboRIO::DoCancelCallbacks() {
HALSIM_CancelRoboRioFPGAButtonCallback(m_fpgaCbKey);

26
simulation/halsim_ws_core/src/main/native/cpp/WSProvider_SimDevice.cpp
View File

@@ -11,7 +11,9 @@
namespace wpilibws {
HALSimWSProviderSimDevice::~HALSimWSProviderSimDevice() { CancelCallbacks(); }
HALSimWSProviderSimDevice::~HALSimWSProviderSimDevice() {
CancelCallbacks();
}
void HALSimWSProviderSimDevice::OnNetworkConnected(
std::shared_ptr<HALSimBaseWebSocketConnection> ws) {
@@ -77,16 +79,18 @@ void HALSimWSProviderSimDevice::OnNetValueChanged(const wpi::json& json) {
auto optionIt =
std::find_if(options.begin(), options.end(),
[&](const std::string& v) { return v == str; });
if (optionIt != options.end())
if (optionIt != options.end()) {
value.data.v_enum = optionIt - options.begin();
}
} else if (it->is_number()) {
auto& values = vd->second->optionValues;
double num = it.value();
auto valueIt = std::find_if(
values.begin(), values.end(),
[&](double v) { return std::fabs(v - num) < 1e-4; });
if (valueIt != values.end())
if (valueIt != values.end()) {
value.data.v_enum = valueIt - values.begin();
}
}
value.data.v_enum = it.value();
break;
@@ -143,8 +147,9 @@ void HALSimWSProviderSimDevice::OnValueCreated(const char* name,
const char** options = HALSIM_GetSimValueEnumOptions(handle, &numOptions);
data->options.reserve(numOptions);
for (int32_t i = 0; i < numOptions; ++i)
for (int32_t i = 0; i < numOptions; ++i) {
data->options.emplace_back(options[i]);
}
const double* values =
HALSIM_GetSimValueEnumDoubleValues(handle, &numOptions);
@@ -185,10 +190,11 @@ void HALSimWSProviderSimDevice::OnValueChanged(SimDeviceValueData* valueData,
break;
case HAL_ENUM: {
int v = value->data.v_enum;
if (v >= 0 && v < static_cast<int>(valueData->optionValues.size()))
if (v >= 0 && v < static_cast<int>(valueData->optionValues.size())) {
ProcessHalCallback({{valueData->key, valueData->optionValues[v]}});
else if (v >= 0 && v < static_cast<int>(valueData->options.size()))
} else if (v >= 0 && v < static_cast<int>(valueData->options.size())) {
ProcessHalCallback({{valueData->key, valueData->options[v]}});
}
break;
}
case HAL_INT:
@@ -212,7 +218,9 @@ void HALSimWSProviderSimDevice::ProcessHalCallback(const wpi::json& payload) {
}
}
HALSimWSProviderSimDevices::~HALSimWSProviderSimDevices() { CancelCallbacks(); }
HALSimWSProviderSimDevices::~HALSimWSProviderSimDevices() {
CancelCallbacks();
}
void HALSimWSProviderSimDevices::DeviceCreatedCallback(
const char* name, HAL_SimDeviceHandle handle) {
@@ -265,6 +273,8 @@ void HALSimWSProviderSimDevices::OnNetworkConnected(
m_ws = hws;
}
void HALSimWSProviderSimDevices::OnNetworkDisconnected() { m_ws = nullptr; }
void HALSimWSProviderSimDevices::OnNetworkDisconnected() {
m_ws = nullptr;
}
} // namespace wpilibws

4
simulation/halsim_ws_core/src/main/native/cpp/WSProvider_dPWM.cpp
View File

@@ -33,7 +33,9 @@ void HALSimWSProviderDigitalPWM::RegisterCallbacks() {
m_pinCbKey = REGISTER(Pin, "<dio_pin", int32_t, int);
}
void HALSimWSProviderDigitalPWM::CancelCallbacks() { DoCancelCallbacks(); }
void HALSimWSProviderDigitalPWM::CancelCallbacks() {
DoCancelCallbacks();
}
void HALSimWSProviderDigitalPWM::DoCancelCallbacks() {
HALSIM_CancelDigitalPWMInitializedCallback(m_channel, m_initCbKey);