commit 7077d340b2475b475baaadb15cdd05d1d15615f4
author James Kuszmaul <jabukuszmaul+collab@gmail.com> Wed Jun 09 20:23:58 2021 -0700
committer James Kuszmaul <jabukuszmaul+collab@gmail.com> Mon Jun 14 21:56:54 2021 -0700
tree 40b6c5d4ad0d9032012f059faed329c615ad5412
parent 1686903051a89a961204cf9d94e7dde748dfafa7

Move aos/input and aos/robot_state to frc971/input

Neither folder makes any sense as part of aos/.

Change-Id: I10e0532da4e688c18a9354012b783c43566fd2a1

y2014_bot3/joystick_reader.cc

diff --git a/y2014_bot3/joystick_reader.cc b/y2014_bot3/joystick_reader.cc
index b2fe9dc..92fa1e1 100644
--- a/y2014_bot3/joystick_reader.cc
+++ b/y2014_bot3/joystick_reader.cc
@@ -1,26 +1,25 @@
+#include <math.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <math.h>
 
 #include "aos/init.h"
-#include "aos/input/joystick_input.h"
-#include "aos/input/driver_station_data.h"
 #include "aos/logging/logging.h"
-#include "aos/util/log_interval.h"
 #include "aos/time/time.h"
-
-#include "aos/input/drivetrain_input.h"
+#include "aos/util/log_interval.h"
 #include "frc971/autonomous/base_autonomous_actor.h"
 #include "frc971/control_loops/drivetrain/drivetrain_goal_generated.h"
+#include "frc971/input/driver_station_data.h"
+#include "frc971/input/drivetrain_input.h"
+#include "frc971/input/joystick_input.h"
 #include "y2014_bot3/control_loops/drivetrain/drivetrain_base.h"
 #include "y2014_bot3/control_loops/rollers/rollers_goal_generated.h"
 
-using ::aos::input::driver_station::ButtonLocation;
-using ::aos::input::driver_station::POVLocation;
-using ::aos::input::driver_station::JoystickAxis;
-using ::aos::input::driver_station::ControlBit;
-using ::aos::input::DrivetrainInputReader;
+using ::frc971::input::DrivetrainInputReader;
+using ::frc971::input::driver_station::ButtonLocation;
+using ::frc971::input::driver_station::ControlBit;
+using ::frc971::input::driver_station::JoystickAxis;
+using ::frc971::input::driver_station::POVLocation;
 
 namespace y2014_bot3 {
 namespace input {
@@ -40,10 +39,10 @@
 const ButtonLocation kBackRollersOut(4, 12);
 const ButtonLocation kHumanPlayer(4, 11);
 
-class Reader : public ::aos::input::JoystickInput {
+class Reader : public ::frc971::input::JoystickInput {
  public:
   Reader(::aos::EventLoop *event_loop)
-      : ::aos::input::JoystickInput(event_loop),
+      : ::frc971::input::JoystickInput(event_loop),
         rollers_goal_sender_(
             event_loop->MakeSender<::y2014_bot3::control_loops::rollers::Goal>(
                 "/rollers")),
@@ -55,7 +54,7 @@
         ::y2014_bot3::control_loops::drivetrain::GetDrivetrainConfig());
   }
 
-  virtual void RunIteration(const ::aos::input::driver_station::Data &data) {
+  virtual void RunIteration(const ::frc971::input::driver_station::Data &data) {
     bool last_auto_running = auto_running_;
     auto_running_ = data.GetControlBit(ControlBit::kAutonomous) &&
                     data.GetControlBit(ControlBit::kEnabled);
@@ -75,11 +74,11 @@
     action_queue_.Tick();
   }
 
-  void HandleDrivetrain(const ::aos::input::driver_station::Data &data) {
+  void HandleDrivetrain(const ::frc971::input::driver_station::Data &data) {
     drivetrain_input_reader_->HandleDrivetrain(data);
   }
 
-  void HandleTeleop(const ::aos::input::driver_station::Data &data) {
+  void HandleTeleop(const ::frc971::input::driver_station::Data &data) {
     if (!data.GetControlBit(ControlBit::kEnabled)) {
       action_queue_.CancelAllActions();
       AOS_LOG(DEBUG, "Canceling\n");