Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-02 02:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move CameraServer and WPILib headers into their own folder

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

6
hal/src/main/native/athena/Accelerometer.cpp
View File

@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "HAL/Accelerometer.h"
#include "hal/Accelerometer.h"
#include <stdint.h>
@@ -13,9 +13,9 @@
#include <cstdio>
#include <memory>
#include "HAL/ChipObject.h"
#include "HAL/HAL.h"
#include "HALInitializer.h"
#include "hal/ChipObject.h"
#include "hal/HAL.h"
using namespace hal;

4
hal/src/main/native/athena/AnalogAccumulator.cpp
View File

@@ -5,10 +5,10 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "HAL/AnalogAccumulator.h"
#include "hal/AnalogAccumulator.h"
#include "AnalogInternal.h"
#include "HAL/HAL.h"
#include "hal/HAL.h"
using namespace hal;

8
hal/src/main/native/athena/AnalogGyro.cpp
View File

@@ -5,15 +5,15 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "HAL/AnalogGyro.h"
#include "hal/AnalogGyro.h"
#include <thread>
#include "AnalogInternal.h"
#include "HAL/AnalogAccumulator.h"
#include "HAL/AnalogInput.h"
#include "HAL/handles/IndexedHandleResource.h"
#include "HALInitializer.h"
#include "hal/AnalogAccumulator.h"
#include "hal/AnalogInput.h"
#include "hal/handles/IndexedHandleResource.h"
namespace {

8
hal/src/main/native/athena/AnalogInput.cpp
View File

@@ -5,17 +5,17 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "HAL/AnalogInput.h"
#include "hal/AnalogInput.h"
#include <FRC_NetworkCommunication/AICalibration.h>
#include <wpi/mutex.h>
#include "AnalogInternal.h"
#include "HAL/AnalogAccumulator.h"
#include "HAL/HAL.h"
#include "HAL/handles/HandlesInternal.h"
#include "HALInitializer.h"
#include "PortsInternal.h"
#include "hal/AnalogAccumulator.h"
#include "hal/HAL.h"
#include "hal/handles/HandlesInternal.h"
namespace hal {
namespace init {

4
hal/src/main/native/athena/AnalogInternal.cpp
View File

@@ -11,10 +11,10 @@
#include <wpi/mutex.h>
#include "HAL/AnalogInput.h"
#include "HAL/ChipObject.h"
#include "HALInitializer.h"
#include "PortsInternal.h"
#include "hal/AnalogInput.h"
#include "hal/ChipObject.h"
namespace hal {

6
hal/src/main/native/athena/AnalogInternal.h
View File

@@ -13,10 +13,10 @@
#include <wpi/mutex.h>
#include "HAL/ChipObject.h"
#include "HAL/Ports.h"
#include "HAL/handles/IndexedHandleResource.h"
#include "PortsInternal.h"
#include "hal/ChipObject.h"
#include "hal/Ports.h"
#include "hal/handles/IndexedHandleResource.h"
namespace hal {

8
hal/src/main/native/athena/AnalogOutput.cpp
View File

@@ -5,14 +5,14 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "HAL/AnalogOutput.h"
#include "hal/AnalogOutput.h"
#include "AnalogInternal.h"
#include "HAL/Errors.h"
#include "HAL/handles/HandlesInternal.h"
#include "HAL/handles/IndexedHandleResource.h"
#include "HALInitializer.h"
#include "PortsInternal.h"
#include "hal/Errors.h"
#include "hal/handles/HandlesInternal.h"
#include "hal/handles/IndexedHandleResource.h"
using namespace hal;

10
hal/src/main/native/athena/AnalogTrigger.cpp
View File

@@ -5,15 +5,15 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "HAL/AnalogTrigger.h"
#include "hal/AnalogTrigger.h"
#include "AnalogInternal.h"
#include "HAL/AnalogInput.h"
#include "HAL/Errors.h"
#include "HAL/handles/HandlesInternal.h"
#include "HAL/handles/LimitedHandleResource.h"
#include "HALInitializer.h"
#include "PortsInternal.h"
#include "hal/AnalogInput.h"
#include "hal/Errors.h"
#include "hal/handles/HandlesInternal.h"
#include "hal/handles/LimitedHandleResource.h"
using namespace hal;

2
hal/src/main/native/athena/CAN.cpp
View File

@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "HAL/CAN.h"
#include "hal/CAN.h"
#include <FRC_NetworkCommunication/CANSessionMux.h>

10
hal/src/main/native/athena/CANAPI.cpp
View File

@@ -5,18 +5,18 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "HAL/CANAPI.h"
#include "hal/CANAPI.h"
#include <atomic>
#include <ctime>
#include <wpi/DenseMap.h>
#include "HAL/CAN.h"
#include "HAL/Errors.h"
#include "HAL/HAL.h"
#include "HAL/handles/UnlimitedHandleResource.h"
#include "HALInitializer.h"
#include "hal/CAN.h"
#include "hal/Errors.h"
#include "hal/HAL.h"
#include "hal/handles/UnlimitedHandleResource.h"
using namespace hal;

6
hal/src/main/native/athena/Compressor.cpp
View File

@@ -5,14 +5,14 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "HAL/Compressor.h"
#include "hal/Compressor.h"
#include "HAL/Errors.h"
#include "HAL/handles/HandlesInternal.h"
#include "HALInitializer.h"
#include "PCMInternal.h"
#include "PortsInternal.h"
#include "ctre/PCM.h"
#include "hal/Errors.h"
#include "hal/handles/HandlesInternal.h"
using namespace hal;

2
hal/src/main/native/athena/Constants.cpp
View File

@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "HAL/Constants.h"
#include "hal/Constants.h"
#include "ConstantsInternal.h"

6
hal/src/main/native/athena/Counter.cpp
View File

@@ -5,14 +5,14 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "HAL/Counter.h"
#include "hal/Counter.h"
#include "ConstantsInternal.h"
#include "DigitalInternal.h"
#include "HAL/HAL.h"
#include "HAL/handles/LimitedHandleResource.h"
#include "HALInitializer.h"
#include "PortsInternal.h"
#include "hal/HAL.h"
#include "hal/handles/LimitedHandleResource.h"
using namespace hal;

8
hal/src/main/native/athena/DIO.cpp
View File

@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "HAL/DIO.h"
#include "hal/DIO.h"
#include <cmath>
#include <thread>
@@ -13,11 +13,11 @@
#include <wpi/raw_ostream.h>
#include "DigitalInternal.h"
#include "HAL/cpp/fpga_clock.h"
#include "HAL/handles/HandlesInternal.h"
#include "HAL/handles/LimitedHandleResource.h"
#include "HALInitializer.h"
#include "PortsInternal.h"
#include "hal/cpp/fpga_clock.h"
#include "hal/handles/HandlesInternal.h"
#include "hal/handles/LimitedHandleResource.h"
using namespace hal;

10
hal/src/main/native/athena/DigitalInternal.cpp
View File

@@ -14,13 +14,13 @@
#include <wpi/mutex.h>
#include "ConstantsInternal.h"
#include "HAL/AnalogTrigger.h"
#include "HAL/ChipObject.h"
#include "HAL/HAL.h"
#include "HAL/Ports.h"
#include "HAL/cpp/UnsafeDIO.h"
#include "HALInitializer.h"
#include "PortsInternal.h"
#include "hal/AnalogTrigger.h"
#include "hal/ChipObject.h"
#include "hal/HAL.h"
#include "hal/Ports.h"
#include "hal/cpp/UnsafeDIO.h"
namespace hal {

12
hal/src/main/native/athena/DigitalInternal.h
View File

@@ -13,13 +13,13 @@
#include <wpi/mutex.h>
#include "HAL/AnalogTrigger.h"
#include "HAL/ChipObject.h"
#include "HAL/Ports.h"
#include "HAL/Types.h"
#include "HAL/handles/DigitalHandleResource.h"
#include "HAL/handles/HandlesInternal.h"
#include "PortsInternal.h"
#include "hal/AnalogTrigger.h"
#include "hal/ChipObject.h"
#include "hal/Ports.h"
#include "hal/Types.h"
#include "hal/handles/DigitalHandleResource.h"
#include "hal/handles/HandlesInternal.h"
namespace hal {

10
hal/src/main/native/athena/Encoder.cpp
View File

@@ -5,16 +5,16 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "HAL/Encoder.h"
#include "hal/Encoder.h"
#include "EncoderInternal.h"
#include "FPGAEncoder.h"
#include "HAL/ChipObject.h"
#include "HAL/Counter.h"
#include "HAL/Errors.h"
#include "HAL/handles/LimitedClassedHandleResource.h"
#include "HALInitializer.h"
#include "PortsInternal.h"
#include "hal/ChipObject.h"
#include "hal/Counter.h"
#include "hal/Errors.h"
#include "hal/handles/LimitedClassedHandleResource.h"
using namespace hal;

2
hal/src/main/native/athena/EncoderInternal.h
View File

@@ -9,7 +9,7 @@
#include <stdint.h>
#include "HAL/Encoder.h"
#include "hal/Encoder.h"
namespace hal {

2
hal/src/main/native/athena/FPGAEncoder.cpp
View File

@@ -10,9 +10,9 @@
#include <memory>
#include "DigitalInternal.h"
#include "HAL/handles/LimitedHandleResource.h"
#include "HALInitializer.h"
#include "PortsInternal.h"
#include "hal/handles/LimitedHandleResource.h"
using namespace hal;

4
hal/src/main/native/athena/FPGAEncoder.h
View File

@@ -9,8 +9,8 @@
#include <stdint.h>
#include "HAL/AnalogTrigger.h"
#include "HAL/Types.h"
#include "hal/AnalogTrigger.h"
#include "hal/Types.h"
extern "C" {

2
hal/src/main/native/athena/FRCDriverStation.cpp
View File

@@ -18,7 +18,7 @@
#include <wpi/mutex.h>
#include <wpi/raw_ostream.h>
#include "HAL/DriverStation.h"
#include "hal/DriverStation.h"
static_assert(sizeof(int32_t) >= sizeof(int),
"FRC_NetworkComm status variable is larger than 32 bits");

12
hal/src/main/native/athena/HAL.cpp
View File

@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "HAL/HAL.h"
#include "hal/HAL.h"
#include <signal.h> // linux for kill
#include <sys/prctl.h>
@@ -22,13 +22,13 @@
#include <wpi/raw_ostream.h>
#include <wpi/timestamp.h>
#include "HAL/ChipObject.h"
#include "HAL/DriverStation.h"
#include "HAL/Errors.h"
#include "HAL/Notifier.h"
#include "HAL/handles/HandlesInternal.h"
#include "HALInitializer.h"
#include "ctre/ctre.h"
#include "hal/ChipObject.h"
#include "hal/DriverStation.h"
#include "hal/Errors.h"
#include "hal/Notifier.h"
#include "hal/handles/HandlesInternal.h"
#include "visa/visa.h"
using namespace hal;

2
hal/src/main/native/athena/HALInitializer.cpp
View File

@@ -7,7 +7,7 @@
#include "HALInitializer.h"
#include "HAL/HAL.h"
#include "hal/HAL.h"
namespace hal {
namespace init {

6
hal/src/main/native/athena/I2C.cpp
View File

@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "HAL/I2C.h"
#include "hal/I2C.h"
#include <fcntl.h>
#include <linux/i2c-dev.h>
@@ -16,9 +16,9 @@
#include <cstring>
#include "DigitalInternal.h"
#include "HAL/DIO.h"
#include "HAL/HAL.h"
#include "HALInitializer.h"
#include "hal/DIO.h"
#include "hal/HAL.h"
using namespace hal;

10
hal/src/main/native/athena/Interrupts.cpp
View File

@@ -5,19 +5,19 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "HAL/Interrupts.h"
#include "hal/Interrupts.h"
#include <memory>
#include <wpi/SafeThread.h>
#include "DigitalInternal.h"
#include "HAL/ChipObject.h"
#include "HAL/Errors.h"
#include "HAL/handles/HandlesInternal.h"
#include "HAL/handles/LimitedHandleResource.h"
#include "HALInitializer.h"
#include "PortsInternal.h"
#include "hal/ChipObject.h"
#include "hal/Errors.h"
#include "hal/handles/HandlesInternal.h"
#include "hal/handles/LimitedHandleResource.h"
using namespace hal;

10
hal/src/main/native/athena/Notifier.cpp
View File

@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "HAL/Notifier.h"
#include "hal/Notifier.h"
#include <atomic>
#include <cstdlib> // For std::atexit()
@@ -14,11 +14,11 @@
#include <wpi/condition_variable.h>
#include <wpi/mutex.h>
#include "HAL/ChipObject.h"
#include "HAL/Errors.h"
#include "HAL/HAL.h"
#include "HAL/handles/UnlimitedHandleResource.h"
#include "HALInitializer.h"
#include "hal/ChipObject.h"
#include "hal/Errors.h"
#include "hal/HAL.h"
#include "hal/handles/UnlimitedHandleResource.h"
using namespace hal;

4
hal/src/main/native/athena/PCMInternal.cpp
View File

@@ -7,10 +7,10 @@
#include "PCMInternal.h"
#include "HAL/Errors.h"
#include "HAL/Solenoid.h"
#include "HALInitializer.h"
#include "PortsInternal.h"
#include "hal/Errors.h"
#include "hal/Solenoid.h"
namespace hal {

6
hal/src/main/native/athena/PCMInternal.h
View File

@@ -11,11 +11,11 @@
#include <memory>
#include "HAL/Errors.h"
#include "HAL/Ports.h"
#include "HAL/Solenoid.h"
#include "PortsInternal.h"
#include "ctre/PCM.h"
#include "hal/Errors.h"
#include "hal/Ports.h"
#include "hal/Solenoid.h"
namespace hal {

10
hal/src/main/native/athena/PDP.cpp
View File

@@ -5,16 +5,16 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "HAL/PDP.h"
#include "hal/PDP.h"
#include <memory>
#include "HAL/CANAPI.h"
#include "HAL/Errors.h"
#include "HAL/Ports.h"
#include "HAL/handles/IndexedHandleResource.h"
#include "HALInitializer.h"
#include "PortsInternal.h"
#include "hal/CANAPI.h"
#include "hal/Errors.h"
#include "hal/Ports.h"
#include "hal/handles/IndexedHandleResource.h"
using namespace hal;

6
hal/src/main/native/athena/PWM.cpp
View File

@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "HAL/PWM.h"
#include "hal/PWM.h"
#include <cmath>
#include <thread>
@@ -14,10 +14,10 @@
#include "ConstantsInternal.h"
#include "DigitalInternal.h"
#include "HAL/cpp/fpga_clock.h"
#include "HAL/handles/HandlesInternal.h"
#include "HALInitializer.h"
#include "PortsInternal.h"
#include "hal/cpp/fpga_clock.h"
#include "hal/handles/HandlesInternal.h"
using namespace hal;

2
hal/src/main/native/athena/Ports.cpp
View File

@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "HAL/Ports.h"
#include "hal/Ports.h"
#include "PortsInternal.h"

2
hal/src/main/native/athena/PortsInternal.h
View File

@@ -9,7 +9,7 @@
#include <stdint.h>
#include "HAL/ChipObject.h"
#include "hal/ChipObject.h"
namespace hal {

4
hal/src/main/native/athena/Power.cpp
View File

@@ -5,12 +5,12 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "HAL/Power.h"
#include "hal/Power.h"
#include <memory>
#include "HAL/ChipObject.h"
#include "HALInitializer.h"
#include "hal/ChipObject.h"
using namespace hal;

4
hal/src/main/native/athena/Relay.cpp
View File

@@ -5,12 +5,12 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "HAL/Relay.h"
#include "hal/Relay.h"
#include "DigitalInternal.h"
#include "HAL/handles/IndexedHandleResource.h"
#include "HALInitializer.h"
#include "PortsInternal.h"
#include "hal/handles/IndexedHandleResource.h"
using namespace hal;

8
hal/src/main/native/athena/SPI.cpp
View File

@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "HAL/SPI.h"
#include "hal/SPI.h"
#include <fcntl.h>
#include <linux/spi/spidev.h>
@@ -20,10 +20,10 @@
#include <wpi/raw_ostream.h>
#include "DigitalInternal.h"
#include "HAL/DIO.h"
#include "HAL/HAL.h"
#include "HAL/handles/HandlesInternal.h"
#include "HALInitializer.h"
#include "hal/DIO.h"
#include "hal/HAL.h"
#include "hal/handles/HandlesInternal.h"
using namespace hal;

4
hal/src/main/native/athena/SerialPort.cpp
View File

@@ -5,12 +5,12 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "HAL/SerialPort.h"
#include "hal/SerialPort.h"
#include <string>
#include "HAL/cpp/SerialHelper.h"
#include "HALInitializer.h"
#include "hal/cpp/SerialHelper.h"
#include "visa/visa.h"
static int32_t resourceManagerHandle{0};

12
hal/src/main/native/athena/Solenoid.cpp
View File

@@ -5,19 +5,19 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "HAL/Solenoid.h"
#include "hal/Solenoid.h"
#include <FRC_NetworkCommunication/LoadOut.h>
#include "HAL/ChipObject.h"
#include "HAL/Errors.h"
#include "HAL/Ports.h"
#include "HAL/handles/HandlesInternal.h"
#include "HAL/handles/IndexedHandleResource.h"
#include "HALInitializer.h"
#include "PCMInternal.h"
#include "PortsInternal.h"
#include "ctre/PCM.h"
#include "hal/ChipObject.h"
#include "hal/Errors.h"
#include "hal/Ports.h"
#include "hal/handles/HandlesInternal.h"
#include "hal/handles/IndexedHandleResource.h"
namespace {

4
hal/src/main/native/athena/Threads.cpp
View File

@@ -5,12 +5,12 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "HAL/Threads.h"
#include "hal/Threads.h"
#include <pthread.h>
#include <sched.h>
#include "HAL/Errors.h"
#include "hal/Errors.h"
namespace hal {
namespace init {

4
hal/src/main/native/athena/cpp/SerialHelper.cpp
View File

@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "HAL/cpp/SerialHelper.h"
#include "hal/cpp/SerialHelper.h"
#include <algorithm>
#include <cstdio>
@@ -15,7 +15,7 @@
#include <wpi/StringRef.h>
#include "../visa/visa.h"
#include "HAL/Errors.h"
#include "hal/Errors.h"
constexpr const char* OnboardResourceVISA = "ASRL1::INSTR";
constexpr const char* MxpResourceVISA = "ASRL2::INSTR";