commit 82b19186ae4874c4d986170ad2fe97731acb32d6
author Sabina Davis <sabina1109@gmail.com> Fri Nov 10 09:30:25 2017 -0800
committer Sabina Davis <sabina1109@gmail.com> Sat Jan 06 17:21:25 2018 -0800
tree 71274b09f329bc0ec4cbae705bcec98333e30571
parent a1ea90b7f5682760d6499c7703142339b85ac67a

Third robot bringup adjustments

Change-Id: I48d28520d4b7e068029b5a0fbb34ca93dbdc85d6

y2017/joystick_reader.cc

diff --git a/y2017/joystick_reader.cc b/y2017/joystick_reader.cc
index e0f66ba..b47c733 100644
--- a/y2017/joystick_reader.cc
+++ b/y2017/joystick_reader.cc
@@ -1,7 +1,7 @@
+#include <math.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <math.h>
 
 #include "aos/common/actions/actions.h"
 #include "aos/common/input/driver_station_data.h"
@@ -16,6 +16,7 @@
 #include "frc971/control_loops/drivetrain/drivetrain.q.h"
 #include "y2017/constants.h"
 #include "y2017/control_loops/superstructure/superstructure.q.h"
+#include "y2017/control_loops/drivetrain/drivetrain_base.h"
 
 using ::frc971::control_loops::drivetrain_queue;
 using ::y2017::control_loops::superstructure_queue;
@@ -54,7 +55,8 @@
  public:
   Reader() {
     drivetrain_input_reader_ = DrivetrainInputReader::Make(
-        DrivetrainInputReader::InputType::kSteeringWheel);
+        DrivetrainInputReader::InputType::kSteeringWheel,
+        ::y2017::control_loops::drivetrain::GetDrivetrainConfig());
   }
 
   enum class ShotDistance { VISION_SHOT, MIDDLE_SHOT, FAR_SHOT };