From 918cde0c0fa546505971dfd6df0e94a6286086f2 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Thu, 25 Jun 2015 18:38:44 -0700 Subject: [PATCH] artf4155: Move Port.h from hal/lib/Athena to hal/include/HAL Change-Id: I76a8d8baf4d77b7383c321d16a9286537632c3e9 --- hal/{lib/Athena => include/HAL}/Port.h | 0 hal/lib/Athena/Analog.cpp | 2 +- hal/lib/Athena/Digital.cpp | 2 +- hal/lib/Athena/HAL.cpp | 2 +- hal/lib/Athena/Solenoid.cpp | 2 +- wpilibc/wpilibC++Devices/include/SolenoidBase.h | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename hal/{lib/Athena => include/HAL}/Port.h (100%) diff --git a/hal/lib/Athena/Port.h b/hal/include/HAL/Port.h similarity index 100% rename from hal/lib/Athena/Port.h rename to hal/include/HAL/Port.h diff --git a/hal/lib/Athena/Analog.cpp b/hal/lib/Athena/Analog.cpp index ab18ad350b..17ad209513 100644 --- a/hal/lib/Athena/Analog.cpp +++ b/hal/lib/Athena/Analog.cpp @@ -2,7 +2,7 @@ #include "HAL/Analog.hpp" #include "HAL/cpp/priority_mutex.h" -#include "Port.h" +#include "HAL/Port.h" #include "HAL/HAL.hpp" #include "ChipObject.h" #include "HAL/cpp/Resource.hpp" diff --git a/hal/lib/Athena/Digital.cpp b/hal/lib/Athena/Digital.cpp index 93241449f2..dcdad9b00f 100644 --- a/hal/lib/Athena/Digital.cpp +++ b/hal/lib/Athena/Digital.cpp @@ -1,7 +1,7 @@ #include "HAL/Digital.hpp" -#include "Port.h" +#include "HAL/Port.h" #include "HAL/HAL.hpp" #include "ChipObject.h" #include "HAL/cpp/Resource.hpp" diff --git a/hal/lib/Athena/HAL.cpp b/hal/lib/Athena/HAL.cpp index b24f8dc95c..185f2be5f8 100644 --- a/hal/lib/Athena/HAL.cpp +++ b/hal/lib/Athena/HAL.cpp @@ -1,6 +1,6 @@ #include "HAL/HAL.hpp" -#include "Port.h" +#include "HAL/Port.h" #include "HAL/Errors.hpp" #include "ctre/ctre.h" #include "visa/visa.h" diff --git a/hal/lib/Athena/Solenoid.cpp b/hal/lib/Athena/Solenoid.cpp index db699ff268..c94fcc2b4e 100644 --- a/hal/lib/Athena/Solenoid.cpp +++ b/hal/lib/Athena/Solenoid.cpp @@ -1,7 +1,7 @@ #include "HAL/Solenoid.hpp" -#include "Port.h" +#include "HAL/Port.h" #include "HAL/Errors.hpp" #include "ChipObject.h" #include "NetworkCommunication/LoadOut.h" diff --git a/wpilibc/wpilibC++Devices/include/SolenoidBase.h b/wpilibc/wpilibC++Devices/include/SolenoidBase.h index 637ad92dc5..159beeb03c 100644 --- a/wpilibc/wpilibC++Devices/include/SolenoidBase.h +++ b/wpilibc/wpilibC++Devices/include/SolenoidBase.h @@ -9,7 +9,7 @@ #include "Resource.h" #include "SensorBase.h" #include "HAL/HAL.hpp" -#include "Port.h" +#include "HAL/Port.h" #include