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

frc971/wpilib/joystick_sender.cc

diff --git a/frc971/wpilib/joystick_sender.cc b/frc971/wpilib/joystick_sender.cc
index a4634bf..5661933 100644
--- a/frc971/wpilib/joystick_sender.cc
+++ b/frc971/wpilib/joystick_sender.cc
@@ -1,11 +1,10 @@
 #include "frc971/wpilib/joystick_sender.h"
 
-#include "aos/input/driver_station_data.h"
 #include "aos/logging/logging.h"
 #include "aos/network/team_number.h"
 #include "aos/realtime.h"
-#include "aos/robot_state/joystick_state_generated.h"
-
+#include "frc971/input/driver_station_data.h"
+#include "frc971/input/joystick_state_generated.h"
 #include "frc971/wpilib/ahal/DriverStation.h"
 #include "hal/HAL.h"
 
@@ -35,15 +34,16 @@
         auto status = HAL_GetMatchInfo(&match_info);
 
         std::array<flatbuffers::Offset<Joystick>,
-                   aos::input::driver_station::JoystickFeature::kJoysticks>
+                   frc971::input::driver_station::JoystickFeature::kJoysticks>
             joysticks;
 
         for (size_t i = 0;
-             i < aos::input::driver_station::JoystickFeature::kJoysticks; ++i) {
-          std::array<double, aos::input::driver_station::JoystickAxis::kAxes>
+             i < frc971::input::driver_station::JoystickFeature::kJoysticks;
+             ++i) {
+          std::array<double, frc971::input::driver_station::JoystickAxis::kAxes>
               axis;
-          for (int j = 0; j < aos::input::driver_station::JoystickAxis::kAxes;
-               ++j) {
+          for (int j = 0;
+               j < frc971::input::driver_station::JoystickAxis::kAxes; ++j) {
             axis[j] = ds->GetStickAxis(i, j);
           }