commit 4bd29b17bf604b83805f0f16ea866680eb9e8801
author Philipp Schrader <philipp.schrader@gmail.com> Wed Feb 22 04:42:27 2017 +0000
committer Philipp Schrader <philipp.schrader@gmail.com> Wed Feb 22 04:43:46 2017 +0000
tree 828226f1ad9494f6a425fc200296785c2cec8f66
parent 0fc1e6dd63fcaea7dc2298fce0fcb74a8459f80e

Factor out drivetrain functionality from y2016 auton actor

I hope that we can re-use this in the y2017 auton actor.

Change-Id: I1258a5ef99a706ebefaba8e2238bb80df68d586f

y2016/wpilib_interface.cc

diff --git a/y2016/wpilib_interface.cc b/y2016/wpilib_interface.cc
index c998a3a..5e98b52 100644
--- a/y2016/wpilib_interface.cc
+++ b/y2016/wpilib_interface.cc
@@ -32,6 +32,7 @@
 #include "aos/common/messages/robot_state.q.h"
 #include "aos/common/commonmath.h"
 
+#include "frc971/autonomous/auto.q.h"
 #include "frc971/control_loops/control_loops.q.h"
 #include "frc971/control_loops/drivetrain/drivetrain.q.h"
 #include "y2016/control_loops/shooter/shooter.q.h"
@@ -40,7 +41,6 @@
 #include "y2016/control_loops/shooter/shooter.q.h"
 #include "y2016/control_loops/superstructure/superstructure.q.h"
 #include "y2016/queues/ball_detector.q.h"
-#include "y2016/actors/autonomous_action.q.h"
 
 #include "frc971/wpilib/joystick_sender.h"
 #include "frc971/wpilib/loop_output_handler.h"
@@ -358,7 +358,7 @@
     }
 
     {
-      auto auto_mode_message = ::y2016::actors::auto_mode.MakeMessage();
+      auto auto_mode_message = ::frc971::autonomous::auto_mode.MakeMessage();
       auto_mode_message->mode = 0;
       for (size_t i = 0; i < autonomous_modes_.size(); ++i) {
         if (autonomous_modes_[i]->Get()) {