diff --git a/.styleguide b/.styleguide index f107020e92..ab1c30a24b 100644 --- a/.styleguide +++ b/.styleguide @@ -53,3 +53,19 @@ modifiableFileExclude { \.py$ \.so$ } + +includeRelated { +} + +includeCSys { +} + +includeCppSys { +} + +includeOtherLibs { +} + +includeProject { + ^ctre/ +} diff --git a/hal/include/HAL/AnalogAccumulator.h b/hal/include/HAL/AnalogAccumulator.h index aab54ca95e..183e469eb8 100644 --- a/hal/include/HAL/AnalogAccumulator.h +++ b/hal/include/HAL/AnalogAccumulator.h @@ -14,6 +14,7 @@ #ifdef __cplusplus extern "C" { #endif + HAL_Bool HAL_IsAccumulatorChannel(HAL_AnalogInputHandle analogPortHandle, int32_t* status); void HAL_InitAccumulator(HAL_AnalogInputHandle analogPortHandle, diff --git a/hal/include/HAL/AnalogGyro.h b/hal/include/HAL/AnalogGyro.h index c620d2064e..6fdd07aaf4 100644 --- a/hal/include/HAL/AnalogGyro.h +++ b/hal/include/HAL/AnalogGyro.h @@ -14,6 +14,7 @@ #ifdef __cplusplus extern "C" { #endif + HAL_GyroHandle HAL_InitializeAnalogGyro(HAL_AnalogInputHandle handle, int32_t* status); void HAL_SetupAnalogGyro(HAL_GyroHandle handle, int32_t* status); diff --git a/hal/include/HAL/AnalogInput.h b/hal/include/HAL/AnalogInput.h index d813eb7280..895f59331c 100644 --- a/hal/include/HAL/AnalogInput.h +++ b/hal/include/HAL/AnalogInput.h @@ -14,6 +14,7 @@ #ifdef __cplusplus extern "C" { #endif + HAL_AnalogInputHandle HAL_InitializeAnalogInputPort(HAL_PortHandle portHandle, int32_t* status); void HAL_FreeAnalogInputPort(HAL_AnalogInputHandle analogPortHandle); diff --git a/hal/include/HAL/AnalogOutput.h b/hal/include/HAL/AnalogOutput.h index 7d6ca7d64f..612d5e312d 100644 --- a/hal/include/HAL/AnalogOutput.h +++ b/hal/include/HAL/AnalogOutput.h @@ -14,6 +14,7 @@ #ifdef __cplusplus extern "C" { #endif + HAL_AnalogOutputHandle HAL_InitializeAnalogOutputPort(HAL_PortHandle portHandle, int32_t* status); void HAL_FreeAnalogOutputPort(HAL_AnalogOutputHandle analogOutputHandle); diff --git a/hal/include/HAL/Compressor.h b/hal/include/HAL/Compressor.h index ccac15a548..ba77d62f8f 100644 --- a/hal/include/HAL/Compressor.h +++ b/hal/include/HAL/Compressor.h @@ -14,6 +14,7 @@ #ifdef __cplusplus extern "C" { #endif + HAL_CompressorHandle HAL_InitializeCompressor(int32_t module, int32_t* status); HAL_Bool HAL_CheckCompressorModule(int32_t module); diff --git a/hal/include/HAL/Constants.h b/hal/include/HAL/Constants.h index d6ae7dfaff..18eaa1bbab 100644 --- a/hal/include/HAL/Constants.h +++ b/hal/include/HAL/Constants.h @@ -12,6 +12,7 @@ #ifdef __cplusplus extern "C" { #endif + int32_t HAL_GetSystemClockTicksPerMicrosecond(void); #ifdef __cplusplus } diff --git a/hal/include/HAL/DIO.h b/hal/include/HAL/DIO.h index b65e210df5..f34b718df8 100644 --- a/hal/include/HAL/DIO.h +++ b/hal/include/HAL/DIO.h @@ -14,6 +14,7 @@ #ifdef __cplusplus extern "C" { #endif + HAL_DigitalHandle HAL_InitializeDIOPort(HAL_PortHandle portHandle, HAL_Bool input, int32_t* status); HAL_Bool HAL_CheckDIOChannel(int32_t channel); diff --git a/hal/include/HAL/I2C.h b/hal/include/HAL/I2C.h index 710386542a..518645868d 100644 --- a/hal/include/HAL/I2C.h +++ b/hal/include/HAL/I2C.h @@ -12,6 +12,7 @@ #ifdef __cplusplus extern "C" { #endif + void HAL_InitializeI2C(int32_t port, int32_t* status); int32_t HAL_TransactionI2C(int32_t port, int32_t deviceAddress, uint8_t* dataToSend, int32_t sendSize, diff --git a/hal/include/HAL/Interrupts.h b/hal/include/HAL/Interrupts.h index ee05e3df68..2578673e63 100644 --- a/hal/include/HAL/Interrupts.h +++ b/hal/include/HAL/Interrupts.h @@ -15,6 +15,7 @@ #ifdef __cplusplus extern "C" { #endif + typedef void (*HAL_InterruptHandlerFunction)(uint32_t interruptAssertedMask, void* param); diff --git a/hal/include/HAL/Notifier.h b/hal/include/HAL/Notifier.h index 0d3d2110ad..aca5e6bdf8 100644 --- a/hal/include/HAL/Notifier.h +++ b/hal/include/HAL/Notifier.h @@ -14,6 +14,7 @@ #ifdef __cplusplus extern "C" { #endif + typedef void (*HAL_NotifierProcessFunction)(uint64_t currentTime, HAL_NotifierHandle handle); diff --git a/hal/include/HAL/PDP.h b/hal/include/HAL/PDP.h index 9121b2ac8b..f86c8817ff 100644 --- a/hal/include/HAL/PDP.h +++ b/hal/include/HAL/PDP.h @@ -14,6 +14,7 @@ #ifdef __cplusplus extern "C" { #endif + void HAL_InitializePDP(int32_t module, int32_t* status); HAL_Bool HAL_CheckPDPChannel(int32_t channel); HAL_Bool HAL_CheckPDPModule(int32_t module); diff --git a/hal/include/HAL/PWM.h b/hal/include/HAL/PWM.h index fd7899e3d0..fdf34a8603 100644 --- a/hal/include/HAL/PWM.h +++ b/hal/include/HAL/PWM.h @@ -14,6 +14,7 @@ #ifdef __cplusplus extern "C" { #endif + HAL_DigitalHandle HAL_InitializePWMPort(HAL_PortHandle portHandle, int32_t* status); void HAL_FreePWMPort(HAL_DigitalHandle pwmPortHandle, int32_t* status); diff --git a/hal/include/HAL/Ports.h b/hal/include/HAL/Ports.h index 7ecaf2237a..61861ee275 100644 --- a/hal/include/HAL/Ports.h +++ b/hal/include/HAL/Ports.h @@ -12,6 +12,7 @@ #ifdef __cplusplus extern "C" { #endif + int32_t HAL_GetNumAccumulators(void); int32_t HAL_GetNumAnalogTriggers(void); int32_t HAL_GetNumAnalogInputs(void); diff --git a/hal/include/HAL/Power.h b/hal/include/HAL/Power.h index 13319fe24f..3b74690d31 100644 --- a/hal/include/HAL/Power.h +++ b/hal/include/HAL/Power.h @@ -14,6 +14,7 @@ #ifdef __cplusplus extern "C" { #endif + double HAL_GetVinVoltage(int32_t* status); double HAL_GetVinCurrent(int32_t* status); double HAL_GetUserVoltage6V(int32_t* status); diff --git a/hal/include/HAL/Relay.h b/hal/include/HAL/Relay.h index 13304f7c78..167cdc16a4 100644 --- a/hal/include/HAL/Relay.h +++ b/hal/include/HAL/Relay.h @@ -14,6 +14,7 @@ #ifdef __cplusplus extern "C" { #endif + HAL_RelayHandle HAL_InitializeRelayPort(HAL_PortHandle portHandle, HAL_Bool fwd, int32_t* status); void HAL_FreeRelayPort(HAL_RelayHandle relayPortHandle); diff --git a/hal/include/HAL/SPI.h b/hal/include/HAL/SPI.h index 084e74b63c..1f64b0efd9 100644 --- a/hal/include/HAL/SPI.h +++ b/hal/include/HAL/SPI.h @@ -14,6 +14,7 @@ #ifdef __cplusplus extern "C" { #endif + void HAL_InitializeSPI(int32_t port, int32_t* status); int32_t HAL_TransactionSPI(int32_t port, uint8_t* dataToSend, uint8_t* dataReceived, int32_t size); diff --git a/hal/include/HAL/SerialPort.h b/hal/include/HAL/SerialPort.h index 833b373c63..33039925e1 100644 --- a/hal/include/HAL/SerialPort.h +++ b/hal/include/HAL/SerialPort.h @@ -12,6 +12,7 @@ #ifdef __cplusplus extern "C" { #endif + void HAL_InitializeSerialPort(int32_t port, int32_t* status); void HAL_SetSerialBaudRate(int32_t port, int32_t baud, int32_t* status); void HAL_SetSerialDataBits(int32_t port, int32_t bits, int32_t* status); diff --git a/hal/include/HAL/Solenoid.h b/hal/include/HAL/Solenoid.h index abd369fdf2..dc83892274 100644 --- a/hal/include/HAL/Solenoid.h +++ b/hal/include/HAL/Solenoid.h @@ -14,6 +14,7 @@ #ifdef __cplusplus extern "C" { #endif + HAL_SolenoidHandle HAL_InitializeSolenoidPort(HAL_PortHandle portHandle, int32_t* status); void HAL_FreeSolenoidPort(HAL_SolenoidHandle solenoidPortHandle); diff --git a/hal/include/HAL/cpp/make_unique.h b/hal/include/HAL/cpp/make_unique.h index 0e0763856f..b01675a605 100644 --- a/hal/include/HAL/cpp/make_unique.h +++ b/hal/include/HAL/cpp/make_unique.h @@ -13,6 +13,7 @@ #include #include #include + namespace std { template struct _Unique_if { diff --git a/hal/lib/athena/ChipObject.h b/hal/lib/athena/ChipObject.h index cba5b0edaa..64225c880e 100644 --- a/hal/lib/athena/ChipObject.h +++ b/hal/lib/athena/ChipObject.h @@ -10,15 +10,15 @@ #pragma GCC diagnostic ignored "-Wpedantic" #pragma GCC diagnostic ignored "-Wignored-qualifiers" +#include "FRC_FPGA_ChipObject/tDMAChannelDescriptor.h" // NOLINT +#include "FRC_FPGA_ChipObject/tDMAManager.h" // NOLINT +#include "FRC_FPGA_ChipObject/tInterruptManager.h" // NOLINT +#include "FRC_FPGA_ChipObject/tSystem.h" // NOLINT +#include "FRC_FPGA_ChipObject/tSystemInterface.h" // NOLINT + #include #include "FRC_FPGA_ChipObject/RoboRIO_FRC_ChipObject_Aliases.h" -#include "FRC_FPGA_ChipObject/tDMAChannelDescriptor.h" -#include "FRC_FPGA_ChipObject/tDMAManager.h" -#include "FRC_FPGA_ChipObject/tInterruptManager.h" -#include "FRC_FPGA_ChipObject/tSystem.h" -#include "FRC_FPGA_ChipObject/tSystemInterface.h" - #include "FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/nInterfaceGlobals.h" #include "FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAI.h" #include "FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAO.h" diff --git a/hal/lib/athena/Interrupts.cpp b/hal/lib/athena/Interrupts.cpp index a9525dd439..caf0c6f56c 100644 --- a/hal/lib/athena/Interrupts.cpp +++ b/hal/lib/athena/Interrupts.cpp @@ -10,7 +10,6 @@ #include #include "ChipObject.h" - #include "DigitalInternal.h" #include "HAL/Errors.h" #include "HAL/cpp/make_unique.h" diff --git a/hal/lib/athena/PCMInternal.h b/hal/lib/athena/PCMInternal.h index 299a72bb60..4f7f9161fa 100644 --- a/hal/lib/athena/PCMInternal.h +++ b/hal/lib/athena/PCMInternal.h @@ -8,6 +8,7 @@ #pragma once #include + #include #include "HAL/Errors.h" 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 60cb266bfb..25c0ccbd29 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,16 +7,16 @@ #pragma once -#ifdef _WIN32 -#include -#endif - #include #include #include #include "switch.h" +#ifdef _WIN32 +#include +#endif + using namespace gazebo; class ExternalLimitSwitch : public Switch { 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 bb4c1fc617..a19e930c60 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,15 +7,15 @@ #pragma once -#ifdef _WIN32 -#include -#endif - #include #include #include "switch.h" +#ifdef _WIN32 +#include +#endif + using namespace gazebo; class InternalLimitSwitch : public Switch { 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 1d0a42df41..c520d95fcc 100644 --- a/simulation/frc_gazebo_plugins/pneumatic_piston/src/pneumatic_piston.cpp +++ b/simulation/frc_gazebo_plugins/pneumatic_piston/src/pneumatic_piston.cpp @@ -7,16 +7,16 @@ #include "pneumatic_piston.h" +#include +#include +#include + #ifdef _WIN32 // Ensure that Winsock2.h is included before Windows.h, which can get // pulled in by anybody (e.g., Boost). #include #endif -#include -#include -#include - GZ_REGISTER_MODEL_PLUGIN(PneumaticPiston) void PneumaticPiston::Load(physics::ModelPtr model, sdf::ElementPtr sdf) { diff --git a/simulation/frc_gazebo_plugins/potentiometer/src/potentiometer.cpp b/simulation/frc_gazebo_plugins/potentiometer/src/potentiometer.cpp index 67a9a16ed7..c59a3e2a9b 100644 --- a/simulation/frc_gazebo_plugins/potentiometer/src/potentiometer.cpp +++ b/simulation/frc_gazebo_plugins/potentiometer/src/potentiometer.cpp @@ -7,16 +7,16 @@ #include "potentiometer.h" +#include +#include +#include + #ifdef _WIN32 // Ensure that Winsock2.h is included before Windows.h, which can get // pulled in by anybody (e.g., Boost). #include #endif -#include -#include -#include - GZ_REGISTER_MODEL_PLUGIN(Potentiometer) void Potentiometer::Load(physics::ModelPtr model, sdf::ElementPtr sdf) { diff --git a/simulation/frc_gazebo_plugins/rangefinder/src/rangefinder.cpp b/simulation/frc_gazebo_plugins/rangefinder/src/rangefinder.cpp index 5719605bbd..7be903566d 100644 --- a/simulation/frc_gazebo_plugins/rangefinder/src/rangefinder.cpp +++ b/simulation/frc_gazebo_plugins/rangefinder/src/rangefinder.cpp @@ -7,17 +7,17 @@ #include "rangefinder.h" +#include +#include +#include +#include + #ifdef _WIN32 // Ensure that Winsock2.h is included before Windows.h, which can get // pulled in by anybody (e.g., Boost). #include #endif -#include -#include -#include -#include - GZ_REGISTER_MODEL_PLUGIN(Rangefinder) void Rangefinder::Load(physics::ModelPtr model, sdf::ElementPtr sdf) { diff --git a/simulation/frc_gazebo_plugins/servo/src/servo.cpp b/simulation/frc_gazebo_plugins/servo/src/servo.cpp index 5c8f25f16f..1e0984edb1 100644 --- a/simulation/frc_gazebo_plugins/servo/src/servo.cpp +++ b/simulation/frc_gazebo_plugins/servo/src/servo.cpp @@ -7,16 +7,16 @@ #include "servo.h" +#include +#include +#include + #ifdef _WIN32 // Ensure that Winsock2.h is included before Windows.h, which can get // pulled in by anybody (e.g., Boost). #include #endif -#include -#include -#include - GZ_REGISTER_MODEL_PLUGIN(Servo) void Servo::Load(physics::ModelPtr model, sdf::ElementPtr sdf) { diff --git a/wpilibc/athena/include/Vision/BinaryImage.h b/wpilibc/athena/include/Vision/BinaryImage.h index c0a677ad69..26987478f2 100644 --- a/wpilibc/athena/include/Vision/BinaryImage.h +++ b/wpilibc/athena/include/Vision/BinaryImage.h @@ -11,6 +11,7 @@ #include #include "MonoImage.h" + /** * Included for ParticleAnalysisReport definition * TODO: Eliminate this dependency! diff --git a/wpilibc/athena/include/WPILib.h b/wpilibc/athena/include/WPILib.h index 33ddc84f1f..8f0002f047 100644 --- a/wpilibc/athena/include/WPILib.h +++ b/wpilibc/athena/include/WPILib.h @@ -94,8 +94,7 @@ #include "Vision/MonoImage.h" #include "Vision/RGBImage.h" #include "Vision/Threshold.h" +#include "WPIErrors.h" #include "interfaces/Accelerometer.h" #include "interfaces/Gyro.h" #include "interfaces/Potentiometer.h" -// XXX: #include "Vision/AxisCamera.h" -#include "WPIErrors.h" diff --git a/wpilibc/athena/src/ADXL345_I2C.cpp b/wpilibc/athena/src/ADXL345_I2C.cpp index b0d7d6b860..430f17f3bb 100644 --- a/wpilibc/athena/src/ADXL345_I2C.cpp +++ b/wpilibc/athena/src/ADXL345_I2C.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "ADXL345_I2C.h" + #include "HAL/HAL.h" #include "I2C.h" #include "LiveWindow/LiveWindow.h" diff --git a/wpilibc/athena/src/ADXL345_SPI.cpp b/wpilibc/athena/src/ADXL345_SPI.cpp index 097bdd9f4b..27dae90b9b 100644 --- a/wpilibc/athena/src/ADXL345_SPI.cpp +++ b/wpilibc/athena/src/ADXL345_SPI.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "ADXL345_SPI.h" + #include "DigitalInput.h" #include "DigitalOutput.h" #include "HAL/HAL.h" diff --git a/wpilibc/athena/src/ADXL362.cpp b/wpilibc/athena/src/ADXL362.cpp index 62edbb7e5e..516e3d9471 100644 --- a/wpilibc/athena/src/ADXL362.cpp +++ b/wpilibc/athena/src/ADXL362.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "ADXL362.h" + #include "DigitalInput.h" #include "DigitalOutput.h" #include "DriverStation.h" diff --git a/wpilibc/athena/src/ADXRS450_Gyro.cpp b/wpilibc/athena/src/ADXRS450_Gyro.cpp index aa1f726166..bf847aeba3 100644 --- a/wpilibc/athena/src/ADXRS450_Gyro.cpp +++ b/wpilibc/athena/src/ADXRS450_Gyro.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "ADXRS450_Gyro.h" + #include "DriverStation.h" #include "LiveWindow/LiveWindow.h" #include "Timer.h" diff --git a/wpilibc/athena/src/AnalogAccelerometer.cpp b/wpilibc/athena/src/AnalogAccelerometer.cpp index 5bc61dbf1a..f954692c58 100644 --- a/wpilibc/athena/src/AnalogAccelerometer.cpp +++ b/wpilibc/athena/src/AnalogAccelerometer.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "AnalogAccelerometer.h" + #include "HAL/HAL.h" #include "LiveWindow/LiveWindow.h" #include "WPIErrors.h" diff --git a/wpilibc/athena/src/AnalogPotentiometer.cpp b/wpilibc/athena/src/AnalogPotentiometer.cpp index 43cde3047d..5c9472a1e3 100644 --- a/wpilibc/athena/src/AnalogPotentiometer.cpp +++ b/wpilibc/athena/src/AnalogPotentiometer.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "AnalogPotentiometer.h" + #include "ControllerPower.h" /** diff --git a/wpilibc/athena/src/AnalogTriggerOutput.cpp b/wpilibc/athena/src/AnalogTriggerOutput.cpp index 8c5c7799e1..53dc94b1ec 100644 --- a/wpilibc/athena/src/AnalogTriggerOutput.cpp +++ b/wpilibc/athena/src/AnalogTriggerOutput.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "AnalogTriggerOutput.h" + #include "AnalogTrigger.h" #include "HAL/HAL.h" #include "WPIErrors.h" diff --git a/wpilibc/athena/src/BuiltInAccelerometer.cpp b/wpilibc/athena/src/BuiltInAccelerometer.cpp index ce8486eb7a..c0f4746377 100644 --- a/wpilibc/athena/src/BuiltInAccelerometer.cpp +++ b/wpilibc/athena/src/BuiltInAccelerometer.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "BuiltInAccelerometer.h" + #include "HAL/HAL.h" #include "LiveWindow/LiveWindow.h" #include "WPIErrors.h" diff --git a/wpilibc/athena/src/Encoder.cpp b/wpilibc/athena/src/Encoder.cpp index 5f6648ca81..7cc85366ce 100644 --- a/wpilibc/athena/src/Encoder.cpp +++ b/wpilibc/athena/src/Encoder.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "Encoder.h" + #include "DigitalInput.h" #include "HAL/HAL.h" #include "LiveWindow/LiveWindow.h" diff --git a/wpilibc/athena/src/GearTooth.cpp b/wpilibc/athena/src/GearTooth.cpp index 2406b0c7f8..4697333569 100644 --- a/wpilibc/athena/src/GearTooth.cpp +++ b/wpilibc/athena/src/GearTooth.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "GearTooth.h" + #include "LiveWindow/LiveWindow.h" constexpr double GearTooth::kGearToothThreshold; diff --git a/wpilibc/athena/src/I2C.cpp b/wpilibc/athena/src/I2C.cpp index 2e8f703bad..da7f06ccde 100644 --- a/wpilibc/athena/src/I2C.cpp +++ b/wpilibc/athena/src/I2C.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "I2C.h" + #include "HAL/HAL.h" #include "WPIErrors.h" diff --git a/wpilibc/athena/src/Internal/HardwareHLReporting.cpp b/wpilibc/athena/src/Internal/HardwareHLReporting.cpp index 9c9be27ff6..17c13f786d 100644 --- a/wpilibc/athena/src/Internal/HardwareHLReporting.cpp +++ b/wpilibc/athena/src/Internal/HardwareHLReporting.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "Internal/HardwareHLReporting.h" + #include "HAL/HAL.h" void HardwareHLReporting::ReportScheduler() { diff --git a/wpilibc/athena/src/Jaguar.cpp b/wpilibc/athena/src/Jaguar.cpp index 2f176833a2..2849e3e2d8 100644 --- a/wpilibc/athena/src/Jaguar.cpp +++ b/wpilibc/athena/src/Jaguar.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "Jaguar.h" + #include "HAL/HAL.h" #include "LiveWindow/LiveWindow.h" diff --git a/wpilibc/athena/src/Notifier.cpp b/wpilibc/athena/src/Notifier.cpp index b3a67b8ced..ad57faa43d 100644 --- a/wpilibc/athena/src/Notifier.cpp +++ b/wpilibc/athena/src/Notifier.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "Notifier.h" + #include "HAL/HAL.h" #include "Timer.h" #include "Utility.h" diff --git a/wpilibc/athena/src/Timer.cpp b/wpilibc/athena/src/Timer.cpp index 40acd9b94f..c3dfd98cdc 100644 --- a/wpilibc/athena/src/Timer.cpp +++ b/wpilibc/athena/src/Timer.cpp @@ -10,6 +10,7 @@ #include #include #include + #include "HAL/HAL.h" #include "Utility.h" diff --git a/wpilibc/athena/src/USBCamera.cpp b/wpilibc/athena/src/USBCamera.cpp index e5af0a6825..f43daa2bac 100644 --- a/wpilibc/athena/src/USBCamera.cpp +++ b/wpilibc/athena/src/USBCamera.cpp @@ -7,8 +7,6 @@ #include "USBCamera.h" -#include "Utility.h" - #include #include #include @@ -17,6 +15,8 @@ #include #include +#include "Utility.h" + // This macro expands the given imaq function to ensure that it is called and // properly checked for an error, calling the wpi_setImaqErrorWithContext // macro diff --git a/wpilibc/athena/src/Vision/FrcError.cpp b/wpilibc/athena/src/Vision/FrcError.cpp index 973af069fc..6fe9a66bd7 100644 --- a/wpilibc/athena/src/Vision/FrcError.cpp +++ b/wpilibc/athena/src/Vision/FrcError.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "Vision/FrcError.h" + #include "nivision.h" /** diff --git a/wpilibc/athena/src/Vision/ImageBase.cpp b/wpilibc/athena/src/Vision/ImageBase.cpp index 979c7551c9..73535df032 100644 --- a/wpilibc/athena/src/Vision/ImageBase.cpp +++ b/wpilibc/athena/src/Vision/ImageBase.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "Vision/ImageBase.h" + #include "nivision.h" /** diff --git a/wpilibc/athena/src/Vision/MonoImage.cpp b/wpilibc/athena/src/Vision/MonoImage.cpp index 0a2ee08f00..f59fe0ddc2 100644 --- a/wpilibc/athena/src/Vision/MonoImage.cpp +++ b/wpilibc/athena/src/Vision/MonoImage.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "Vision/MonoImage.h" + #include "nivision.h" MonoImage::MonoImage() : ImageBase(IMAQ_IMAGE_U8) {} diff --git a/wpilibc/athena/src/Vision/VisionAPI.cpp b/wpilibc/athena/src/Vision/VisionAPI.cpp index 4223fb9050..9a46e71923 100644 --- a/wpilibc/athena/src/Vision/VisionAPI.cpp +++ b/wpilibc/athena/src/Vision/VisionAPI.cpp @@ -5,11 +5,12 @@ /* the project. */ /*----------------------------------------------------------------------------*/ +#include "Vision/VisionAPI.h" + #include #include "Vision/BaeUtilities.h" #include "Vision/FrcError.h" -#include "Vision/VisionAPI.h" int VisionAPI_debugFlag = 1; #define DPRINTF \ diff --git a/wpilibc/shared/include/Buttons/NetworkButton.h b/wpilibc/shared/include/Buttons/NetworkButton.h index e72ae6e4dc..e7fbb60a73 100644 --- a/wpilibc/shared/include/Buttons/NetworkButton.h +++ b/wpilibc/shared/include/Buttons/NetworkButton.h @@ -9,6 +9,7 @@ #include #include + #include "Buttons/Button.h" class NetworkButton : public Button { diff --git a/wpilibc/shared/include/Commands/Command.h b/wpilibc/shared/include/Commands/Command.h index 1dc35db918..1b5d846890 100644 --- a/wpilibc/shared/include/Commands/Command.h +++ b/wpilibc/shared/include/Commands/Command.h @@ -10,6 +10,7 @@ #include #include #include + #include "ErrorBase.h" #include "SmartDashboard/NamedSendable.h" #include "tables/ITableListener.h" diff --git a/wpilibc/shared/include/Commands/PrintCommand.h b/wpilibc/shared/include/Commands/PrintCommand.h index fd5468f71e..56cf816e95 100644 --- a/wpilibc/shared/include/Commands/PrintCommand.h +++ b/wpilibc/shared/include/Commands/PrintCommand.h @@ -8,6 +8,7 @@ #pragma once #include + #include "Commands/Command.h" class PrintCommand : public Command { diff --git a/wpilibc/shared/include/Commands/Scheduler.h b/wpilibc/shared/include/Commands/Scheduler.h index 8e5d7f7e93..86c3a5c2e1 100644 --- a/wpilibc/shared/include/Commands/Scheduler.h +++ b/wpilibc/shared/include/Commands/Scheduler.h @@ -13,6 +13,7 @@ #include #include #include + #include "Commands/Command.h" #include "ErrorBase.h" #include "HAL/cpp/priority_mutex.h" diff --git a/wpilibc/shared/include/Commands/Subsystem.h b/wpilibc/shared/include/Commands/Subsystem.h index 3baffef654..7e9a2a65a4 100644 --- a/wpilibc/shared/include/Commands/Subsystem.h +++ b/wpilibc/shared/include/Commands/Subsystem.h @@ -9,6 +9,7 @@ #include #include + #include "ErrorBase.h" #include "SmartDashboard/NamedSendable.h" diff --git a/wpilibc/shared/include/Error.h b/wpilibc/shared/include/Error.h index 0f77654af0..478cac14b9 100644 --- a/wpilibc/shared/include/Error.h +++ b/wpilibc/shared/include/Error.h @@ -7,7 +7,12 @@ #pragma once +#include + +#include + #include "Base.h" +#include "llvm/StringRef.h" #ifdef _WIN32 #include @@ -15,10 +20,6 @@ #undef GetMessage #endif -#include -#include -#include "llvm/StringRef.h" - // Forward declarations class ErrorBase; diff --git a/wpilibc/shared/include/ErrorBase.h b/wpilibc/shared/include/ErrorBase.h index 489c2ea1b6..cb25d77b4c 100644 --- a/wpilibc/shared/include/ErrorBase.h +++ b/wpilibc/shared/include/ErrorBase.h @@ -9,7 +9,6 @@ #include "Base.h" #include "Error.h" - #include "HAL/cpp/priority_mutex.h" #include "llvm/StringRef.h" diff --git a/wpilibc/shared/include/Filters/Filter.h b/wpilibc/shared/include/Filters/Filter.h index 1f2a62039f..76010f2620 100644 --- a/wpilibc/shared/include/Filters/Filter.h +++ b/wpilibc/shared/include/Filters/Filter.h @@ -8,6 +8,7 @@ #pragma once #include + #include "PIDSource.h" /** diff --git a/wpilibc/shared/include/Filters/LinearDigitalFilter.h b/wpilibc/shared/include/Filters/LinearDigitalFilter.h index 0766f29bdc..b6ff3a3168 100644 --- a/wpilibc/shared/include/Filters/LinearDigitalFilter.h +++ b/wpilibc/shared/include/Filters/LinearDigitalFilter.h @@ -10,6 +10,7 @@ #include #include #include + #include "CircularBuffer.h" #include "Filter.h" diff --git a/wpilibc/shared/include/SmartDashboard/NamedSendable.h b/wpilibc/shared/include/SmartDashboard/NamedSendable.h index b62f20515d..dfe5a26425 100644 --- a/wpilibc/shared/include/SmartDashboard/NamedSendable.h +++ b/wpilibc/shared/include/SmartDashboard/NamedSendable.h @@ -8,6 +8,7 @@ #pragma once #include + #include "SmartDashboard/Sendable.h" /** diff --git a/wpilibc/shared/include/SmartDashboard/Sendable.h b/wpilibc/shared/include/SmartDashboard/Sendable.h index 56ec98c690..64130f18b1 100644 --- a/wpilibc/shared/include/SmartDashboard/Sendable.h +++ b/wpilibc/shared/include/SmartDashboard/Sendable.h @@ -9,6 +9,7 @@ #include #include + #include "tables/ITable.h" class Sendable { diff --git a/wpilibc/shared/include/SmartDashboard/SendableChooser.h b/wpilibc/shared/include/SmartDashboard/SendableChooser.h index c2787ba318..3fcaa70c1f 100644 --- a/wpilibc/shared/include/SmartDashboard/SendableChooser.h +++ b/wpilibc/shared/include/SmartDashboard/SendableChooser.h @@ -10,6 +10,7 @@ #include #include #include + #include "SmartDashboard/Sendable.h" #include "tables/ITable.h" diff --git a/wpilibc/shared/include/Task.h b/wpilibc/shared/include/Task.h index 2731b7380d..3941710ce3 100644 --- a/wpilibc/shared/include/Task.h +++ b/wpilibc/shared/include/Task.h @@ -10,6 +10,7 @@ #include #include #include + #include "ErrorBase.h" #include "HAL/Task.h" diff --git a/wpilibc/shared/include/Utility.h b/wpilibc/shared/include/Utility.h index 0d24d3d656..1face1fb40 100644 --- a/wpilibc/shared/include/Utility.h +++ b/wpilibc/shared/include/Utility.h @@ -12,6 +12,7 @@ */ #include + #include #define wpi_assert(condition) \ diff --git a/wpilibc/shared/src/Buttons/NetworkButton.cpp b/wpilibc/shared/src/Buttons/NetworkButton.cpp index 208c282331..5b9595284c 100644 --- a/wpilibc/shared/src/Buttons/NetworkButton.cpp +++ b/wpilibc/shared/src/Buttons/NetworkButton.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "Buttons/NetworkButton.h" + #include "networktables/NetworkTable.h" NetworkButton::NetworkButton(const std::string& tableName, diff --git a/wpilibc/shared/src/Buttons/Trigger.cpp b/wpilibc/shared/src/Buttons/Trigger.cpp index 54a409cea2..8ca70d3b7d 100644 --- a/wpilibc/shared/src/Buttons/Trigger.cpp +++ b/wpilibc/shared/src/Buttons/Trigger.cpp @@ -6,7 +6,6 @@ /*----------------------------------------------------------------------------*/ #include "Buttons/Button.h" - #include "Buttons/CancelButtonScheduler.h" #include "Buttons/HeldButtonScheduler.h" #include "Buttons/PressedButtonScheduler.h" diff --git a/wpilibc/shared/src/Commands/Command.cpp b/wpilibc/shared/src/Commands/Command.cpp index 2035505416..c6ed7b5d17 100644 --- a/wpilibc/shared/src/Commands/Command.cpp +++ b/wpilibc/shared/src/Commands/Command.cpp @@ -6,7 +6,9 @@ /*----------------------------------------------------------------------------*/ #include "Commands/Command.h" + #include + #include "Commands/CommandGroup.h" #include "Commands/Scheduler.h" #include "RobotState.h" diff --git a/wpilibc/shared/src/Commands/CommandGroup.cpp b/wpilibc/shared/src/Commands/CommandGroup.cpp index 28d18bb8c1..007b7ca9ad 100644 --- a/wpilibc/shared/src/Commands/CommandGroup.cpp +++ b/wpilibc/shared/src/Commands/CommandGroup.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "Commands/CommandGroup.h" + #include "WPIErrors.h" /** diff --git a/wpilibc/shared/src/Commands/PIDCommand.cpp b/wpilibc/shared/src/Commands/PIDCommand.cpp index 49fab7946c..904b5a105b 100644 --- a/wpilibc/shared/src/Commands/PIDCommand.cpp +++ b/wpilibc/shared/src/Commands/PIDCommand.cpp @@ -7,7 +7,7 @@ #include "Commands/PIDCommand.h" -#include "float.h" +#include PIDCommand::PIDCommand(const std::string& name, double p, double i, double d, double f, double period) diff --git a/wpilibc/shared/src/Commands/PIDSubsystem.cpp b/wpilibc/shared/src/Commands/PIDSubsystem.cpp index be621020c1..c6d7e25fc4 100644 --- a/wpilibc/shared/src/Commands/PIDSubsystem.cpp +++ b/wpilibc/shared/src/Commands/PIDSubsystem.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "Commands/PIDSubsystem.h" + #include "PIDController.h" /** diff --git a/wpilibc/shared/src/Commands/Scheduler.cpp b/wpilibc/shared/src/Commands/Scheduler.cpp index 0ec8f72e18..4c927d4a71 100644 --- a/wpilibc/shared/src/Commands/Scheduler.cpp +++ b/wpilibc/shared/src/Commands/Scheduler.cpp @@ -10,6 +10,7 @@ #include #include #include + #include "Buttons/ButtonScheduler.h" #include "Commands/Subsystem.h" #include "HLUsageReporting.h" diff --git a/wpilibc/shared/src/Commands/WaitCommand.cpp b/wpilibc/shared/src/Commands/WaitCommand.cpp index 0f85ce0a18..6b94b367b9 100644 --- a/wpilibc/shared/src/Commands/WaitCommand.cpp +++ b/wpilibc/shared/src/Commands/WaitCommand.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "Commands/WaitCommand.h" + #include WaitCommand::WaitCommand(double timeout) diff --git a/wpilibc/shared/src/Commands/WaitForChildren.cpp b/wpilibc/shared/src/Commands/WaitForChildren.cpp index ad8f12815f..e7f9bfb901 100644 --- a/wpilibc/shared/src/Commands/WaitForChildren.cpp +++ b/wpilibc/shared/src/Commands/WaitForChildren.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "Commands/WaitForChildren.h" + #include "Commands/CommandGroup.h" WaitForChildren::WaitForChildren(double timeout) diff --git a/wpilibc/shared/src/Commands/WaitUntilCommand.cpp b/wpilibc/shared/src/Commands/WaitUntilCommand.cpp index fb47a65e01..0b3e0bf806 100644 --- a/wpilibc/shared/src/Commands/WaitUntilCommand.cpp +++ b/wpilibc/shared/src/Commands/WaitUntilCommand.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "Commands/WaitUntilCommand.h" + #include "Timer.h" /** diff --git a/wpilibc/shared/src/GyroBase.cpp b/wpilibc/shared/src/GyroBase.cpp index 18018cc6a7..6b6112b86a 100644 --- a/wpilibc/shared/src/GyroBase.cpp +++ b/wpilibc/shared/src/GyroBase.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "GyroBase.h" + #include "LiveWindow/LiveWindow.h" #include "WPIErrors.h" diff --git a/wpilibc/shared/src/LiveWindow/LiveWindow.cpp b/wpilibc/shared/src/LiveWindow/LiveWindow.cpp index db28352e4f..93c61182a6 100644 --- a/wpilibc/shared/src/LiveWindow/LiveWindow.cpp +++ b/wpilibc/shared/src/LiveWindow/LiveWindow.cpp @@ -6,8 +6,10 @@ /*----------------------------------------------------------------------------*/ #include "LiveWindow/LiveWindow.h" + #include #include + #include "networktables/NetworkTable.h" /** diff --git a/wpilibc/shared/src/LiveWindow/LiveWindowStatusListener.cpp b/wpilibc/shared/src/LiveWindow/LiveWindowStatusListener.cpp index 5b02dc8489..040720b090 100644 --- a/wpilibc/shared/src/LiveWindow/LiveWindowStatusListener.cpp +++ b/wpilibc/shared/src/LiveWindow/LiveWindowStatusListener.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "LiveWindow/LiveWindowStatusListener.h" + #include "Commands/Scheduler.h" void LiveWindowStatusListener::ValueChanged(ITable* source, llvm::StringRef key, diff --git a/wpilibc/shared/src/Resource.cpp b/wpilibc/shared/src/Resource.cpp index c6df9e2d14..f52e184a8c 100644 --- a/wpilibc/shared/src/Resource.cpp +++ b/wpilibc/shared/src/Resource.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "Resource.h" + #include "ErrorBase.h" #include "WPIErrors.h" diff --git a/wpilibc/shared/src/interfaces/Potentiometer.cpp b/wpilibc/shared/src/interfaces/Potentiometer.cpp index fb95aa333e..2f0497aa57 100644 --- a/wpilibc/shared/src/interfaces/Potentiometer.cpp +++ b/wpilibc/shared/src/interfaces/Potentiometer.cpp @@ -5,8 +5,9 @@ /* the project. */ /*----------------------------------------------------------------------------*/ +#include "interfaces/Potentiometer.h" + #include -#include void Potentiometer::SetPIDSourceType(PIDSourceType pidSource) { if (wpi_assert(pidSource == PIDSourceType::kDisplacement)) { diff --git a/wpilibc/sim/include/DriverStation.h b/wpilibc/sim/include/DriverStation.h index 59729ab771..2a9f1230c5 100644 --- a/wpilibc/sim/include/DriverStation.h +++ b/wpilibc/sim/include/DriverStation.h @@ -7,12 +7,6 @@ #pragma once -#ifdef _WIN32 -// Ensure that Winsock2.h is included before Windows.h, which can get -// pulled in by anybody (e.g., Boost). -#include -#endif - #include #include #include @@ -23,6 +17,12 @@ #include "SensorBase.h" #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). +#include +#endif + struct HALCommonControlData; class AnalogInput; diff --git a/wpilibc/sim/include/Joystick.h b/wpilibc/sim/include/Joystick.h index 584137a93e..7059b83e44 100644 --- a/wpilibc/sim/include/Joystick.h +++ b/wpilibc/sim/include/Joystick.h @@ -8,6 +8,7 @@ #pragma once #include + #include "ErrorBase.h" #include "GenericHID.h" diff --git a/wpilibc/sim/include/RobotDrive.h b/wpilibc/sim/include/RobotDrive.h index 6383dcc0d3..b55c11987d 100644 --- a/wpilibc/sim/include/RobotDrive.h +++ b/wpilibc/sim/include/RobotDrive.h @@ -10,6 +10,7 @@ #include #include + #include "ErrorBase.h" #include "MotorSafety.h" #include "MotorSafetyHelper.h" diff --git a/wpilibc/sim/include/SafePWM.h b/wpilibc/sim/include/SafePWM.h index 70925059cd..703509efea 100644 --- a/wpilibc/sim/include/SafePWM.h +++ b/wpilibc/sim/include/SafePWM.h @@ -8,6 +8,7 @@ #pragma once #include + #include "MotorSafety.h" #include "MotorSafetyHelper.h" #include "PWM.h" diff --git a/wpilibc/sim/include/WPILib.h b/wpilibc/sim/include/WPILib.h index 95d110c404..4bbc3ec3f5 100644 --- a/wpilibc/sim/include/WPILib.h +++ b/wpilibc/sim/include/WPILib.h @@ -9,15 +9,17 @@ #define SIMULATION "gazebo" +#include #include -#include "string.h" +#include "AnalogGyro.h" +#include "AnalogInput.h" +#include "AnalogPotentiometer.h" #include "Buttons/Button.h" #include "Buttons/InternalButton.h" #include "Buttons/JoystickButton.h" #include "Buttons/NetworkButton.h" #include "Buttons/Trigger.h" - #include "Commands/Command.h" #include "Commands/CommandGroup.h" #include "Commands/PIDCommand.h" @@ -29,13 +31,6 @@ #include "Commands/WaitCommand.h" #include "Commands/WaitForChildren.h" #include "Commands/WaitUntilCommand.h" - -#include "SmartDashboard/SendableChooser.h" -#include "SmartDashboard/SmartDashboard.h" - -#include "AnalogGyro.h" -#include "AnalogInput.h" -#include "AnalogPotentiometer.h" #include "Counter.h" #include "DigitalInput.h" #include "DoubleSolenoid.h" @@ -49,6 +44,8 @@ #include "RobotBase.h" #include "RobotDrive.h" #include "SampleRobot.h" +#include "SmartDashboard/SendableChooser.h" +#include "SmartDashboard/SmartDashboard.h" #include "Solenoid.h" #include "SpeedController.h" #include "Talon.h" diff --git a/wpilibc/sim/include/simulation/SimContinuousOutput.h b/wpilibc/sim/include/simulation/SimContinuousOutput.h index 20161d826f..c8115b710d 100644 --- a/wpilibc/sim/include/simulation/SimContinuousOutput.h +++ b/wpilibc/sim/include/simulation/SimContinuousOutput.h @@ -7,18 +7,18 @@ #pragma once -#ifdef _WIN32 -// Ensure that Winsock2.h is included before Windows.h, which can get -// pulled in by anybody (e.g., Boost). -#include -#endif - #include #include #include "SpeedController.h" +#ifdef _WIN32 +// Ensure that Winsock2.h is included before Windows.h, which can get +// pulled in by anybody (e.g., Boost). +#include +#endif + using namespace gazebo; class SimContinuousOutput { diff --git a/wpilibc/sim/include/simulation/simTime.h b/wpilibc/sim/include/simulation/simTime.h index 5bf67425b2..8e31d55e03 100644 --- a/wpilibc/sim/include/simulation/simTime.h +++ b/wpilibc/sim/include/simulation/simTime.h @@ -7,17 +7,17 @@ #pragma once +#include +#include + +#include "simulation/SimFloatInput.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 -#include - -#include "simulation/SimFloatInput.h" - namespace wpilib { namespace internal { extern double simTime; diff --git a/wpilibc/sim/src/Jaguar.cpp b/wpilibc/sim/src/Jaguar.cpp index bc3cf6397b..694ba1000f 100644 --- a/wpilibc/sim/src/Jaguar.cpp +++ b/wpilibc/sim/src/Jaguar.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "Jaguar.h" + #include "LiveWindow/LiveWindow.h" /** diff --git a/wpilibc/sim/src/MotorSafetyHelper.cpp b/wpilibc/sim/src/MotorSafetyHelper.cpp index c3f13388b3..b8dcd27790 100644 --- a/wpilibc/sim/src/MotorSafetyHelper.cpp +++ b/wpilibc/sim/src/MotorSafetyHelper.cpp @@ -7,13 +7,13 @@ #include "MotorSafetyHelper.h" +#include + #include "DriverStation.h" #include "MotorSafety.h" #include "Timer.h" #include "WPIErrors.h" -#include - std::set MotorSafetyHelper::m_helperList; priority_recursive_mutex MotorSafetyHelper::m_listMutex; diff --git a/wpilibc/sim/src/Notifier.cpp b/wpilibc/sim/src/Notifier.cpp index 253706ab89..8a272a6b54 100644 --- a/wpilibc/sim/src/Notifier.cpp +++ b/wpilibc/sim/src/Notifier.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "Notifier.h" + #include "Timer.h" #include "Utility.h" #include "WPIErrors.h" diff --git a/wpilibc/sim/src/SafePWM.cpp b/wpilibc/sim/src/SafePWM.cpp index c60d362d7b..f3a09daf22 100644 --- a/wpilibc/sim/src/SafePWM.cpp +++ b/wpilibc/sim/src/SafePWM.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "SafePWM.h" + #include #include diff --git a/wpilibc/sim/src/simulation/SimContinuousOutput.cpp b/wpilibc/sim/src/simulation/SimContinuousOutput.cpp index 417ff62aef..f5855e47a2 100644 --- a/wpilibc/sim/src/simulation/SimContinuousOutput.cpp +++ b/wpilibc/sim/src/simulation/SimContinuousOutput.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "simulation/SimContinuousOutput.h" + #include "simulation/MainNode.h" SimContinuousOutput::SimContinuousOutput(std::string topic) { diff --git a/wpilibc/sim/src/simulation/SimDigitalInput.cpp b/wpilibc/sim/src/simulation/SimDigitalInput.cpp index 1ed958fcf7..ebb7ab623c 100644 --- a/wpilibc/sim/src/simulation/SimDigitalInput.cpp +++ b/wpilibc/sim/src/simulation/SimDigitalInput.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "simulation/SimDigitalInput.h" + #include "simulation/MainNode.h" SimDigitalInput::SimDigitalInput(std::string topic) { diff --git a/wpilibc/sim/src/simulation/SimEncoder.cpp b/wpilibc/sim/src/simulation/SimEncoder.cpp index 89d3c7f176..0b7bacafcc 100644 --- a/wpilibc/sim/src/simulation/SimEncoder.cpp +++ b/wpilibc/sim/src/simulation/SimEncoder.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "simulation/SimEncoder.h" + #include "simulation/MainNode.h" SimEncoder::SimEncoder(std::string topic) { diff --git a/wpilibc/sim/src/simulation/SimFloatInput.cpp b/wpilibc/sim/src/simulation/SimFloatInput.cpp index d758ce00c4..ebe1b098d5 100644 --- a/wpilibc/sim/src/simulation/SimFloatInput.cpp +++ b/wpilibc/sim/src/simulation/SimFloatInput.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "simulation/SimFloatInput.h" + #include "simulation/MainNode.h" SimFloatInput::SimFloatInput(std::string topic) { diff --git a/wpilibc/sim/src/simulation/SimGyro.cpp b/wpilibc/sim/src/simulation/SimGyro.cpp index 07352dde3c..9e1723b7bf 100644 --- a/wpilibc/sim/src/simulation/SimGyro.cpp +++ b/wpilibc/sim/src/simulation/SimGyro.cpp @@ -6,6 +6,7 @@ /*----------------------------------------------------------------------------*/ #include "simulation/SimGyro.h" + #include "simulation/MainNode.h" SimGyro::SimGyro(std::string topic) { diff --git a/wpilibcIntegrationTests/src/AnalogPotentiometerTest.cpp b/wpilibcIntegrationTests/src/AnalogPotentiometerTest.cpp index ea4a27a7dc..b3aa470b06 100644 --- a/wpilibcIntegrationTests/src/AnalogPotentiometerTest.cpp +++ b/wpilibcIntegrationTests/src/AnalogPotentiometerTest.cpp @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "AnalogPotentiometer.h" +#include "AnalogPotentiometer.h" // NOLINT(build/include_order) #include "AnalogOutput.h" #include "ControllerPower.h" diff --git a/wpilibcIntegrationTests/src/BuiltInAccelerometerTest.cpp b/wpilibcIntegrationTests/src/BuiltInAccelerometerTest.cpp index e34dd8a4e3..c6fe2fe401 100644 --- a/wpilibcIntegrationTests/src/BuiltInAccelerometerTest.cpp +++ b/wpilibcIntegrationTests/src/BuiltInAccelerometerTest.cpp @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "BuiltInAccelerometer.h" +#include "BuiltInAccelerometer.h" // NOLINT(build/include_order) #include "Timer.h" #include "gtest/gtest.h" diff --git a/wpilibcIntegrationTests/src/CANJaguarTest.cpp b/wpilibcIntegrationTests/src/CANJaguarTest.cpp index cc8869e842..f8b95122cf 100644 --- a/wpilibcIntegrationTests/src/CANJaguarTest.cpp +++ b/wpilibcIntegrationTests/src/CANJaguarTest.cpp @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "CANJaguar.h" +#include "CANJaguar.h" // NOLINT(build/include_order) #include diff --git a/wpilibcIntegrationTests/src/CANTalonTest.cpp b/wpilibcIntegrationTests/src/CANTalonTest.cpp index b11956d05d..eeaa4389bd 100644 --- a/wpilibcIntegrationTests/src/CANTalonTest.cpp +++ b/wpilibcIntegrationTests/src/CANTalonTest.cpp @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "CANTalon.h" +#include "CANTalon.h" // NOLINT(build/include_order) #include "TestBench.h" #include "Timer.h" diff --git a/wpilibcIntegrationTests/src/CircularBufferTest.cpp b/wpilibcIntegrationTests/src/CircularBufferTest.cpp index dbc7927c3a..47564a741e 100644 --- a/wpilibcIntegrationTests/src/CircularBufferTest.cpp +++ b/wpilibcIntegrationTests/src/CircularBufferTest.cpp @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "CircularBuffer.h" +#include "CircularBuffer.h" // NOLINT(build/include_order) #include diff --git a/wpilibcIntegrationTests/src/CounterTest.cpp b/wpilibcIntegrationTests/src/CounterTest.cpp index 5e8b2d9b80..fcd2361f86 100644 --- a/wpilibcIntegrationTests/src/CounterTest.cpp +++ b/wpilibcIntegrationTests/src/CounterTest.cpp @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "Counter.h" +#include "Counter.h" // NOLINT(build/include_order) #include "Jaguar.h" #include "Talon.h" diff --git a/wpilibcIntegrationTests/src/DIOLoopTest.cpp b/wpilibcIntegrationTests/src/DIOLoopTest.cpp index d6864043e8..c55264a30e 100644 --- a/wpilibcIntegrationTests/src/DIOLoopTest.cpp +++ b/wpilibcIntegrationTests/src/DIOLoopTest.cpp @@ -5,8 +5,8 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "DigitalInput.h" -#include "DigitalOutput.h" +#include "DigitalInput.h" // NOLINT(build/include_order) +#include "DigitalOutput.h" // NOLINT(build/include_order) #include "Counter.h" #include "InterruptableSensorBase.h" diff --git a/wpilibcIntegrationTests/src/DigitalGlitchFilterTest.cpp b/wpilibcIntegrationTests/src/DigitalGlitchFilterTest.cpp index dffdb7cbd9..4f91a7beb3 100644 --- a/wpilibcIntegrationTests/src/DigitalGlitchFilterTest.cpp +++ b/wpilibcIntegrationTests/src/DigitalGlitchFilterTest.cpp @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "DigitalGlitchFilter.h" +#include "DigitalGlitchFilter.h" // NOLINT(build/include_order) #include "Counter.h" #include "DigitalInput.h" diff --git a/wpilibcIntegrationTests/src/FakeEncoderTest.cpp b/wpilibcIntegrationTests/src/FakeEncoderTest.cpp index 4c33d45cbe..3f87fc74f9 100644 --- a/wpilibcIntegrationTests/src/FakeEncoderTest.cpp +++ b/wpilibcIntegrationTests/src/FakeEncoderTest.cpp @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "Encoder.h" +#include "Encoder.h" // NOLINT(build/include_order) #include "AnalogOutput.h" #include "AnalogTrigger.h" diff --git a/wpilibcIntegrationTests/src/NotifierTest.cpp b/wpilibcIntegrationTests/src/NotifierTest.cpp index aa962ee113..3a5e58fa87 100644 --- a/wpilibcIntegrationTests/src/NotifierTest.cpp +++ b/wpilibcIntegrationTests/src/NotifierTest.cpp @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "Notifier.h" +#include "Notifier.h" // NOLINT(build/include_order) #include "TestBench.h" #include "Timer.h" diff --git a/wpilibcIntegrationTests/src/PowerDistributionPanelTest.cpp b/wpilibcIntegrationTests/src/PowerDistributionPanelTest.cpp index d582b6fd67..8a103f04d1 100644 --- a/wpilibcIntegrationTests/src/PowerDistributionPanelTest.cpp +++ b/wpilibcIntegrationTests/src/PowerDistributionPanelTest.cpp @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "PowerDistributionPanel.h" +#include "PowerDistributionPanel.h" // NOLINT(build/include_order) #include "Jaguar.h" #include "Talon.h" diff --git a/wpilibcIntegrationTests/src/RelayTest.cpp b/wpilibcIntegrationTests/src/RelayTest.cpp index 1ba6c25b18..4a3a7b820d 100644 --- a/wpilibcIntegrationTests/src/RelayTest.cpp +++ b/wpilibcIntegrationTests/src/RelayTest.cpp @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "Relay.h" +#include "Relay.h" // NOLINT(build/include_order) #include "DigitalInput.h" #include "TestBench.h" diff --git a/wpilibcIntegrationTests/src/TimerTest.cpp b/wpilibcIntegrationTests/src/TimerTest.cpp index 57d6bd9803..e3b64f4b7c 100644 --- a/wpilibcIntegrationTests/src/TimerTest.cpp +++ b/wpilibcIntegrationTests/src/TimerTest.cpp @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "Timer.h" +#include "Timer.h" // NOLINT(build/include_order) #include "TestBench.h" #include "gtest/gtest.h"