Move CameraServer and WPILib headers into their own folder

The old headers were moved into folders because doing so avoids polluting
the system include directories.

Folder names were also normalized to lowercase.
This commit is contained in:
Tyler Veness
2018-07-20 00:03:45 -07:00
committed by Peter Johnson
parent 31ced30c1e
commit d89b7dd412
728 changed files with 1876 additions and 1851 deletions

View File

@@ -5,11 +5,11 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "HAL/cpp/fpga_clock.h"
#include "hal/cpp/fpga_clock.h"
#include <wpi/raw_ostream.h>
#include "HAL/HAL.h"
#include "hal/HAL.h"
namespace hal {
const fpga_clock::time_point fpga_clock::min_time =

View File

@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "HAL/handles/HandlesInternal.h"
#include "hal/handles/HandlesInternal.h"
#include <algorithm>

View File

@@ -7,8 +7,8 @@
#include <jni.h>
#include "HAL/Accelerometer.h"
#include "edu_wpi_first_wpilibj_hal_AccelerometerJNI.h"
#include "hal/Accelerometer.h"
extern "C" {

View File

@@ -9,11 +9,11 @@
#include <cassert>
#include "HAL/AnalogGyro.h"
#include "HAL/cpp/Log.h"
#include "HAL/handles/HandlesInternal.h"
#include "HALUtil.h"
#include "edu_wpi_first_wpilibj_hal_AnalogGyroJNI.h"
#include "hal/AnalogGyro.h"
#include "hal/cpp/Log.h"
#include "hal/handles/HandlesInternal.h"
using namespace frc;

View File

@@ -9,15 +9,15 @@
#include <cassert>
#include "HAL/AnalogAccumulator.h"
#include "HAL/AnalogInput.h"
#include "HAL/AnalogOutput.h"
#include "HAL/AnalogTrigger.h"
#include "HAL/Ports.h"
#include "HAL/cpp/Log.h"
#include "HAL/handles/HandlesInternal.h"
#include "HALUtil.h"
#include "edu_wpi_first_wpilibj_hal_AnalogJNI.h"
#include "hal/AnalogAccumulator.h"
#include "hal/AnalogInput.h"
#include "hal/AnalogOutput.h"
#include "hal/AnalogTrigger.h"
#include "hal/Ports.h"
#include "hal/cpp/Log.h"
#include "hal/handles/HandlesInternal.h"
using namespace frc;

View File

@@ -13,12 +13,12 @@
#include <wpi/jni_util.h>
#include <wpi/raw_ostream.h>
#include "HAL/CAN.h"
#include "HAL/CANAPI.h"
#include "HAL/Errors.h"
#include "HAL/cpp/Log.h"
#include "HALUtil.h"
#include "edu_wpi_first_wpilibj_hal_CANAPIJNI.h"
#include "hal/CAN.h"
#include "hal/CANAPI.h"
#include "hal/Errors.h"
#include "hal/cpp/Log.h"
using namespace frc;
using namespace wpi::java;

View File

@@ -13,10 +13,10 @@
#include <wpi/jni_util.h>
#include <wpi/raw_ostream.h>
#include "HAL/CAN.h"
#include "HAL/cpp/Log.h"
#include "HALUtil.h"
#include "edu_wpi_first_wpilibj_can_CANJNI.h"
#include "hal/CAN.h"
#include "hal/cpp/Log.h"
using namespace frc;
using namespace wpi::java;

View File

@@ -5,12 +5,12 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "HAL/Compressor.h"
#include "HAL/Ports.h"
#include "HAL/Solenoid.h"
#include "HAL/cpp/Log.h"
#include "HALUtil.h"
#include "edu_wpi_first_wpilibj_hal_CompressorJNI.h"
#include "hal/Compressor.h"
#include "hal/Ports.h"
#include "hal/Solenoid.h"
#include "hal/cpp/Log.h"
using namespace frc;

View File

@@ -9,10 +9,10 @@
#include <cassert>
#include "HAL/Constants.h"
#include "HAL/cpp/Log.h"
#include "HALUtil.h"
#include "edu_wpi_first_wpilibj_hal_ConstantsJNI.h"
#include "hal/Constants.h"
#include "hal/cpp/Log.h"
using namespace frc;

View File

@@ -9,11 +9,11 @@
#include <cassert>
#include "HAL/Counter.h"
#include "HAL/Errors.h"
#include "HAL/cpp/Log.h"
#include "HALUtil.h"
#include "edu_wpi_first_wpilibj_hal_CounterJNI.h"
#include "hal/Counter.h"
#include "hal/Errors.h"
#include "hal/cpp/Log.h"
using namespace frc;

View File

@@ -9,13 +9,13 @@
#include <cassert>
#include "HAL/DIO.h"
#include "HAL/PWM.h"
#include "HAL/Ports.h"
#include "HAL/cpp/Log.h"
#include "HAL/handles/HandlesInternal.h"
#include "HALUtil.h"
#include "edu_wpi_first_wpilibj_hal_DIOJNI.h"
#include "hal/DIO.h"
#include "hal/PWM.h"
#include "hal/Ports.h"
#include "hal/cpp/Log.h"
#include "hal/handles/HandlesInternal.h"
using namespace frc;

View File

@@ -7,9 +7,9 @@
#include <jni.h>
#include "HAL/DIO.h"
#include "HALUtil.h"
#include "edu_wpi_first_wpilibj_hal_DigitalGlitchFilterJNI.h"
#include "hal/DIO.h"
using namespace frc;

View File

@@ -9,11 +9,11 @@
#include <cassert>
#include "HAL/Encoder.h"
#include "HAL/Errors.h"
#include "HAL/cpp/Log.h"
#include "HALUtil.h"
#include "edu_wpi_first_wpilibj_hal_EncoderJNI.h"
#include "hal/Encoder.h"
#include "hal/Errors.h"
#include "hal/cpp/Log.h"
using namespace frc;

View File

@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "HAL/HAL.h"
#include "hal/HAL.h"
#include <jni.h>
@@ -14,10 +14,10 @@
#include <wpi/jni_util.h>
#include "HAL/DriverStation.h"
#include "HAL/cpp/Log.h"
#include "HALUtil.h"
#include "edu_wpi_first_wpilibj_hal_HAL.h"
#include "hal/DriverStation.h"
#include "hal/cpp/Log.h"
using namespace frc;
using namespace wpi::java;

View File

@@ -19,12 +19,12 @@
#include <wpi/jni_util.h>
#include <wpi/raw_ostream.h>
#include "HAL/CAN.h"
#include "HAL/DriverStation.h"
#include "HAL/Errors.h"
#include "HAL/HAL.h"
#include "HAL/cpp/Log.h"
#include "edu_wpi_first_wpilibj_hal_HALUtil.h"
#include "hal/CAN.h"
#include "hal/DriverStation.h"
#include "hal/Errors.h"
#include "hal/HAL.h"
#include "hal/cpp/Log.h"
using namespace wpi::java;

View File

@@ -11,10 +11,10 @@
#include <wpi/jni_util.h>
#include "HAL/I2C.h"
#include "HAL/cpp/Log.h"
#include "HALUtil.h"
#include "edu_wpi_first_wpilibj_hal_I2CJNI.h"
#include "hal/I2C.h"
#include "hal/cpp/Log.h"
using namespace frc;
using namespace wpi::java;

View File

@@ -14,10 +14,10 @@
#include <wpi/SafeThread.h>
#include <wpi/mutex.h>
#include "HAL/Interrupts.h"
#include "HAL/cpp/Log.h"
#include "HALUtil.h"
#include "edu_wpi_first_wpilibj_hal_InterruptJNI.h"
#include "hal/Interrupts.h"
#include "hal/cpp/Log.h"
using namespace frc;

View File

@@ -10,10 +10,10 @@
#include <cassert>
#include <cstdio>
#include "HAL/Notifier.h"
#include "HAL/cpp/Log.h"
#include "HALUtil.h"
#include "edu_wpi_first_wpilibj_hal_NotifierJNI.h"
#include "hal/Notifier.h"
#include "hal/cpp/Log.h"
using namespace frc;

View File

@@ -5,10 +5,10 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "HAL/PDP.h"
#include "HAL/Ports.h"
#include "HALUtil.h"
#include "edu_wpi_first_wpilibj_hal_PDPJNI.h"
#include "hal/PDP.h"
#include "hal/Ports.h"
using namespace frc;

View File

@@ -9,13 +9,13 @@
#include <cassert>
#include "HAL/DIO.h"
#include "HAL/PWM.h"
#include "HAL/Ports.h"
#include "HAL/cpp/Log.h"
#include "HAL/handles/HandlesInternal.h"
#include "HALUtil.h"
#include "edu_wpi_first_wpilibj_hal_PWMJNI.h"
#include "hal/DIO.h"
#include "hal/PWM.h"
#include "hal/Ports.h"
#include "hal/cpp/Log.h"
#include "hal/handles/HandlesInternal.h"
using namespace frc;

View File

@@ -9,10 +9,10 @@
#include <cassert>
#include "HAL/Ports.h"
#include "HAL/cpp/Log.h"
#include "HALUtil.h"
#include "edu_wpi_first_wpilibj_hal_PortsJNI.h"
#include "hal/Ports.h"
#include "hal/cpp/Log.h"
using namespace frc;

View File

@@ -7,9 +7,9 @@
#include <jni.h>
#include "HAL/Power.h"
#include "HALUtil.h"
#include "edu_wpi_first_wpilibj_hal_PowerJNI.h"
#include "hal/Power.h"
using namespace frc;

View File

@@ -9,12 +9,12 @@
#include <cassert>
#include "HAL/Ports.h"
#include "HAL/Relay.h"
#include "HAL/cpp/Log.h"
#include "HAL/handles/HandlesInternal.h"
#include "HALUtil.h"
#include "edu_wpi_first_wpilibj_hal_RelayJNI.h"
#include "hal/Ports.h"
#include "hal/Relay.h"
#include "hal/cpp/Log.h"
#include "hal/handles/HandlesInternal.h"
using namespace frc;

View File

@@ -11,10 +11,10 @@
#include <wpi/jni_util.h>
#include "HAL/SPI.h"
#include "HAL/cpp/Log.h"
#include "HALUtil.h"
#include "edu_wpi_first_wpilibj_hal_SPIJNI.h"
#include "hal/SPI.h"
#include "hal/cpp/Log.h"
using namespace frc;
using namespace wpi::java;

View File

@@ -11,10 +11,10 @@
#include <wpi/jni_util.h>
#include "HAL/SerialPort.h"
#include "HAL/cpp/Log.h"
#include "HALUtil.h"
#include "edu_wpi_first_wpilibj_hal_SerialPortJNI.h"
#include "hal/SerialPort.h"
#include "hal/cpp/Log.h"
using namespace frc;
using namespace wpi::java;

View File

@@ -7,12 +7,12 @@
#include <jni.h>
#include "HAL/Ports.h"
#include "HAL/Solenoid.h"
#include "HAL/cpp/Log.h"
#include "HAL/handles/HandlesInternal.h"
#include "HALUtil.h"
#include "edu_wpi_first_wpilibj_hal_SolenoidJNI.h"
#include "hal/Ports.h"
#include "hal/Solenoid.h"
#include "hal/cpp/Log.h"
#include "hal/handles/HandlesInternal.h"
using namespace frc;

View File

@@ -9,10 +9,10 @@
#include <cassert>
#include "HAL/Threads.h"
#include "HAL/cpp/Log.h"
#include "HALUtil.h"
#include "edu_wpi_first_wpilibj_hal_ThreadsJNI.h"
#include "hal/Threads.h"
#include "hal/cpp/Log.h"
using namespace frc;