diff --git a/hal/src/main/native/include/hal/DriverStation.h b/hal/src/main/native/include/hal/DriverStation.h index 1c18681049..db98698b62 100644 --- a/hal/src/main/native/include/hal/DriverStation.h +++ b/hal/src/main/native/include/hal/DriverStation.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2013-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2013-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -187,8 +187,6 @@ double HAL_GetMatchTime(int32_t* status); */ int32_t HAL_GetMatchInfo(HAL_MatchInfo* info); -#ifndef HAL_USE_LABVIEW - /** * Releases the DS Mutex to allow proper shutdown of any threads that are * waiting on it. @@ -268,8 +266,6 @@ void HAL_ObserveUserProgramTeleop(void); */ void HAL_ObserveUserProgramTest(void); -#endif // HAL_USE_LABVIEW - #ifdef __cplusplus } // extern "C" #endif diff --git a/hal/src/main/native/include/hal/HAL.h b/hal/src/main/native/include/hal/HAL.h index 07147ef05d..2cb358dadf 100644 --- a/hal/src/main/native/include/hal/HAL.h +++ b/hal/src/main/native/include/hal/HAL.h @@ -9,8 +9,6 @@ #include -#ifndef HAL_USE_LABVIEW - #include "hal/Accelerometer.h" #include "hal/AnalogAccumulator.h" #include "hal/AnalogGyro.h" @@ -26,6 +24,7 @@ #include "hal/DriverStation.h" #include "hal/Encoder.h" #include "hal/Errors.h" +#include "hal/HALBase.h" #include "hal/I2C.h" #include "hal/Interrupts.h" #include "hal/Notifier.h" @@ -38,11 +37,7 @@ #include "hal/SerialPort.h" #include "hal/Solenoid.h" #include "hal/Threads.h" - -#endif // HAL_USE_LABVIEW - #include "hal/Types.h" -#include "hal/HALBase.h" #ifdef __cplusplus #include "hal/FRCUsageReporting.h" diff --git a/hal/src/main/native/include/hal/HALBase.h b/hal/src/main/native/include/hal/HALBase.h index c1a46d2885..123ca41cc3 100644 --- a/hal/src/main/native/include/hal/HALBase.h +++ b/hal/src/main/native/include/hal/HALBase.h @@ -87,8 +87,6 @@ HAL_Bool HAL_GetBrownedOut(int32_t* status); */ void HAL_BaseInitialize(int32_t* status); -#ifndef HAL_USE_LABVIEW - /** * Gets a port handle for a specific channel. * @@ -175,7 +173,6 @@ int64_t HAL_Report(int32_t resource, int32_t instanceNumber, int32_t context, const char* feature); #endif -#endif // HAL_USE_LABVIEW #ifdef __cplusplus } // extern "C" #endif diff --git a/hal/src/main/native/include/hal/labview/HAL.h b/hal/src/main/native/include/hal/labview/HAL.h deleted file mode 100644 index db9f20fdb4..0000000000 --- a/hal/src/main/native/include/hal/labview/HAL.h +++ /dev/null @@ -1,14 +0,0 @@ -/*----------------------------------------------------------------------------*/ -/* Copyright (c) 2016-2018 FIRST. All Rights Reserved. */ -/* Open Source Software - may be modified and shared by FRC teams. The code */ -/* must be accompanied by the FIRST BSD license file in the root directory of */ -/* the project. */ -/*----------------------------------------------------------------------------*/ - -#pragma once - -#define HAL_USE_LABVIEW - -#include "hal/DriverStation.h" -#include "hal/HAL.h" -#include "hal/Types.h"