commit 06016bc4cc080fc45cf76970c592dca6b97c0008
author Brian Silverman <brians> Sat Feb 11 16:34:34 2017 -0800
committer Brian Silverman <bsilver16384@gmail.com> Sun Feb 12 16:53:34 2017 -0800
tree 24fdbe4a1814d2c619c31a3ba509ecf9a2289207
parent 4d9dfa5f2ad321635d63f2529203920d634f3545

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

y2012/BUILD

diff --git a/y2012/BUILD b/y2012/BUILD
index bbdab0a..5dac709 100644
--- a/y2012/BUILD
+++ b/y2012/BUILD
@@ -23,12 +23,46 @@
   name = 'download',
   start_srcs = [
     ':joystick_reader',
+    ':wpilib_interface',
     '//y2012/control_loops/drivetrain',
     '//y2012/control_loops/accessories',
-    '//y2012/wpilib:wpilib_interface',
     '//aos:prime_start_binaries',
   ],
   srcs = [
     '//aos:prime_binaries',
   ],
 )
+
+cc_binary(
+  name = 'wpilib_interface',
+  srcs = [
+    'wpilib_interface.cc',
+  ],
+  deps = [
+    '//aos/common/controls:control_loop',
+    '//aos/common/logging',
+    '//aos/common/logging:queue_logging',
+    '//aos/common/messages:robot_state',
+    '//aos/common/util:log_interval',
+    '//aos/common/util:phased_loop',
+    '//aos/common/util:wrapping_counter',
+    '//aos/common:stl_mutex',
+    '//aos/common:time',
+    '//aos/linux_code:init',
+    '//frc971/control_loops/drivetrain:drivetrain_queue',
+    '//frc971/control_loops:queues',
+    '//frc971/wpilib:buffered_pcm',
+    '//frc971/wpilib:dma',
+    '//frc971/wpilib:dma_edge_counting',
+    '//frc971/wpilib:encoder_and_potentiometer',
+    '//frc971/wpilib:gyro_sender',
+    '//frc971/wpilib:interrupt_edge_counting',
+    '//frc971/wpilib:joystick_sender',
+    '//frc971/wpilib:logging_queue',
+    '//frc971/wpilib:loop_output_handler',
+    '//frc971/wpilib:wpilib_interface',
+    '//frc971/wpilib:wpilib_robot_base',
+    '//third_party:wpilib',
+    '//y2012/control_loops/accessories:accessories_queue',
+  ],
+)

y2012/wpilib/BUILD

diff --git a/y2012/wpilib/BUILD b/y2012/wpilib/BUILD
deleted file mode 100644
index b2e6934..0000000
--- a/y2012/wpilib/BUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-package(default_visibility = ['//visibility:public'])
-
-cc_binary(
-  name = 'wpilib_interface',
-  srcs = [
-    'wpilib_interface.cc',
-  ],
-  deps = [
-    '//aos/common/controls:control_loop',
-    '//aos/common/logging',
-    '//aos/common/logging:queue_logging',
-    '//aos/common/messages:robot_state',
-    '//aos/common/util:log_interval',
-    '//aos/common/util:phased_loop',
-    '//aos/common/util:wrapping_counter',
-    '//aos/common:stl_mutex',
-    '//aos/common:time',
-    '//aos/linux_code:init',
-    '//frc971/control_loops/drivetrain:drivetrain_queue',
-    '//frc971/control_loops:queues',
-    '//frc971/wpilib:buffered_pcm',
-    '//frc971/wpilib:dma',
-    '//frc971/wpilib:dma_edge_counting',
-    '//frc971/wpilib:encoder_and_potentiometer',
-    '//frc971/wpilib:gyro_sender',
-    '//frc971/wpilib:interrupt_edge_counting',
-    '//frc971/wpilib:joystick_sender',
-    '//frc971/wpilib:logging_queue',
-    '//frc971/wpilib:loop_output_handler',
-    '//frc971/wpilib:wpilib_interface',
-    '//frc971/wpilib:wpilib_robot_base',
-    '//third_party:wpilib',
-    '//y2012/control_loops/accessories:accessories_queue',
-  ],
-)

y2012/wpilib_interface.cc

diff --git a/y2012/wpilib/wpilib_interface.cc b/y2012/wpilib_interface.cc
similarity index 100%
rename from y2012/wpilib/wpilib_interface.cc
rename to y2012/wpilib_interface.cc