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

y2012/joystick_reader.cc

diff --git a/y2012/joystick_reader.cc b/y2012/joystick_reader.cc
index e723fa4..50052c7 100644
--- a/y2012/joystick_reader.cc
+++ b/y2012/joystick_reader.cc
@@ -1,22 +1,21 @@
+#include <math.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <math.h>
 
 #include "aos/actions/actions.h"
 #include "aos/events/shm_event_loop.h"
 #include "aos/init.h"
-#include "aos/input/driver_station_data.h"
-#include "aos/input/joystick_input.h"
 #include "aos/logging/logging.h"
 #include "aos/time/time.h"
-
 #include "frc971/control_loops/drivetrain/drivetrain_goal_generated.h"
+#include "frc971/input/driver_station_data.h"
+#include "frc971/input/joystick_input.h"
 #include "y2012/control_loops/accessories/accessories_generated.h"
 
-using ::aos::input::driver_station::ButtonLocation;
-using ::aos::input::driver_station::JoystickAxis;
-using ::aos::input::driver_station::ControlBit;
+using ::frc971::input::driver_station::ButtonLocation;
+using ::frc971::input::driver_station::ControlBit;
+using ::frc971::input::driver_station::JoystickAxis;
 
 #define OLD_DS 0
 
@@ -76,10 +75,10 @@
 const JoystickAxis kAdjustClawGoal(3, 2);
 const JoystickAxis kAdjustClawSeparation(3, 1);
 
-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),
         drivetrain_goal_sender_(
             event_loop->MakeSender<::frc971::control_loops::drivetrain::Goal>(
                 "/drivetrain")),
@@ -89,14 +88,15 @@
                     "/accessories")),
         is_high_gear_(false) {}
 
-  void RunIteration(const ::aos::input::driver_station::Data &data) override {
+  void RunIteration(
+      const ::frc971::input::driver_station::Data &data) override {
     if (!data.GetControlBit(ControlBit::kAutonomous)) {
       HandleDrivetrain(data);
       HandleTeleop(data);
     }
   }
 
-  void HandleDrivetrain(const ::aos::input::driver_station::Data &data) {
+  void HandleDrivetrain(const ::frc971::input::driver_station::Data &data) {
     const double wheel = -data.GetAxis(kSteeringWheel);
     const double throttle = -data.GetAxis(kDriveThrottle);
     if (data.PosEdge(kShiftLow)) {
@@ -118,16 +118,17 @@
     }
   }
 
-  void HandleTeleop(const ::aos::input::driver_station::Data &data) {
+  void HandleTeleop(const ::frc971::input::driver_station::Data &data) {
     auto builder = accessories_goal_sender_.MakeBuilder();
     flatbuffers::Offset<flatbuffers::Vector<uint8_t>> solenoids_offset =
         builder.fbb()->CreateVector<uint8_t>({data.IsPressed(kLongShot),
-                                     data.IsPressed(kCloseShot),
-                                     data.IsPressed(kFenderShot)});
+                                              data.IsPressed(kCloseShot),
+                                              data.IsPressed(kFenderShot)});
 
     flatbuffers::Offset<flatbuffers::Vector<double>> sticks_offset =
-        builder.fbb()->CreateVector<double>({data.GetAxis(kAdjustClawGoal),
-                                     data.GetAxis(kAdjustClawSeparation)});
+        builder.fbb()->CreateVector<double>(
+            {data.GetAxis(kAdjustClawGoal),
+             data.GetAxis(kAdjustClawSeparation)});
 
     y2012::control_loops::accessories::Message::Builder message_builder =
         builder.MakeBuilder<y2012::control_loops::accessories::Message>();