Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-30 02:31:44 +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

12
simulation/frc_gazebo_plugins/src/clockTest/cpp/clockTest.cpp
View File

@@ -18,7 +18,9 @@ static char* library;
static char* world_sdf;
static double latest_time;
void cb(gazebo::msgs::ConstFloat64Ptr& msg) { latest_time = msg->data(); }
void cb(gazebo::msgs::ConstFloat64Ptr& msg) {
latest_time = msg->data();
}
TEST(ClockTests, test_clock) {
gazebo::physics::WorldPtr world;
@@ -64,9 +66,13 @@ TEST(ClockTests, test_clock) {
int main(int argc, char** argv) {
testing::InitGoogleTest(&argc, argv);
if (argc >= 1) library = argv[1];
if (argc >= 1) {
library = argv[1];
}
if (argc >= 2) world_sdf = argv[2];
if (argc >= 2) {
world_sdf = argv[2];
}
return RUN_ALL_TESTS();
}

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));

9
simulation/frc_gazebo_plugins/src/gyro/cpp/gyro.cpp
View File

@@ -20,9 +20,12 @@ void Gyro::Load(gazebo::physics::ModelPtr model, sdf::ElementPtr sdf) {
}
std::string axisString = sdf->Get<std::string>("axis");
if (axisString == "roll") axis = Roll;
if (axisString == "pitch") axis = Pitch;
if (axisString == "yaw") axis = Yaw;
if (axisString == "roll")
axis = Roll;
if (axisString == "pitch")
axis = Pitch;
if (axisString == "yaw")
axis = Yaw;
if (sdf->HasElement("units")) {
radians = sdf->Get<std::string>("units") != "degrees";

3
simulation/frc_gazebo_plugins/src/pneumatic_piston/cpp/pneumatic_piston.cpp
View File

@@ -78,7 +78,8 @@ void PneumaticPiston::Update(const gazebo::common::UpdateInfo& info) {
the lack of the forward signal suffices.
Note that a true simulation would not allow a SingleSolenoid to
have reverse force, but we put that in the hands of the model builder.*/
if (reverse_topic.empty() || reverse_signal) force = reverse_force;
if (reverse_topic.empty() || reverse_signal)
force = reverse_force;
}
joint->SetForce(0, force);
}