Remove stupid wpilib forwarding target
It's silly to need to use NO_BUILD_AMD64 for //aos/...
Change-Id: I103b3c3a0f5cfb72c081c5aafef624cf0533acb0
diff --git a/NO_BUILD_AMD64 b/NO_BUILD_AMD64
index 2536534..716368c 100644
--- a/NO_BUILD_AMD64
+++ b/NO_BUILD_AMD64
@@ -1,4 +1,3 @@
--//aos/externals:wpilib
-//third_party/allwpilib_2016/...
-//third_party/ntcore_2016/...
-//frc971/wpilib/...
diff --git a/aos/externals/BUILD b/aos/externals/BUILD
deleted file mode 100644
index 4a03d83..0000000
--- a/aos/externals/BUILD
+++ /dev/null
@@ -1,16 +0,0 @@
-cc_library(
- name = 'wpilib',
- visibility = ['//visibility:public'],
- deps = [
- '//third_party/allwpilib_2016:wpilib',
- ],
- includes = [
- 'forwpilib',
- ],
- hdrs = [
- 'forwpilib/dma.h',
- ],
- srcs = [
- 'forwpilib/dma.cc',
- ],
-)
diff --git a/frc971/wpilib/BUILD b/frc971/wpilib/BUILD
index 288f809..6ea778a 100644
--- a/frc971/wpilib/BUILD
+++ b/frc971/wpilib/BUILD
@@ -18,11 +18,12 @@
'encoder_and_potentiometer.h',
],
deps = [
- '//aos/externals:wpilib',
+ '//third_party/allwpilib_2016:wpilib',
':dma_edge_counting',
'//aos/linux_code:init',
'//aos/common/logging',
'//aos/common:mutex',
+ ':dma',
],
)
@@ -35,8 +36,9 @@
'dma_edge_counting.h',
],
deps = [
- '//aos/externals:wpilib',
+ '//third_party/allwpilib_2016:wpilib',
'//aos/common/logging',
+ ':dma',
],
)
@@ -49,7 +51,7 @@
'interrupt_edge_counting.h',
],
deps = [
- '//aos/externals:wpilib',
+ '//third_party/allwpilib_2016:wpilib',
'//aos/common/logging',
'//aos/common:stl_mutex',
'//aos/common:time',
@@ -68,7 +70,7 @@
'buffered_pcm.h',
],
deps = [
- '//aos/externals:wpilib',
+ '//third_party/allwpilib_2016:wpilib',
'//aos/common/logging',
],
)
@@ -82,7 +84,7 @@
'gyro_interface.h',
],
deps = [
- '//aos/externals:wpilib',
+ '//third_party/allwpilib_2016:wpilib',
'//aos/common/logging',
'//aos/common:time',
],
@@ -118,7 +120,7 @@
],
deps = [
'//aos/common:mutex',
- '//aos/externals:wpilib',
+ '//third_party/allwpilib_2016:wpilib',
'//frc971/queues:gyro',
'//aos/common:time',
],
@@ -150,7 +152,7 @@
'joystick_sender.h',
],
deps = [
- '//aos/externals:wpilib',
+ '//third_party/allwpilib_2016:wpilib',
'//aos/common/messages:robot_state',
'//aos/linux_code:init',
'//aos/common/network:team_number',
@@ -168,7 +170,7 @@
],
deps = [
'//aos/common/messages:robot_state',
- '//aos/externals:wpilib',
+ '//third_party/allwpilib_2016:wpilib',
'//aos/common/logging:queue_logging',
],
)
@@ -190,7 +192,7 @@
],
deps = [
':pdp_values',
- '//aos/externals:wpilib',
+ '//third_party/allwpilib_2016:wpilib',
'//aos/common/logging:queue_logging',
'//aos/linux_code:init',
'//aos/common/util:phased_loop',
@@ -203,7 +205,7 @@
'wpilib_robot_base.h',
],
deps = [
- '//aos/externals:wpilib',
+ '//third_party/allwpilib_2016:wpilib',
],
)
@@ -223,7 +225,7 @@
'ADIS16448.cc',
],
deps = [
- '//aos/externals:wpilib',
+ '//third_party/allwpilib_2016:wpilib',
'//aos/common/logging',
'//aos/common/logging:queue_logging',
'//aos/common:time',
@@ -231,3 +233,16 @@
':imu_queue',
],
)
+
+cc_library(
+ name = 'dma',
+ hdrs = [
+ 'dma.h',
+ ],
+ srcs = [
+ 'dma.cc',
+ ],
+ deps = [
+ '//third_party/allwpilib_2016:wpilib',
+ ],
+)
diff --git a/aos/externals/forwpilib/dma.cc b/frc971/wpilib/dma.cc
similarity index 99%
rename from aos/externals/forwpilib/dma.cc
rename to frc971/wpilib/dma.cc
index e3b88d0..ea9f64c 100644
--- a/aos/externals/forwpilib/dma.cc
+++ b/frc971/wpilib/dma.cc
@@ -1,4 +1,4 @@
-#include "dma.h"
+#include "frc971/wpilib/dma.h"
#include <string.h>
@@ -9,7 +9,6 @@
#include "AnalogInput.h"
#include "Encoder.h"
-
// Interface to the roboRIO FPGA's DMA features.
// Like tEncoder::tOutput with the bitfields reversed.
diff --git a/aos/externals/forwpilib/dma.h b/frc971/wpilib/dma.h
similarity index 95%
rename from aos/externals/forwpilib/dma.h
rename to frc971/wpilib/dma.h
index 2c4d4e0..970497c 100644
--- a/aos/externals/forwpilib/dma.h
+++ b/frc971/wpilib/dma.h
@@ -1,7 +1,8 @@
-#ifndef _DMA_H_
-#define _DMA_H_
+#ifndef FRC971_WPILIB_DMA_H_
+#define FRC971_WPILIB_DMA_H_
// Interface to the roboRIO FPGA's DMA features.
+// TODO(Brian): Make this less wpilib-like and more frc971-like.
#include <stdint.h>
@@ -131,4 +132,4 @@
#endif
};
-#endif // _DMA_H_
+#endif // FRC971_WPILIB_DMA_H_
diff --git a/frc971/wpilib/dma_edge_counting.h b/frc971/wpilib/dma_edge_counting.h
index 37f5837..cdbff1d 100644
--- a/frc971/wpilib/dma_edge_counting.h
+++ b/frc971/wpilib/dma_edge_counting.h
@@ -6,11 +6,12 @@
#include "aos/common/macros.h"
+#include "frc971/wpilib/dma.h"
+
#include "DigitalInput.h"
#include "Encoder.h"
#include "AnalogInput.h"
#include "Utility.h"
-#include "dma.h"
#undef ERROR
namespace frc971 {
diff --git a/frc971/wpilib/encoder_and_potentiometer.h b/frc971/wpilib/encoder_and_potentiometer.h
index 2450841..7f784e9 100644
--- a/frc971/wpilib/encoder_and_potentiometer.h
+++ b/frc971/wpilib/encoder_and_potentiometer.h
@@ -10,9 +10,9 @@
#include "Encoder.h"
#include "DigitalSource.h"
#include "AnalogInput.h"
-#include "dma.h"
#include "frc971/wpilib/dma_edge_counting.h"
+#include "frc971/wpilib/dma.h"
namespace frc971 {
namespace wpilib {
diff --git a/y2012/wpilib/BUILD b/y2012/wpilib/BUILD
index 5c0c900..9b42c3a 100644
--- a/y2012/wpilib/BUILD
+++ b/y2012/wpilib/BUILD
@@ -9,7 +9,7 @@
'//aos/linux_code:init',
'//aos/common:stl_mutex',
'//aos/common/logging',
- '//aos/externals:wpilib',
+ '//third_party/allwpilib_2016:wpilib',
'//y2012/control_loops/drivetrain:drivetrain_queue',
'//y2012/control_loops/accessories:accessories_queue',
'//aos/common/controls:control_loop',
@@ -30,5 +30,6 @@
'//frc971/control_loops:queues',
'//frc971/wpilib:logging_queue',
'//frc971/wpilib:wpilib_interface',
+ '//frc971/wpilib:dma',
],
)
diff --git a/y2012/wpilib/wpilib_interface.cc b/y2012/wpilib/wpilib_interface.cc
index a9b7bf6..6702dc4 100644
--- a/y2012/wpilib/wpilib_interface.cc
+++ b/y2012/wpilib/wpilib_interface.cc
@@ -14,7 +14,6 @@
#include "Compressor.h"
#include "Relay.h"
#include "frc971/wpilib/wpilib_robot_base.h"
-#include "dma.h"
#ifndef WPILIB2015
#include "DigitalGlitchFilter.h"
#endif
@@ -44,6 +43,7 @@
#include "frc971/wpilib/encoder_and_potentiometer.h"
#include "frc971/wpilib/logging.q.h"
#include "frc971/wpilib/wpilib_interface.h"
+#include "frc971/wpilib/dma.h"
#ifndef M_PI
#define M_PI 3.14159265358979323846
diff --git a/y2014/wpilib/BUILD b/y2014/wpilib/BUILD
index 120ff49..0f9d72e 100644
--- a/y2014/wpilib/BUILD
+++ b/y2014/wpilib/BUILD
@@ -9,7 +9,7 @@
'//aos/linux_code:init',
'//aos/common:stl_mutex',
'//aos/common/logging',
- '//aos/externals:wpilib',
+ '//third_party/allwpilib_2016:wpilib',
'//y2014:constants',
'//y2014/queues:auto_mode',
'//frc971/control_loops/drivetrain:drivetrain_queue',
@@ -34,5 +34,6 @@
'//frc971/wpilib:logging_queue',
'//frc971/wpilib:wpilib_interface',
'//frc971/wpilib:pdp_fetcher',
+ '//frc971/wpilib:dma',
],
)
diff --git a/y2014/wpilib/wpilib_interface.cc b/y2014/wpilib/wpilib_interface.cc
index 6442a2a..5195ab6 100644
--- a/y2014/wpilib/wpilib_interface.cc
+++ b/y2014/wpilib/wpilib_interface.cc
@@ -14,7 +14,6 @@
#include "Compressor.h"
#include "Relay.h"
#include "frc971/wpilib/wpilib_robot_base.h"
-#include "dma.h"
#ifndef WPILIB2015
#include "DigitalGlitchFilter.h"
#endif
@@ -49,6 +48,7 @@
#include "frc971/wpilib/logging.q.h"
#include "frc971/wpilib/wpilib_interface.h"
#include "frc971/wpilib/pdp_fetcher.h"
+#include "frc971/wpilib/dma.h"
#ifndef M_PI
#define M_PI 3.14159265358979323846
diff --git a/y2014_bot3/wpilib/BUILD b/y2014_bot3/wpilib/BUILD
index ff64e60..5f5319c 100644
--- a/y2014_bot3/wpilib/BUILD
+++ b/y2014_bot3/wpilib/BUILD
@@ -9,7 +9,7 @@
'//aos/linux_code:init',
'//aos/common:stl_mutex',
'//aos/common/logging',
- '//aos/externals:wpilib',
+ '//third_party/allwpilib_2016:wpilib',
'//y2014_bot3/control_loops/drivetrain:drivetrain_queue',
'//aos/common/controls:control_loop',
'//aos/common/util:log_interval',
@@ -27,6 +27,7 @@
'//frc971/wpilib:wpilib_robot_base',
'//frc971/wpilib:wpilib_interface',
'//frc971/wpilib:pdp_fetcher',
+ '//frc971/wpilib:dma',
'//y2014_bot3/autonomous:auto_queue',
'//y2014_bot3/control_loops/drivetrain:drivetrain_lib',
'//y2014_bot3/control_loops/rollers:rollers_lib',
diff --git a/y2014_bot3/wpilib/wpilib_interface.cc b/y2014_bot3/wpilib/wpilib_interface.cc
index a3e0c27..e1e07a0 100644
--- a/y2014_bot3/wpilib/wpilib_interface.cc
+++ b/y2014_bot3/wpilib/wpilib_interface.cc
@@ -14,7 +14,6 @@
#include "Compressor.h"
#include "Relay.h"
#include "frc971/wpilib/wpilib_robot_base.h"
-#include "dma.h"
#include "DigitalInput.h"
#undef ERROR
@@ -42,6 +41,7 @@
#include "frc971/wpilib/logging.q.h"
#include "frc971/wpilib/wpilib_interface.h"
#include "frc971/wpilib/pdp_fetcher.h"
+#include "frc971/wpilib/dma.h"
#ifndef M_PI
#define M_PI 3.14159265358979323846
diff --git a/y2015/wpilib/BUILD b/y2015/wpilib/BUILD
index 0bdf7b3..2a5979f 100644
--- a/y2015/wpilib/BUILD
+++ b/y2015/wpilib/BUILD
@@ -9,7 +9,7 @@
'//aos/linux_code:init',
'//aos/common:stl_mutex',
'//aos/common/logging',
- '//aos/externals:wpilib',
+ '//third_party/allwpilib_2016:wpilib',
'//y2015:constants',
'//y2015/control_loops/drivetrain:drivetrain_queue',
'//y2015/control_loops/fridge:fridge_queue',
@@ -35,5 +35,6 @@
'//frc971/wpilib:logging_queue',
'//frc971/wpilib:wpilib_interface',
'//frc971/wpilib:pdp_fetcher',
+ '//frc971/wpilib:dma',
],
)
diff --git a/y2015/wpilib/wpilib_interface.cc b/y2015/wpilib/wpilib_interface.cc
index c2250bb..3130424 100644
--- a/y2015/wpilib/wpilib_interface.cc
+++ b/y2015/wpilib/wpilib_interface.cc
@@ -14,7 +14,6 @@
#include "Compressor.h"
#include "Relay.h"
#include "frc971/wpilib/wpilib_robot_base.h"
-#include "dma.h"
#ifndef WPILIB2015
#include "DigitalGlitchFilter.h"
#endif
@@ -49,6 +48,7 @@
#include "frc971/wpilib/logging.q.h"
#include "frc971/wpilib/wpilib_interface.h"
#include "frc971/wpilib/pdp_fetcher.h"
+#include "frc971/wpilib/dma.h"
#ifndef M_PI
#define M_PI 3.14159265358979323846
diff --git a/y2015_bot3/wpilib/BUILD b/y2015_bot3/wpilib/BUILD
index 89742c9..6c84505 100644
--- a/y2015_bot3/wpilib/BUILD
+++ b/y2015_bot3/wpilib/BUILD
@@ -9,7 +9,7 @@
'//aos/linux_code:init',
'//aos/common:stl_mutex',
'//aos/common/logging',
- '//aos/externals:wpilib',
+ '//third_party/allwpilib_2016:wpilib',
'//y2015_bot3/control_loops/drivetrain:drivetrain_queue',
'//aos/common/controls:control_loop',
'//aos/common/util:log_interval',
@@ -27,6 +27,7 @@
'//frc971/control_loops:queues',
'//frc971/wpilib:logging_queue',
'//frc971/wpilib:pdp_fetcher',
+ '//frc971/wpilib:dma',
'//y2015_bot3/autonomous:auto_queue',
'//y2015_bot3/control_loops/drivetrain:drivetrain_lib',
'//y2015_bot3/control_loops/elevator:elevator_lib',
diff --git a/y2015_bot3/wpilib/wpilib_interface.cc b/y2015_bot3/wpilib/wpilib_interface.cc
index ad87fa5..cb2acf1 100644
--- a/y2015_bot3/wpilib/wpilib_interface.cc
+++ b/y2015_bot3/wpilib/wpilib_interface.cc
@@ -14,7 +14,6 @@
#include "Compressor.h"
#include "Relay.h"
#include "frc971/wpilib/wpilib_robot_base.h"
-#include "dma.h"
#ifndef WPILIB2015
#include "DigitalGlitchFilter.h"
#endif
@@ -49,6 +48,7 @@
#include "frc971/wpilib/logging.q.h"
#include "frc971/wpilib/wpilib_interface.h"
#include "frc971/wpilib/pdp_fetcher.h"
+#include "frc971/wpilib/dma.h"
#ifndef M_PI
#define M_PI 3.14159265358979323846
diff --git a/y2016/wpilib/BUILD b/y2016/wpilib/BUILD
index 13e5eae..bd55575 100644
--- a/y2016/wpilib/BUILD
+++ b/y2016/wpilib/BUILD
@@ -17,7 +17,7 @@
'//aos/common/util:phased_loop',
'//aos/common/util:wrapping_counter',
'//aos/linux_code:init',
- '//aos/externals:wpilib',
+ '//third_party/allwpilib_2016:wpilib',
'//frc971/control_loops/drivetrain:drivetrain_queue',
'//frc971/control_loops:queues',
'//frc971/wpilib:joystick_sender',
@@ -32,6 +32,7 @@
'//frc971/wpilib:wpilib_interface',
'//frc971/wpilib:pdp_fetcher',
'//frc971/wpilib:ADIS16448',
+ '//frc971/wpilib:dma',
'//y2016:constants',
'//y2016/control_loops/drivetrain:polydrivetrain_plants',
'//y2016/control_loops/shooter:shooter_queue',
diff --git a/y2016/wpilib/wpilib_interface.cc b/y2016/wpilib/wpilib_interface.cc
index 6d16323..2adddd9 100644
--- a/y2016/wpilib/wpilib_interface.cc
+++ b/y2016/wpilib/wpilib_interface.cc
@@ -13,7 +13,6 @@
#include "AnalogInput.h"
#include "Compressor.h"
#include "frc971/wpilib/wpilib_robot_base.h"
-#include "dma.h"
#ifndef WPILIB2015
#include "DigitalGlitchFilter.h"
#endif
@@ -50,6 +49,7 @@
#include "frc971/wpilib/wpilib_interface.h"
#include "frc971/wpilib/pdp_fetcher.h"
#include "frc971/wpilib/ADIS16448.h"
+#include "frc971/wpilib/dma.h"
#ifndef M_PI
#define M_PI 3.14159265358979323846