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

7
simulation/frc_gazebo_plugins/src/drive_motor/cpp/drive_motor.cpp
View File

@@ -87,7 +87,9 @@ void DriveMotor::Load(gazebo::physics::ModelPtr model, sdf::ElementPtr sdf) {
static double computeForce(double input, double velocity, double max) {
double output = input;
if (max == 0.0) return output;
if (max == 0.0) {
return output;
}
if (std::fabs(velocity) >= max) {
output = 0;
} else {
@@ -104,7 +106,8 @@ void DriveMotor::Update(const gazebo::common::UpdateInfo& info) {
ignition::math::Vector3d velocity = parent->GetRelativeLinearVel().Ign();
#endif
if (signal == 0) return;
if (signal == 0)
return;
double x = computeForce(signal * dx * multiplier, velocity.X(),
std::fabs(maxSpeed * dx));