commit dd479cd39f0aefd0d11e948d8ef63d8ff6c38fef
author Austin Schuh <austin.linux@gmail.com> Thu Dec 27 11:50:39 2018 -0800
committer Gerrit Code Review <gerrit@robotics.mvla.net> Thu Dec 27 11:50:39 2018 -0800
tree 46a9986d2d0c3fb068b629c3919733443e7a78ed
parent 4a66adf151f8b4f0ff27ba3afe4bcc1c51a4e0c7
parent 9edb5dfd1d47afc002cf0f5a7e4784841bc21e99

Merge "Rename RungeKutta to RungeKuttaU"

y2018/joystick_reader.cc

diff --git a/y2018/joystick_reader.cc b/y2018/joystick_reader.cc
index bc43b0c..41efc00 100644
--- a/y2018/joystick_reader.cc
+++ b/y2018/joystick_reader.cc
@@ -85,8 +85,6 @@
 const ButtonLocation kClawOpen(4, 4);
 const ButtonLocation kDriverClawOpen(2, 4);
 
-std::unique_ptr<DrivetrainInputReader> drivetrain_input_reader_;
-
 class Reader : public ::aos::input::JoystickInput {
  public:
   Reader() {
@@ -400,6 +398,8 @@
   ::aos::common::actions::ActionQueue action_queue_;
 
   ::std::unique_ptr<ProtoTXUdpSocket<VisionControl>> video_tx_;
+
+  ::std::unique_ptr<DrivetrainInputReader> drivetrain_input_reader_;
 };
 
 }  // namespace joysticks