From 6a4130a3d566120f17cee201313c4024cee753dc Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Mon, 1 Jul 2024 19:37:08 -0700 Subject: [PATCH] Fix #include sorting --- include/.styleguide | 1 + include/trajopt/path/SwervePathBuilder.hpp | 3 ++- include/trajopt/util/GenerateSplineInitialGuess.hpp | 13 +++++++------ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/include/.styleguide b/include/.styleguide index 63357f53..9be0a2b8 100644 --- a/include/.styleguide +++ b/include/.styleguide @@ -14,5 +14,6 @@ modifiableFileExclude { includeOtherLibs { ^Eigen/ + ^frc/ ^sleipnir/ } diff --git a/include/trajopt/path/SwervePathBuilder.hpp b/include/trajopt/path/SwervePathBuilder.hpp index ccee1800..bb3ddfe9 100644 --- a/include/trajopt/path/SwervePathBuilder.hpp +++ b/include/trajopt/path/SwervePathBuilder.hpp @@ -2,7 +2,6 @@ #pragma once -#include #include #include @@ -10,6 +9,8 @@ #include #include +#include + #include "trajopt/constraint/Constraint.hpp" #include "trajopt/drivetrain/SwerveDrivetrain.hpp" #include "trajopt/geometry/Pose2.hpp" diff --git a/include/trajopt/util/GenerateSplineInitialGuess.hpp b/include/trajopt/util/GenerateSplineInitialGuess.hpp index 30d00b29..59cbf843 100644 --- a/include/trajopt/util/GenerateSplineInitialGuess.hpp +++ b/include/trajopt/util/GenerateSplineInitialGuess.hpp @@ -4,12 +4,13 @@ #include -#include "frc/MathUtil.h" -#include "frc/geometry/Pose2d.h" -#include "frc/geometry/Translation2d.h" -#include "frc/trajectory/Trajectory.h" -#include "frc/trajectory/TrajectoryGenerator.h" -#include "frc/trajectory/TrajectoryParameterizer.h" +#include +#include +#include +#include +#include +#include + #include "spline/CubicHermitePoseSplineHolonomic.hpp" #include "spline/SplineParameterizer.hpp" #include "spline/SplineUtil.hpp"