diff --git a/.styleguide b/.styleguide index e09a1fac49..4eff33eebd 100644 --- a/.styleguide +++ b/.styleguide @@ -33,6 +33,13 @@ modifiableFileExclude { \.so$ } +includeOtherLibs { + ^HAL/ + ^llvm/ + ^opencv2/ + ^support/ +} + includeProject { ^ctre/ } diff --git a/hal/.styleguide b/hal/.styleguide new file mode 100644 index 0000000000..89c9541dfc --- /dev/null +++ b/hal/.styleguide @@ -0,0 +1,48 @@ +cppHeaderExtensions { + h + hpp + inc +} + +cppSrcExtensions { + cpp +} + +otherExtensions { + java +} + +genFileExclude { + gmock/ + ni-libraries/ + hal/src/main/native/athena/ctre/ + hal/src/main/native/athena/frccansae/ + hal/src/main/native/athena/visa/ + hal/src/main/native/include/ctre/ + simulation/JavaGazebo/build/classes/main/gazebo/msgs/ + wpilibj/src/athena/cpp/nivision/ + UsageReporting\.h$ +} + +modifiableFileExclude { + wpilibj/src/arm-linux-jni/ + wpilibj/src/main/native/cpp/ + \.patch$ + \.png$ + \.py$ + \.so$ +} + +includeOtherLibs { + ^FRC_FPGA_ChipObject/ + ^FRC_NetworkCommunication/ + ^i2clib/ + ^llvm/ + ^opencv2/ + ^spilib/ + ^support/ +} + +includeProject { + ^ctre/ +} diff --git a/hal/src/main/native/athena/AnalogInput.cpp b/hal/src/main/native/athena/AnalogInput.cpp index 03d95e40ab..59a534da7e 100644 --- a/hal/src/main/native/athena/AnalogInput.cpp +++ b/hal/src/main/native/athena/AnalogInput.cpp @@ -9,8 +9,9 @@ #include +#include + #include "AnalogInternal.h" -#include "FRC_NetworkCommunication/AICalibration.h" #include "HAL/AnalogAccumulator.h" #include "HAL/HAL.h" #include "HAL/cpp/priority_mutex.h" diff --git a/hal/src/main/native/athena/DigitalInternal.cpp b/hal/src/main/native/athena/DigitalInternal.cpp index e3b65255a7..6dca5c4d3c 100644 --- a/hal/src/main/native/athena/DigitalInternal.cpp +++ b/hal/src/main/native/athena/DigitalInternal.cpp @@ -11,8 +11,9 @@ #include #include +#include + #include "ConstantsInternal.h" -#include "FRC_NetworkCommunication/LoadOut.h" #include "HAL/AnalogTrigger.h" #include "HAL/ChipObject.h" #include "HAL/HAL.h" diff --git a/hal/src/main/native/athena/FRCDriverStation.cpp b/hal/src/main/native/athena/FRCDriverStation.cpp index b2a96adf53..438e321003 100644 --- a/hal/src/main/native/athena/FRCDriverStation.cpp +++ b/hal/src/main/native/athena/FRCDriverStation.cpp @@ -11,11 +11,12 @@ #include #include -#include "FRC_NetworkCommunication/FRCComm.h" +#include +#include + #include "HAL/DriverStation.h" #include "HAL/cpp/priority_condition_variable.h" #include "HAL/cpp/priority_mutex.h" -#include "llvm/raw_ostream.h" static_assert(sizeof(int32_t) >= sizeof(int), "FRC_NetworkComm status variable is larger than 32 bits"); diff --git a/hal/src/main/native/athena/HAL.cpp b/hal/src/main/native/athena/HAL.cpp index d17ba3f6bc..01b2538dcc 100644 --- a/hal/src/main/native/athena/HAL.cpp +++ b/hal/src/main/native/athena/HAL.cpp @@ -17,9 +17,11 @@ #include #include -#include "FRC_NetworkCommunication/CANSessionMux.h" -#include "FRC_NetworkCommunication/FRCComm.h" -#include "FRC_NetworkCommunication/LoadOut.h" +#include +#include +#include +#include + #include "HAL/ChipObject.h" #include "HAL/DriverStation.h" #include "HAL/Errors.h" @@ -28,7 +30,6 @@ #include "HAL/cpp/priority_mutex.h" #include "HAL/handles/HandlesInternal.h" #include "ctre/ctre.h" -#include "llvm/raw_ostream.h" #include "visa/visa.h" using namespace hal; diff --git a/hal/src/main/native/athena/I2C.cpp b/hal/src/main/native/athena/I2C.cpp index dac920cc19..c522419abc 100644 --- a/hal/src/main/native/athena/I2C.cpp +++ b/hal/src/main/native/athena/I2C.cpp @@ -7,10 +7,11 @@ #include "HAL/I2C.h" +#include + #include "DigitalInternal.h" #include "HAL/DIO.h" #include "HAL/HAL.h" -#include "i2clib/i2c-lib.h" using namespace hal; diff --git a/hal/src/main/native/athena/Interrupts.cpp b/hal/src/main/native/athena/Interrupts.cpp index 6e4de9a027..a38192192b 100644 --- a/hal/src/main/native/athena/Interrupts.cpp +++ b/hal/src/main/native/athena/Interrupts.cpp @@ -9,6 +9,8 @@ #include +#include + #include "DigitalInternal.h" #include "HAL/ChipObject.h" #include "HAL/Errors.h" @@ -16,7 +18,6 @@ #include "HAL/handles/HandlesInternal.h" #include "HAL/handles/LimitedHandleResource.h" #include "PortsInternal.h" -#include "support/SafeThread.h" using namespace hal; diff --git a/hal/src/main/native/athena/SPI.cpp b/hal/src/main/native/athena/SPI.cpp index 9e41166267..e2a5fa79df 100644 --- a/hal/src/main/native/athena/SPI.cpp +++ b/hal/src/main/native/athena/SPI.cpp @@ -9,6 +9,9 @@ #include +#include +#include + #include "DigitalInternal.h" #include "HAL/DIO.h" #include "HAL/HAL.h" @@ -16,8 +19,6 @@ #include "HAL/cpp/make_unique.h" #include "HAL/cpp/priority_mutex.h" #include "HAL/handles/HandlesInternal.h" -#include "llvm/raw_ostream.h" -#include "spilib/spi-lib.h" using namespace hal; diff --git a/hal/src/main/native/athena/Solenoid.cpp b/hal/src/main/native/athena/Solenoid.cpp index 8cde386790..f97c6f6089 100644 --- a/hal/src/main/native/athena/Solenoid.cpp +++ b/hal/src/main/native/athena/Solenoid.cpp @@ -7,7 +7,8 @@ #include "HAL/Solenoid.h" -#include "FRC_NetworkCommunication/LoadOut.h" +#include + #include "HAL/ChipObject.h" #include "HAL/Errors.h" #include "HAL/Ports.h" diff --git a/hal/src/main/native/athena/cpp/SerialHelper.cpp b/hal/src/main/native/athena/cpp/SerialHelper.cpp index 22743effc9..392c77e139 100644 --- a/hal/src/main/native/athena/cpp/SerialHelper.cpp +++ b/hal/src/main/native/athena/cpp/SerialHelper.cpp @@ -11,9 +11,10 @@ #include #include +#include + #include "../visa/visa.h" #include "HAL/Errors.h" -#include "llvm/StringRef.h" constexpr const char* OnboardResourceVISA = "ASRL1::INSTR"; constexpr const char* MxpResourceVISA = "ASRL2::INSTR"; diff --git a/hal/src/main/native/include/HAL/ChipObject.h b/hal/src/main/native/include/HAL/ChipObject.h index ffd6220544..dda061dbad 100644 --- a/hal/src/main/native/include/HAL/ChipObject.h +++ b/hal/src/main/native/include/HAL/ChipObject.h @@ -12,31 +12,31 @@ #include -#include "FRC_FPGA_ChipObject/RoboRIO_FRC_ChipObject_Aliases.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" -#include "FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccel.h" -#include "FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccumulator.h" -#include "FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAlarm.h" -#include "FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAnalogTrigger.h" -#include "FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tBIST.h" -#include "FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tCounter.h" -#include "FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDIO.h" -#include "FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDMA.h" -#include "FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tEncoder.h" -#include "FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tGlobal.h" -#include "FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tInterrupt.h" -#include "FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPWM.h" -#include "FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPower.h" -#include "FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tRelay.h" -#include "FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSPI.h" -#include "FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSysWatchdog.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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace hal { using namespace nFPGA; diff --git a/hal/src/main/native/include/HAL/Threads.h b/hal/src/main/native/include/HAL/Threads.h index 9221deaf20..7241cc00d3 100644 --- a/hal/src/main/native/include/HAL/Threads.h +++ b/hal/src/main/native/include/HAL/Threads.h @@ -7,8 +7,6 @@ #pragma once -#include "HAL/Types.h" - #ifdef _WIN32 #include #define NativeThreadHandle const HANDLE* @@ -17,6 +15,8 @@ #define NativeThreadHandle const pthread_t* #endif +#include "HAL/Types.h" + extern "C" { int32_t HAL_GetThreadPriority(NativeThreadHandle handle, HAL_Bool* isRealTime, int32_t* status); diff --git a/hal/src/main/native/include/HAL/cpp/Log.h b/hal/src/main/native/include/HAL/cpp/Log.h index 6a03cb1223..af4f340e01 100644 --- a/hal/src/main/native/include/HAL/cpp/Log.h +++ b/hal/src/main/native/include/HAL/cpp/Log.h @@ -10,8 +10,8 @@ #include #include -#include "llvm/SmallString.h" -#include "llvm/raw_ostream.h" +#include +#include inline std::string NowTime(); diff --git a/hal/src/main/native/include/HAL/cpp/SerialHelper.h b/hal/src/main/native/include/HAL/cpp/SerialHelper.h index 6522a1f3b6..c0ede644ac 100644 --- a/hal/src/main/native/include/HAL/cpp/SerialHelper.h +++ b/hal/src/main/native/include/HAL/cpp/SerialHelper.h @@ -12,10 +12,11 @@ #include #include +#include +#include + #include "HAL/SerialPort.h" #include "HAL/cpp/priority_mutex.h" -#include "llvm/SmallString.h" -#include "llvm/SmallVector.h" namespace hal { class SerialHelper { diff --git a/hal/src/main/native/shared/cpp/fpga_clock.cpp b/hal/src/main/native/shared/cpp/fpga_clock.cpp index fc4e1daec7..fd201e1be7 100644 --- a/hal/src/main/native/shared/cpp/fpga_clock.cpp +++ b/hal/src/main/native/shared/cpp/fpga_clock.cpp @@ -7,8 +7,9 @@ #include "HAL/cpp/fpga_clock.h" +#include + #include "HAL/HAL.h" -#include "llvm/raw_ostream.h" namespace hal { const fpga_clock::time_point fpga_clock::min_time = diff --git a/hal/src/main/native/shared/handles/HandlesInternal.cpp b/hal/src/main/native/shared/handles/HandlesInternal.cpp index a8f414ef62..68a5cc21c5 100644 --- a/hal/src/main/native/shared/handles/HandlesInternal.cpp +++ b/hal/src/main/native/shared/handles/HandlesInternal.cpp @@ -9,8 +9,9 @@ #include +#include + #include "HAL/cpp/priority_mutex.h" -#include "llvm/SmallVector.h" namespace hal { static llvm::SmallVector globalHandles; diff --git a/hal/src/main/native/sim/DriverStation.cpp b/hal/src/main/native/sim/DriverStation.cpp index a2894636fc..9b78b6a0bf 100644 --- a/hal/src/main/native/sim/DriverStation.cpp +++ b/hal/src/main/native/sim/DriverStation.cpp @@ -176,16 +176,10 @@ void HAL_ObserveUserProgramTest(void) { static pthread_key_t lastCountKey; static pthread_once_t lastCountKeyOnce = PTHREAD_ONCE_INIT; -static void InitLastCountKey() { - pthread_key_create(&lastCountKey, std::free); -} +static void InitLastCountKey() { pthread_key_create(&lastCountKey, std::free); } #endif bool HAL_IsNewControlData(void) { - // There is a rollover error condition here. At Packet# = n * (uintmax), this - // will return false when instead it should return true. However, this at a - // 20ms rate occurs once every 2.7 years of DS connected runtime, so not - // worth the cycles to check. #ifdef __APPLE__ pthread_once(&lastCountKeyOnce, InitLastCountKey); int* lastCountPtr = static_cast(pthread_getspecific(lastCountKey)); @@ -198,6 +192,10 @@ bool HAL_IsNewControlData(void) { #else thread_local int lastCount{-1}; #endif + // There is a rollover error condition here. At Packet# = n * (uintmax), this + // will return false when instead it should return true. However, this at a + // 20ms rate occurs once every 2.7 years of DS connected runtime, so not + // worth the cycles to check. int currentCount = 0; { std::unique_lock lock(newDSDataAvailableMutex); diff --git a/hal/src/main/native/sim/MockHooks.cpp b/hal/src/main/native/sim/MockHooks.cpp index a5719c4387..35b03dee7e 100644 --- a/hal/src/main/native/sim/MockHooks.cpp +++ b/hal/src/main/native/sim/MockHooks.cpp @@ -10,8 +10,9 @@ #include #include +#include + #include "MockHooksInternal.h" -#include "support/timestamp.h" static std::atomic programStarted{false}; diff --git a/hal/src/main/native/sim/Notifier.cpp b/hal/src/main/native/sim/Notifier.cpp index 7e0695b516..3ec3b4db79 100644 --- a/hal/src/main/native/sim/Notifier.cpp +++ b/hal/src/main/native/sim/Notifier.cpp @@ -10,12 +10,13 @@ #include #include +#include +#include + #include "HAL/HAL.h" #include "HAL/cpp/fpga_clock.h" #include "HAL/cpp/make_unique.h" #include "HAL/handles/UnlimitedHandleResource.h" -#include "support/SafeThread.h" -#include "support/timestamp.h" namespace { class NotifierThread : public wpi::SafeThread { diff --git a/wpilibc/src/dev/native/cpp/main.cpp b/wpilibc/src/dev/native/cpp/main.cpp index 6f74a88905..28dfa3e98b 100644 --- a/wpilibc/src/dev/native/cpp/main.cpp +++ b/wpilibc/src/dev/native/cpp/main.cpp @@ -7,7 +7,8 @@ #include -#include "HAL/HAL.h" +#include + #include "WPILibVersion.h" int main() { diff --git a/wpilibc/src/main/native/cpp/ADXL345_I2C.cpp b/wpilibc/src/main/native/cpp/ADXL345_I2C.cpp index ec7cde77fe..3d465b5366 100644 --- a/wpilibc/src/main/native/cpp/ADXL345_I2C.cpp +++ b/wpilibc/src/main/native/cpp/ADXL345_I2C.cpp @@ -7,7 +7,8 @@ #include "ADXL345_I2C.h" -#include "HAL/HAL.h" +#include + #include "I2C.h" #include "LiveWindow/LiveWindow.h" diff --git a/wpilibc/src/main/native/cpp/ADXL345_SPI.cpp b/wpilibc/src/main/native/cpp/ADXL345_SPI.cpp index c1c9e7813a..2aace0603f 100644 --- a/wpilibc/src/main/native/cpp/ADXL345_SPI.cpp +++ b/wpilibc/src/main/native/cpp/ADXL345_SPI.cpp @@ -7,9 +7,10 @@ #include "ADXL345_SPI.h" +#include + #include "DigitalInput.h" #include "DigitalOutput.h" -#include "HAL/HAL.h" #include "LiveWindow/LiveWindow.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/ADXL362.cpp b/wpilibc/src/main/native/cpp/ADXL362.cpp index 657cbc1be1..993be1727e 100644 --- a/wpilibc/src/main/native/cpp/ADXL362.cpp +++ b/wpilibc/src/main/native/cpp/ADXL362.cpp @@ -7,10 +7,11 @@ #include "ADXL362.h" +#include + #include "DigitalInput.h" #include "DigitalOutput.h" #include "DriverStation.h" -#include "HAL/HAL.h" #include "LiveWindow/LiveWindow.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/ADXRS450_Gyro.cpp b/wpilibc/src/main/native/cpp/ADXRS450_Gyro.cpp index 1a6da0aae4..ec5d8dce59 100644 --- a/wpilibc/src/main/native/cpp/ADXRS450_Gyro.cpp +++ b/wpilibc/src/main/native/cpp/ADXRS450_Gyro.cpp @@ -7,8 +7,9 @@ #include "ADXRS450_Gyro.h" +#include + #include "DriverStation.h" -#include "HAL/HAL.h" #include "LiveWindow/LiveWindow.h" #include "Timer.h" diff --git a/wpilibc/src/main/native/cpp/AnalogAccelerometer.cpp b/wpilibc/src/main/native/cpp/AnalogAccelerometer.cpp index c9c3b2602d..9b416a3589 100644 --- a/wpilibc/src/main/native/cpp/AnalogAccelerometer.cpp +++ b/wpilibc/src/main/native/cpp/AnalogAccelerometer.cpp @@ -7,7 +7,8 @@ #include "AnalogAccelerometer.h" -#include "HAL/HAL.h" +#include + #include "LiveWindow/LiveWindow.h" #include "WPIErrors.h" diff --git a/wpilibc/src/main/native/cpp/AnalogGyro.cpp b/wpilibc/src/main/native/cpp/AnalogGyro.cpp index 4682c15efa..440d6a1529 100644 --- a/wpilibc/src/main/native/cpp/AnalogGyro.cpp +++ b/wpilibc/src/main/native/cpp/AnalogGyro.cpp @@ -6,13 +6,14 @@ /*----------------------------------------------------------------------------*/ #include "AnalogGyro.h" -#include "HAL/AnalogGyro.h" #include +#include +#include +#include + #include "AnalogInput.h" -#include "HAL/Errors.h" -#include "HAL/HAL.h" #include "LiveWindow/LiveWindow.h" #include "Timer.h" #include "WPIErrors.h" diff --git a/wpilibc/src/main/native/cpp/AnalogInput.cpp b/wpilibc/src/main/native/cpp/AnalogInput.cpp index f4d40b27cc..ddd14a9def 100644 --- a/wpilibc/src/main/native/cpp/AnalogInput.cpp +++ b/wpilibc/src/main/native/cpp/AnalogInput.cpp @@ -6,16 +6,17 @@ /*----------------------------------------------------------------------------*/ #include "AnalogInput.h" -#include "HAL/AnalogInput.h" -#include "HAL/AnalogAccumulator.h" -#include "HAL/HAL.h" -#include "HAL/Ports.h" +#include +#include +#include +#include +#include +#include + #include "LiveWindow/LiveWindow.h" #include "Timer.h" #include "WPIErrors.h" -#include "llvm/SmallString.h" -#include "llvm/raw_ostream.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/AnalogOutput.cpp b/wpilibc/src/main/native/cpp/AnalogOutput.cpp index dc8ba38ded..8df97ce3db 100644 --- a/wpilibc/src/main/native/cpp/AnalogOutput.cpp +++ b/wpilibc/src/main/native/cpp/AnalogOutput.cpp @@ -9,12 +9,13 @@ #include -#include "HAL/HAL.h" -#include "HAL/Ports.h" +#include +#include +#include +#include + #include "LiveWindow/LiveWindow.h" #include "WPIErrors.h" -#include "llvm/SmallString.h" -#include "llvm/raw_ostream.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/AnalogTrigger.cpp b/wpilibc/src/main/native/cpp/AnalogTrigger.cpp index 320446eab2..11af78e80a 100644 --- a/wpilibc/src/main/native/cpp/AnalogTrigger.cpp +++ b/wpilibc/src/main/native/cpp/AnalogTrigger.cpp @@ -9,8 +9,9 @@ #include +#include + #include "AnalogInput.h" -#include "HAL/HAL.h" #include "WPIErrors.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/AnalogTriggerOutput.cpp b/wpilibc/src/main/native/cpp/AnalogTriggerOutput.cpp index 71c51141cc..68cceea986 100644 --- a/wpilibc/src/main/native/cpp/AnalogTriggerOutput.cpp +++ b/wpilibc/src/main/native/cpp/AnalogTriggerOutput.cpp @@ -7,8 +7,9 @@ #include "AnalogTriggerOutput.h" +#include + #include "AnalogTrigger.h" -#include "HAL/HAL.h" #include "WPIErrors.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/BuiltInAccelerometer.cpp b/wpilibc/src/main/native/cpp/BuiltInAccelerometer.cpp index d0898ca728..13cb2bc605 100644 --- a/wpilibc/src/main/native/cpp/BuiltInAccelerometer.cpp +++ b/wpilibc/src/main/native/cpp/BuiltInAccelerometer.cpp @@ -7,8 +7,9 @@ #include "BuiltInAccelerometer.h" -#include "HAL/Accelerometer.h" -#include "HAL/HAL.h" +#include +#include + #include "LiveWindow/LiveWindow.h" #include "WPIErrors.h" diff --git a/wpilibc/src/main/native/cpp/CameraServer.cpp b/wpilibc/src/main/native/cpp/CameraServer.cpp index 627b1cfd55..4e72290d90 100644 --- a/wpilibc/src/main/native/cpp/CameraServer.cpp +++ b/wpilibc/src/main/native/cpp/CameraServer.cpp @@ -7,10 +7,11 @@ #include "CameraServer.h" +#include +#include + #include "Utility.h" #include "WPIErrors.h" -#include "llvm/SmallString.h" -#include "llvm/raw_ostream.h" #include "ntcore_cpp.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/Commands/PrintCommand.cpp b/wpilibc/src/main/native/cpp/Commands/PrintCommand.cpp index ba8e9f490d..d89871b911 100644 --- a/wpilibc/src/main/native/cpp/Commands/PrintCommand.cpp +++ b/wpilibc/src/main/native/cpp/Commands/PrintCommand.cpp @@ -7,7 +7,7 @@ #include "Commands/PrintCommand.h" -#include "llvm/raw_ostream.h" +#include using namespace frc; diff --git a/wpilibc/src/main/native/cpp/Compressor.cpp b/wpilibc/src/main/native/cpp/Compressor.cpp index a13438c748..37f5008523 100644 --- a/wpilibc/src/main/native/cpp/Compressor.cpp +++ b/wpilibc/src/main/native/cpp/Compressor.cpp @@ -6,11 +6,12 @@ /*----------------------------------------------------------------------------*/ #include "Compressor.h" -#include "HAL/Compressor.h" -#include "HAL/HAL.h" -#include "HAL/Ports.h" -#include "HAL/Solenoid.h" +#include +#include +#include +#include + #include "WPIErrors.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/ControllerPower.cpp b/wpilibc/src/main/native/cpp/ControllerPower.cpp index 90e06367f3..373f5e2815 100644 --- a/wpilibc/src/main/native/cpp/ControllerPower.cpp +++ b/wpilibc/src/main/native/cpp/ControllerPower.cpp @@ -9,9 +9,10 @@ #include +#include +#include + #include "ErrorBase.h" -#include "HAL/HAL.h" -#include "HAL/Power.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/Counter.cpp b/wpilibc/src/main/native/cpp/Counter.cpp index 1d58f1b7f4..d240b38383 100644 --- a/wpilibc/src/main/native/cpp/Counter.cpp +++ b/wpilibc/src/main/native/cpp/Counter.cpp @@ -7,9 +7,10 @@ #include "Counter.h" +#include + #include "AnalogTrigger.h" #include "DigitalInput.h" -#include "HAL/HAL.h" #include "WPIErrors.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/DigitalGlitchFilter.cpp b/wpilibc/src/main/native/cpp/DigitalGlitchFilter.cpp index 007488a3f5..ab505d6d0c 100644 --- a/wpilibc/src/main/native/cpp/DigitalGlitchFilter.cpp +++ b/wpilibc/src/main/native/cpp/DigitalGlitchFilter.cpp @@ -10,11 +10,12 @@ #include #include +#include +#include +#include + #include "Counter.h" #include "Encoder.h" -#include "HAL/Constants.h" -#include "HAL/DIO.h" -#include "HAL/HAL.h" #include "Utility.h" #include "WPIErrors.h" diff --git a/wpilibc/src/main/native/cpp/DigitalInput.cpp b/wpilibc/src/main/native/cpp/DigitalInput.cpp index b1c690d3b4..afa73b232b 100644 --- a/wpilibc/src/main/native/cpp/DigitalInput.cpp +++ b/wpilibc/src/main/native/cpp/DigitalInput.cpp @@ -9,13 +9,14 @@ #include -#include "HAL/DIO.h" -#include "HAL/HAL.h" -#include "HAL/Ports.h" +#include +#include +#include +#include +#include + #include "LiveWindow/LiveWindow.h" #include "WPIErrors.h" -#include "llvm/SmallString.h" -#include "llvm/raw_ostream.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/DigitalOutput.cpp b/wpilibc/src/main/native/cpp/DigitalOutput.cpp index be81eb5a9e..26f33bcf93 100644 --- a/wpilibc/src/main/native/cpp/DigitalOutput.cpp +++ b/wpilibc/src/main/native/cpp/DigitalOutput.cpp @@ -9,12 +9,13 @@ #include -#include "HAL/DIO.h" -#include "HAL/HAL.h" -#include "HAL/Ports.h" +#include +#include +#include +#include +#include + #include "WPIErrors.h" -#include "llvm/SmallString.h" -#include "llvm/raw_ostream.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/DoubleSolenoid.cpp b/wpilibc/src/main/native/cpp/DoubleSolenoid.cpp index 80dcdf6adc..a18d3fc997 100644 --- a/wpilibc/src/main/native/cpp/DoubleSolenoid.cpp +++ b/wpilibc/src/main/native/cpp/DoubleSolenoid.cpp @@ -7,13 +7,14 @@ #include "DoubleSolenoid.h" -#include "HAL/HAL.h" -#include "HAL/Ports.h" -#include "HAL/Solenoid.h" +#include +#include +#include +#include +#include + #include "LiveWindow/LiveWindow.h" #include "WPIErrors.h" -#include "llvm/SmallString.h" -#include "llvm/raw_ostream.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/DriverStation.cpp b/wpilibc/src/main/native/cpp/DriverStation.cpp index 16366cb555..7d6393576f 100644 --- a/wpilibc/src/main/native/cpp/DriverStation.cpp +++ b/wpilibc/src/main/native/cpp/DriverStation.cpp @@ -9,15 +9,16 @@ #include +#include +#include +#include +#include + #include "AnalogInput.h" -#include "HAL/HAL.h" -#include "HAL/Power.h" -#include "HAL/cpp/Log.h" #include "MotorSafetyHelper.h" #include "Timer.h" #include "Utility.h" #include "WPIErrors.h" -#include "llvm/SmallString.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/Encoder.cpp b/wpilibc/src/main/native/cpp/Encoder.cpp index a4d5d49252..43b6c6d880 100644 --- a/wpilibc/src/main/native/cpp/Encoder.cpp +++ b/wpilibc/src/main/native/cpp/Encoder.cpp @@ -7,8 +7,9 @@ #include "Encoder.h" +#include + #include "DigitalInput.h" -#include "HAL/HAL.h" #include "LiveWindow/LiveWindow.h" #include "WPIErrors.h" diff --git a/wpilibc/src/main/native/cpp/Error.cpp b/wpilibc/src/main/native/cpp/Error.cpp index f35a25dae9..5e09edd4c5 100644 --- a/wpilibc/src/main/native/cpp/Error.cpp +++ b/wpilibc/src/main/native/cpp/Error.cpp @@ -7,12 +7,13 @@ #include "Error.h" +#include +#include +#include + #include "DriverStation.h" #include "Timer.h" #include "Utility.h" -#include "llvm/Path.h" -#include "llvm/SmallString.h" -#include "llvm/raw_ostream.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/GenericHID.cpp b/wpilibc/src/main/native/cpp/GenericHID.cpp index 6f4131e94f..f175be2887 100644 --- a/wpilibc/src/main/native/cpp/GenericHID.cpp +++ b/wpilibc/src/main/native/cpp/GenericHID.cpp @@ -7,8 +7,9 @@ #include "GenericHID.h" +#include + #include "DriverStation.h" -#include "HAL/HAL.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/I2C.cpp b/wpilibc/src/main/native/cpp/I2C.cpp index a825ae22d0..989d5b0042 100644 --- a/wpilibc/src/main/native/cpp/I2C.cpp +++ b/wpilibc/src/main/native/cpp/I2C.cpp @@ -5,10 +5,11 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "HAL/I2C.h" #include "I2C.h" -#include "HAL/HAL.h" +#include +#include + #include "WPIErrors.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/Internal/HardwareHLReporting.cpp b/wpilibc/src/main/native/cpp/Internal/HardwareHLReporting.cpp index 9cb40d5c19..4b3abc5979 100644 --- a/wpilibc/src/main/native/cpp/Internal/HardwareHLReporting.cpp +++ b/wpilibc/src/main/native/cpp/Internal/HardwareHLReporting.cpp @@ -7,7 +7,7 @@ #include "Internal/HardwareHLReporting.h" -#include "HAL/HAL.h" +#include using namespace frc; diff --git a/wpilibc/src/main/native/cpp/InterruptableSensorBase.cpp b/wpilibc/src/main/native/cpp/InterruptableSensorBase.cpp index 36ae205855..cccc687850 100644 --- a/wpilibc/src/main/native/cpp/InterruptableSensorBase.cpp +++ b/wpilibc/src/main/native/cpp/InterruptableSensorBase.cpp @@ -7,7 +7,8 @@ #include "InterruptableSensorBase.h" -#include "HAL/HAL.h" +#include + #include "Utility.h" #include "WPIErrors.h" diff --git a/wpilibc/src/main/native/cpp/IterativeRobot.cpp b/wpilibc/src/main/native/cpp/IterativeRobot.cpp index 0ba8410266..5b0efac0ac 100644 --- a/wpilibc/src/main/native/cpp/IterativeRobot.cpp +++ b/wpilibc/src/main/native/cpp/IterativeRobot.cpp @@ -7,8 +7,9 @@ #include "IterativeRobot.h" +#include + #include "DriverStation.h" -#include "HAL/HAL.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/IterativeRobotBase.cpp b/wpilibc/src/main/native/cpp/IterativeRobotBase.cpp index 107d720ca2..64dc9f6e87 100644 --- a/wpilibc/src/main/native/cpp/IterativeRobotBase.cpp +++ b/wpilibc/src/main/native/cpp/IterativeRobotBase.cpp @@ -9,9 +9,10 @@ #include -#include "HAL/HAL.h" +#include +#include + #include "LiveWindow/LiveWindow.h" -#include "llvm/raw_ostream.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/Jaguar.cpp b/wpilibc/src/main/native/cpp/Jaguar.cpp index 08cb5cbd53..c38fe80533 100644 --- a/wpilibc/src/main/native/cpp/Jaguar.cpp +++ b/wpilibc/src/main/native/cpp/Jaguar.cpp @@ -7,7 +7,8 @@ #include "Jaguar.h" -#include "HAL/HAL.h" +#include + #include "LiveWindow/LiveWindow.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/Joystick.cpp b/wpilibc/src/main/native/cpp/Joystick.cpp index a04c1f7f85..65ec8164d8 100644 --- a/wpilibc/src/main/native/cpp/Joystick.cpp +++ b/wpilibc/src/main/native/cpp/Joystick.cpp @@ -9,8 +9,9 @@ #include +#include + #include "DriverStation.h" -#include "HAL/HAL.h" #include "WPIErrors.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/LiveWindow/LiveWindow.cpp b/wpilibc/src/main/native/cpp/LiveWindow/LiveWindow.cpp index 681d98f6c6..773c7dfa99 100644 --- a/wpilibc/src/main/native/cpp/LiveWindow/LiveWindow.cpp +++ b/wpilibc/src/main/native/cpp/LiveWindow/LiveWindow.cpp @@ -9,8 +9,9 @@ #include -#include "llvm/SmallString.h" -#include "llvm/raw_ostream.h" +#include +#include + #include "networktables/NetworkTable.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/MotorSafetyHelper.cpp b/wpilibc/src/main/native/cpp/MotorSafetyHelper.cpp index feebb2c501..c69efde52d 100644 --- a/wpilibc/src/main/native/cpp/MotorSafetyHelper.cpp +++ b/wpilibc/src/main/native/cpp/MotorSafetyHelper.cpp @@ -7,12 +7,13 @@ #include "MotorSafetyHelper.h" +#include +#include + #include "DriverStation.h" #include "MotorSafety.h" #include "Timer.h" #include "WPIErrors.h" -#include "llvm/SmallString.h" -#include "llvm/raw_ostream.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/Notifier.cpp b/wpilibc/src/main/native/cpp/Notifier.cpp index 4513fc7f15..48cef16b5a 100644 --- a/wpilibc/src/main/native/cpp/Notifier.cpp +++ b/wpilibc/src/main/native/cpp/Notifier.cpp @@ -7,7 +7,8 @@ #include "Notifier.h" -#include "HAL/HAL.h" +#include + #include "Timer.h" #include "Utility.h" #include "WPIErrors.h" diff --git a/wpilibc/src/main/native/cpp/PIDController.cpp b/wpilibc/src/main/native/cpp/PIDController.cpp index 92785d7cf3..48b1865822 100644 --- a/wpilibc/src/main/native/cpp/PIDController.cpp +++ b/wpilibc/src/main/native/cpp/PIDController.cpp @@ -10,7 +10,8 @@ #include #include -#include "HAL/HAL.h" +#include + #include "Notifier.h" #include "PIDOutput.h" #include "PIDSource.h" diff --git a/wpilibc/src/main/native/cpp/PWM.cpp b/wpilibc/src/main/native/cpp/PWM.cpp index 880002c7e6..ac3984abef 100644 --- a/wpilibc/src/main/native/cpp/PWM.cpp +++ b/wpilibc/src/main/native/cpp/PWM.cpp @@ -5,15 +5,16 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "HAL/PWM.h" #include "PWM.h" -#include "HAL/HAL.h" -#include "HAL/Ports.h" +#include +#include +#include +#include +#include + #include "Utility.h" #include "WPIErrors.h" -#include "llvm/SmallString.h" -#include "llvm/raw_ostream.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/PowerDistributionPanel.cpp b/wpilibc/src/main/native/cpp/PowerDistributionPanel.cpp index 64a79e576f..4519e11957 100644 --- a/wpilibc/src/main/native/cpp/PowerDistributionPanel.cpp +++ b/wpilibc/src/main/native/cpp/PowerDistributionPanel.cpp @@ -7,13 +7,14 @@ #include "PowerDistributionPanel.h" -#include "HAL/HAL.h" -#include "HAL/PDP.h" -#include "HAL/Ports.h" +#include +#include +#include +#include +#include + #include "LiveWindow/LiveWindow.h" #include "WPIErrors.h" -#include "llvm/SmallString.h" -#include "llvm/raw_ostream.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/Preferences.cpp b/wpilibc/src/main/native/cpp/Preferences.cpp index 59acba9cb9..fb67d699e8 100644 --- a/wpilibc/src/main/native/cpp/Preferences.cpp +++ b/wpilibc/src/main/native/cpp/Preferences.cpp @@ -9,9 +9,10 @@ #include -#include "HAL/HAL.h" +#include +#include + #include "WPIErrors.h" -#include "llvm/StringRef.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/Relay.cpp b/wpilibc/src/main/native/cpp/Relay.cpp index 2ff5cc9fcb..ea0ca32d35 100644 --- a/wpilibc/src/main/native/cpp/Relay.cpp +++ b/wpilibc/src/main/native/cpp/Relay.cpp @@ -5,15 +5,16 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "HAL/Relay.h" #include "Relay.h" -#include "HAL/HAL.h" -#include "HAL/Ports.h" +#include +#include +#include +#include + #include "LiveWindow/LiveWindow.h" #include "MotorSafetyHelper.h" #include "WPIErrors.h" -#include "llvm/SmallString.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/RobotBase.cpp b/wpilibc/src/main/native/cpp/RobotBase.cpp index f775bb2b28..c1ebc039af 100644 --- a/wpilibc/src/main/native/cpp/RobotBase.cpp +++ b/wpilibc/src/main/native/cpp/RobotBase.cpp @@ -9,8 +9,9 @@ #include +#include + #include "DriverStation.h" -#include "HAL/HAL.h" #include "HLUsageReporting.h" #include "Internal/HardwareHLReporting.h" #include "LiveWindow/LiveWindow.h" diff --git a/wpilibc/src/main/native/cpp/RobotDrive.cpp b/wpilibc/src/main/native/cpp/RobotDrive.cpp index e6a1dd1fd2..ab307d896b 100644 --- a/wpilibc/src/main/native/cpp/RobotDrive.cpp +++ b/wpilibc/src/main/native/cpp/RobotDrive.cpp @@ -10,8 +10,9 @@ #include #include +#include + #include "GenericHID.h" -#include "HAL/HAL.h" #include "Joystick.h" #include "Talon.h" #include "Utility.h" diff --git a/wpilibc/src/main/native/cpp/SD540.cpp b/wpilibc/src/main/native/cpp/SD540.cpp index d0b42dcb7b..a2db7adfe8 100644 --- a/wpilibc/src/main/native/cpp/SD540.cpp +++ b/wpilibc/src/main/native/cpp/SD540.cpp @@ -7,7 +7,8 @@ #include "SD540.h" -#include "HAL/HAL.h" +#include + #include "LiveWindow/LiveWindow.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/SPI.cpp b/wpilibc/src/main/native/cpp/SPI.cpp index 0d75283a45..78d96e1348 100644 --- a/wpilibc/src/main/native/cpp/SPI.cpp +++ b/wpilibc/src/main/native/cpp/SPI.cpp @@ -5,14 +5,15 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "HAL/SPI.h" #include "SPI.h" #include -#include "HAL/HAL.h" +#include +#include +#include + #include "WPIErrors.h" -#include "llvm/SmallVector.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/SampleRobot.cpp b/wpilibc/src/main/native/cpp/SampleRobot.cpp index 2b7552565e..19c06481c8 100644 --- a/wpilibc/src/main/native/cpp/SampleRobot.cpp +++ b/wpilibc/src/main/native/cpp/SampleRobot.cpp @@ -7,10 +7,11 @@ #include "SampleRobot.h" +#include + #include "DriverStation.h" #include "LiveWindow/LiveWindow.h" #include "Timer.h" -#include "llvm/raw_ostream.h" #include "networktables/NetworkTable.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/SensorBase.cpp b/wpilibc/src/main/native/cpp/SensorBase.cpp index dfe99a4d2c..044de549bd 100644 --- a/wpilibc/src/main/native/cpp/SensorBase.cpp +++ b/wpilibc/src/main/native/cpp/SensorBase.cpp @@ -7,15 +7,16 @@ #include "SensorBase.h" -#include "HAL/AnalogInput.h" -#include "HAL/AnalogOutput.h" -#include "HAL/DIO.h" -#include "HAL/HAL.h" -#include "HAL/PDP.h" -#include "HAL/PWM.h" -#include "HAL/Ports.h" -#include "HAL/Relay.h" -#include "HAL/Solenoid.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "WPIErrors.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/SerialPort.cpp b/wpilibc/src/main/native/cpp/SerialPort.cpp index 33c0ed7a59..83eb4f647a 100644 --- a/wpilibc/src/main/native/cpp/SerialPort.cpp +++ b/wpilibc/src/main/native/cpp/SerialPort.cpp @@ -5,10 +5,10 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "HAL/SerialPort.h" #include "SerialPort.h" -#include "HAL/HAL.h" +#include +#include // static ViStatus _VI_FUNCH ioCompleteHandler (ViSession vi, ViEventType // eventType, ViEvent event, ViAddr userHandle); diff --git a/wpilibc/src/main/native/cpp/Solenoid.cpp b/wpilibc/src/main/native/cpp/Solenoid.cpp index 4a163c6d62..0f8d4e408e 100644 --- a/wpilibc/src/main/native/cpp/Solenoid.cpp +++ b/wpilibc/src/main/native/cpp/Solenoid.cpp @@ -5,15 +5,16 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "HAL/Solenoid.h" #include "Solenoid.h" -#include "HAL/HAL.h" -#include "HAL/Ports.h" +#include +#include +#include +#include +#include + #include "LiveWindow/LiveWindow.h" #include "WPIErrors.h" -#include "llvm/SmallString.h" -#include "llvm/raw_ostream.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/SolenoidBase.cpp b/wpilibc/src/main/native/cpp/SolenoidBase.cpp index 5eb4115a61..c8ebd99b48 100644 --- a/wpilibc/src/main/native/cpp/SolenoidBase.cpp +++ b/wpilibc/src/main/native/cpp/SolenoidBase.cpp @@ -7,8 +7,8 @@ #include "SolenoidBase.h" -#include "HAL/HAL.h" -#include "HAL/Solenoid.h" +#include +#include using namespace frc; diff --git a/wpilibc/src/main/native/cpp/Spark.cpp b/wpilibc/src/main/native/cpp/Spark.cpp index e064d705f6..653d5838dc 100644 --- a/wpilibc/src/main/native/cpp/Spark.cpp +++ b/wpilibc/src/main/native/cpp/Spark.cpp @@ -7,7 +7,8 @@ #include "Spark.h" -#include "HAL/HAL.h" +#include + #include "LiveWindow/LiveWindow.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/Talon.cpp b/wpilibc/src/main/native/cpp/Talon.cpp index 0f0139ecd3..bbd3b27a8b 100644 --- a/wpilibc/src/main/native/cpp/Talon.cpp +++ b/wpilibc/src/main/native/cpp/Talon.cpp @@ -7,7 +7,8 @@ #include "Talon.h" -#include "HAL/HAL.h" +#include + #include "LiveWindow/LiveWindow.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/TalonSRX.cpp b/wpilibc/src/main/native/cpp/TalonSRX.cpp index 249e8fdc82..0e1b19a5d0 100644 --- a/wpilibc/src/main/native/cpp/TalonSRX.cpp +++ b/wpilibc/src/main/native/cpp/TalonSRX.cpp @@ -7,7 +7,8 @@ #include "TalonSRX.h" -#include "HAL/HAL.h" +#include + #include "LiveWindow/LiveWindow.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/Threads.cpp b/wpilibc/src/main/native/cpp/Threads.cpp index 6e1eaec90f..5f20e1ac03 100644 --- a/wpilibc/src/main/native/cpp/Threads.cpp +++ b/wpilibc/src/main/native/cpp/Threads.cpp @@ -5,11 +5,12 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "HAL/Threads.h" #include "Threads.h" +#include +#include + #include "ErrorBase.h" -#include "HAL/HAL.h" namespace frc { /** diff --git a/wpilibc/src/main/native/cpp/TimedRobot.cpp b/wpilibc/src/main/native/cpp/TimedRobot.cpp index b99ae8ee5c..07cc0f665e 100644 --- a/wpilibc/src/main/native/cpp/TimedRobot.cpp +++ b/wpilibc/src/main/native/cpp/TimedRobot.cpp @@ -9,7 +9,7 @@ #include -#include "HAL/HAL.h" +#include using namespace frc; diff --git a/wpilibc/src/main/native/cpp/Timer.cpp b/wpilibc/src/main/native/cpp/Timer.cpp index ed0e0e2935..4f965b031d 100644 --- a/wpilibc/src/main/native/cpp/Timer.cpp +++ b/wpilibc/src/main/native/cpp/Timer.cpp @@ -10,8 +10,9 @@ #include #include +#include + #include "DriverStation.h" -#include "HAL/HAL.h" #include "Utility.h" namespace frc { diff --git a/wpilibc/src/main/native/cpp/Ultrasonic.cpp b/wpilibc/src/main/native/cpp/Ultrasonic.cpp index bf3d736cf5..c7975aae9f 100644 --- a/wpilibc/src/main/native/cpp/Ultrasonic.cpp +++ b/wpilibc/src/main/native/cpp/Ultrasonic.cpp @@ -7,10 +7,11 @@ #include "Ultrasonic.h" +#include + #include "Counter.h" #include "DigitalInput.h" #include "DigitalOutput.h" -#include "HAL/HAL.h" #include "LiveWindow/LiveWindow.h" #include "Timer.h" #include "Utility.h" diff --git a/wpilibc/src/main/native/cpp/Victor.cpp b/wpilibc/src/main/native/cpp/Victor.cpp index 73af5e40f7..a08e15c983 100644 --- a/wpilibc/src/main/native/cpp/Victor.cpp +++ b/wpilibc/src/main/native/cpp/Victor.cpp @@ -7,7 +7,8 @@ #include "Victor.h" -#include "HAL/HAL.h" +#include + #include "LiveWindow/LiveWindow.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/VictorSP.cpp b/wpilibc/src/main/native/cpp/VictorSP.cpp index 573eb6f9b2..859d2b7a1d 100644 --- a/wpilibc/src/main/native/cpp/VictorSP.cpp +++ b/wpilibc/src/main/native/cpp/VictorSP.cpp @@ -7,7 +7,8 @@ #include "VictorSP.h" -#include "HAL/HAL.h" +#include + #include "LiveWindow/LiveWindow.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/XboxController.cpp b/wpilibc/src/main/native/cpp/XboxController.cpp index bc77faa1f1..ffbc4a137a 100644 --- a/wpilibc/src/main/native/cpp/XboxController.cpp +++ b/wpilibc/src/main/native/cpp/XboxController.cpp @@ -7,8 +7,9 @@ #include "XboxController.h" +#include + #include "DriverStation.h" -#include "HAL/HAL.h" using namespace frc; diff --git a/wpilibc/src/main/native/cpp/vision/VisionRunner.cpp b/wpilibc/src/main/native/cpp/vision/VisionRunner.cpp index 9e36e9db2c..0d6792c4b9 100644 --- a/wpilibc/src/main/native/cpp/vision/VisionRunner.cpp +++ b/wpilibc/src/main/native/cpp/vision/VisionRunner.cpp @@ -7,9 +7,10 @@ #include "vision/VisionRunner.h" +#include + #include "DriverStation.h" #include "RobotBase.h" -#include "opencv2/core/mat.hpp" using namespace frc; diff --git a/wpilibc/src/main/native/include/AnalogGyro.h b/wpilibc/src/main/native/include/AnalogGyro.h index e99d720f42..8a324def7b 100644 --- a/wpilibc/src/main/native/include/AnalogGyro.h +++ b/wpilibc/src/main/native/include/AnalogGyro.h @@ -9,8 +9,9 @@ #include +#include + #include "GyroBase.h" -#include "HAL/Types.h" namespace frc { diff --git a/wpilibc/src/main/native/include/AnalogInput.h b/wpilibc/src/main/native/include/AnalogInput.h index b06f118de9..1262d0f240 100644 --- a/wpilibc/src/main/native/include/AnalogInput.h +++ b/wpilibc/src/main/native/include/AnalogInput.h @@ -12,7 +12,8 @@ #include #include -#include "HAL/Types.h" +#include + #include "LiveWindow/LiveWindowSendable.h" #include "PIDSource.h" #include "SensorBase.h" diff --git a/wpilibc/src/main/native/include/AnalogOutput.h b/wpilibc/src/main/native/include/AnalogOutput.h index f721a09ae5..2e0a42e7e0 100644 --- a/wpilibc/src/main/native/include/AnalogOutput.h +++ b/wpilibc/src/main/native/include/AnalogOutput.h @@ -10,7 +10,8 @@ #include #include -#include "HAL/AnalogOutput.h" +#include + #include "LiveWindow/LiveWindowSendable.h" #include "SensorBase.h" diff --git a/wpilibc/src/main/native/include/AnalogTrigger.h b/wpilibc/src/main/native/include/AnalogTrigger.h index 17882c89cc..e0c9ead4b9 100644 --- a/wpilibc/src/main/native/include/AnalogTrigger.h +++ b/wpilibc/src/main/native/include/AnalogTrigger.h @@ -9,8 +9,9 @@ #include +#include + #include "AnalogTriggerOutput.h" -#include "HAL/Types.h" #include "SensorBase.h" namespace frc { diff --git a/wpilibc/src/main/native/include/AnalogTriggerOutput.h b/wpilibc/src/main/native/include/AnalogTriggerOutput.h index 43655f12eb..041aa44c25 100644 --- a/wpilibc/src/main/native/include/AnalogTriggerOutput.h +++ b/wpilibc/src/main/native/include/AnalogTriggerOutput.h @@ -7,8 +7,9 @@ #pragma once +#include + #include "DigitalSource.h" -#include "HAL/AnalogTrigger.h" namespace frc { diff --git a/wpilibc/src/main/native/include/Base.h b/wpilibc/src/main/native/include/Base.h index 6018bc0e76..cda0e301ce 100644 --- a/wpilibc/src/main/native/include/Base.h +++ b/wpilibc/src/main/native/include/Base.h @@ -7,7 +7,7 @@ #pragma once -#include "HAL/cpp/make_unique.h" +#include // MSVC 2013 doesn't allow "= default" on move constructors, but since we are // (currently) only actually using the move constructors in non-MSVC situations diff --git a/wpilibc/src/main/native/include/CameraServer.h b/wpilibc/src/main/native/include/CameraServer.h index 77ad27642d..2b3780bc66 100644 --- a/wpilibc/src/main/native/include/CameraServer.h +++ b/wpilibc/src/main/native/include/CameraServer.h @@ -15,11 +15,12 @@ #include #include +#include +#include +#include + #include "ErrorBase.h" #include "cscore.h" -#include "llvm/DenseMap.h" -#include "llvm/StringMap.h" -#include "llvm/StringRef.h" #include "networktables/NetworkTable.h" namespace frc { diff --git a/wpilibc/src/main/native/include/Commands/Scheduler.h b/wpilibc/src/main/native/include/Commands/Scheduler.h index b4b2ca5b3a..e45a5ef993 100644 --- a/wpilibc/src/main/native/include/Commands/Scheduler.h +++ b/wpilibc/src/main/native/include/Commands/Scheduler.h @@ -14,9 +14,10 @@ #include #include +#include + #include "Commands/Command.h" #include "ErrorBase.h" -#include "HAL/cpp/priority_mutex.h" #include "SmartDashboard/NamedSendable.h" #include "SmartDashboard/SmartDashboard.h" #include "networktables/NetworkTable.h" diff --git a/wpilibc/src/main/native/include/Compressor.h b/wpilibc/src/main/native/include/Compressor.h index 0d29096155..58ec5d413f 100644 --- a/wpilibc/src/main/native/include/Compressor.h +++ b/wpilibc/src/main/native/include/Compressor.h @@ -10,7 +10,8 @@ #include #include -#include "HAL/Types.h" +#include + #include "LiveWindow/LiveWindowSendable.h" #include "SensorBase.h" #include "tables/ITableListener.h" diff --git a/wpilibc/src/main/native/include/Counter.h b/wpilibc/src/main/native/include/Counter.h index abaa3bcbab..62d9f7568d 100644 --- a/wpilibc/src/main/native/include/Counter.h +++ b/wpilibc/src/main/native/include/Counter.h @@ -10,10 +10,11 @@ #include #include +#include +#include + #include "AnalogTrigger.h" #include "CounterBase.h" -#include "HAL/Counter.h" -#include "HAL/Types.h" #include "LiveWindow/LiveWindowSendable.h" #include "SensorBase.h" diff --git a/wpilibc/src/main/native/include/DigitalGlitchFilter.h b/wpilibc/src/main/native/include/DigitalGlitchFilter.h index c3fd8d89db..fc024ec440 100644 --- a/wpilibc/src/main/native/include/DigitalGlitchFilter.h +++ b/wpilibc/src/main/native/include/DigitalGlitchFilter.h @@ -11,8 +11,9 @@ #include +#include + #include "DigitalSource.h" -#include "HAL/cpp/priority_mutex.h" namespace frc { diff --git a/wpilibc/src/main/native/include/DigitalOutput.h b/wpilibc/src/main/native/include/DigitalOutput.h index 7b9e12a813..a3c8b72f13 100644 --- a/wpilibc/src/main/native/include/DigitalOutput.h +++ b/wpilibc/src/main/native/include/DigitalOutput.h @@ -10,8 +10,9 @@ #include #include +#include + #include "DigitalSource.h" -#include "HAL/Types.h" #include "LiveWindow/LiveWindowSendable.h" #include "tables/ITableListener.h" diff --git a/wpilibc/src/main/native/include/DigitalSource.h b/wpilibc/src/main/native/include/DigitalSource.h index 603a53d266..22727fb42f 100644 --- a/wpilibc/src/main/native/include/DigitalSource.h +++ b/wpilibc/src/main/native/include/DigitalSource.h @@ -7,7 +7,8 @@ #pragma once -#include "HAL/Types.h" +#include + #include "InterruptableSensorBase.h" namespace frc { diff --git a/wpilibc/src/main/native/include/DoubleSolenoid.h b/wpilibc/src/main/native/include/DoubleSolenoid.h index 6b88eb3f1c..8f9adf9330 100644 --- a/wpilibc/src/main/native/include/DoubleSolenoid.h +++ b/wpilibc/src/main/native/include/DoubleSolenoid.h @@ -10,7 +10,8 @@ #include #include -#include "HAL/Types.h" +#include + #include "LiveWindow/LiveWindowSendable.h" #include "SolenoidBase.h" #include "tables/ITableListener.h" diff --git a/wpilibc/src/main/native/include/DriverStation.h b/wpilibc/src/main/native/include/DriverStation.h index db5ca5e4f5..7156f28c44 100644 --- a/wpilibc/src/main/native/include/DriverStation.h +++ b/wpilibc/src/main/native/include/DriverStation.h @@ -12,11 +12,12 @@ #include #include -#include "HAL/DriverStation.h" -#include "HAL/cpp/priority_mutex.h" +#include +#include +#include + #include "RobotState.h" #include "SensorBase.h" -#include "llvm/StringRef.h" namespace frc { diff --git a/wpilibc/src/main/native/include/Encoder.h b/wpilibc/src/main/native/include/Encoder.h index 58473bb582..2ff6406c32 100644 --- a/wpilibc/src/main/native/include/Encoder.h +++ b/wpilibc/src/main/native/include/Encoder.h @@ -10,9 +10,10 @@ #include #include +#include + #include "Counter.h" #include "CounterBase.h" -#include "HAL/Encoder.h" #include "LiveWindow/LiveWindowSendable.h" #include "PIDSource.h" #include "SensorBase.h" diff --git a/wpilibc/src/main/native/include/Error.h b/wpilibc/src/main/native/include/Error.h index ffbc48c32f..32cae1c1c2 100644 --- a/wpilibc/src/main/native/include/Error.h +++ b/wpilibc/src/main/native/include/Error.h @@ -11,8 +11,7 @@ #include -#include "Base.h" -#include "llvm/StringRef.h" +#include #ifdef _WIN32 #include @@ -20,6 +19,8 @@ #undef GetMessage #endif +#include "Base.h" + namespace frc { // Forward declarations diff --git a/wpilibc/src/main/native/include/ErrorBase.h b/wpilibc/src/main/native/include/ErrorBase.h index d97afce7ae..b6635d393f 100644 --- a/wpilibc/src/main/native/include/ErrorBase.h +++ b/wpilibc/src/main/native/include/ErrorBase.h @@ -7,10 +7,11 @@ #pragma once +#include +#include + #include "Base.h" #include "Error.h" -#include "HAL/cpp/priority_mutex.h" -#include "llvm/StringRef.h" #define wpi_setErrnoErrorWithContext(context) \ this->SetErrnoError((context), __FILE__, __FUNCTION__, __LINE__) diff --git a/wpilibc/src/main/native/include/InterruptableSensorBase.h b/wpilibc/src/main/native/include/InterruptableSensorBase.h index 90d499ab02..265004e3cc 100644 --- a/wpilibc/src/main/native/include/InterruptableSensorBase.h +++ b/wpilibc/src/main/native/include/InterruptableSensorBase.h @@ -7,8 +7,9 @@ #pragma once +#include + #include "AnalogTriggerType.h" -#include "HAL/Interrupts.h" #include "SensorBase.h" namespace frc { diff --git a/wpilibc/src/main/native/include/MotorSafety.h b/wpilibc/src/main/native/include/MotorSafety.h index 9a5c9005ea..faa953c8e0 100644 --- a/wpilibc/src/main/native/include/MotorSafety.h +++ b/wpilibc/src/main/native/include/MotorSafety.h @@ -9,7 +9,7 @@ #define DEFAULT_SAFETY_EXPIRATION 0.1 -#include "llvm/raw_ostream.h" +#include namespace frc { diff --git a/wpilibc/src/main/native/include/MotorSafetyHelper.h b/wpilibc/src/main/native/include/MotorSafetyHelper.h index 495812dc0d..2d41369e20 100644 --- a/wpilibc/src/main/native/include/MotorSafetyHelper.h +++ b/wpilibc/src/main/native/include/MotorSafetyHelper.h @@ -9,8 +9,9 @@ #include +#include + #include "ErrorBase.h" -#include "HAL/cpp/priority_mutex.h" namespace frc { diff --git a/wpilibc/src/main/native/include/Notifier.h b/wpilibc/src/main/native/include/Notifier.h index 1e1bd9d65f..5c3c9351cd 100644 --- a/wpilibc/src/main/native/include/Notifier.h +++ b/wpilibc/src/main/native/include/Notifier.h @@ -13,9 +13,10 @@ #include #include +#include +#include + #include "ErrorBase.h" -#include "HAL/Notifier.h" -#include "HAL/cpp/priority_mutex.h" namespace frc { diff --git a/wpilibc/src/main/native/include/PIDController.h b/wpilibc/src/main/native/include/PIDController.h index 0b866ed9b3..75188aef73 100644 --- a/wpilibc/src/main/native/include/PIDController.h +++ b/wpilibc/src/main/native/include/PIDController.h @@ -12,9 +12,10 @@ #include #include +#include + #include "Base.h" #include "Controller.h" -#include "HAL/cpp/priority_mutex.h" #include "LiveWindow/LiveWindow.h" #include "Notifier.h" #include "PIDInterface.h" diff --git a/wpilibc/src/main/native/include/PWM.h b/wpilibc/src/main/native/include/PWM.h index 81e532cdec..62260baa9a 100644 --- a/wpilibc/src/main/native/include/PWM.h +++ b/wpilibc/src/main/native/include/PWM.h @@ -12,7 +12,8 @@ #include #include -#include "HAL/Types.h" +#include + #include "LiveWindow/LiveWindowSendable.h" #include "SensorBase.h" #include "tables/ITableListener.h" diff --git a/wpilibc/src/main/native/include/Relay.h b/wpilibc/src/main/native/include/Relay.h index 042c12abbb..168740777c 100644 --- a/wpilibc/src/main/native/include/Relay.h +++ b/wpilibc/src/main/native/include/Relay.h @@ -10,11 +10,12 @@ #include #include -#include "HAL/Types.h" +#include +#include + #include "LiveWindow/LiveWindowSendable.h" #include "MotorSafety.h" #include "SensorBase.h" -#include "llvm/raw_ostream.h" #include "tables/ITable.h" #include "tables/ITableListener.h" diff --git a/wpilibc/src/main/native/include/Resource.h b/wpilibc/src/main/native/include/Resource.h index b7623be022..c0e36ef890 100644 --- a/wpilibc/src/main/native/include/Resource.h +++ b/wpilibc/src/main/native/include/Resource.h @@ -13,8 +13,9 @@ #include #include +#include + #include "ErrorBase.h" -#include "HAL/cpp/priority_mutex.h" namespace frc { diff --git a/wpilibc/src/main/native/include/RobotBase.h b/wpilibc/src/main/native/include/RobotBase.h index eac1e6329b..ff11f82dda 100644 --- a/wpilibc/src/main/native/include/RobotBase.h +++ b/wpilibc/src/main/native/include/RobotBase.h @@ -9,9 +9,10 @@ #include +#include +#include + #include "Base.h" -#include "HAL/HAL.h" -#include "llvm/raw_ostream.h" namespace frc { diff --git a/wpilibc/src/main/native/include/RobotDrive.h b/wpilibc/src/main/native/include/RobotDrive.h index ce1413af7e..af4dbf0104 100644 --- a/wpilibc/src/main/native/include/RobotDrive.h +++ b/wpilibc/src/main/native/include/RobotDrive.h @@ -9,10 +9,11 @@ #include +#include + #include "ErrorBase.h" #include "MotorSafety.h" #include "MotorSafetyHelper.h" -#include "llvm/raw_ostream.h" namespace frc { diff --git a/wpilibc/src/main/native/include/SafePWM.h b/wpilibc/src/main/native/include/SafePWM.h index 7b0361dd39..3dbe645607 100644 --- a/wpilibc/src/main/native/include/SafePWM.h +++ b/wpilibc/src/main/native/include/SafePWM.h @@ -9,10 +9,11 @@ #include +#include + #include "MotorSafety.h" #include "MotorSafetyHelper.h" #include "PWM.h" -#include "llvm/raw_ostream.h" namespace frc { diff --git a/wpilibc/src/main/native/include/SerialPort.h b/wpilibc/src/main/native/include/SerialPort.h index 21490668db..0ecb4121cf 100644 --- a/wpilibc/src/main/native/include/SerialPort.h +++ b/wpilibc/src/main/native/include/SerialPort.h @@ -9,8 +9,9 @@ #include +#include + #include "ErrorBase.h" -#include "llvm/StringRef.h" namespace frc { diff --git a/wpilibc/src/main/native/include/SmartDashboard/SendableChooser.h b/wpilibc/src/main/native/include/SmartDashboard/SendableChooser.h index 01c83b2cef..627dd0a121 100644 --- a/wpilibc/src/main/native/include/SmartDashboard/SendableChooser.h +++ b/wpilibc/src/main/native/include/SmartDashboard/SendableChooser.h @@ -10,9 +10,10 @@ #include #include +#include +#include + #include "SmartDashboard/SendableChooserBase.h" -#include "llvm/StringMap.h" -#include "llvm/StringRef.h" #include "tables/ITable.h" namespace frc { diff --git a/wpilibc/src/main/native/include/Solenoid.h b/wpilibc/src/main/native/include/Solenoid.h index a5e40ed7e4..bb53680517 100644 --- a/wpilibc/src/main/native/include/Solenoid.h +++ b/wpilibc/src/main/native/include/Solenoid.h @@ -10,7 +10,8 @@ #include #include -#include "HAL/Types.h" +#include + #include "LiveWindow/LiveWindowSendable.h" #include "SolenoidBase.h" #include "tables/ITableListener.h" diff --git a/wpilibc/src/main/native/include/Timer.h b/wpilibc/src/main/native/include/Timer.h index dac426ce57..26c843138c 100644 --- a/wpilibc/src/main/native/include/Timer.h +++ b/wpilibc/src/main/native/include/Timer.h @@ -7,8 +7,9 @@ #pragma once +#include + #include "Base.h" -#include "HAL/cpp/priority_mutex.h" namespace frc { diff --git a/wpilibc/src/main/native/include/Utility.h b/wpilibc/src/main/native/include/Utility.h index 42ff7c21bc..ae2695247d 100644 --- a/wpilibc/src/main/native/include/Utility.h +++ b/wpilibc/src/main/native/include/Utility.h @@ -15,7 +15,7 @@ #include -#include "llvm/StringRef.h" +#include #define wpi_assert(condition) \ wpi_assert_impl(condition, #condition, "", __FILE__, __LINE__, __FUNCTION__) diff --git a/wpilibcIntegrationTests/src/FRCUserProgram/cpp/ConditionVariableTest.cpp b/wpilibcIntegrationTests/src/FRCUserProgram/cpp/ConditionVariableTest.cpp index 29808f0c0f..49dd7069ff 100644 --- a/wpilibcIntegrationTests/src/FRCUserProgram/cpp/ConditionVariableTest.cpp +++ b/wpilibcIntegrationTests/src/FRCUserProgram/cpp/ConditionVariableTest.cpp @@ -11,8 +11,9 @@ #include #include -#include "HAL/cpp/priority_condition_variable.h" -#include "HAL/cpp/priority_mutex.h" +#include +#include + #include "TestBench.h" #include "gtest/gtest.h" diff --git a/wpilibcIntegrationTests/src/FRCUserProgram/cpp/DIOLoopTest.cpp b/wpilibcIntegrationTests/src/FRCUserProgram/cpp/DIOLoopTest.cpp index da9d95e101..fb802ad042 100644 --- a/wpilibcIntegrationTests/src/FRCUserProgram/cpp/DIOLoopTest.cpp +++ b/wpilibcIntegrationTests/src/FRCUserProgram/cpp/DIOLoopTest.cpp @@ -5,7 +5,8 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "DigitalInput.h" // NOLINT(build/include_order) +#include "DigitalInput.h" // NOLINT(build/include_order) + #include "DigitalOutput.h" // NOLINT(build/include_order) #include "Counter.h" diff --git a/wpilibcIntegrationTests/src/FRCUserProgram/cpp/MutexTest.cpp b/wpilibcIntegrationTests/src/FRCUserProgram/cpp/MutexTest.cpp index 56ae187c79..3561529c66 100644 --- a/wpilibcIntegrationTests/src/FRCUserProgram/cpp/MutexTest.cpp +++ b/wpilibcIntegrationTests/src/FRCUserProgram/cpp/MutexTest.cpp @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "HAL/cpp/priority_mutex.h" // NOLINT(build/include_order) +#include // NOLINT(build/include_order) #include #include diff --git a/wpilibcIntegrationTests/src/FRCUserProgram/cpp/NotifierTest.cpp b/wpilibcIntegrationTests/src/FRCUserProgram/cpp/NotifierTest.cpp index 2e2ea8b423..9a6a1fdb99 100644 --- a/wpilibcIntegrationTests/src/FRCUserProgram/cpp/NotifierTest.cpp +++ b/wpilibcIntegrationTests/src/FRCUserProgram/cpp/NotifierTest.cpp @@ -7,10 +7,11 @@ #include "Notifier.h" // NOLINT(build/include_order) +#include + #include "TestBench.h" #include "Timer.h" #include "gtest/gtest.h" -#include "llvm/raw_ostream.h" using namespace frc; diff --git a/wpilibcIntegrationTests/src/FRCUserProgram/cpp/TestEnvironment.cpp b/wpilibcIntegrationTests/src/FRCUserProgram/cpp/TestEnvironment.cpp index b546000549..f82d10f0a5 100644 --- a/wpilibcIntegrationTests/src/FRCUserProgram/cpp/TestEnvironment.cpp +++ b/wpilibcIntegrationTests/src/FRCUserProgram/cpp/TestEnvironment.cpp @@ -7,12 +7,13 @@ #include +#include +#include + #include "DriverStation.h" -#include "HAL/HAL.h" #include "LiveWindow/LiveWindow.h" #include "Timer.h" #include "gtest/gtest.h" -#include "llvm/raw_ostream.h" using namespace frc; diff --git a/wpilibj/src/main/native/cpp/.styleguide b/wpilibj/src/main/native/cpp/.styleguide new file mode 100644 index 0000000000..4eff33eebd --- /dev/null +++ b/wpilibj/src/main/native/cpp/.styleguide @@ -0,0 +1,45 @@ +cppHeaderExtensions { + h + hpp + inc +} + +cppSrcExtensions { + cpp +} + +otherExtensions { + java +} + +genFileExclude { + gmock/ + ni-libraries/ + hal/src/main/native/athena/ctre/ + hal/src/main/native/athena/frccansae/ + hal/src/main/native/athena/visa/ + hal/src/main/native/include/ctre/ + simulation/JavaGazebo/build/classes/main/gazebo/msgs/ + wpilibj/src/athena/cpp/nivision/ + UsageReporting\.h$ +} + +modifiableFileExclude { + wpilibj/src/arm-linux-jni/ + wpilibj/src/main/native/cpp/ + \.patch$ + \.png$ + \.py$ + \.so$ +} + +includeOtherLibs { + ^HAL/ + ^llvm/ + ^opencv2/ + ^support/ +} + +includeProject { + ^ctre/ +}