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

@@ -26,9 +26,14 @@ repoRootNameOverride {
}
includeOtherLibs {
^HAL/
^cameraserver/
^cscore
^hal/
^mockdata/
^networktables/
^ntcore
^opencv2/
^support/
^vision/
^wpi/
}

View File

@@ -5,13 +5,13 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "CameraServer.h"
#include "cameraserver/CameraServer.h"
#include <networktables/NetworkTableInstance.h>
#include <wpi/SmallString.h>
#include <wpi/raw_ostream.h>
#include "CameraServerShared.h"
#include "cameraserver/CameraServerShared.h"
#include "ntcore_cpp.h"
using namespace frc;

View File

@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "CameraServerShared.h"
#include "cameraserver/CameraServerShared.h"
#include <wpi/mutex.h>

View File

@@ -11,7 +11,7 @@
#include <opencv2/core/mat.hpp>
#include "CameraServerShared.h"
#include "cameraserver/CameraServerShared.h"
using namespace frc;

View File

@@ -308,4 +308,4 @@ class CameraServer {
} // namespace frc
#include "CameraServer.inc"
#include "cameraserver/CameraServer.inc"

View File

@@ -82,7 +82,7 @@ public class FRCNetComm extends JNIWrapper {
first_enum = True
files = [
"/ni-libraries/include/FRC_NetworkCommunication/LoadOut.h",
"/hal/src/main/native/include/HAL/UsageReporting.h"
"/hal/src/main/native/include/hal/UsageReporting.h"
]
for file_name in files:
with open(config_path + file_name, "r") as cpp_source:

View File

@@ -40,4 +40,5 @@ includeOtherLibs {
includeProject {
^ctre/
^mockdata/
}

View File

@@ -7,7 +7,7 @@
#include <iostream>
#include "HAL/HAL.h"
#include "hal/HAL.h"
int main() {
std::cout << "Hello World" << std::endl;

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;

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;

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 {

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 {

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 {

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 {

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;

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;

View File

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

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;

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;

View File

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

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;

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;

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 {

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 {

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;

View File

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

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;

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" {

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");

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;

View File

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

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;

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;

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;

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 {

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 {

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;

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;

View File

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

View File

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

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;

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;

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;

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};

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 {

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 {

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";

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;

View File

@@ -7,7 +7,7 @@
#pragma once
#include "HAL/Types.h"
#include "hal/Types.h"
// clang-format off
/**

View File

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

View File

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

View File

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

View File

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

View File

@@ -9,7 +9,7 @@
#include <stdint.h>
#include "HAL/Types.h"
#include "hal/Types.h"
// clang-format off
/**

View File

@@ -9,7 +9,7 @@
#include <stdint.h>
#include "HAL/Types.h"
#include "hal/Types.h"
// These are copies of defines located in CANSessionMux.h prepended with HAL_

View File

@@ -9,7 +9,7 @@
#include <stdint.h>
#include "HAL/Types.h"
#include "hal/Types.h"
// clang-format off
/**

View File

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

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"
// clang-format off
/**

View File

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

View File

@@ -9,7 +9,7 @@
#include <stdint.h>
#include "HAL/Types.h"
#include "hal/Types.h"
#define HAL_IO_CONFIG_DATA_SIZE 32
#define HAL_SYS_STATUS_DATA_SIZE 44

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"
// clang-format off
/**

View File

@@ -11,34 +11,34 @@
#ifndef HAL_USE_LABVIEW
#include "HAL/Accelerometer.h"
#include "HAL/AnalogAccumulator.h"
#include "HAL/AnalogGyro.h"
#include "HAL/AnalogInput.h"
#include "HAL/AnalogOutput.h"
#include "HAL/AnalogTrigger.h"
#include "HAL/CAN.h"
#include "HAL/Compressor.h"
#include "HAL/Constants.h"
#include "HAL/Counter.h"
#include "HAL/DIO.h"
#include "HAL/DriverStation.h"
#include "HAL/Errors.h"
#include "HAL/I2C.h"
#include "HAL/Interrupts.h"
#include "HAL/Notifier.h"
#include "HAL/PDP.h"
#include "HAL/PWM.h"
#include "HAL/Ports.h"
#include "HAL/Power.h"
#include "HAL/Relay.h"
#include "HAL/SPI.h"
#include "HAL/SerialPort.h"
#include "HAL/Solenoid.h"
#include "hal/Accelerometer.h"
#include "hal/AnalogAccumulator.h"
#include "hal/AnalogGyro.h"
#include "hal/AnalogInput.h"
#include "hal/AnalogOutput.h"
#include "hal/AnalogTrigger.h"
#include "hal/CAN.h"
#include "hal/Compressor.h"
#include "hal/Constants.h"
#include "hal/Counter.h"
#include "hal/DIO.h"
#include "hal/DriverStation.h"
#include "hal/Errors.h"
#include "hal/I2C.h"
#include "hal/Interrupts.h"
#include "hal/Notifier.h"
#include "hal/PDP.h"
#include "hal/PWM.h"
#include "hal/Ports.h"
#include "hal/Power.h"
#include "hal/Relay.h"
#include "hal/SPI.h"
#include "hal/SerialPort.h"
#include "hal/Solenoid.h"
#endif // HAL_USE_LABVIEW
#include "HAL/Types.h"
#include "hal/Types.h"
#ifdef __cplusplus
#include "UsageReporting.h"

View File

@@ -9,7 +9,7 @@
#include <stdint.h>
#include "HAL/Types.h"
#include "hal/Types.h"
// clang-format off
HAL_ENUM(HAL_I2CPort) { HAL_I2C_kOnboard = 0, HAL_I2C_kMXP };

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"
#ifdef __cplusplus
extern "C" {

View File

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

View File

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

View File

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

Some files were not shown because too many files have changed in this diff Show More