Move wpilib_interface
I'm tired of typing the useless folder.
y2017's still doesn't compile, but it didn't before anyways.
Change-Id: I2c454c5a0efae743274e5c3f759a1ab712c70847
diff --git a/y2014/BUILD b/y2014/BUILD
index 2938aa6..07b9169 100644
--- a/y2014/BUILD
+++ b/y2014/BUILD
@@ -47,13 +47,13 @@
start_srcs = [
':hot_goal_reader',
':joystick_reader',
+ ':wpilib_interface',
'//y2014/control_loops/drivetrain:drivetrain',
'//y2014/control_loops/claw:claw',
'//y2014/control_loops/shooter:shooter',
'//y2014/autonomous:auto',
'//y2014/actors:binaries',
'//aos:prime_start_binaries',
- '//y2014/wpilib:wpilib_interface',
],
srcs = [
'//aos:prime_binaries',
@@ -73,3 +73,41 @@
'//y2014/queues:hot_goal',
],
)
+
+cc_binary(
+ name = 'wpilib_interface',
+ srcs = [
+ 'wpilib_interface.cc',
+ ],
+ deps = [
+ ':constants',
+ '//aos/linux_code:init',
+ '//aos/common:stl_mutex',
+ '//aos/common/logging',
+ '//third_party:wpilib',
+ '//y2014/queues:auto_mode',
+ '//frc971/control_loops/drivetrain:drivetrain_queue',
+ '//y2014/control_loops/shooter:shooter_queue',
+ '//y2014/control_loops/claw:claw_queue',
+ '//aos/common/controls:control_loop',
+ '//aos/common/util:log_interval',
+ '//aos/common:time',
+ '//aos/common/logging:queue_logging',
+ '//aos/common/messages:robot_state',
+ '//aos/common/util:phased_loop',
+ '//aos/common/util:wrapping_counter',
+ '//frc971/wpilib:joystick_sender',
+ '//frc971/wpilib:loop_output_handler',
+ '//frc971/wpilib:buffered_pcm',
+ '//frc971/wpilib:gyro_sender',
+ '//frc971/wpilib:dma_edge_counting',
+ '//frc971/wpilib:interrupt_edge_counting',
+ '//frc971/wpilib:wpilib_robot_base',
+ '//frc971/wpilib:encoder_and_potentiometer',
+ '//frc971/control_loops:queues',
+ '//frc971/wpilib:logging_queue',
+ '//frc971/wpilib:wpilib_interface',
+ '//frc971/wpilib:pdp_fetcher',
+ '//frc971/wpilib:dma',
+ ],
+)
diff --git a/y2014/wpilib/BUILD b/y2014/wpilib/BUILD
deleted file mode 100644
index 048f26c..0000000
--- a/y2014/wpilib/BUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-package(default_visibility = ['//visibility:public'])
-
-cc_binary(
- name = 'wpilib_interface',
- srcs = [
- 'wpilib_interface.cc',
- ],
- deps = [
- '//aos/linux_code:init',
- '//aos/common:stl_mutex',
- '//aos/common/logging',
- '//third_party:wpilib',
- '//y2014:constants',
- '//y2014/queues:auto_mode',
- '//frc971/control_loops/drivetrain:drivetrain_queue',
- '//y2014/control_loops/shooter:shooter_queue',
- '//y2014/control_loops/claw:claw_queue',
- '//aos/common/controls:control_loop',
- '//aos/common/util:log_interval',
- '//aos/common:time',
- '//aos/common/logging:queue_logging',
- '//aos/common/messages:robot_state',
- '//aos/common/util:phased_loop',
- '//aos/common/util:wrapping_counter',
- '//frc971/wpilib:joystick_sender',
- '//frc971/wpilib:loop_output_handler',
- '//frc971/wpilib:buffered_pcm',
- '//frc971/wpilib:gyro_sender',
- '//frc971/wpilib:dma_edge_counting',
- '//frc971/wpilib:interrupt_edge_counting',
- '//frc971/wpilib:wpilib_robot_base',
- '//frc971/wpilib:encoder_and_potentiometer',
- '//frc971/control_loops:queues',
- '//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_interface.cc
similarity index 100%
rename from y2014/wpilib/wpilib_interface.cc
rename to y2014/wpilib_interface.cc