From 6830c65a155ed7e7a6e8af970c897ef5ee5d0881 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Fri, 13 Mar 2026 17:19:39 -0700 Subject: [PATCH] [hal] Rename HALBase.h to HAL.h (#8668) --- commandsv2/src/test/native/cpp/main.cpp | 2 +- hal/robotpy_pybind_build_info.bzl | 6 +++--- hal/src/dev/native/cpp/main.cpp | 2 +- hal/src/main/java/org/wpilib/hardware/hal/HAL.java | 2 +- hal/src/main/java/org/wpilib/hardware/hal/HALUtil.java | 2 +- hal/src/main/native/cpp/ErrorHandling.cpp | 2 +- hal/src/main/native/cpp/cpp/fpga_clock.cpp | 2 +- hal/src/main/native/cpp/jni/DriverStationJNI.cpp | 2 +- hal/src/main/native/cpp/jni/HAL.cpp | 4 ++-- hal/src/main/native/cpp/jni/HALUtil.cpp | 2 +- hal/src/main/native/cpp/jni/simulation/SimulatorJNI.cpp | 2 +- hal/src/main/native/include/wpi/hal/{HALBase.h => HAL.h} | 0 hal/src/main/native/include/wpi/hal/simulation/MockHooks.h | 2 +- hal/src/main/native/sim/Alert.cpp | 2 +- hal/src/main/native/sim/HAL.cpp | 4 ++-- hal/src/main/native/sim/HALInitializer.cpp | 2 +- hal/src/main/native/sim/Notifier.cpp | 2 +- hal/src/main/native/systemcore/Alert.cpp | 2 +- hal/src/main/native/systemcore/HAL.cpp | 3 ++- hal/src/main/native/systemcore/HALInitializer.cpp | 2 +- hal/src/main/native/systemcore/Notifier.cpp | 2 +- hal/src/main/native/systemcore/PowerDistribution.cpp | 2 +- hal/src/main/python/hal/src/hal.cpp | 2 +- hal/src/main/python/pyproject.toml | 2 +- hal/src/main/python/semiwrap/{HALBase.yml => HAL.yml} | 0 hal/src/test/native/cpp/HALTest.cpp | 4 ++-- hal/src/test/native/cpp/main.cpp | 2 +- hal/src/test/native/cpp/mockdata/AnalogInDataTest.cpp | 2 +- hal/src/test/native/cpp/mockdata/DIODataTest.cpp | 2 +- hal/src/test/native/cpp/mockdata/PCMDataTest.cpp | 2 +- hal/src/test/native/cpp/mockdata/PWMDataTest.cpp | 2 +- simulation/halsim_ds_socket/src/dev/native/cpp/main.cpp | 2 +- simulation/halsim_ds_socket/src/test/native/cpp/main.cpp | 2 +- simulation/halsim_gui/src/main/native/cpp/TimingGui.cpp | 2 +- simulation/halsim_gui/src/test/native/cpp/main.cpp | 2 +- simulation/halsim_ws_client/src/dev/native/cpp/main.cpp | 2 +- simulation/halsim_ws_server/src/dev/native/cpp/main.cpp | 2 +- simulation/halsim_ws_server/src/test/native/cpp/main.cpp | 2 +- wpilibc/src/dev/native/cpp/main.cpp | 2 +- wpilibc/src/main/native/cpp/driverstation/DriverStation.cpp | 2 +- wpilibc/src/main/native/cpp/framework/OpModeRobot.cpp | 2 +- wpilibc/src/main/native/cpp/system/Errors.cpp | 2 +- wpilibc/src/main/native/cpp/system/RobotController.cpp | 2 +- wpilibc/src/main/native/cpp/system/Watchdog.cpp | 2 +- wpilibc/src/main/native/cppcs/RobotBase.cpp | 2 +- wpilibc/src/main/native/include/wpi/framework/RobotBase.hpp | 2 +- wpilibc/src/main/native/include/wpi/simulation/SimHooks.hpp | 2 +- wpilibc/src/test/native/c/test.c | 2 +- wpilibc/src/test/native/cpp/AnalogPotentiometerTest.cpp | 2 +- wpilibc/src/test/native/cpp/main.cpp | 2 +- .../test/native/cpp/simulation/AddressableLEDSimTest.cpp | 2 +- wpilibc/src/test/native/cpp/simulation/AlertSimTest.cpp | 2 +- .../src/test/native/cpp/simulation/AnalogInputSimTest.cpp | 2 +- wpilibc/src/test/native/cpp/simulation/DIOSimTest.cpp | 2 +- .../src/test/native/cpp/simulation/DigitalPWMSimTest.cpp | 2 +- .../src/test/native/cpp/simulation/DriverStationSimTest.cpp | 2 +- .../test/native/cpp/simulation/DutyCycleEncoderSimTest.cpp | 2 +- wpilibc/src/test/native/cpp/simulation/DutyCycleSimTest.cpp | 2 +- wpilibc/src/test/native/cpp/simulation/EncoderSimTest.cpp | 2 +- wpilibc/src/test/native/cpp/simulation/PWMSimTest.cpp | 2 +- .../test/native/cpp/simulation/PowerDistributionSimTest.cpp | 2 +- .../test/native/cpp/simulation/SimInitializationTest.cpp | 2 +- wpilibcExamples/src/main/cpp/examples/HAL/c/Robot.c | 2 +- .../src/test/cpp/examples/ArmSimulation/cpp/main.cpp | 2 +- .../src/test/cpp/examples/DigitalCommunication/cpp/main.cpp | 2 +- .../src/test/cpp/examples/ElevatorSimulation/cpp/main.cpp | 2 +- .../src/test/cpp/examples/I2CCommunication/cpp/main.cpp | 2 +- .../src/test/cpp/examples/PotentiometerPID/cpp/main.cpp | 2 +- wpilibcExamples/src/test/cpp/examples/UnitTest/cpp/main.cpp | 2 +- 69 files changed, 73 insertions(+), 72 deletions(-) rename hal/src/main/native/include/wpi/hal/{HALBase.h => HAL.h} (100%) rename hal/src/main/python/semiwrap/{HALBase.yml => HAL.yml} (100%) diff --git a/commandsv2/src/test/native/cpp/main.cpp b/commandsv2/src/test/native/cpp/main.cpp index 52b60dc4ef..8b833f274b 100644 --- a/commandsv2/src/test/native/cpp/main.cpp +++ b/commandsv2/src/test/native/cpp/main.cpp @@ -4,7 +4,7 @@ #include -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" int main(int argc, char** argv) { HAL_Initialize(500, 0); diff --git a/hal/robotpy_pybind_build_info.bzl b/hal/robotpy_pybind_build_info.bzl index 9b1f9c7cf5..69784c6d51 100644 --- a/hal/robotpy_pybind_build_info.bzl +++ b/hal/robotpy_pybind_build_info.bzl @@ -209,10 +209,10 @@ def wpihal_extension(srcs = [], header_to_dat_deps = [], extra_hdrs = [], includ trampolines = [], ), struct( - class_name = "HALBase", - yml_file = "semiwrap/HALBase.yml", + class_name = "HAL", + yml_file = "semiwrap/HAL.yml", header_root = "$(execpath :robotpy-native-wpihal.copy_headers)", - header_file = "$(execpath :robotpy-native-wpihal.copy_headers)/wpi/hal/HALBase.h", + header_file = "$(execpath :robotpy-native-wpihal.copy_headers)/wpi/hal/HAL.h", tmpl_class_names = [], trampolines = [], ), diff --git a/hal/src/dev/native/cpp/main.cpp b/hal/src/dev/native/cpp/main.cpp index 7d124cad0b..348a3ef4db 100644 --- a/hal/src/dev/native/cpp/main.cpp +++ b/hal/src/dev/native/cpp/main.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/util/print.hpp" int main() { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/HAL.java b/hal/src/main/java/org/wpilib/hardware/hal/HAL.java index b7880f1bc7..19c760bef6 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/HAL.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/HAL.java @@ -10,7 +10,7 @@ import java.util.List; /** * JNI Wrapper for Hardware Abstraction Layer (HAL). * - * @see "wpi/hal/HALBase.h" + * @see "wpi/hal/HAL.h" * @see "wpi/hal/Main.h" */ public final class HAL extends JNIWrapper { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/HALUtil.java b/hal/src/main/java/org/wpilib/hardware/hal/HALUtil.java index a736f42595..6ace64dbc7 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/HALUtil.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/HALUtil.java @@ -7,7 +7,7 @@ package org.wpilib.hardware.hal; /** * Hardware Abstraction Layer (HAL) Utilities JNI Functions. * - * @see "wpi/hal/HALBase.h" + * @see "wpi/hal/HAL.h" */ public final class HALUtil extends JNIWrapper { /** A pointer parameter to a method is NULL. */ diff --git a/hal/src/main/native/cpp/ErrorHandling.cpp b/hal/src/main/native/cpp/ErrorHandling.cpp index 8a435ea76f..35aef02241 100644 --- a/hal/src/main/native/cpp/ErrorHandling.cpp +++ b/hal/src/main/native/cpp/ErrorHandling.cpp @@ -5,7 +5,7 @@ #include #include "wpi/hal/Errors.h" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/util/SmallString.hpp" namespace { diff --git a/hal/src/main/native/cpp/cpp/fpga_clock.cpp b/hal/src/main/native/cpp/cpp/fpga_clock.cpp index f317430d31..2733aec8e8 100644 --- a/hal/src/main/native/cpp/cpp/fpga_clock.cpp +++ b/hal/src/main/native/cpp/cpp/fpga_clock.cpp @@ -7,7 +7,7 @@ #include #include -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/util/print.hpp" namespace wpi::hal { diff --git a/hal/src/main/native/cpp/jni/DriverStationJNI.cpp b/hal/src/main/native/cpp/jni/DriverStationJNI.cpp index 90e30d1fb6..4e97fad8f0 100644 --- a/hal/src/main/native/cpp/jni/DriverStationJNI.cpp +++ b/hal/src/main/native/cpp/jni/DriverStationJNI.cpp @@ -13,7 +13,7 @@ #include "HALUtil.hpp" #include "org_wpilib_hardware_hal_DriverStationJNI.h" #include "wpi/hal/DriverStation.h" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/util/jni_util.hpp" static_assert( diff --git a/hal/src/main/native/cpp/jni/HAL.cpp b/hal/src/main/native/cpp/jni/HAL.cpp index 86f9dafa0d..a113725e30 100644 --- a/hal/src/main/native/cpp/jni/HAL.cpp +++ b/hal/src/main/native/cpp/jni/HAL.cpp @@ -2,9 +2,9 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include +#include "wpi/hal/HAL.h" -#include "wpi/hal/HALBase.h" +#include #ifdef __FRC_SYSTEMCORE__ #include diff --git a/hal/src/main/native/cpp/jni/HALUtil.cpp b/hal/src/main/native/cpp/jni/HALUtil.cpp index 9c51bbc90c..d9d551194d 100644 --- a/hal/src/main/native/cpp/jni/HALUtil.cpp +++ b/hal/src/main/native/cpp/jni/HALUtil.cpp @@ -18,7 +18,7 @@ #include "wpi/hal/CAN.h" #include "wpi/hal/DriverStation.h" #include "wpi/hal/Errors.h" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/hal/Value.h" #include "wpi/util/jni_util.hpp" diff --git a/hal/src/main/native/cpp/jni/simulation/SimulatorJNI.cpp b/hal/src/main/native/cpp/jni/simulation/SimulatorJNI.cpp index b7f6eed5a8..2aab0b293d 100644 --- a/hal/src/main/native/cpp/jni/simulation/SimulatorJNI.cpp +++ b/hal/src/main/native/cpp/jni/simulation/SimulatorJNI.cpp @@ -11,7 +11,7 @@ #include "OpModeOptionsCallbackStore.hpp" #include "SimDeviceDataJNI.hpp" #include "org_wpilib_hardware_hal_simulation_SimulatorJNI.h" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/hal/handles/HandlesInternal.hpp" #include "wpi/hal/simulation/MockHooks.h" #include "wpi/util/jni_util.hpp" diff --git a/hal/src/main/native/include/wpi/hal/HALBase.h b/hal/src/main/native/include/wpi/hal/HAL.h similarity index 100% rename from hal/src/main/native/include/wpi/hal/HALBase.h rename to hal/src/main/native/include/wpi/hal/HAL.h diff --git a/hal/src/main/native/include/wpi/hal/simulation/MockHooks.h b/hal/src/main/native/include/wpi/hal/simulation/MockHooks.h index bc1b1dbf67..e5ac98c5d2 100644 --- a/hal/src/main/native/include/wpi/hal/simulation/MockHooks.h +++ b/hal/src/main/native/include/wpi/hal/simulation/MockHooks.h @@ -5,7 +5,7 @@ #pragma once #include "wpi/hal/DriverStationTypes.h" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/hal/Types.h" #ifdef __cplusplus diff --git a/hal/src/main/native/sim/Alert.cpp b/hal/src/main/native/sim/Alert.cpp index da426cba2c..79c0ec7a95 100644 --- a/hal/src/main/native/sim/Alert.cpp +++ b/hal/src/main/native/sim/Alert.cpp @@ -11,7 +11,7 @@ #include "HALInitializer.hpp" #include "wpi/hal/Errors.h" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/hal/Types.h" #include "wpi/hal/handles/UnlimitedHandleResource.hpp" #include "wpi/hal/simulation/AlertData.h" diff --git a/hal/src/main/native/sim/HAL.cpp b/hal/src/main/native/sim/HAL.cpp index be1aab8599..5d318e760f 100644 --- a/hal/src/main/native/sim/HAL.cpp +++ b/hal/src/main/native/sim/HAL.cpp @@ -2,13 +2,13 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. +#include "wpi/hal/HAL.h" + #include #include #include #include -#include "wpi/hal/HALBase.h" - #ifdef _WIN32 #include #pragma comment(lib, "Winmm.lib") diff --git a/hal/src/main/native/sim/HALInitializer.cpp b/hal/src/main/native/sim/HALInitializer.cpp index 517b97e7cf..f8c9978734 100644 --- a/hal/src/main/native/sim/HALInitializer.cpp +++ b/hal/src/main/native/sim/HALInitializer.cpp @@ -4,7 +4,7 @@ #include "HALInitializer.hpp" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" namespace wpi::hal::init { std::atomic_bool HAL_IsInitialized{false}; diff --git a/hal/src/main/native/sim/Notifier.cpp b/hal/src/main/native/sim/Notifier.cpp index c24a75cc7e..a6667aa85d 100644 --- a/hal/src/main/native/sim/Notifier.cpp +++ b/hal/src/main/native/sim/Notifier.cpp @@ -18,7 +18,7 @@ #include "HALInitializer.hpp" #include "NotifierInternal.hpp" #include "wpi/hal/Errors.h" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/hal/Threads.h" #include "wpi/hal/Types.h" #include "wpi/hal/handles/UnlimitedHandleResource.hpp" diff --git a/hal/src/main/native/systemcore/Alert.cpp b/hal/src/main/native/systemcore/Alert.cpp index 4c70be6e34..5fbb42762e 100644 --- a/hal/src/main/native/systemcore/Alert.cpp +++ b/hal/src/main/native/systemcore/Alert.cpp @@ -11,7 +11,7 @@ #include "HALInitializer.hpp" #include "wpi/hal/Errors.h" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/hal/Types.h" #include "wpi/hal/handles/UnlimitedHandleResource.hpp" #include "wpi/hal/simulation/AlertData.h" diff --git a/hal/src/main/native/systemcore/HAL.cpp b/hal/src/main/native/systemcore/HAL.cpp index 512113b732..21002e2eea 100644 --- a/hal/src/main/native/systemcore/HAL.cpp +++ b/hal/src/main/native/systemcore/HAL.cpp @@ -2,6 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. +#include "wpi/hal/HAL.h" + #include #include // linux for kill #include @@ -17,7 +19,6 @@ #include "SystemServerInternal.hpp" #include "wpi/hal/CAN.h" #include "wpi/hal/Errors.h" -#include "wpi/hal/HALBase.h" #include "wpi/util/StringExtras.hpp" #include "wpi/util/mutex.hpp" #include "wpi/util/timestamp.hpp" diff --git a/hal/src/main/native/systemcore/HALInitializer.cpp b/hal/src/main/native/systemcore/HALInitializer.cpp index 517b97e7cf..f8c9978734 100644 --- a/hal/src/main/native/systemcore/HALInitializer.cpp +++ b/hal/src/main/native/systemcore/HALInitializer.cpp @@ -4,7 +4,7 @@ #include "HALInitializer.hpp" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" namespace wpi::hal::init { std::atomic_bool HAL_IsInitialized{false}; diff --git a/hal/src/main/native/systemcore/Notifier.cpp b/hal/src/main/native/systemcore/Notifier.cpp index 1a3b46fa60..93b5c91ff6 100644 --- a/hal/src/main/native/systemcore/Notifier.cpp +++ b/hal/src/main/native/systemcore/Notifier.cpp @@ -14,7 +14,7 @@ #include "HALInitializer.hpp" #include "wpi/hal/Errors.h" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/hal/Threads.h" #include "wpi/hal/Types.h" #include "wpi/hal/handles/UnlimitedHandleResource.hpp" diff --git a/hal/src/main/native/systemcore/PowerDistribution.cpp b/hal/src/main/native/systemcore/PowerDistribution.cpp index a06f991286..c0c3fbebec 100644 --- a/hal/src/main/native/systemcore/PowerDistribution.cpp +++ b/hal/src/main/native/systemcore/PowerDistribution.cpp @@ -12,7 +12,7 @@ #include "PortsInternal.hpp" #include "REVPDH.h" #include "wpi/hal/Errors.h" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/hal/handles/HandlesInternal.hpp" using namespace wpi::hal; diff --git a/hal/src/main/python/hal/src/hal.cpp b/hal/src/main/python/hal/src/hal.cpp index f846db552b..0a1ba505bc 100644 --- a/hal/src/main/python/hal/src/hal.cpp +++ b/hal/src/main/python/hal/src/hal.cpp @@ -1,6 +1,6 @@ -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/hal/DriverStation.h" #include "wpi/hal/Value.h" #include diff --git a/hal/src/main/python/pyproject.toml b/hal/src/main/python/pyproject.toml index c0514d874b..4bff193413 100644 --- a/hal/src/main/python/pyproject.toml +++ b/hal/src/main/python/pyproject.toml @@ -68,7 +68,7 @@ DriverStation = "wpi/hal/DriverStation.hpp" DriverStationTypes_c = "wpi/hal/DriverStationTypes.h" DriverStationTypes = "wpi/hal/DriverStationTypes.hpp" Extensions = "wpi/hal/Extensions.h" -HALBase = "wpi/hal/HALBase.h" +HAL = "wpi/hal/HAL.h" Main = "wpi/hal/Main.h" Notifier_c = "wpi/hal/Notifier.h" Notifier = "wpi/hal/Notifier.hpp" diff --git a/hal/src/main/python/semiwrap/HALBase.yml b/hal/src/main/python/semiwrap/HAL.yml similarity index 100% rename from hal/src/main/python/semiwrap/HALBase.yml rename to hal/src/main/python/semiwrap/HAL.yml diff --git a/hal/src/test/native/cpp/HALTest.cpp b/hal/src/test/native/cpp/HALTest.cpp index 2557ea2f74..011830dcbf 100644 --- a/hal/src/test/native/cpp/HALTest.cpp +++ b/hal/src/test/native/cpp/HALTest.cpp @@ -2,9 +2,9 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include +#include "wpi/hal/HAL.h" -#include "wpi/hal/HALBase.h" +#include namespace wpi::hal { TEST(HALTest, RuntimeType) { diff --git a/hal/src/test/native/cpp/main.cpp b/hal/src/test/native/cpp/main.cpp index 52b60dc4ef..8b833f274b 100644 --- a/hal/src/test/native/cpp/main.cpp +++ b/hal/src/test/native/cpp/main.cpp @@ -4,7 +4,7 @@ #include -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" int main(int argc, char** argv) { HAL_Initialize(500, 0); diff --git a/hal/src/test/native/cpp/mockdata/AnalogInDataTest.cpp b/hal/src/test/native/cpp/mockdata/AnalogInDataTest.cpp index 01bfcb4f17..9889e9b079 100644 --- a/hal/src/test/native/cpp/mockdata/AnalogInDataTest.cpp +++ b/hal/src/test/native/cpp/mockdata/AnalogInDataTest.cpp @@ -10,7 +10,7 @@ #include "wpi/hal/AnalogInput.h" #include "wpi/hal/Errors.h" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/hal/handles/HandlesInternal.hpp" namespace wpi::hal { diff --git a/hal/src/test/native/cpp/mockdata/DIODataTest.cpp b/hal/src/test/native/cpp/mockdata/DIODataTest.cpp index cad7429412..b2ddd6dcbb 100644 --- a/hal/src/test/native/cpp/mockdata/DIODataTest.cpp +++ b/hal/src/test/native/cpp/mockdata/DIODataTest.cpp @@ -10,7 +10,7 @@ #include "wpi/hal/DIO.h" #include "wpi/hal/Errors.h" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/hal/handles/HandlesInternal.hpp" namespace wpi::hal { diff --git a/hal/src/test/native/cpp/mockdata/PCMDataTest.cpp b/hal/src/test/native/cpp/mockdata/PCMDataTest.cpp index 695236157e..32ceb6e66b 100644 --- a/hal/src/test/native/cpp/mockdata/PCMDataTest.cpp +++ b/hal/src/test/native/cpp/mockdata/PCMDataTest.cpp @@ -8,7 +8,7 @@ #include "wpi/hal/CTREPCM.h" #include "wpi/hal/Errors.h" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/hal/handles/HandlesInternal.hpp" #include "wpi/hal/simulation/CTREPCMData.h" diff --git a/hal/src/test/native/cpp/mockdata/PWMDataTest.cpp b/hal/src/test/native/cpp/mockdata/PWMDataTest.cpp index 14d234e8e0..c0bc14e94e 100644 --- a/hal/src/test/native/cpp/mockdata/PWMDataTest.cpp +++ b/hal/src/test/native/cpp/mockdata/PWMDataTest.cpp @@ -9,7 +9,7 @@ #include #include "wpi/hal/Errors.h" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/hal/PWM.h" #include "wpi/hal/handles/HandlesInternal.hpp" diff --git a/simulation/halsim_ds_socket/src/dev/native/cpp/main.cpp b/simulation/halsim_ds_socket/src/dev/native/cpp/main.cpp index 23114a179c..9541d006a8 100644 --- a/simulation/halsim_ds_socket/src/dev/native/cpp/main.cpp +++ b/simulation/halsim_ds_socket/src/dev/native/cpp/main.cpp @@ -5,7 +5,7 @@ #include #include "wpi/hal/DriverStation.h" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" extern "C" int HALSIM_InitExtension(void); diff --git a/simulation/halsim_ds_socket/src/test/native/cpp/main.cpp b/simulation/halsim_ds_socket/src/test/native/cpp/main.cpp index 52b60dc4ef..8b833f274b 100644 --- a/simulation/halsim_ds_socket/src/test/native/cpp/main.cpp +++ b/simulation/halsim_ds_socket/src/test/native/cpp/main.cpp @@ -4,7 +4,7 @@ #include -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" int main(int argc, char** argv) { HAL_Initialize(500, 0); diff --git a/simulation/halsim_gui/src/main/native/cpp/TimingGui.cpp b/simulation/halsim_gui/src/main/native/cpp/TimingGui.cpp index cc801da3c5..1144f05d3b 100644 --- a/simulation/halsim_gui/src/main/native/cpp/TimingGui.cpp +++ b/simulation/halsim_gui/src/main/native/cpp/TimingGui.cpp @@ -13,7 +13,7 @@ #include "wpi/glass/Model.hpp" #include "wpi/glass/View.hpp" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/hal/simulation/MockHooks.h" #include "wpi/hal/simulation/NotifierData.h" #include "wpi/halsim/gui/HALSimGui.hpp" diff --git a/simulation/halsim_gui/src/test/native/cpp/main.cpp b/simulation/halsim_gui/src/test/native/cpp/main.cpp index 52b60dc4ef..8b833f274b 100644 --- a/simulation/halsim_gui/src/test/native/cpp/main.cpp +++ b/simulation/halsim_gui/src/test/native/cpp/main.cpp @@ -4,7 +4,7 @@ #include -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" int main(int argc, char** argv) { HAL_Initialize(500, 0); diff --git a/simulation/halsim_ws_client/src/dev/native/cpp/main.cpp b/simulation/halsim_ws_client/src/dev/native/cpp/main.cpp index 7711823811..715cc3900a 100644 --- a/simulation/halsim_ws_client/src/dev/native/cpp/main.cpp +++ b/simulation/halsim_ws_client/src/dev/native/cpp/main.cpp @@ -7,7 +7,7 @@ #include #include "wpi/hal/DriverStation.h" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/util/print.hpp" extern "C" int HALSIM_InitExtension(void); diff --git a/simulation/halsim_ws_server/src/dev/native/cpp/main.cpp b/simulation/halsim_ws_server/src/dev/native/cpp/main.cpp index b16c86231b..d94f6aa05a 100644 --- a/simulation/halsim_ws_server/src/dev/native/cpp/main.cpp +++ b/simulation/halsim_ws_server/src/dev/native/cpp/main.cpp @@ -8,7 +8,7 @@ #include #include "wpi/hal/DriverStation.h" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/util/print.hpp" extern "C" int HALSIM_InitExtension(void); diff --git a/simulation/halsim_ws_server/src/test/native/cpp/main.cpp b/simulation/halsim_ws_server/src/test/native/cpp/main.cpp index aeff393a35..9b35d23cc8 100644 --- a/simulation/halsim_ws_server/src/test/native/cpp/main.cpp +++ b/simulation/halsim_ws_server/src/test/native/cpp/main.cpp @@ -12,7 +12,7 @@ #include "WebServerClientTest.hpp" #include "wpi/hal/DriverStation.h" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/hal/simulation/DIOData.h" #include "wpi/halsim/ws_server/HALSimWSServer.hpp" #include "wpi/net/uv/Loop.hpp" diff --git a/wpilibc/src/dev/native/cpp/main.cpp b/wpilibc/src/dev/native/cpp/main.cpp index af572151af..ddeda50f82 100644 --- a/wpilibc/src/dev/native/cpp/main.cpp +++ b/wpilibc/src/dev/native/cpp/main.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/system/WPILibVersion.hpp" #include "wpi/util/print.hpp" diff --git a/wpilibc/src/main/native/cpp/driverstation/DriverStation.cpp b/wpilibc/src/main/native/cpp/driverstation/DriverStation.cpp index bca903fd9b..5165e9e9ef 100644 --- a/wpilibc/src/main/native/cpp/driverstation/DriverStation.cpp +++ b/wpilibc/src/main/native/cpp/driverstation/DriverStation.cpp @@ -20,7 +20,7 @@ #include "wpi/datalog/DataLog.hpp" #include "wpi/hal/DriverStation.h" #include "wpi/hal/DriverStationTypes.h" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/hal/Power.h" #include "wpi/nt/BooleanTopic.hpp" #include "wpi/nt/IntegerTopic.hpp" diff --git a/wpilibc/src/main/native/cpp/framework/OpModeRobot.cpp b/wpilibc/src/main/native/cpp/framework/OpModeRobot.cpp index 7cbb3e4566..0a3f934c37 100644 --- a/wpilibc/src/main/native/cpp/framework/OpModeRobot.cpp +++ b/wpilibc/src/main/native/cpp/framework/OpModeRobot.cpp @@ -15,7 +15,7 @@ #include "wpi/driverstation/DriverStation.hpp" #include "wpi/hal/DriverStation.h" #include "wpi/hal/DriverStationTypes.h" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/hal/Notifier.hpp" #include "wpi/opmode/OpMode.hpp" #include "wpi/util/SafeThread.hpp" diff --git a/wpilibc/src/main/native/cpp/system/Errors.cpp b/wpilibc/src/main/native/cpp/system/Errors.cpp index 2678a1d5ea..a98ac846d1 100644 --- a/wpilibc/src/main/native/cpp/system/Errors.cpp +++ b/wpilibc/src/main/native/cpp/system/Errors.cpp @@ -8,7 +8,7 @@ #include #include "wpi/hal/DriverStation.h" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/util/StackTrace.hpp" #include "wpi/util/fs.hpp" diff --git a/wpilibc/src/main/native/cpp/system/RobotController.cpp b/wpilibc/src/main/native/cpp/system/RobotController.cpp index 86847b8381..a81b372801 100644 --- a/wpilibc/src/main/native/cpp/system/RobotController.cpp +++ b/wpilibc/src/main/native/cpp/system/RobotController.cpp @@ -8,7 +8,7 @@ #include #include "wpi/hal/CAN.h" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/hal/Power.h" #include "wpi/system/Errors.hpp" #include "wpi/util/string.hpp" diff --git a/wpilibc/src/main/native/cpp/system/Watchdog.cpp b/wpilibc/src/main/native/cpp/system/Watchdog.cpp index 46fd643a92..789c13c6ee 100644 --- a/wpilibc/src/main/native/cpp/system/Watchdog.cpp +++ b/wpilibc/src/main/native/cpp/system/Watchdog.cpp @@ -11,7 +11,7 @@ #include -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/hal/Notifier.hpp" #include "wpi/system/Errors.hpp" #include "wpi/system/Timer.hpp" diff --git a/wpilibc/src/main/native/cppcs/RobotBase.cpp b/wpilibc/src/main/native/cppcs/RobotBase.cpp index c889a1c582..1010eeb7a8 100644 --- a/wpilibc/src/main/native/cppcs/RobotBase.cpp +++ b/wpilibc/src/main/native/cppcs/RobotBase.cpp @@ -17,7 +17,7 @@ #include "wpi/cameraserver/CameraServerShared.hpp" #include "wpi/driverstation/DriverStation.hpp" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/hal/UsageReporting.hpp" #include "wpi/math/util/MathShared.hpp" #include "wpi/nt/NetworkTable.hpp" diff --git a/wpilibc/src/main/native/include/wpi/framework/RobotBase.hpp b/wpilibc/src/main/native/include/wpi/framework/RobotBase.hpp index f162a2b6b7..832498957e 100644 --- a/wpilibc/src/main/native/include/wpi/framework/RobotBase.hpp +++ b/wpilibc/src/main/native/include/wpi/framework/RobotBase.hpp @@ -9,7 +9,7 @@ #include #include "wpi/hal/DriverStation.h" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/hal/Main.h" #include "wpi/nt/NetworkTable.hpp" #include "wpi/system/Errors.hpp" diff --git a/wpilibc/src/main/native/include/wpi/simulation/SimHooks.hpp b/wpilibc/src/main/native/include/wpi/simulation/SimHooks.hpp index 263370cc25..45a51271f8 100644 --- a/wpilibc/src/main/native/include/wpi/simulation/SimHooks.hpp +++ b/wpilibc/src/main/native/include/wpi/simulation/SimHooks.hpp @@ -7,7 +7,7 @@ #include #include "wpi/hal/DriverStationTypes.hpp" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/units/time.hpp" namespace wpi::sim { diff --git a/wpilibc/src/test/native/c/test.c b/wpilibc/src/test/native/c/test.c index 756c04769e..e1a728923b 100644 --- a/wpilibc/src/test/native/c/test.c +++ b/wpilibc/src/test/native/c/test.c @@ -3,5 +3,5 @@ // the WPILib BSD license file in the root directory of this project. #include "wpi/cs/cscore_c.h" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/nt/ntcore.h" diff --git a/wpilibc/src/test/native/cpp/AnalogPotentiometerTest.cpp b/wpilibc/src/test/native/cpp/AnalogPotentiometerTest.cpp index 76666d74e9..a6468697a5 100644 --- a/wpilibc/src/test/native/cpp/AnalogPotentiometerTest.cpp +++ b/wpilibc/src/test/native/cpp/AnalogPotentiometerTest.cpp @@ -6,7 +6,7 @@ #include -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/simulation/AnalogInputSim.hpp" #include "wpi/simulation/RoboRioSim.hpp" diff --git a/wpilibc/src/test/native/cpp/main.cpp b/wpilibc/src/test/native/cpp/main.cpp index 9bea26b945..6117636bc5 100644 --- a/wpilibc/src/test/native/cpp/main.cpp +++ b/wpilibc/src/test/native/cpp/main.cpp @@ -4,7 +4,7 @@ #include -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #ifndef __FRC_SYSTEMCORE__ namespace wpi::impl { diff --git a/wpilibc/src/test/native/cpp/simulation/AddressableLEDSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/AddressableLEDSimTest.cpp index fba7b0d4b7..87c4a3f53e 100644 --- a/wpilibc/src/test/native/cpp/simulation/AddressableLEDSimTest.cpp +++ b/wpilibc/src/test/native/cpp/simulation/AddressableLEDSimTest.cpp @@ -9,7 +9,7 @@ #include #include "callback_helpers/TestCallbackHelpers.hpp" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/hardware/led/AddressableLED.hpp" namespace wpi::sim { diff --git a/wpilibc/src/test/native/cpp/simulation/AlertSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/AlertSimTest.cpp index 4e680f3aaf..78be8c0aff 100644 --- a/wpilibc/src/test/native/cpp/simulation/AlertSimTest.cpp +++ b/wpilibc/src/test/native/cpp/simulation/AlertSimTest.cpp @@ -13,7 +13,7 @@ #include #include "wpi/driverstation/Alert.hpp" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" namespace wpi::sim { diff --git a/wpilibc/src/test/native/cpp/simulation/AnalogInputSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/AnalogInputSimTest.cpp index e9eaab9465..3395cbcda7 100644 --- a/wpilibc/src/test/native/cpp/simulation/AnalogInputSimTest.cpp +++ b/wpilibc/src/test/native/cpp/simulation/AnalogInputSimTest.cpp @@ -7,7 +7,7 @@ #include #include "callback_helpers/TestCallbackHelpers.hpp" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/hardware/discrete/AnalogInput.hpp" namespace wpi::sim { diff --git a/wpilibc/src/test/native/cpp/simulation/DIOSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/DIOSimTest.cpp index 308e9600a9..4af8e2ede9 100644 --- a/wpilibc/src/test/native/cpp/simulation/DIOSimTest.cpp +++ b/wpilibc/src/test/native/cpp/simulation/DIOSimTest.cpp @@ -7,7 +7,7 @@ #include #include "callback_helpers/TestCallbackHelpers.hpp" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/hardware/discrete/DigitalInput.hpp" #include "wpi/hardware/discrete/DigitalOutput.hpp" diff --git a/wpilibc/src/test/native/cpp/simulation/DigitalPWMSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/DigitalPWMSimTest.cpp index 1945fb1178..5804d9774a 100644 --- a/wpilibc/src/test/native/cpp/simulation/DigitalPWMSimTest.cpp +++ b/wpilibc/src/test/native/cpp/simulation/DigitalPWMSimTest.cpp @@ -7,7 +7,7 @@ #include #include "callback_helpers/TestCallbackHelpers.hpp" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/hardware/discrete/DigitalOutput.hpp" namespace wpi::sim { diff --git a/wpilibc/src/test/native/cpp/simulation/DriverStationSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/DriverStationSimTest.cpp index 87dfc41bf2..6e2a35f442 100644 --- a/wpilibc/src/test/native/cpp/simulation/DriverStationSimTest.cpp +++ b/wpilibc/src/test/native/cpp/simulation/DriverStationSimTest.cpp @@ -9,7 +9,7 @@ #include "callback_helpers/TestCallbackHelpers.hpp" #include "wpi/driverstation/DriverStation.hpp" #include "wpi/hal/DriverStationTypes.h" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" using namespace wpi; using namespace wpi::sim; diff --git a/wpilibc/src/test/native/cpp/simulation/DutyCycleEncoderSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/DutyCycleEncoderSimTest.cpp index a636ec192c..69dba68aac 100644 --- a/wpilibc/src/test/native/cpp/simulation/DutyCycleEncoderSimTest.cpp +++ b/wpilibc/src/test/native/cpp/simulation/DutyCycleEncoderSimTest.cpp @@ -6,7 +6,7 @@ #include -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/hardware/rotation/DutyCycleEncoder.hpp" namespace wpi::sim { diff --git a/wpilibc/src/test/native/cpp/simulation/DutyCycleSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/DutyCycleSimTest.cpp index f43c5b4f33..fe4e5fef99 100644 --- a/wpilibc/src/test/native/cpp/simulation/DutyCycleSimTest.cpp +++ b/wpilibc/src/test/native/cpp/simulation/DutyCycleSimTest.cpp @@ -7,7 +7,7 @@ #include #include "callback_helpers/TestCallbackHelpers.hpp" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/hardware/rotation/DutyCycle.hpp" namespace wpi::sim { diff --git a/wpilibc/src/test/native/cpp/simulation/EncoderSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/EncoderSimTest.cpp index fa456ba41b..5eb6ad17b7 100644 --- a/wpilibc/src/test/native/cpp/simulation/EncoderSimTest.cpp +++ b/wpilibc/src/test/native/cpp/simulation/EncoderSimTest.cpp @@ -7,7 +7,7 @@ #include #include "callback_helpers/TestCallbackHelpers.hpp" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/hardware/rotation/Encoder.hpp" #include "wpi/util/deprecated.hpp" diff --git a/wpilibc/src/test/native/cpp/simulation/PWMSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/PWMSimTest.cpp index a932f51864..5994be7b60 100644 --- a/wpilibc/src/test/native/cpp/simulation/PWMSimTest.cpp +++ b/wpilibc/src/test/native/cpp/simulation/PWMSimTest.cpp @@ -7,7 +7,7 @@ #include #include "callback_helpers/TestCallbackHelpers.hpp" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/hardware/discrete/PWM.hpp" namespace wpi::sim { diff --git a/wpilibc/src/test/native/cpp/simulation/PowerDistributionSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/PowerDistributionSimTest.cpp index 5785384072..6374c9a9f3 100644 --- a/wpilibc/src/test/native/cpp/simulation/PowerDistributionSimTest.cpp +++ b/wpilibc/src/test/native/cpp/simulation/PowerDistributionSimTest.cpp @@ -9,7 +9,7 @@ #include #include "callback_helpers/TestCallbackHelpers.hpp" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/hal/Ports.h" #include "wpi/hardware/power/PowerDistribution.hpp" diff --git a/wpilibc/src/test/native/cpp/simulation/SimInitializationTest.cpp b/wpilibc/src/test/native/cpp/simulation/SimInitializationTest.cpp index c6c20e0513..2f81192133 100644 --- a/wpilibc/src/test/native/cpp/simulation/SimInitializationTest.cpp +++ b/wpilibc/src/test/native/cpp/simulation/SimInitializationTest.cpp @@ -6,7 +6,7 @@ #include -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/simulation/AddressableLEDSim.hpp" #include "wpi/simulation/AnalogInputSim.hpp" #include "wpi/simulation/CTREPCMSim.hpp" diff --git a/wpilibcExamples/src/main/cpp/examples/HAL/c/Robot.c b/wpilibcExamples/src/main/cpp/examples/HAL/c/Robot.c index 6f6e6fb62f..fb5acb8e59 100644 --- a/wpilibcExamples/src/main/cpp/examples/HAL/c/Robot.c +++ b/wpilibcExamples/src/main/cpp/examples/HAL/c/Robot.c @@ -18,7 +18,7 @@ that want even more control over what code runs on their robot. #include "wpi/hal/DIO.h" #include "wpi/hal/DriverStation.h" #include "wpi/hal/DriverStationTypes.h" -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" #include "wpi/hal/PWM.h" HAL_RobotMode getDSMode(void) { diff --git a/wpilibcExamples/src/test/cpp/examples/ArmSimulation/cpp/main.cpp b/wpilibcExamples/src/test/cpp/examples/ArmSimulation/cpp/main.cpp index 0413b855da..8d21f191e7 100644 --- a/wpilibcExamples/src/test/cpp/examples/ArmSimulation/cpp/main.cpp +++ b/wpilibcExamples/src/test/cpp/examples/ArmSimulation/cpp/main.cpp @@ -4,7 +4,7 @@ #include -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" /** * Runs all unit tests. diff --git a/wpilibcExamples/src/test/cpp/examples/DigitalCommunication/cpp/main.cpp b/wpilibcExamples/src/test/cpp/examples/DigitalCommunication/cpp/main.cpp index 0413b855da..8d21f191e7 100644 --- a/wpilibcExamples/src/test/cpp/examples/DigitalCommunication/cpp/main.cpp +++ b/wpilibcExamples/src/test/cpp/examples/DigitalCommunication/cpp/main.cpp @@ -4,7 +4,7 @@ #include -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" /** * Runs all unit tests. diff --git a/wpilibcExamples/src/test/cpp/examples/ElevatorSimulation/cpp/main.cpp b/wpilibcExamples/src/test/cpp/examples/ElevatorSimulation/cpp/main.cpp index 0413b855da..8d21f191e7 100644 --- a/wpilibcExamples/src/test/cpp/examples/ElevatorSimulation/cpp/main.cpp +++ b/wpilibcExamples/src/test/cpp/examples/ElevatorSimulation/cpp/main.cpp @@ -4,7 +4,7 @@ #include -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" /** * Runs all unit tests. diff --git a/wpilibcExamples/src/test/cpp/examples/I2CCommunication/cpp/main.cpp b/wpilibcExamples/src/test/cpp/examples/I2CCommunication/cpp/main.cpp index 0413b855da..8d21f191e7 100644 --- a/wpilibcExamples/src/test/cpp/examples/I2CCommunication/cpp/main.cpp +++ b/wpilibcExamples/src/test/cpp/examples/I2CCommunication/cpp/main.cpp @@ -4,7 +4,7 @@ #include -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" /** * Runs all unit tests. diff --git a/wpilibcExamples/src/test/cpp/examples/PotentiometerPID/cpp/main.cpp b/wpilibcExamples/src/test/cpp/examples/PotentiometerPID/cpp/main.cpp index 0413b855da..8d21f191e7 100644 --- a/wpilibcExamples/src/test/cpp/examples/PotentiometerPID/cpp/main.cpp +++ b/wpilibcExamples/src/test/cpp/examples/PotentiometerPID/cpp/main.cpp @@ -4,7 +4,7 @@ #include -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" /** * Runs all unit tests. diff --git a/wpilibcExamples/src/test/cpp/examples/UnitTest/cpp/main.cpp b/wpilibcExamples/src/test/cpp/examples/UnitTest/cpp/main.cpp index 0413b855da..8d21f191e7 100644 --- a/wpilibcExamples/src/test/cpp/examples/UnitTest/cpp/main.cpp +++ b/wpilibcExamples/src/test/cpp/examples/UnitTest/cpp/main.cpp @@ -4,7 +4,7 @@ #include -#include "wpi/hal/HALBase.h" +#include "wpi/hal/HAL.h" /** * Runs all unit tests.