Run clang-format on the entire repo
This patch clang-formats the entire repo. Third-party code is
excluded.
I needed to fix up the .clang-format file so that all the header
includes are ordered properly. I could have sworn that it used to work
without the extra modification, but I guess not.
Signed-off-by: Philipp Schrader <philipp.schrader@gmail.com>
Change-Id: I64bb9f2c795401393f9dfe2fefc4f04cb36b52f6
diff --git a/y2020/control_loops/drivetrain/drivetrain_base.cc b/y2020/control_loops/drivetrain/drivetrain_base.cc
index 952c3dc..7b42df5 100644
--- a/y2020/control_loops/drivetrain/drivetrain_base.cc
+++ b/y2020/control_loops/drivetrain/drivetrain_base.cc
@@ -60,7 +60,8 @@
.finished() /*imu_transform*/,
};
- if (::aos::network::GetTeamNumber() != constants::Values::kCodingRobotTeamNumber) {
+ if (::aos::network::GetTeamNumber() !=
+ constants::Values::kCodingRobotTeamNumber) {
// TODO(james): Check X/Y axis
// transformations.
kDrivetrainConfig.imu_transform = (Eigen::Matrix<double, 3, 3>() << 1.0,
diff --git a/y2020/control_loops/drivetrain/drivetrain_replay.cc b/y2020/control_loops/drivetrain/drivetrain_replay.cc
index 8373258..0035fb3 100644
--- a/y2020/control_loops/drivetrain/drivetrain_replay.cc
+++ b/y2020/control_loops/drivetrain/drivetrain_replay.cc
@@ -4,6 +4,8 @@
// replayed, so that it can then be run through the plotting tool or analyzed
// in some other way. The original drivetrain status data will be on the
// /original/drivetrain channel.
+#include "gflags/gflags.h"
+
#include "aos/configuration.h"
#include "aos/events/logging/log_reader.h"
#include "aos/events/logging/log_writer.h"
@@ -14,7 +16,6 @@
#include "aos/util/simulation_logger.h"
#include "frc971/control_loops/drivetrain/drivetrain.h"
#include "frc971/control_loops/drivetrain/trajectory_generator.h"
-#include "gflags/gflags.h"
#include "y2020/constants.h"
#include "y2020/control_loops/drivetrain/drivetrain_base.h"
#include "y2020/control_loops/drivetrain/localizer.h"
diff --git a/y2020/control_loops/drivetrain/drivetrain_replay_test.cc b/y2020/control_loops/drivetrain/drivetrain_replay_test.cc
index 08622cb..0baf34b 100644
--- a/y2020/control_loops/drivetrain/drivetrain_replay_test.cc
+++ b/y2020/control_loops/drivetrain/drivetrain_replay_test.cc
@@ -8,6 +8,7 @@
// longer be valid.
// TODO(james): Do something about that when the time comes--could just copy
// the existing drivetrain config into this file and use it directly.
+#include "gflags/gflags.h"
#include "gtest/gtest.h"
#include "aos/configuration.h"
@@ -19,13 +20,10 @@
#include "aos/network/team_number.h"
#include "frc971/control_loops/drivetrain/drivetrain.h"
#include "frc971/control_loops/drivetrain/trajectory_schema.h"
-#include "gflags/gflags.h"
#include "y2020/control_loops/drivetrain/drivetrain_base.h"
-DEFINE_string(
- logfile,
- "external/drivetrain_replay/",
- "Name of the logfile to read from.");
+DEFINE_string(logfile, "external/drivetrain_replay/",
+ "Name of the logfile to read from.");
DEFINE_string(config, "y2020/aos_config.json",
"Name of the config file to replay using.");
@@ -43,9 +41,9 @@
// TODO(james): Actually enforce not sending on the same buses as the
// logfile spews out.
reader_.RemapLoggedChannel("/drivetrain",
- "frc971.control_loops.drivetrain.Status");
+ "frc971.control_loops.drivetrain.Status");
reader_.RemapLoggedChannel("/drivetrain",
- "frc971.control_loops.drivetrain.Output");
+ "frc971.control_loops.drivetrain.Output");
// Patch in any new channels.
updated_config_ = aos::configuration::MergeWithConfig(
@@ -98,9 +96,7 @@
"/drivetrain");
}
- ~DrivetrainReplayTest() {
- reader_.Deregister();
- }
+ ~DrivetrainReplayTest() { reader_.Deregister(); }
aos::logger::LogReader reader_;
const aos::Node *roborio_;
diff --git a/y2020/control_loops/drivetrain/localizer_test.cc b/y2020/control_loops/drivetrain/localizer_test.cc
index 9e9e7dd..bb85921 100644
--- a/y2020/control_loops/drivetrain/localizer_test.cc
+++ b/y2020/control_loops/drivetrain/localizer_test.cc
@@ -2,6 +2,8 @@
#include <queue>
+#include "gtest/gtest.h"
+
#include "aos/events/logging/log_writer.h"
#include "aos/network/message_bridge_server_generated.h"
#include "aos/network/team_number.h"
@@ -9,7 +11,6 @@
#include "frc971/control_loops/drivetrain/drivetrain.h"
#include "frc971/control_loops/drivetrain/drivetrain_test_lib.h"
#include "frc971/control_loops/team_number_test_environment.h"
-#include "gtest/gtest.h"
#include "y2020/control_loops/drivetrain/drivetrain_base.h"
#include "y2020/control_loops/superstructure/superstructure_status_generated.h"