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/y2021_bot3/control_loops/superstructure/superstructure.h b/y2021_bot3/control_loops/superstructure/superstructure.h
index da4da62..23dd801 100644
--- a/y2021_bot3/control_loops/superstructure/superstructure.h
+++ b/y2021_bot3/control_loops/superstructure/superstructure.h
@@ -1,8 +1,8 @@
#ifndef Y2021_BOT3_CONTROL_LOOPS_SUPERSTRUCTURE_SUPERSTRUCTURE_H_
#define Y2021_BOT3_CONTROL_LOOPS_SUPERSTRUCTURE_SUPERSTRUCTURE_H_
-#include "frc971/control_loops/control_loop.h"
#include "aos/events/event_loop.h"
+#include "frc971/control_loops/control_loop.h"
#include "y2021_bot3/constants.h"
#include "y2021_bot3/control_loops/superstructure/superstructure_goal_generated.h"
#include "y2021_bot3/control_loops/superstructure/superstructure_output_generated.h"
diff --git a/y2021_bot3/control_loops/superstructure/superstructure_lib_test.cc b/y2021_bot3/control_loops/superstructure/superstructure_lib_test.cc
index 548dc25..a47cd57 100644
--- a/y2021_bot3/control_loops/superstructure/superstructure_lib_test.cc
+++ b/y2021_bot3/control_loops/superstructure/superstructure_lib_test.cc
@@ -1,13 +1,14 @@
#include <chrono>
#include <memory>
+#include "gtest/gtest.h"
+
+#include "aos/events/logging/log_writer.h"
#include "frc971/control_loops/capped_test_plant.h"
#include "frc971/control_loops/control_loop_test.h"
#include "frc971/control_loops/position_sensor_sim.h"
#include "frc971/control_loops/team_number_test_environment.h"
-#include "gtest/gtest.h"
#include "y2021_bot3/control_loops/superstructure/superstructure.h"
-#include "aos/events/logging/log_writer.h"
DEFINE_string(output_folder, "",
"If set, logs all channels to the provided logfile.");
@@ -185,19 +186,19 @@
TEST_F(SuperstructureTest, PlotterTest) {
double speed = 10.0;
test_event_loop_->AddPhasedLoop(
- [&](int) {
- auto builder = superstructure_goal_sender_.MakeBuilder();
- Goal::Builder goal_builder = builder.MakeBuilder<Goal>();
- goal_builder.add_intake_speed(speed);
- goal_builder.add_outtake_speed(speed);
- goal_builder.add_climber_speed(speed);
- builder.CheckOk(builder.Send(goal_builder.Finish()));
- speed += .001;
- if (speed >= 12) {
- speed = -12;
- }
- },
- frc971::controls::kLoopFrequency);
+ [&](int) {
+ auto builder = superstructure_goal_sender_.MakeBuilder();
+ Goal::Builder goal_builder = builder.MakeBuilder<Goal>();
+ goal_builder.add_intake_speed(speed);
+ goal_builder.add_outtake_speed(speed);
+ goal_builder.add_climber_speed(speed);
+ builder.CheckOk(builder.Send(goal_builder.Finish()));
+ speed += .001;
+ if (speed >= 12) {
+ speed = -12;
+ }
+ },
+ frc971::controls::kLoopFrequency);
RunFor(std::chrono::seconds(10));
}
diff --git a/y2021_bot3/control_loops/superstructure/superstructure_main.cc b/y2021_bot3/control_loops/superstructure/superstructure_main.cc
index be37e92..3886cac 100644
--- a/y2021_bot3/control_loops/superstructure/superstructure_main.cc
+++ b/y2021_bot3/control_loops/superstructure/superstructure_main.cc
@@ -1,7 +1,6 @@
-#include "y2021_bot3/control_loops/superstructure/superstructure.h"
-
#include "aos/events/shm_event_loop.h"
#include "aos/init.h"
+#include "y2021_bot3/control_loops/superstructure/superstructure.h"
int main(int argc, char **argv) {
::aos::InitGoogle(&argc, &argv);