diff --git a/wpilibOldCommands/src/main/native/include/frc/PIDBase.h b/wpilibOldCommands/src/main/native/include/frc/PIDBase.h index f118cc1b21..e2ffe31bbd 100644 --- a/wpilibOldCommands/src/main/native/include/frc/PIDBase.h +++ b/wpilibOldCommands/src/main/native/include/frc/PIDBase.h @@ -10,11 +10,11 @@ #include #include -#include "frc/LinearFilter.h" #include "frc/PIDInterface.h" #include "frc/PIDOutput.h" #include "frc/PIDSource.h" #include "frc/Timer.h" +#include "frc/filter/LinearFilter.h" #include "frc/smartdashboard/Sendable.h" #include "frc/smartdashboard/SendableHelper.h" diff --git a/wpilibcExamples/src/main/cpp/examples/DifferentialDriveBot/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/DifferentialDriveBot/cpp/Robot.cpp index 7f1f748ebd..8478682c9b 100644 --- a/wpilibcExamples/src/main/cpp/examples/DifferentialDriveBot/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/DifferentialDriveBot/cpp/Robot.cpp @@ -2,9 +2,9 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include #include #include +#include #include "Drivetrain.h" diff --git a/wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/cpp/Robot.cpp index 7f1f748ebd..8478682c9b 100644 --- a/wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/cpp/Robot.cpp @@ -2,9 +2,9 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include #include #include +#include #include "Drivetrain.h" diff --git a/wpilibcExamples/src/main/cpp/examples/MecanumBot/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/MecanumBot/cpp/Robot.cpp index 94cb195e7f..694f8ee467 100644 --- a/wpilibcExamples/src/main/cpp/examples/MecanumBot/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/MecanumBot/cpp/Robot.cpp @@ -2,9 +2,9 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include #include #include +#include #include "Drivetrain.h" diff --git a/wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/cpp/Robot.cpp index 94cb195e7f..694f8ee467 100644 --- a/wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/cpp/Robot.cpp @@ -2,9 +2,9 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include #include #include +#include #include "Drivetrain.h" diff --git a/wpilibcExamples/src/main/cpp/examples/RamseteController/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/RamseteController/cpp/Robot.cpp index 085e01ae58..32be83406c 100644 --- a/wpilibcExamples/src/main/cpp/examples/RamseteController/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/RamseteController/cpp/Robot.cpp @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include #include #include #include #include +#include #include #include #include diff --git a/wpilibcExamples/src/main/cpp/examples/SimpleDifferentialDriveSimulation/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/SimpleDifferentialDriveSimulation/cpp/Robot.cpp index ea61ea60c7..ec596e0e16 100644 --- a/wpilibcExamples/src/main/cpp/examples/SimpleDifferentialDriveSimulation/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/SimpleDifferentialDriveSimulation/cpp/Robot.cpp @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include #include #include #include #include +#include #include #include "Drivetrain.h" diff --git a/wpilibcExamples/src/main/cpp/examples/SwerveBot/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/SwerveBot/cpp/Robot.cpp index 28782bfbf3..85632b9588 100644 --- a/wpilibcExamples/src/main/cpp/examples/SwerveBot/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/SwerveBot/cpp/Robot.cpp @@ -2,9 +2,9 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include #include #include +#include #include "Drivetrain.h" diff --git a/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/cpp/Robot.cpp index 28782bfbf3..85632b9588 100644 --- a/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/cpp/Robot.cpp @@ -2,9 +2,9 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include #include #include +#include #include "Drivetrain.h" diff --git a/wpilibcExamples/src/main/cpp/examples/Ultrasonic/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/Ultrasonic/cpp/Robot.cpp index 482e5ffb10..e8f805d8d0 100644 --- a/wpilibcExamples/src/main/cpp/examples/Ultrasonic/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/Ultrasonic/cpp/Robot.cpp @@ -3,9 +3,9 @@ // the WPILib BSD license file in the root directory of this project. #include -#include #include #include +#include #include /** diff --git a/wpilibcExamples/src/main/cpp/examples/UltrasonicPID/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/UltrasonicPID/cpp/Robot.cpp index 4673975e71..62d4106d8d 100644 --- a/wpilibcExamples/src/main/cpp/examples/UltrasonicPID/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/UltrasonicPID/cpp/Robot.cpp @@ -3,10 +3,10 @@ // the WPILib BSD license file in the root directory of this project. #include -#include #include #include #include +#include #include /** diff --git a/wpilibcIntegrationTests/src/main/native/cpp/MotorEncoderTest.cpp b/wpilibcIntegrationTests/src/main/native/cpp/MotorEncoderTest.cpp index 6cba95f0c5..35b2abcc4b 100644 --- a/wpilibcIntegrationTests/src/main/native/cpp/MotorEncoderTest.cpp +++ b/wpilibcIntegrationTests/src/main/native/cpp/MotorEncoderTest.cpp @@ -8,10 +8,10 @@ #include "TestBench.h" #include "frc/Encoder.h" -#include "frc/LinearFilter.h" #include "frc/Notifier.h" #include "frc/Timer.h" #include "frc/controller/PIDController.h" +#include "frc/filter/LinearFilter.h" #include "frc/motorcontrol/Jaguar.h" #include "frc/motorcontrol/Talon.h" #include "frc/motorcontrol/Victor.h" diff --git a/wpimath/src/main/native/include/frc/LinearFilter.h b/wpimath/src/main/native/include/frc/filter/LinearFilter.h similarity index 100% rename from wpimath/src/main/native/include/frc/LinearFilter.h rename to wpimath/src/main/native/include/frc/filter/LinearFilter.h diff --git a/wpimath/src/main/native/include/frc/MedianFilter.h b/wpimath/src/main/native/include/frc/filter/MedianFilter.h similarity index 100% rename from wpimath/src/main/native/include/frc/MedianFilter.h rename to wpimath/src/main/native/include/frc/filter/MedianFilter.h diff --git a/wpimath/src/main/native/include/frc/SlewRateLimiter.h b/wpimath/src/main/native/include/frc/filter/SlewRateLimiter.h similarity index 100% rename from wpimath/src/main/native/include/frc/SlewRateLimiter.h rename to wpimath/src/main/native/include/frc/filter/SlewRateLimiter.h diff --git a/wpimath/src/test/native/cpp/LinearFilterNoiseTest.cpp b/wpimath/src/test/native/cpp/filter/LinearFilterNoiseTest.cpp similarity index 96% rename from wpimath/src/test/native/cpp/LinearFilterNoiseTest.cpp rename to wpimath/src/test/native/cpp/filter/LinearFilterNoiseTest.cpp index 2dc55b5825..86cb136741 100644 --- a/wpimath/src/test/native/cpp/LinearFilterNoiseTest.cpp +++ b/wpimath/src/test/native/cpp/filter/LinearFilterNoiseTest.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "frc/LinearFilter.h" // NOLINT(build/include_order) +#include "frc/filter/LinearFilter.h" // NOLINT(build/include_order) #include #include diff --git a/wpimath/src/test/native/cpp/LinearFilterOutputTest.cpp b/wpimath/src/test/native/cpp/filter/LinearFilterOutputTest.cpp similarity index 97% rename from wpimath/src/test/native/cpp/LinearFilterOutputTest.cpp rename to wpimath/src/test/native/cpp/filter/LinearFilterOutputTest.cpp index 3ce53b0eb5..6b944121c7 100644 --- a/wpimath/src/test/native/cpp/LinearFilterOutputTest.cpp +++ b/wpimath/src/test/native/cpp/filter/LinearFilterOutputTest.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "frc/LinearFilter.h" // NOLINT(build/include_order) +#include "frc/filter/LinearFilter.h" // NOLINT(build/include_order) #include #include diff --git a/wpimath/src/test/native/cpp/MedianFilterTest.cpp b/wpimath/src/test/native/cpp/filter/MedianFilterTest.cpp similarity index 96% rename from wpimath/src/test/native/cpp/MedianFilterTest.cpp rename to wpimath/src/test/native/cpp/filter/MedianFilterTest.cpp index cab307b11b..8151a45ea2 100644 --- a/wpimath/src/test/native/cpp/MedianFilterTest.cpp +++ b/wpimath/src/test/native/cpp/filter/MedianFilterTest.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "frc/MedianFilter.h" +#include "frc/filter/MedianFilter.h" #include "gtest/gtest.h" TEST(MedianFilterTest, MedianFilterNotFullTestEven) { diff --git a/wpimath/src/test/native/cpp/SlewRateLimiterTest.cpp b/wpimath/src/test/native/cpp/filter/SlewRateLimiterTest.cpp similarity index 95% rename from wpimath/src/test/native/cpp/SlewRateLimiterTest.cpp rename to wpimath/src/test/native/cpp/filter/SlewRateLimiterTest.cpp index 23525de41e..38259d60fc 100644 --- a/wpimath/src/test/native/cpp/SlewRateLimiterTest.cpp +++ b/wpimath/src/test/native/cpp/filter/SlewRateLimiterTest.cpp @@ -4,7 +4,7 @@ #include -#include "frc/SlewRateLimiter.h" +#include "frc/filter/SlewRateLimiter.h" #include "gtest/gtest.h" #include "units/length.h" #include "units/time.h"