diff --git a/.styleguide b/.styleguide index 6f90aa79d1..f107020e92 100644 --- a/.styleguide +++ b/.styleguide @@ -1,12 +1,15 @@ cExtensions { } -cppExtensions { - cpp +cppHeaderExtensions { h inc } +cppSrcExtensions { + cpp +} + otherExtensions { java } diff --git a/hal/include/HAL/cpp/priority_condition_variable.h b/hal/include/HAL/cpp/priority_condition_variable.h index 1fc0eea6ef..021785e520 100644 --- a/hal/include/HAL/cpp/priority_condition_variable.h +++ b/hal/include/HAL/cpp/priority_condition_variable.h @@ -18,6 +18,7 @@ #include #include +#include #include "priority_mutex.h" diff --git a/hal/lib/athena/Accelerometer.cpp b/hal/lib/athena/Accelerometer.cpp index c55d638dbf..a9f012a136 100644 --- a/hal/lib/athena/Accelerometer.cpp +++ b/hal/lib/athena/Accelerometer.cpp @@ -7,12 +7,12 @@ #include "HAL/Accelerometer.h" +#include + #include #include #include -#include - #include "ChipObject.h" #include "HAL/HAL.h" diff --git a/hal/lib/athena/AnalogInternal.h b/hal/lib/athena/AnalogInternal.h index c0e205a48e..1ffe3f82df 100644 --- a/hal/lib/athena/AnalogInternal.h +++ b/hal/lib/athena/AnalogInternal.h @@ -9,6 +9,8 @@ #include +#include + #include "ChipObject.h" #include "HAL/Ports.h" #include "HAL/cpp/priority_mutex.h" diff --git a/hal/lib/athena/DigitalInternal.h b/hal/lib/athena/DigitalInternal.h index 934c6aeca8..00d4ba7013 100644 --- a/hal/lib/athena/DigitalInternal.h +++ b/hal/lib/athena/DigitalInternal.h @@ -9,6 +9,8 @@ #include +#include + #include "ChipObject.h" #include "HAL/AnalogTrigger.h" #include "HAL/Ports.h" diff --git a/hal/lib/athena/FRCDriverStation.cpp b/hal/lib/athena/FRCDriverStation.cpp index 3db7495e2c..6f63e4e4c8 100644 --- a/hal/lib/athena/FRCDriverStation.cpp +++ b/hal/lib/athena/FRCDriverStation.cpp @@ -5,13 +5,12 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "HAL/HAL.h" - #include #include #include #include "FRC_NetworkCommunication/FRCComm.h" +#include "HAL/HAL.h" #include "HAL/cpp/priority_condition_variable.h" #include "HAL/cpp/priority_mutex.h" diff --git a/hal/lib/athena/HALAthena.cpp b/hal/lib/athena/HAL.cpp similarity index 100% rename from hal/lib/athena/HALAthena.cpp rename to hal/lib/athena/HAL.cpp diff --git a/simulation/frc_gazebo_plugins/clock/src/clock.h b/simulation/frc_gazebo_plugins/clock/src/clock.h index 188d2ff100..101a68e986 100644 --- a/simulation/frc_gazebo_plugins/clock/src/clock.h +++ b/simulation/frc_gazebo_plugins/clock/src/clock.h @@ -7,12 +7,14 @@ #pragma once -#include "simulation/gz_msgs/msgs.h" +#include #include #include #include +#include "simulation/gz_msgs/msgs.h" + using namespace gazebo; /** diff --git a/simulation/frc_gazebo_plugins/dc_motor/src/dc_motor.h b/simulation/frc_gazebo_plugins/dc_motor/src/dc_motor.h index a4336d6837..6c0e4d8658 100644 --- a/simulation/frc_gazebo_plugins/dc_motor/src/dc_motor.h +++ b/simulation/frc_gazebo_plugins/dc_motor/src/dc_motor.h @@ -7,12 +7,14 @@ #pragma once -#include "simulation/gz_msgs/msgs.h" +#include #include #include #include +#include "simulation/gz_msgs/msgs.h" + using namespace gazebo; /** diff --git a/simulation/frc_gazebo_plugins/encoder/src/encoder.h b/simulation/frc_gazebo_plugins/encoder/src/encoder.h index 6c05d56f11..c11121044a 100644 --- a/simulation/frc_gazebo_plugins/encoder/src/encoder.h +++ b/simulation/frc_gazebo_plugins/encoder/src/encoder.h @@ -7,12 +7,14 @@ #pragma once -#include "simulation/gz_msgs/msgs.h" +#include #include #include #include +#include "simulation/gz_msgs/msgs.h" + using namespace gazebo; /** diff --git a/simulation/frc_gazebo_plugins/gyro/src/gyro.h b/simulation/frc_gazebo_plugins/gyro/src/gyro.h index 38fd9f64d2..3064ba0d77 100644 --- a/simulation/frc_gazebo_plugins/gyro/src/gyro.h +++ b/simulation/frc_gazebo_plugins/gyro/src/gyro.h @@ -7,12 +7,14 @@ #pragma once -#include "simulation/gz_msgs/msgs.h" +#include #include #include #include +#include "simulation/gz_msgs/msgs.h" + using namespace gazebo; /// \brief The axis about which to measure rotation. diff --git a/simulation/frc_gazebo_plugins/limit_switch/src/external_limit_switch.cpp b/simulation/frc_gazebo_plugins/limit_switch/src/external_limit_switch.cpp index 070f95f0a3..65e3366934 100644 --- a/simulation/frc_gazebo_plugins/limit_switch/src/external_limit_switch.cpp +++ b/simulation/frc_gazebo_plugins/limit_switch/src/external_limit_switch.cpp @@ -7,6 +7,8 @@ #include "external_limit_switch.h" +#include + ExternalLimitSwitch::ExternalLimitSwitch(sdf::ElementPtr sdf) { sensor = std::dynamic_pointer_cast( sensors::get_sensor(sdf->Get("sensor"))); diff --git a/simulation/frc_gazebo_plugins/limit_switch/src/external_limit_switch.h b/simulation/frc_gazebo_plugins/limit_switch/src/external_limit_switch.h index 4be5363d4e..60cb266bfb 100644 --- a/simulation/frc_gazebo_plugins/limit_switch/src/external_limit_switch.h +++ b/simulation/frc_gazebo_plugins/limit_switch/src/external_limit_switch.h @@ -7,8 +7,6 @@ #pragma once -#include "switch.h" - #ifdef _WIN32 #include #endif @@ -17,6 +15,8 @@ #include #include +#include "switch.h" + using namespace gazebo; class ExternalLimitSwitch : public Switch { diff --git a/simulation/frc_gazebo_plugins/limit_switch/src/internal_limit_switch.cpp b/simulation/frc_gazebo_plugins/limit_switch/src/internal_limit_switch.cpp index cc77cc6a1b..198003de1e 100644 --- a/simulation/frc_gazebo_plugins/limit_switch/src/internal_limit_switch.cpp +++ b/simulation/frc_gazebo_plugins/limit_switch/src/internal_limit_switch.cpp @@ -7,6 +7,8 @@ #include "internal_limit_switch.h" +#include + InternalLimitSwitch::InternalLimitSwitch(physics::ModelPtr model, sdf::ElementPtr sdf) { joint = model->GetJoint(sdf->Get("joint")); diff --git a/simulation/frc_gazebo_plugins/limit_switch/src/internal_limit_switch.h b/simulation/frc_gazebo_plugins/limit_switch/src/internal_limit_switch.h index 897b72411c..bb4c1fc617 100644 --- a/simulation/frc_gazebo_plugins/limit_switch/src/internal_limit_switch.h +++ b/simulation/frc_gazebo_plugins/limit_switch/src/internal_limit_switch.h @@ -7,14 +7,15 @@ #pragma once -#include "switch.h" - #ifdef _WIN32 #include #endif + #include #include +#include "switch.h" + using namespace gazebo; class InternalLimitSwitch : public Switch { diff --git a/simulation/frc_gazebo_plugins/limit_switch/src/limit_switch.h b/simulation/frc_gazebo_plugins/limit_switch/src/limit_switch.h index bbd00cbe67..a2ecc6a0b2 100644 --- a/simulation/frc_gazebo_plugins/limit_switch/src/limit_switch.h +++ b/simulation/frc_gazebo_plugins/limit_switch/src/limit_switch.h @@ -7,17 +7,17 @@ #pragma once -#include "simulation/gz_msgs/msgs.h" - -#include "switch.h" - -#include "external_limit_switch.h" -#include "internal_limit_switch.h" +#include #include #include #include +#include "external_limit_switch.h" +#include "internal_limit_switch.h" +#include "simulation/gz_msgs/msgs.h" +#include "switch.h" + using namespace gazebo; /** diff --git a/simulation/frc_gazebo_plugins/limit_switch/src/switch.h b/simulation/frc_gazebo_plugins/limit_switch/src/switch.h index d2b07ba440..1176ce62b2 100644 --- a/simulation/frc_gazebo_plugins/limit_switch/src/switch.h +++ b/simulation/frc_gazebo_plugins/limit_switch/src/switch.h @@ -9,7 +9,7 @@ class Switch { public: - virtual ~Switch() {} + virtual ~Switch() = default; /// \brief Returns true when the switch is triggered. virtual bool Get() = 0; diff --git a/simulation/frc_gazebo_plugins/pneumatic_piston/src/pneumatic_piston.cpp b/simulation/frc_gazebo_plugins/pneumatic_piston/src/pneumatic_piston.cpp index b3a45472fc..1d0a42df41 100644 --- a/simulation/frc_gazebo_plugins/pneumatic_piston/src/pneumatic_piston.cpp +++ b/simulation/frc_gazebo_plugins/pneumatic_piston/src/pneumatic_piston.cpp @@ -5,14 +5,14 @@ /* the project. */ /*----------------------------------------------------------------------------*/ +#include "pneumatic_piston.h" + #ifdef _WIN32 // Ensure that Winsock2.h is included before Windows.h, which can get // pulled in by anybody (e.g., Boost). #include #endif -#include "pneumatic_piston.h" - #include #include #include diff --git a/simulation/frc_gazebo_plugins/pneumatic_piston/src/pneumatic_piston.h b/simulation/frc_gazebo_plugins/pneumatic_piston/src/pneumatic_piston.h index acd428cad5..7de33e439c 100644 --- a/simulation/frc_gazebo_plugins/pneumatic_piston/src/pneumatic_piston.h +++ b/simulation/frc_gazebo_plugins/pneumatic_piston/src/pneumatic_piston.h @@ -7,10 +7,12 @@ #pragma once -#include "simulation/gz_msgs/msgs.h" +#include #include +#include "simulation/gz_msgs/msgs.h" + using namespace gazebo; /** diff --git a/simulation/frc_gazebo_plugins/potentiometer/src/potentiometer.cpp b/simulation/frc_gazebo_plugins/potentiometer/src/potentiometer.cpp index fcb658d37b..67a9a16ed7 100644 --- a/simulation/frc_gazebo_plugins/potentiometer/src/potentiometer.cpp +++ b/simulation/frc_gazebo_plugins/potentiometer/src/potentiometer.cpp @@ -5,14 +5,14 @@ /* the project. */ /*----------------------------------------------------------------------------*/ +#include "potentiometer.h" + #ifdef _WIN32 // Ensure that Winsock2.h is included before Windows.h, which can get // pulled in by anybody (e.g., Boost). #include #endif -#include "potentiometer.h" - #include #include #include diff --git a/simulation/frc_gazebo_plugins/potentiometer/src/potentiometer.h b/simulation/frc_gazebo_plugins/potentiometer/src/potentiometer.h index 5e7048f947..db43a2b054 100644 --- a/simulation/frc_gazebo_plugins/potentiometer/src/potentiometer.h +++ b/simulation/frc_gazebo_plugins/potentiometer/src/potentiometer.h @@ -7,10 +7,12 @@ #pragma once -#include +#include #include +#include "simulation/gz_msgs/msgs.h" + using namespace gazebo; /** diff --git a/simulation/frc_gazebo_plugins/rangefinder/src/rangefinder.cpp b/simulation/frc_gazebo_plugins/rangefinder/src/rangefinder.cpp index eb20c45d82..5719605bbd 100644 --- a/simulation/frc_gazebo_plugins/rangefinder/src/rangefinder.cpp +++ b/simulation/frc_gazebo_plugins/rangefinder/src/rangefinder.cpp @@ -5,14 +5,14 @@ /* the project. */ /*----------------------------------------------------------------------------*/ +#include "rangefinder.h" + #ifdef _WIN32 // Ensure that Winsock2.h is included before Windows.h, which can get // pulled in by anybody (e.g., Boost). #include #endif -#include "rangefinder.h" - #include #include #include diff --git a/simulation/frc_gazebo_plugins/rangefinder/src/rangefinder.h b/simulation/frc_gazebo_plugins/rangefinder/src/rangefinder.h index f64a790cf3..673febceec 100644 --- a/simulation/frc_gazebo_plugins/rangefinder/src/rangefinder.h +++ b/simulation/frc_gazebo_plugins/rangefinder/src/rangefinder.h @@ -7,10 +7,12 @@ #pragma once -#include +#include #include +#include "simulation/gz_msgs/msgs.h" + using namespace gazebo; /** diff --git a/simulation/frc_gazebo_plugins/servo/src/servo.cpp b/simulation/frc_gazebo_plugins/servo/src/servo.cpp index 73e15b646d..5c8f25f16f 100644 --- a/simulation/frc_gazebo_plugins/servo/src/servo.cpp +++ b/simulation/frc_gazebo_plugins/servo/src/servo.cpp @@ -5,14 +5,14 @@ /* the project. */ /*----------------------------------------------------------------------------*/ +#include "servo.h" + #ifdef _WIN32 // Ensure that Winsock2.h is included before Windows.h, which can get // pulled in by anybody (e.g., Boost). #include #endif -#include "servo.h" - #include #include #include diff --git a/simulation/frc_gazebo_plugins/servo/src/servo.h b/simulation/frc_gazebo_plugins/servo/src/servo.h index 789333b961..0f47bd84e9 100644 --- a/simulation/frc_gazebo_plugins/servo/src/servo.h +++ b/simulation/frc_gazebo_plugins/servo/src/servo.h @@ -7,10 +7,12 @@ #pragma once -#include "simulation/gz_msgs/msgs.h" +#include #include +#include "simulation/gz_msgs/msgs.h" + using namespace gazebo; /** diff --git a/wpilibc/athena/include/ADXL345_I2C.h b/wpilibc/athena/include/ADXL345_I2C.h index 9cc7b741cb..e161fc4bb7 100644 --- a/wpilibc/athena/include/ADXL345_I2C.h +++ b/wpilibc/athena/include/ADXL345_I2C.h @@ -8,6 +8,7 @@ #pragma once #include +#include #include "I2C.h" #include "LiveWindow/LiveWindowSendable.h" diff --git a/wpilibc/athena/include/ADXL345_SPI.h b/wpilibc/athena/include/ADXL345_SPI.h index ef417f9c8a..14be56333d 100644 --- a/wpilibc/athena/include/ADXL345_SPI.h +++ b/wpilibc/athena/include/ADXL345_SPI.h @@ -8,6 +8,7 @@ #pragma once #include +#include #include "LiveWindow/LiveWindowSendable.h" #include "SPI.h" diff --git a/wpilibc/athena/include/ADXL362.h b/wpilibc/athena/include/ADXL362.h index 2cdb9a75d9..90765a6d33 100644 --- a/wpilibc/athena/include/ADXL362.h +++ b/wpilibc/athena/include/ADXL362.h @@ -8,6 +8,7 @@ #pragma once #include +#include #include "LiveWindow/LiveWindowSendable.h" #include "SPI.h" diff --git a/wpilibc/athena/include/AnalogAccelerometer.h b/wpilibc/athena/include/AnalogAccelerometer.h index a93407ebe8..f5ace7c3c6 100644 --- a/wpilibc/athena/include/AnalogAccelerometer.h +++ b/wpilibc/athena/include/AnalogAccelerometer.h @@ -8,6 +8,7 @@ #pragma once #include +#include #include "AnalogInput.h" #include "LiveWindow/LiveWindowSendable.h" diff --git a/wpilibc/athena/include/AnalogGyro.h b/wpilibc/athena/include/AnalogGyro.h index 51fd1aa7f8..739181d1fb 100644 --- a/wpilibc/athena/include/AnalogGyro.h +++ b/wpilibc/athena/include/AnalogGyro.h @@ -7,8 +7,9 @@ #pragma once -#include "GyroBase.h" +#include +#include "GyroBase.h" #include "HAL/Types.h" class AnalogInput; diff --git a/wpilibc/athena/include/AnalogInput.h b/wpilibc/athena/include/AnalogInput.h index 054969f63f..9e84ed7003 100644 --- a/wpilibc/athena/include/AnalogInput.h +++ b/wpilibc/athena/include/AnalogInput.h @@ -8,6 +8,7 @@ #pragma once #include +#include #include "HAL/Types.h" #include "LiveWindow/LiveWindowSendable.h" diff --git a/wpilibc/athena/include/AnalogOutput.h b/wpilibc/athena/include/AnalogOutput.h index b86083298f..3cde877939 100644 --- a/wpilibc/athena/include/AnalogOutput.h +++ b/wpilibc/athena/include/AnalogOutput.h @@ -10,6 +10,7 @@ #include #include +#include #include "HAL/AnalogOutput.h" #include "LiveWindow/LiveWindowSendable.h" diff --git a/wpilibc/athena/include/AnalogPotentiometer.h b/wpilibc/athena/include/AnalogPotentiometer.h index 065e05b3b7..9a4b342f4c 100644 --- a/wpilibc/athena/include/AnalogPotentiometer.h +++ b/wpilibc/athena/include/AnalogPotentiometer.h @@ -5,7 +5,10 @@ /* the project. */ /*----------------------------------------------------------------------------*/ +#pragma once + #include +#include #include "AnalogInput.h" #include "LiveWindow/LiveWindowSendable.h" diff --git a/wpilibc/athena/include/AnalogTrigger.h b/wpilibc/athena/include/AnalogTrigger.h index 9df64a3841..bbad565dc5 100644 --- a/wpilibc/athena/include/AnalogTrigger.h +++ b/wpilibc/athena/include/AnalogTrigger.h @@ -7,6 +7,8 @@ #pragma once +#include + #include "AnalogTriggerOutput.h" #include "HAL/Types.h" #include "SensorBase.h" diff --git a/wpilibc/athena/include/BuiltInAccelerometer.h b/wpilibc/athena/include/BuiltInAccelerometer.h index c1ae09d9be..6e6e6db60c 100644 --- a/wpilibc/athena/include/BuiltInAccelerometer.h +++ b/wpilibc/athena/include/BuiltInAccelerometer.h @@ -8,6 +8,7 @@ #pragma once #include +#include #include "LiveWindow/LiveWindowSendable.h" #include "SensorBase.h" diff --git a/wpilibc/athena/include/CANJaguar.h b/wpilibc/athena/include/CANJaguar.h index 9ad2c0b8f6..d1759e1e3c 100644 --- a/wpilibc/athena/include/CANJaguar.h +++ b/wpilibc/athena/include/CANJaguar.h @@ -10,6 +10,7 @@ #include #include #include +#include #include #include "CAN/can_proto.h" diff --git a/wpilibc/athena/include/CANTalon.h b/wpilibc/athena/include/CANTalon.h index dc55278915..9292877e37 100644 --- a/wpilibc/athena/include/CANTalon.h +++ b/wpilibc/athena/include/CANTalon.h @@ -8,6 +8,7 @@ #pragma once #include +#include #include "CANSpeedController.h" #include "HAL/CanTalonSRX.h" diff --git a/wpilibc/athena/include/Compressor.h b/wpilibc/athena/include/Compressor.h index 57e1f9a357..618a95e6c5 100644 --- a/wpilibc/athena/include/Compressor.h +++ b/wpilibc/athena/include/Compressor.h @@ -8,6 +8,7 @@ #pragma once #include +#include #include "HAL/Types.h" #include "LiveWindow/LiveWindowSendable.h" diff --git a/wpilibc/athena/include/Counter.h b/wpilibc/athena/include/Counter.h index e4ca03a525..ab8fb34200 100644 --- a/wpilibc/athena/include/Counter.h +++ b/wpilibc/athena/include/Counter.h @@ -8,6 +8,7 @@ #pragma once #include +#include #include "AnalogTrigger.h" #include "CounterBase.h" diff --git a/wpilibc/athena/include/DigitalInput.h b/wpilibc/athena/include/DigitalInput.h index aca510b3b1..9017b76650 100644 --- a/wpilibc/athena/include/DigitalInput.h +++ b/wpilibc/athena/include/DigitalInput.h @@ -10,6 +10,7 @@ #include #include +#include #include "DigitalSource.h" #include "LiveWindow/LiveWindowSendable.h" diff --git a/wpilibc/athena/include/DigitalOutput.h b/wpilibc/athena/include/DigitalOutput.h index 2b88539e66..cbe84fe954 100644 --- a/wpilibc/athena/include/DigitalOutput.h +++ b/wpilibc/athena/include/DigitalOutput.h @@ -8,6 +8,7 @@ #pragma once #include +#include #include "DigitalSource.h" #include "HAL/Types.h" diff --git a/wpilibc/athena/include/DoubleSolenoid.h b/wpilibc/athena/include/DoubleSolenoid.h index e4b558303f..41528ab7cb 100644 --- a/wpilibc/athena/include/DoubleSolenoid.h +++ b/wpilibc/athena/include/DoubleSolenoid.h @@ -8,6 +8,7 @@ #pragma once #include +#include #include "HAL/Types.h" #include "LiveWindow/LiveWindowSendable.h" diff --git a/wpilibc/athena/include/DriverStation.h b/wpilibc/athena/include/DriverStation.h index 39e0be218d..948945f06f 100644 --- a/wpilibc/athena/include/DriverStation.h +++ b/wpilibc/athena/include/DriverStation.h @@ -9,6 +9,8 @@ #include #include +#include +#include #include "HAL/cpp/Semaphore.h" #include "HAL/cpp/priority_condition_variable.h" diff --git a/wpilibc/athena/include/Encoder.h b/wpilibc/athena/include/Encoder.h index e3f821d48c..f38f13be19 100644 --- a/wpilibc/athena/include/Encoder.h +++ b/wpilibc/athena/include/Encoder.h @@ -8,6 +8,7 @@ #pragma once #include +#include #include "Counter.h" #include "CounterBase.h" diff --git a/wpilibc/athena/include/GearTooth.h b/wpilibc/athena/include/GearTooth.h index 41a0ea2ab6..1ef6064dbb 100644 --- a/wpilibc/athena/include/GearTooth.h +++ b/wpilibc/athena/include/GearTooth.h @@ -8,6 +8,7 @@ #pragma once #include +#include #include "Counter.h" diff --git a/wpilibc/athena/include/Internal/HardwareHLReporting.h b/wpilibc/athena/include/Internal/HardwareHLReporting.h index b411ecfdd9..500af13162 100644 --- a/wpilibc/athena/include/Internal/HardwareHLReporting.h +++ b/wpilibc/athena/include/Internal/HardwareHLReporting.h @@ -5,6 +5,8 @@ /* the project. */ /*----------------------------------------------------------------------------*/ +#pragma once + #include "HLUsageReporting.h" class HardwareHLReporting : public HLUsageReportingInterface { diff --git a/wpilibc/athena/include/Joystick.h b/wpilibc/athena/include/Joystick.h index a7dfb40b12..ac3b1bc83d 100644 --- a/wpilibc/athena/include/Joystick.h +++ b/wpilibc/athena/include/Joystick.h @@ -10,6 +10,7 @@ #include #include +#include #include #include "ErrorBase.h" diff --git a/wpilibc/athena/include/Notifier.h b/wpilibc/athena/include/Notifier.h index 24ea549b18..635e2b388d 100644 --- a/wpilibc/athena/include/Notifier.h +++ b/wpilibc/athena/include/Notifier.h @@ -9,6 +9,7 @@ #include #include +#include #include "ErrorBase.h" #include "HAL/Notifier.h" diff --git a/wpilibc/athena/include/PWM.h b/wpilibc/athena/include/PWM.h index f7961b9579..64172251c5 100644 --- a/wpilibc/athena/include/PWM.h +++ b/wpilibc/athena/include/PWM.h @@ -8,6 +8,7 @@ #pragma once #include +#include #include "HAL/Types.h" #include "LiveWindow/LiveWindowSendable.h" diff --git a/wpilibc/athena/include/PowerDistributionPanel.h b/wpilibc/athena/include/PowerDistributionPanel.h index 17877ed866..15b19b479d 100644 --- a/wpilibc/athena/include/PowerDistributionPanel.h +++ b/wpilibc/athena/include/PowerDistributionPanel.h @@ -8,6 +8,7 @@ #pragma once #include +#include #include "LiveWindow/LiveWindowSendable.h" #include "SensorBase.h" diff --git a/wpilibc/athena/include/Preferences.h b/wpilibc/athena/include/Preferences.h index e8f3d8b5e8..43f920056d 100644 --- a/wpilibc/athena/include/Preferences.h +++ b/wpilibc/athena/include/Preferences.h @@ -8,6 +8,7 @@ #pragma once #include +#include #include #include diff --git a/wpilibc/athena/include/Relay.h b/wpilibc/athena/include/Relay.h index 704c4bf262..b63a61d182 100644 --- a/wpilibc/athena/include/Relay.h +++ b/wpilibc/athena/include/Relay.h @@ -8,6 +8,7 @@ #pragma once #include +#include #include "HAL/Types.h" #include "LiveWindow/LiveWindowSendable.h" diff --git a/wpilibc/athena/include/SerialPort.h b/wpilibc/athena/include/SerialPort.h index 1cb46ec529..a4eff69a41 100644 --- a/wpilibc/athena/include/SerialPort.h +++ b/wpilibc/athena/include/SerialPort.h @@ -7,6 +7,8 @@ #pragma once +#include + #include "ErrorBase.h" /** diff --git a/wpilibc/athena/include/Servo.h b/wpilibc/athena/include/Servo.h index f1185f3a2b..1d949b0538 100644 --- a/wpilibc/athena/include/Servo.h +++ b/wpilibc/athena/include/Servo.h @@ -8,6 +8,7 @@ #pragma once #include +#include #include "SafePWM.h" #include "SpeedController.h" diff --git a/wpilibc/athena/include/Solenoid.h b/wpilibc/athena/include/Solenoid.h index f07e3e20d3..2110985578 100644 --- a/wpilibc/athena/include/Solenoid.h +++ b/wpilibc/athena/include/Solenoid.h @@ -8,6 +8,7 @@ #pragma once #include +#include #include "HAL/Types.h" #include "LiveWindow/LiveWindowSendable.h" diff --git a/wpilibc/athena/include/Ultrasonic.h b/wpilibc/athena/include/Ultrasonic.h index 9d0dbf9adc..213db2d952 100644 --- a/wpilibc/athena/include/Ultrasonic.h +++ b/wpilibc/athena/include/Ultrasonic.h @@ -10,6 +10,7 @@ #include #include #include +#include #include "Counter.h" #include "LiveWindow/LiveWindowSendable.h" diff --git a/wpilibc/athena/include/Vision/AxisCamera.h b/wpilibc/athena/include/Vision/AxisCamera.h index 0887e0222c..ad7e48b4a2 100644 --- a/wpilibc/athena/include/Vision/AxisCamera.h +++ b/wpilibc/athena/include/Vision/AxisCamera.h @@ -9,6 +9,7 @@ #include #include +#include #include "ErrorBase.h" #include "HAL/cpp/priority_mutex.h" diff --git a/wpilibc/athena/include/Vision/BaeUtilities.h b/wpilibc/athena/include/Vision/BaeUtilities.h index 5e8df42459..40c3ed7bd4 100644 --- a/wpilibc/athena/include/Vision/BaeUtilities.h +++ b/wpilibc/athena/include/Vision/BaeUtilities.h @@ -7,6 +7,8 @@ #pragma once +#include + /* Constants */ #define LOG_DEBUG __FILE__, __FUNCTION__, __LINE__, DEBUG_TYPE #define LOG_INFO __FILE__, __FUNCTION__, __LINE__, INFO_TYPE diff --git a/wpilibc/athena/src/AnalogInput.cpp b/wpilibc/athena/src/AnalogInput.cpp index 69529a1adf..f8bd932e13 100644 --- a/wpilibc/athena/src/AnalogInput.cpp +++ b/wpilibc/athena/src/AnalogInput.cpp @@ -6,13 +6,14 @@ /*----------------------------------------------------------------------------*/ #include "AnalogInput.h" + +#include + #include "HAL/HAL.h" #include "LiveWindow/LiveWindow.h" #include "Timer.h" #include "WPIErrors.h" -#include - const uint8_t AnalogInput::kAccumulatorModuleNumber; const uint32_t AnalogInput::kAccumulatorNumChannels; const uint32_t AnalogInput::kAccumulatorChannels[] = {0, 1}; diff --git a/wpilibc/athena/src/AnalogOutput.cpp b/wpilibc/athena/src/AnalogOutput.cpp index 8e8584848a..d641f00803 100644 --- a/wpilibc/athena/src/AnalogOutput.cpp +++ b/wpilibc/athena/src/AnalogOutput.cpp @@ -6,13 +6,14 @@ /*----------------------------------------------------------------------------*/ #include "AnalogOutput.h" -#include "HAL/HAL.h" -#include "LiveWindow/LiveWindow.h" -#include "WPIErrors.h" #include #include +#include "HAL/HAL.h" +#include "LiveWindow/LiveWindow.h" +#include "WPIErrors.h" + /** * Construct an analog output on the given channel. * diff --git a/wpilibc/athena/src/AnalogTrigger.cpp b/wpilibc/athena/src/AnalogTrigger.cpp index f3fa28bebf..85d097d6a0 100644 --- a/wpilibc/athena/src/AnalogTrigger.cpp +++ b/wpilibc/athena/src/AnalogTrigger.cpp @@ -7,12 +7,12 @@ #include "AnalogTrigger.h" +#include + #include "AnalogInput.h" #include "HAL/HAL.h" #include "WPIErrors.h" -#include - /** * Constructor for an analog trigger given a channel number. * diff --git a/wpilibc/athena/src/DigitalOutput.cpp b/wpilibc/athena/src/DigitalOutput.cpp index e7fb58dec6..ee76e717a7 100644 --- a/wpilibc/athena/src/DigitalOutput.cpp +++ b/wpilibc/athena/src/DigitalOutput.cpp @@ -7,12 +7,12 @@ #include "DigitalOutput.h" -#include "HAL/HAL.h" -#include "WPIErrors.h" - #include #include +#include "HAL/HAL.h" +#include "WPIErrors.h" + /** * Create an instance of a digital output. * diff --git a/wpilibc/athena/src/DoubleSolenoid.cpp b/wpilibc/athena/src/DoubleSolenoid.cpp index ef9ddc7508..d77a2d1d59 100644 --- a/wpilibc/athena/src/DoubleSolenoid.cpp +++ b/wpilibc/athena/src/DoubleSolenoid.cpp @@ -6,12 +6,13 @@ /*----------------------------------------------------------------------------*/ #include "DoubleSolenoid.h" + +#include + #include "HAL/HAL.h" #include "LiveWindow/LiveWindow.h" #include "WPIErrors.h" -#include - /** * Constructor. * diff --git a/wpilibc/athena/src/PWM.cpp b/wpilibc/athena/src/PWM.cpp index e605fec19b..abadcb4118 100644 --- a/wpilibc/athena/src/PWM.cpp +++ b/wpilibc/athena/src/PWM.cpp @@ -7,12 +7,12 @@ #include "PWM.h" +#include + #include "HAL/HAL.h" #include "Utility.h" #include "WPIErrors.h" -#include - /** * Allocate a PWM given a channel number. * diff --git a/wpilibc/athena/src/PowerDistributionPanel.cpp b/wpilibc/athena/src/PowerDistributionPanel.cpp index c451e3c603..56f51d307a 100644 --- a/wpilibc/athena/src/PowerDistributionPanel.cpp +++ b/wpilibc/athena/src/PowerDistributionPanel.cpp @@ -6,12 +6,13 @@ /*----------------------------------------------------------------------------*/ #include "PowerDistributionPanel.h" + +#include + #include "HAL/HAL.h" #include "LiveWindow/LiveWindow.h" #include "WPIErrors.h" -#include - PowerDistributionPanel::PowerDistributionPanel() : PowerDistributionPanel(0) {} /** diff --git a/wpilibc/athena/src/Relay.cpp b/wpilibc/athena/src/Relay.cpp index 2304af2265..0e3f9acd98 100644 --- a/wpilibc/athena/src/Relay.cpp +++ b/wpilibc/athena/src/Relay.cpp @@ -7,13 +7,13 @@ #include "Relay.h" +#include + #include "HAL/HAL.h" #include "LiveWindow/LiveWindow.h" #include "MotorSafetyHelper.h" #include "WPIErrors.h" -#include - /** * Relay constructor given a channel. * diff --git a/wpilibc/athena/src/RobotDrive.cpp b/wpilibc/athena/src/RobotDrive.cpp index 85a6029570..42dc715203 100644 --- a/wpilibc/athena/src/RobotDrive.cpp +++ b/wpilibc/athena/src/RobotDrive.cpp @@ -7,7 +7,9 @@ #include "RobotDrive.h" -#include +#include +#include + #include "GenericHID.h" #include "HAL/HAL.h" #include "Joystick.h" @@ -15,9 +17,6 @@ #include "Utility.h" #include "WPIErrors.h" -#undef max -#include - const int32_t RobotDrive::kMaxNumberOfMotors; static auto make_shared_nodelete(SpeedController* ptr) { @@ -223,13 +222,13 @@ void RobotDrive::Drive(float outputMagnitude, float curve) { } if (curve < 0) { - float value = log(-curve); + float value = std::log(-curve); float ratio = (value - m_sensitivity) / (value + m_sensitivity); if (ratio == 0) ratio = .0000000001; leftOutput = outputMagnitude / ratio; rightOutput = outputMagnitude; } else if (curve > 0) { - float value = log(curve); + float value = std::log(curve); float ratio = (value - m_sensitivity) / (value + m_sensitivity); if (ratio == 0) ratio = .0000000001; leftOutput = outputMagnitude; @@ -557,11 +556,11 @@ void RobotDrive::MecanumDrive_Polar(float magnitude, float direction, } // Normalized for full power along the Cartesian axes. - magnitude = Limit(magnitude) * sqrt(2.0); + magnitude = Limit(magnitude) * std::sqrt(2.0); // The rollers are at 45 degree angles. double dirInRad = (direction + 45.0) * 3.14159 / 180.0; - double cosD = cos(dirInRad); - double sinD = sin(dirInRad); + double cosD = std::cos(dirInRad); + double sinD = std::sin(dirInRad); double wheelSpeeds[kMaxNumberOfMotors]; wheelSpeeds[kFrontLeftMotor] = sinD * magnitude + rotation; @@ -637,10 +636,10 @@ float RobotDrive::Limit(float num) { * Normalize all wheel speeds if the magnitude of any wheel is greater than 1.0. */ void RobotDrive::Normalize(double* wheelSpeeds) { - double maxMagnitude = fabs(wheelSpeeds[0]); + double maxMagnitude = std::fabs(wheelSpeeds[0]); int32_t i; for (i = 1; i < kMaxNumberOfMotors; i++) { - double temp = fabs(wheelSpeeds[i]); + double temp = std::fabs(wheelSpeeds[i]); if (maxMagnitude < temp) maxMagnitude = temp; } if (maxMagnitude > 1.0) { @@ -654,8 +653,8 @@ void RobotDrive::Normalize(double* wheelSpeeds) { * Rotate a vector in Cartesian space. */ void RobotDrive::RotateVector(double& x, double& y, double angle) { - double cosA = cos(angle * (3.14159 / 180.0)); - double sinA = sin(angle * (3.14159 / 180.0)); + double cosA = std::cos(angle * (3.14159 / 180.0)); + double sinA = std::sin(angle * (3.14159 / 180.0)); double xOut = x * cosA - y * sinA; double yOut = x * sinA + y * cosA; x = xOut; diff --git a/wpilibc/athena/src/Solenoid.cpp b/wpilibc/athena/src/Solenoid.cpp index bb83f87410..083ff3e6ab 100644 --- a/wpilibc/athena/src/Solenoid.cpp +++ b/wpilibc/athena/src/Solenoid.cpp @@ -6,12 +6,13 @@ /*----------------------------------------------------------------------------*/ #include "Solenoid.h" + +#include + #include "HAL/HAL.h" #include "LiveWindow/LiveWindow.h" #include "WPIErrors.h" -#include - /** * Constructor using the default PCM ID (0). * diff --git a/wpilibc/athena/src/Vision/BaeUtilities.cpp b/wpilibc/athena/src/Vision/BaeUtilities.cpp index 2608037f4c..23c4f7f5ee 100644 --- a/wpilibc/athena/src/Vision/BaeUtilities.cpp +++ b/wpilibc/athena/src/Vision/BaeUtilities.cpp @@ -5,19 +5,20 @@ /* the project. */ /*----------------------------------------------------------------------------*/ +#include "Vision/BaeUtilities.h" + +#include +#include +#include + #include #include #include #include #include -#include -#include -#include - #include "Servo.h" #include "Timer.h" -#include "Vision/BaeUtilities.h" /** @file * Utility functions diff --git a/wpilibc/shared/include/Buttons/Trigger.h b/wpilibc/shared/include/Buttons/Trigger.h index 2dcf72f654..a2b6c1dbaf 100644 --- a/wpilibc/shared/include/Buttons/Trigger.h +++ b/wpilibc/shared/include/Buttons/Trigger.h @@ -8,6 +8,8 @@ #pragma once #include +#include + #include "SmartDashboard/Sendable.h" class Command; diff --git a/wpilibc/shared/include/CircularBuffer.inc b/wpilibc/shared/include/CircularBuffer.inc index 200d556265..e6f9ceb983 100644 --- a/wpilibc/shared/include/CircularBuffer.inc +++ b/wpilibc/shared/include/CircularBuffer.inc @@ -5,6 +5,8 @@ /* the project. */ /*----------------------------------------------------------------------------*/ +#pragma once + #include template diff --git a/wpilibc/shared/include/Commands/CommandGroup.h b/wpilibc/shared/include/Commands/CommandGroup.h index 2b430c85eb..893507304e 100644 --- a/wpilibc/shared/include/Commands/CommandGroup.h +++ b/wpilibc/shared/include/Commands/CommandGroup.h @@ -8,7 +8,9 @@ #pragma once #include +#include #include + #include "Commands/Command.h" #include "Commands/CommandGroupEntry.h" diff --git a/wpilibc/shared/include/Commands/PIDCommand.h b/wpilibc/shared/include/Commands/PIDCommand.h index de8165ecde..38ffc416a8 100644 --- a/wpilibc/shared/include/Commands/PIDCommand.h +++ b/wpilibc/shared/include/Commands/PIDCommand.h @@ -7,13 +7,14 @@ #pragma once +#include +#include + #include "Commands/Command.h" #include "PIDController.h" #include "PIDOutput.h" #include "PIDSource.h" -#include - class PIDCommand : public Command, public PIDOutput, public PIDSource { public: PIDCommand(const std::string& name, double p, double i, double d); diff --git a/wpilibc/shared/include/Commands/PIDSubsystem.h b/wpilibc/shared/include/Commands/PIDSubsystem.h index 4ed8688d6b..3b4a1f2161 100644 --- a/wpilibc/shared/include/Commands/PIDSubsystem.h +++ b/wpilibc/shared/include/Commands/PIDSubsystem.h @@ -7,13 +7,14 @@ #pragma once +#include +#include + #include "Commands/Subsystem.h" #include "PIDController.h" #include "PIDOutput.h" #include "PIDSource.h" -#include - /** * This class is designed to handle the case where there is a {@link Subsystem} * which uses a single {@link PIDController} almost constantly (for instance, diff --git a/wpilibc/shared/include/Commands/WaitCommand.h b/wpilibc/shared/include/Commands/WaitCommand.h index 3845cf418b..1b1f077216 100644 --- a/wpilibc/shared/include/Commands/WaitCommand.h +++ b/wpilibc/shared/include/Commands/WaitCommand.h @@ -7,6 +7,8 @@ #pragma once +#include + #include "Commands/Command.h" class WaitCommand : public Command { diff --git a/wpilibc/shared/include/Commands/WaitForChildren.h b/wpilibc/shared/include/Commands/WaitForChildren.h index f7ab406bbb..f7ce128963 100644 --- a/wpilibc/shared/include/Commands/WaitForChildren.h +++ b/wpilibc/shared/include/Commands/WaitForChildren.h @@ -7,6 +7,8 @@ #pragma once +#include + #include "Commands/Command.h" class WaitForChildren : public Command { diff --git a/wpilibc/shared/include/Commands/WaitUntilCommand.h b/wpilibc/shared/include/Commands/WaitUntilCommand.h index 5d941f552d..9b4ad86b41 100644 --- a/wpilibc/shared/include/Commands/WaitUntilCommand.h +++ b/wpilibc/shared/include/Commands/WaitUntilCommand.h @@ -7,6 +7,8 @@ #pragma once +#include + #include "Commands/Command.h" class WaitUntilCommand : public Command { diff --git a/wpilibc/shared/include/GyroBase.h b/wpilibc/shared/include/GyroBase.h index 558a1902b3..4583896a38 100644 --- a/wpilibc/shared/include/GyroBase.h +++ b/wpilibc/shared/include/GyroBase.h @@ -7,13 +7,14 @@ #pragma once +#include +#include + #include "LiveWindow/LiveWindowSendable.h" #include "PIDSource.h" #include "SensorBase.h" #include "interfaces/Gyro.h" -#include - /** * GyroBase is the common base class for Gyro implementations such as * AnalogGyro. diff --git a/wpilibc/shared/include/LiveWindow/LiveWindow.h b/wpilibc/shared/include/LiveWindow/LiveWindow.h index 6191c51855..3727daf92a 100644 --- a/wpilibc/shared/include/LiveWindow/LiveWindow.h +++ b/wpilibc/shared/include/LiveWindow/LiveWindow.h @@ -9,7 +9,9 @@ #include #include +#include #include + #include "Commands/Scheduler.h" #include "LiveWindow/LiveWindowSendable.h" #include "tables/ITable.h" diff --git a/wpilibc/shared/include/LiveWindow/LiveWindowStatusListener.h b/wpilibc/shared/include/LiveWindow/LiveWindowStatusListener.h index 6eed487333..3d965aa6a1 100644 --- a/wpilibc/shared/include/LiveWindow/LiveWindowStatusListener.h +++ b/wpilibc/shared/include/LiveWindow/LiveWindowStatusListener.h @@ -7,6 +7,8 @@ #pragma once +#include + #include "tables/ITable.h" #include "tables/ITableListener.h" diff --git a/wpilibc/shared/include/PIDController.h b/wpilibc/shared/include/PIDController.h index a2bd436b46..9d10794d01 100644 --- a/wpilibc/shared/include/PIDController.h +++ b/wpilibc/shared/include/PIDController.h @@ -7,6 +7,11 @@ #pragma once +#include +#include +#include +#include + #include "Base.h" #include "Controller.h" #include "HAL/cpp/priority_mutex.h" @@ -16,11 +21,6 @@ #include "PIDSource.h" #include "Timer.h" -#include - -#include -#include - class PIDOutput; /** diff --git a/wpilibc/shared/include/Resource.h b/wpilibc/shared/include/Resource.h index 427ab1d6e1..8956228690 100644 --- a/wpilibc/shared/include/Resource.h +++ b/wpilibc/shared/include/Resource.h @@ -8,10 +8,12 @@ #pragma once #include -#include -#include -#include "ErrorBase.h" +#include +#include +#include + +#include "ErrorBase.h" #include "HAL/cpp/priority_mutex.h" /** diff --git a/wpilibc/shared/include/SmartDashboard/SmartDashboard.h b/wpilibc/shared/include/SmartDashboard/SmartDashboard.h index 20eb2ac4a2..6e7edd0cb1 100644 --- a/wpilibc/shared/include/SmartDashboard/SmartDashboard.h +++ b/wpilibc/shared/include/SmartDashboard/SmartDashboard.h @@ -8,7 +8,9 @@ #pragma once #include +#include #include + #include "SensorBase.h" #include "SmartDashboard/NamedSendable.h" #include "SmartDashboard/Sendable.h" diff --git a/wpilibc/shared/include/Task.inc b/wpilibc/shared/include/Task.inc index 706e3b2b70..5a81a19e54 100644 --- a/wpilibc/shared/include/Task.inc +++ b/wpilibc/shared/include/Task.inc @@ -5,7 +5,12 @@ /* the project. */ /*----------------------------------------------------------------------------*/ +#pragma once + #include +#include +#include + #include "HAL/HAL.h" /** diff --git a/wpilibc/shared/src/Commands/CommandGroup.cpp b/wpilibc/shared/src/Commands/CommandGroup.cpp index f2fe97b5f6..28d18bb8c1 100644 --- a/wpilibc/shared/src/Commands/CommandGroup.cpp +++ b/wpilibc/shared/src/Commands/CommandGroup.cpp @@ -181,7 +181,7 @@ void CommandGroup::_Execute() { m_currentCommandIndex = 0; } - while ((unsigned)m_currentCommandIndex < m_commands.size()) { + while (static_cast(m_currentCommandIndex) < m_commands.size()) { if (cmd != nullptr) { if (entry.IsTimedOut()) cmd->_Cancel(); @@ -243,7 +243,7 @@ void CommandGroup::_End() { // Theoretically, we don't have to check this, but we do if teams override the // IsFinished method if (m_currentCommandIndex != -1 && - (unsigned)m_currentCommandIndex < m_commands.size()) { + static_cast(m_currentCommandIndex) < m_commands.size()) { Command* cmd = m_commands[m_currentCommandIndex].m_command; cmd->_Cancel(); cmd->Removed(); @@ -273,7 +273,7 @@ void CommandGroup::End() {} void CommandGroup::Interrupted() {} bool CommandGroup::IsFinished() { - return (unsigned)m_currentCommandIndex >= m_commands.size() && + return static_cast(m_currentCommandIndex) >= m_commands.size() && m_children.empty(); } @@ -281,7 +281,7 @@ bool CommandGroup::IsInterruptible() const { if (!Command::IsInterruptible()) return false; if (m_currentCommandIndex != -1 && - (unsigned)m_currentCommandIndex < m_commands.size()) { + static_cast(m_currentCommandIndex) < m_commands.size()) { Command* cmd = m_commands[m_currentCommandIndex].m_command; if (!cmd->IsInterruptible()) return false; } diff --git a/wpilibc/shared/src/Commands/PIDSubsystem.cpp b/wpilibc/shared/src/Commands/PIDSubsystem.cpp index b153cf40c3..be621020c1 100644 --- a/wpilibc/shared/src/Commands/PIDSubsystem.cpp +++ b/wpilibc/shared/src/Commands/PIDSubsystem.cpp @@ -7,7 +7,6 @@ #include "Commands/PIDSubsystem.h" #include "PIDController.h" -#include "float.h" /** * Instantiates a {@link PIDSubsystem} that will use the given p, i and d diff --git a/wpilibc/sim/include/AnalogGyro.h b/wpilibc/sim/include/AnalogGyro.h index 8e17b146f1..11ece7b07d 100644 --- a/wpilibc/sim/include/AnalogGyro.h +++ b/wpilibc/sim/include/AnalogGyro.h @@ -7,11 +7,11 @@ #pragma once +#include + #include "GyroBase.h" #include "simulation/SimGyro.h" -#include - class AnalogInput; class AnalogModule; diff --git a/wpilibc/sim/include/AnalogInput.h b/wpilibc/sim/include/AnalogInput.h index b0859257cb..d6c5c21c84 100644 --- a/wpilibc/sim/include/AnalogInput.h +++ b/wpilibc/sim/include/AnalogInput.h @@ -7,13 +7,14 @@ #pragma once +#include +#include + #include "LiveWindow/LiveWindowSendable.h" #include "PIDSource.h" #include "SensorBase.h" #include "simulation/SimFloatInput.h" -#include - /** * Analog input class. * diff --git a/wpilibc/sim/include/AnalogPotentiometer.h b/wpilibc/sim/include/AnalogPotentiometer.h index 62acda5c24..f5b4a4ae42 100644 --- a/wpilibc/sim/include/AnalogPotentiometer.h +++ b/wpilibc/sim/include/AnalogPotentiometer.h @@ -7,12 +7,13 @@ #pragma once +#include +#include + #include "AnalogInput.h" #include "LiveWindow/LiveWindowSendable.h" #include "interfaces/Potentiometer.h" -#include - /** * Class for reading analog potentiometers. Analog potentiometers read * in an analog voltage that corresponds to a position. Usually the diff --git a/wpilibc/sim/include/Counter.h b/wpilibc/sim/include/Counter.h index 78f02bdad9..2ec0724244 100644 --- a/wpilibc/sim/include/Counter.h +++ b/wpilibc/sim/include/Counter.h @@ -7,12 +7,13 @@ #pragma once +#include +#include + #include "CounterBase.h" #include "LiveWindow/LiveWindowSendable.h" #include "SensorBase.h" -#include - /** * Class for counting the number of ticks on a digital input channel. * diff --git a/wpilibc/sim/include/DigitalInput.h b/wpilibc/sim/include/DigitalInput.h index 554400628d..2d68f0d22d 100644 --- a/wpilibc/sim/include/DigitalInput.h +++ b/wpilibc/sim/include/DigitalInput.h @@ -7,11 +7,12 @@ #pragma once +#include +#include + #include "LiveWindow/LiveWindowSendable.h" #include "simulation/SimDigitalInput.h" -#include - /** * Class to read a digital input. * diff --git a/wpilibc/sim/include/DoubleSolenoid.h b/wpilibc/sim/include/DoubleSolenoid.h index a2685610df..02a5558558 100644 --- a/wpilibc/sim/include/DoubleSolenoid.h +++ b/wpilibc/sim/include/DoubleSolenoid.h @@ -7,12 +7,13 @@ #pragma once +#include +#include + #include "LiveWindow/LiveWindowSendable.h" #include "simulation/SimContinuousOutput.h" #include "tables/ITableListener.h" -#include - /** * DoubleSolenoid class for running 2 channels of high voltage Digital Output * (PCM). diff --git a/wpilibc/sim/include/DriverStation.h b/wpilibc/sim/include/DriverStation.h index bb2a8b312d..5aea6ba81a 100644 --- a/wpilibc/sim/include/DriverStation.h +++ b/wpilibc/sim/include/DriverStation.h @@ -7,8 +7,6 @@ #pragma once -#include "simulation/gz_msgs/msgs.h" - #ifdef _WIN32 // Ensure that Winsock2.h is included before Windows.h, which can get // pulled in by anybody (e.g., Boost). @@ -16,10 +14,14 @@ #endif #include -#include #include +#include + +#include + #include "RobotState.h" #include "SensorBase.h" +#include "simulation/gz_msgs/msgs.h" struct HALCommonControlData; class AnalogInput; diff --git a/wpilibc/sim/include/Encoder.h b/wpilibc/sim/include/Encoder.h index 9db1695fc5..de03a8ac7d 100644 --- a/wpilibc/sim/include/Encoder.h +++ b/wpilibc/sim/include/Encoder.h @@ -10,6 +10,7 @@ #include #include +#include #include "CounterBase.h" #include "LiveWindow/LiveWindowSendable.h" diff --git a/wpilibc/sim/include/MotorSafetyHelper.h b/wpilibc/sim/include/MotorSafetyHelper.h index 60fea90c33..66d7f69f4b 100644 --- a/wpilibc/sim/include/MotorSafetyHelper.h +++ b/wpilibc/sim/include/MotorSafetyHelper.h @@ -7,11 +7,11 @@ #pragma once +#include + #include "ErrorBase.h" #include "HAL/cpp/priority_mutex.h" -#include - class MotorSafety; class MotorSafetyHelper : public ErrorBase { diff --git a/wpilibc/sim/include/Notifier.h b/wpilibc/sim/include/Notifier.h index a0929eb5f3..a75e69d518 100644 --- a/wpilibc/sim/include/Notifier.h +++ b/wpilibc/sim/include/Notifier.h @@ -11,6 +11,7 @@ #include #include #include +#include #include "ErrorBase.h" #include "HAL/cpp/priority_mutex.h" diff --git a/wpilibc/sim/include/PWM.h b/wpilibc/sim/include/PWM.h index 8c475d9526..5476339a80 100644 --- a/wpilibc/sim/include/PWM.h +++ b/wpilibc/sim/include/PWM.h @@ -7,13 +7,14 @@ #pragma once +#include +#include + #include "LiveWindow/LiveWindowSendable.h" #include "SensorBase.h" #include "simulation/SimContinuousOutput.h" #include "tables/ITableListener.h" -#include - /** * Class implements the PWM generation in the FPGA. * diff --git a/wpilibc/sim/include/Relay.h b/wpilibc/sim/include/Relay.h index d67d176b1d..934f16abef 100644 --- a/wpilibc/sim/include/Relay.h +++ b/wpilibc/sim/include/Relay.h @@ -7,6 +7,9 @@ #pragma once +#include +#include + #include "LiveWindow/LiveWindowSendable.h" #include "MotorSafety.h" #include "SensorBase.h" @@ -14,8 +17,6 @@ #include "tables/ITable.h" #include "tables/ITableListener.h" -#include - class MotorSafetyHelper; class DigitalModule; diff --git a/wpilibc/sim/include/Solenoid.h b/wpilibc/sim/include/Solenoid.h index 3aae4399d0..e6dc5aa7dd 100644 --- a/wpilibc/sim/include/Solenoid.h +++ b/wpilibc/sim/include/Solenoid.h @@ -7,12 +7,13 @@ #pragma once +#include +#include + #include "LiveWindow/LiveWindowSendable.h" #include "simulation/SimContinuousOutput.h" #include "tables/ITableListener.h" -#include - /** * Solenoid class for running high voltage Digital Output (PCM). * diff --git a/wpilibc/sim/include/simulation/MainNode.h b/wpilibc/sim/include/simulation/MainNode.h index 8654c4a5da..82bb0ac1a8 100644 --- a/wpilibc/sim/include/simulation/MainNode.h +++ b/wpilibc/sim/include/simulation/MainNode.h @@ -7,8 +7,11 @@ #pragma once +#include + #include #include + #include "simulation/gz_msgs/msgs.h" using namespace gazebo; diff --git a/wpilibc/sim/include/simulation/SimContinuousOutput.h b/wpilibc/sim/include/simulation/SimContinuousOutput.h index 200c0119d7..20161d826f 100644 --- a/wpilibc/sim/include/simulation/SimContinuousOutput.h +++ b/wpilibc/sim/include/simulation/SimContinuousOutput.h @@ -13,7 +13,10 @@ #include #endif +#include + #include + #include "SpeedController.h" using namespace gazebo; diff --git a/wpilibc/sim/include/simulation/SimDigitalInput.h b/wpilibc/sim/include/simulation/SimDigitalInput.h index c85da85f7e..b9f1f6d1c3 100644 --- a/wpilibc/sim/include/simulation/SimDigitalInput.h +++ b/wpilibc/sim/include/simulation/SimDigitalInput.h @@ -7,7 +7,10 @@ #pragma once +#include + #include + #include "simulation/gz_msgs/msgs.h" using namespace gazebo; diff --git a/wpilibc/sim/include/simulation/SimEncoder.h b/wpilibc/sim/include/simulation/SimEncoder.h index b81113b638..4dc1f6b1fc 100644 --- a/wpilibc/sim/include/simulation/SimEncoder.h +++ b/wpilibc/sim/include/simulation/SimEncoder.h @@ -7,8 +7,11 @@ #pragma once +#include + #include #include + #include "simulation/gz_msgs/msgs.h" using namespace gazebo; diff --git a/wpilibc/sim/include/simulation/SimFloatInput.h b/wpilibc/sim/include/simulation/SimFloatInput.h index 894ee7c8aa..a73514c1ee 100644 --- a/wpilibc/sim/include/simulation/SimFloatInput.h +++ b/wpilibc/sim/include/simulation/SimFloatInput.h @@ -7,7 +7,10 @@ #pragma once +#include + #include + #include "simulation/gz_msgs/msgs.h" using namespace gazebo; diff --git a/wpilibc/sim/include/simulation/SimGyro.h b/wpilibc/sim/include/simulation/SimGyro.h index 7884890c7d..0414ad3f5c 100644 --- a/wpilibc/sim/include/simulation/SimGyro.h +++ b/wpilibc/sim/include/simulation/SimGyro.h @@ -7,7 +7,10 @@ #pragma once +#include + #include + #include "simulation/gz_msgs/msgs.h" using namespace gazebo; diff --git a/wpilibc/sim/include/simulation/simTime.h b/wpilibc/sim/include/simulation/simTime.h index 1208c46f14..5bf67425b2 100644 --- a/wpilibc/sim/include/simulation/simTime.h +++ b/wpilibc/sim/include/simulation/simTime.h @@ -13,11 +13,11 @@ #include #endif -#include "simulation/SimFloatInput.h" - #include #include +#include "simulation/SimFloatInput.h" + namespace wpilib { namespace internal { extern double simTime; diff --git a/wpilibcIntegrationTests/src/AnalogLoopTest.cpp b/wpilibcIntegrationTests/src/AnalogLoopTest.cpp index 855c6a5ea6..260919bec2 100644 --- a/wpilibcIntegrationTests/src/AnalogLoopTest.cpp +++ b/wpilibcIntegrationTests/src/AnalogLoopTest.cpp @@ -5,14 +5,13 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "gtest/gtest.h" - #include "AnalogInput.h" #include "AnalogOutput.h" #include "AnalogTrigger.h" #include "Counter.h" #include "TestBench.h" #include "Timer.h" +#include "gtest/gtest.h" static const double kDelayTime = 0.01; diff --git a/wpilibcIntegrationTests/src/AnalogPotentiometerTest.cpp b/wpilibcIntegrationTests/src/AnalogPotentiometerTest.cpp index 9ab9555533..ea4a27a7dc 100644 --- a/wpilibcIntegrationTests/src/AnalogPotentiometerTest.cpp +++ b/wpilibcIntegrationTests/src/AnalogPotentiometerTest.cpp @@ -7,12 +7,11 @@ #include "AnalogPotentiometer.h" -#include "gtest/gtest.h" - #include "AnalogOutput.h" #include "ControllerPower.h" #include "TestBench.h" #include "Timer.h" +#include "gtest/gtest.h" static const double kScale = 270.0; static const double kAngle = 180.0; diff --git a/wpilibcIntegrationTests/src/BuiltInAccelerometerTest.cpp b/wpilibcIntegrationTests/src/BuiltInAccelerometerTest.cpp index 9db12cd016..e34dd8a4e3 100644 --- a/wpilibcIntegrationTests/src/BuiltInAccelerometerTest.cpp +++ b/wpilibcIntegrationTests/src/BuiltInAccelerometerTest.cpp @@ -7,9 +7,8 @@ #include "BuiltInAccelerometer.h" -#include "gtest/gtest.h" - #include "Timer.h" +#include "gtest/gtest.h" static constexpr double kAccelerationTolerance = 0.1; /** diff --git a/wpilibcIntegrationTests/src/CANJaguarTest.cpp b/wpilibcIntegrationTests/src/CANJaguarTest.cpp index f90ec97003..9b54b51f10 100644 --- a/wpilibcIntegrationTests/src/CANJaguarTest.cpp +++ b/wpilibcIntegrationTests/src/CANJaguarTest.cpp @@ -7,14 +7,13 @@ #include "CANJaguar.h" -#include "gtest/gtest.h" - #include "AnalogOutput.h" #include "DigitalOutput.h" #include "Relay.h" #include "TestBench.h" #include "Timer.h" #include "WPIErrors.h" +#include "gtest/gtest.h" static constexpr double kSpikeTime = 0.5; diff --git a/wpilibcIntegrationTests/src/CANTalonTest.cpp b/wpilibcIntegrationTests/src/CANTalonTest.cpp index 777980be86..4f8c46c1a6 100644 --- a/wpilibcIntegrationTests/src/CANTalonTest.cpp +++ b/wpilibcIntegrationTests/src/CANTalonTest.cpp @@ -7,10 +7,9 @@ #include "CANTalon.h" -#include "gtest/gtest.h" - #include "TestBench.h" #include "Timer.h" +#include "gtest/gtest.h" const int deviceId = 0; diff --git a/wpilibcIntegrationTests/src/CircularBufferTest.cpp b/wpilibcIntegrationTests/src/CircularBufferTest.cpp index c387c32552..bfb2f387bc 100644 --- a/wpilibcIntegrationTests/src/CircularBufferTest.cpp +++ b/wpilibcIntegrationTests/src/CircularBufferTest.cpp @@ -7,10 +7,10 @@ #include "CircularBuffer.h" -#include "gtest/gtest.h" - #include +#include "gtest/gtest.h" + static const std::array values = { 751.848, 766.366, 342.657, 234.252, 716.126, 132.344, 445.697, 22.727, 421.125, 799.913}; diff --git a/wpilibcIntegrationTests/src/ConditionVariableTest.cpp b/wpilibcIntegrationTests/src/ConditionVariableTest.cpp index ca8bb45ee1..c6098de683 100644 --- a/wpilibcIntegrationTests/src/ConditionVariableTest.cpp +++ b/wpilibcIntegrationTests/src/ConditionVariableTest.cpp @@ -11,11 +11,10 @@ #include #include -#include "gtest/gtest.h" - #include "HAL/cpp/priority_condition_variable.h" #include "HAL/cpp/priority_mutex.h" #include "TestBench.h" +#include "gtest/gtest.h" namespace wpilib { namespace testing { diff --git a/wpilibcIntegrationTests/src/CounterTest.cpp b/wpilibcIntegrationTests/src/CounterTest.cpp index 5a43accb73..5e8b2d9b80 100644 --- a/wpilibcIntegrationTests/src/CounterTest.cpp +++ b/wpilibcIntegrationTests/src/CounterTest.cpp @@ -7,13 +7,12 @@ #include "Counter.h" -#include "gtest/gtest.h" - #include "Jaguar.h" #include "Talon.h" #include "TestBench.h" #include "Timer.h" #include "Victor.h" +#include "gtest/gtest.h" static const double kMotorDelay = 2.5; diff --git a/wpilibcIntegrationTests/src/DIOLoopTest.cpp b/wpilibcIntegrationTests/src/DIOLoopTest.cpp index 69dcb71870..81d3bbd334 100644 --- a/wpilibcIntegrationTests/src/DIOLoopTest.cpp +++ b/wpilibcIntegrationTests/src/DIOLoopTest.cpp @@ -8,12 +8,11 @@ #include "DigitalInput.h" #include "DigitalOutput.h" -#include "gtest/gtest.h" - #include "Counter.h" #include "InterruptableSensorBase.h" #include "TestBench.h" #include "Timer.h" +#include "gtest/gtest.h" static const double kCounterTime = 0.001; diff --git a/wpilibcIntegrationTests/src/DigitalGlitchFilterTest.cpp b/wpilibcIntegrationTests/src/DigitalGlitchFilterTest.cpp index db4db469d4..dffdb7cbd9 100644 --- a/wpilibcIntegrationTests/src/DigitalGlitchFilterTest.cpp +++ b/wpilibcIntegrationTests/src/DigitalGlitchFilterTest.cpp @@ -7,11 +7,10 @@ #include "DigitalGlitchFilter.h" -#include "gtest/gtest.h" - #include "Counter.h" #include "DigitalInput.h" #include "Encoder.h" +#include "gtest/gtest.h" /** * Tests that configuring inputs to be filtered succeeds. diff --git a/wpilibcIntegrationTests/src/FakeEncoderTest.cpp b/wpilibcIntegrationTests/src/FakeEncoderTest.cpp index 10db9ac132..b09d20908e 100644 --- a/wpilibcIntegrationTests/src/FakeEncoderTest.cpp +++ b/wpilibcIntegrationTests/src/FakeEncoderTest.cpp @@ -7,13 +7,12 @@ #include "Encoder.h" -#include "gtest/gtest.h" - #include "AnalogOutput.h" #include "AnalogTrigger.h" #include "DigitalOutput.h" #include "TestBench.h" #include "Timer.h" +#include "gtest/gtest.h" static const double kDelayTime = 0.001; diff --git a/wpilibcIntegrationTests/src/FilterNoiseTest.cpp b/wpilibcIntegrationTests/src/FilterNoiseTest.cpp index 7a789c1fdc..48fcbc8b7e 100644 --- a/wpilibcIntegrationTests/src/FilterNoiseTest.cpp +++ b/wpilibcIntegrationTests/src/FilterNoiseTest.cpp @@ -5,18 +5,18 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "Filters/LinearDigitalFilter.h" +#include "Filters/LinearDigitalFilter.h" // NOLINT(build/include_order) #include + #include #include #include #include -#include "gtest/gtest.h" - #include "Base.h" #include "TestBench.h" +#include "gtest/gtest.h" enum FilterNoiseTestType { TEST_SINGLE_POLE_IIR, TEST_MOVAVG }; diff --git a/wpilibcIntegrationTests/src/FilterOutputTest.cpp b/wpilibcIntegrationTests/src/FilterOutputTest.cpp index 9f4663b5b9..c0ee980c8e 100644 --- a/wpilibcIntegrationTests/src/FilterOutputTest.cpp +++ b/wpilibcIntegrationTests/src/FilterOutputTest.cpp @@ -5,18 +5,18 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "Filters/LinearDigitalFilter.h" +#include "Filters/LinearDigitalFilter.h" // NOLINT(build/include_order) #include + #include #include #include #include -#include "gtest/gtest.h" - #include "Base.h" #include "TestBench.h" +#include "gtest/gtest.h" enum FilterOutputTestType { TEST_SINGLE_POLE_IIR, TEST_HIGH_PASS, TEST_MOVAVG }; diff --git a/wpilibcIntegrationTests/src/MotorEncoderTest.cpp b/wpilibcIntegrationTests/src/MotorEncoderTest.cpp index 49ce3dc001..b42d1e6f23 100644 --- a/wpilibcIntegrationTests/src/MotorEncoderTest.cpp +++ b/wpilibcIntegrationTests/src/MotorEncoderTest.cpp @@ -5,8 +5,6 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "gtest/gtest.h" - #include "Encoder.h" #include "Jaguar.h" #include "PIDController.h" @@ -14,6 +12,7 @@ #include "TestBench.h" #include "Timer.h" #include "Victor.h" +#include "gtest/gtest.h" enum MotorEncoderTestType { TEST_VICTOR, TEST_JAGUAR, TEST_TALON }; diff --git a/wpilibcIntegrationTests/src/MotorInvertingTest.cpp b/wpilibcIntegrationTests/src/MotorInvertingTest.cpp index d81e884a9a..ff1015c804 100644 --- a/wpilibcIntegrationTests/src/MotorInvertingTest.cpp +++ b/wpilibcIntegrationTests/src/MotorInvertingTest.cpp @@ -5,14 +5,13 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "gtest/gtest.h" - #include "Encoder.h" #include "Jaguar.h" #include "Talon.h" #include "TestBench.h" #include "Timer.h" #include "Victor.h" +#include "gtest/gtest.h" enum MotorInvertingTestType { TEST_VICTOR, TEST_JAGUAR, TEST_TALON }; static const double motorSpeed = 0.15; diff --git a/wpilibcIntegrationTests/src/MutexTest.cpp b/wpilibcIntegrationTests/src/MutexTest.cpp index 901d1b1e35..6e7266747a 100644 --- a/wpilibcIntegrationTests/src/MutexTest.cpp +++ b/wpilibcIntegrationTests/src/MutexTest.cpp @@ -5,15 +5,14 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "HAL/cpp/priority_mutex.h" +#include "HAL/cpp/priority_mutex.h" // NOLINT(build/include_order) #include #include #include -#include "gtest/gtest.h" - #include "TestBench.h" +#include "gtest/gtest.h" namespace wpilib { namespace testing { diff --git a/wpilibcIntegrationTests/src/NotifierTest.cpp b/wpilibcIntegrationTests/src/NotifierTest.cpp index 7d97278f5c..aa962ee113 100644 --- a/wpilibcIntegrationTests/src/NotifierTest.cpp +++ b/wpilibcIntegrationTests/src/NotifierTest.cpp @@ -7,10 +7,9 @@ #include "Notifier.h" -#include "gtest/gtest.h" - #include "TestBench.h" #include "Timer.h" +#include "gtest/gtest.h" unsigned notifierCounter; diff --git a/wpilibcIntegrationTests/src/PCMTest.cpp b/wpilibcIntegrationTests/src/PCMTest.cpp index 3df651b684..45c80f2f4c 100644 --- a/wpilibcIntegrationTests/src/PCMTest.cpp +++ b/wpilibcIntegrationTests/src/PCMTest.cpp @@ -5,8 +5,6 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "gtest/gtest.h" - #include "AnalogInput.h" #include "Compressor.h" #include "DigitalInput.h" @@ -15,6 +13,7 @@ #include "Solenoid.h" #include "TestBench.h" #include "Timer.h" +#include "gtest/gtest.h" /* The PCM switches the compressor up to a couple seconds after the pressure switch changes. */ diff --git a/wpilibcIntegrationTests/src/PIDToleranceTest.cpp b/wpilibcIntegrationTests/src/PIDToleranceTest.cpp index 2dac7f69a7..b2b51c9609 100644 --- a/wpilibcIntegrationTests/src/PIDToleranceTest.cpp +++ b/wpilibcIntegrationTests/src/PIDToleranceTest.cpp @@ -5,13 +5,12 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "gtest/gtest.h" - #include "PIDController.h" #include "PIDOutput.h" #include "PIDSource.h" #include "TestBench.h" #include "Timer.h" +#include "gtest/gtest.h" class PIDToleranceTest : public testing::Test { protected: diff --git a/wpilibcIntegrationTests/src/PowerDistributionPanelTest.cpp b/wpilibcIntegrationTests/src/PowerDistributionPanelTest.cpp index cc4b30e88c..d582b6fd67 100644 --- a/wpilibcIntegrationTests/src/PowerDistributionPanelTest.cpp +++ b/wpilibcIntegrationTests/src/PowerDistributionPanelTest.cpp @@ -7,13 +7,12 @@ #include "PowerDistributionPanel.h" -#include "gtest/gtest.h" - #include "Jaguar.h" #include "Talon.h" #include "TestBench.h" #include "Timer.h" #include "Victor.h" +#include "gtest/gtest.h" static const double kMotorTime = 0.25; diff --git a/wpilibcIntegrationTests/src/PreferencesTest.cpp b/wpilibcIntegrationTests/src/PreferencesTest.cpp index f4e4acb3aa..c48665276b 100644 --- a/wpilibcIntegrationTests/src/PreferencesTest.cpp +++ b/wpilibcIntegrationTests/src/PreferencesTest.cpp @@ -5,14 +5,14 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "Preferences.h" +#include "Preferences.h" // NOLINT(build/include_order) #include + #include -#include "gtest/gtest.h" - #include "Timer.h" +#include "gtest/gtest.h" #include "ntcore.h" static const char* kFileName = "networktables.ini"; diff --git a/wpilibcIntegrationTests/src/RelayTest.cpp b/wpilibcIntegrationTests/src/RelayTest.cpp index c0ef8c4bf4..1ba6c25b18 100644 --- a/wpilibcIntegrationTests/src/RelayTest.cpp +++ b/wpilibcIntegrationTests/src/RelayTest.cpp @@ -7,11 +7,10 @@ #include "Relay.h" -#include "gtest/gtest.h" - #include "DigitalInput.h" #include "TestBench.h" #include "Timer.h" +#include "gtest/gtest.h" static const double kDelayTime = 0.01; diff --git a/wpilibcIntegrationTests/src/TestEnvironment.cpp b/wpilibcIntegrationTests/src/TestEnvironment.cpp index b9c3edb5e0..968d8fe344 100644 --- a/wpilibcIntegrationTests/src/TestEnvironment.cpp +++ b/wpilibcIntegrationTests/src/TestEnvironment.cpp @@ -5,11 +5,10 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "gtest/gtest.h" - #include "DriverStation.h" #include "LiveWindow/LiveWindow.h" #include "Timer.h" +#include "gtest/gtest.h" class TestEnvironment : public testing::Environment { bool m_alreadySetUp = false; diff --git a/wpilibcIntegrationTests/src/TiltPanCameraTest.cpp b/wpilibcIntegrationTests/src/TiltPanCameraTest.cpp index 4a6bc650b8..e5c32f3bed 100644 --- a/wpilibcIntegrationTests/src/TiltPanCameraTest.cpp +++ b/wpilibcIntegrationTests/src/TiltPanCameraTest.cpp @@ -5,13 +5,12 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "gtest/gtest.h" - #include "ADXL345_SPI.h" #include "AnalogGyro.h" #include "Servo.h" #include "TestBench.h" #include "Timer.h" +#include "gtest/gtest.h" static constexpr double kServoResetTime = 2.0; diff --git a/wpilibcIntegrationTests/src/TimerTest.cpp b/wpilibcIntegrationTests/src/TimerTest.cpp index 565153c2d2..57d6bd9803 100644 --- a/wpilibcIntegrationTests/src/TimerTest.cpp +++ b/wpilibcIntegrationTests/src/TimerTest.cpp @@ -7,9 +7,8 @@ #include "Timer.h" -#include "gtest/gtest.h" - #include "TestBench.h" +#include "gtest/gtest.h" static const double kWaitTime = 0.5; diff --git a/wpilibcIntegrationTests/src/command/CommandTest.cpp b/wpilibcIntegrationTests/src/command/CommandTest.cpp index be1b3a66a0..965fc2176d 100644 --- a/wpilibcIntegrationTests/src/command/CommandTest.cpp +++ b/wpilibcIntegrationTests/src/command/CommandTest.cpp @@ -5,8 +5,6 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "gtest/gtest.h" - #include "Commands/CommandGroup.h" #include "Commands/Scheduler.h" #include "Commands/Subsystem.h" @@ -14,6 +12,7 @@ #include "RobotState.h" #include "Timer.h" #include "command/MockCommand.h" +#include "gtest/gtest.h" class CommandTest : public testing::Test { protected: