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/y2016/BUILD b/y2016/BUILD
index 4a2e768..a168496 100644
--- a/y2016/BUILD
+++ b/y2016/BUILD
@@ -52,6 +52,7 @@
name = 'download',
start_srcs = [
':joystick_reader',
+ ':wpilib_interface',
'//aos:prime_start_binaries',
'//y2016/control_loops/drivetrain:drivetrain',
'//y2016/control_loops/superstructure:superstructure',
@@ -60,7 +61,6 @@
'//y2016/actors:autonomous_action',
'//y2016/actors:superstructure_action',
'//y2016/actors:vision_align_action',
- '//y2016/wpilib:wpilib_interface',
'//y2016/vision:target_receiver',
],
srcs = [
@@ -75,6 +75,7 @@
name = 'download_stripped',
start_srcs = [
':joystick_reader.stripped',
+ ':wpilib_interface.stripped',
'//aos:prime_start_binaries_stripped',
'//y2016/control_loops/drivetrain:drivetrain.stripped',
'//y2016/control_loops/superstructure:superstructure.stripped',
@@ -83,7 +84,6 @@
'//y2016/actors:autonomous_action.stripped',
'//y2016/actors:superstructure_action.stripped',
'//y2016/actors:vision_align_action.stripped',
- '//y2016/wpilib:wpilib_interface.stripped',
'//y2016/vision:target_receiver.stripped',
],
srcs = [
@@ -93,3 +93,45 @@
'//y2016/dashboard:www_files',
],
)
+
+cc_binary(
+ name = 'wpilib_interface',
+ srcs = [
+ 'wpilib_interface.cc',
+ ],
+ deps = [
+ ':constants',
+ '//aos/common:stl_mutex',
+ '//aos/common/logging',
+ '//aos/common:math',
+ '//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',
+ '//aos/linux_code:init',
+ '//third_party:wpilib',
+ '//frc971/control_loops/drivetrain:drivetrain_queue',
+ '//frc971/control_loops:queues',
+ '//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/wpilib:logging_queue',
+ '//frc971/wpilib:wpilib_interface',
+ '//frc971/wpilib:pdp_fetcher',
+ '//frc971/wpilib:ADIS16448',
+ '//frc971/wpilib:dma',
+ '//y2016/control_loops/drivetrain:polydrivetrain_plants',
+ '//y2016/control_loops/shooter:shooter_queue',
+ '//y2016/control_loops/superstructure:superstructure_queue',
+ '//y2016/queues:ball_detector',
+ '//y2016/actors:autonomous_action_queue',
+ ],
+)
diff --git a/y2016/wpilib/BUILD b/y2016/wpilib/BUILD
deleted file mode 100644
index a0c0930..0000000
--- a/y2016/wpilib/BUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-package(default_visibility = ['//visibility:public'])
-
-cc_binary(
- name = 'wpilib_interface',
- srcs = [
- 'wpilib_interface.cc',
- ],
- deps = [
- '//aos/common:stl_mutex',
- '//aos/common/logging',
- '//aos/common:math',
- '//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',
- '//aos/linux_code:init',
- '//third_party:wpilib',
- '//frc971/control_loops/drivetrain:drivetrain_queue',
- '//frc971/control_loops:queues',
- '//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/wpilib:logging_queue',
- '//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',
- '//y2016/control_loops/superstructure:superstructure_queue',
- '//y2016/queues:ball_detector',
- '//y2016/actors:autonomous_action_queue',
- ],
-)
diff --git a/y2016/wpilib/wpilib_interface.cc b/y2016/wpilib_interface.cc
similarity index 100%
rename from y2016/wpilib/wpilib_interface.cc
rename to y2016/wpilib_interface.cc