commit 70810b9b466595f25c48ab2c424d5be7b0a92264
author Austin Schuh <austin.linux@gmail.com> Sat Nov 26 14:55:34 2016 -0800
committer Austin Schuh <austin.linux@gmail.com> Sun Dec 04 19:32:16 2016 -0800
tree 8a6da56280260fd4ab05eb11fa0aa43d0d03a769
parent d6c364e3242284550936273fe15fe69eaac95a80

Upgraded //y2015 to use the common drive code.

This is a fixup from changing the call signature of DoCoerceGoal

Change-Id: I8536f4cd793370cec8d369a00e4fc34b35442fd3

y2015/wpilib/BUILD

diff --git a/y2015/wpilib/BUILD b/y2015/wpilib/BUILD
index fbc7535..dc3196f 100644
--- a/y2015/wpilib/BUILD
+++ b/y2015/wpilib/BUILD
@@ -11,7 +11,7 @@
     '//aos/common/logging',
     '//third_party:wpilib',
     '//y2015:constants',
-    '//y2015/control_loops/drivetrain:drivetrain_queue',
+    '//frc971/control_loops/drivetrain:drivetrain_queue',
     '//y2015/control_loops/fridge:fridge_queue',
     '//y2015/control_loops/claw:claw_queue',
     '//y2015/autonomous:auto_queue',

y2015/wpilib/wpilib_interface.cc

diff --git a/y2015/wpilib/wpilib_interface.cc b/y2015/wpilib/wpilib_interface.cc
index 14ca146..7accc92 100644
--- a/y2015/wpilib/wpilib_interface.cc
+++ b/y2015/wpilib/wpilib_interface.cc
@@ -32,24 +32,23 @@
 
 #include "frc971/control_loops/control_loops.q.h"
 
-#include "y2015/constants.h"
-#include "y2015/control_loops/drivetrain/drivetrain.q.h"
-#include "y2015/control_loops/fridge/fridge.q.h"
-#include "y2015/control_loops/claw/claw.q.h"
-#include "y2015/autonomous/auto.q.h"
-
-#include "frc971/wpilib/joystick_sender.h"
-#include "frc971/wpilib/loop_output_handler.h"
-#include "frc971/wpilib/buffered_solenoid.h"
+#include "frc971/control_loops/drivetrain/drivetrain.q.h"
 #include "frc971/wpilib/buffered_pcm.h"
-#include "frc971/wpilib/gyro_sender.h"
-#include "frc971/wpilib/dma_edge_counting.h"
-#include "frc971/wpilib/interrupt_edge_counting.h"
-#include "frc971/wpilib/encoder_and_potentiometer.h"
-#include "frc971/wpilib/logging.q.h"
-#include "frc971/wpilib/wpilib_interface.h"
-#include "frc971/wpilib/pdp_fetcher.h"
+#include "frc971/wpilib/buffered_solenoid.h"
 #include "frc971/wpilib/dma.h"
+#include "frc971/wpilib/dma_edge_counting.h"
+#include "frc971/wpilib/encoder_and_potentiometer.h"
+#include "frc971/wpilib/gyro_sender.h"
+#include "frc971/wpilib/interrupt_edge_counting.h"
+#include "frc971/wpilib/joystick_sender.h"
+#include "frc971/wpilib/logging.q.h"
+#include "frc971/wpilib/loop_output_handler.h"
+#include "frc971/wpilib/pdp_fetcher.h"
+#include "frc971/wpilib/wpilib_interface.h"
+#include "y2015/autonomous/auto.q.h"
+#include "y2015/constants.h"
+#include "y2015/control_loops/claw/claw.q.h"
+#include "y2015/control_loops/fridge/fridge.q.h"
 
 #ifndef M_PI
 #define M_PI 3.14159265358979323846