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

y2020/control_loops/superstructure/superstructure.h

diff --git a/y2020/control_loops/superstructure/superstructure.h b/y2020/control_loops/superstructure/superstructure.h
index af15be6..4777aef 100644
--- a/y2020/control_loops/superstructure/superstructure.h
+++ b/y2020/control_loops/superstructure/superstructure.h
@@ -3,8 +3,8 @@
 
 #include "aos/controls/control_loop.h"
 #include "aos/events/event_loop.h"
-#include "aos/robot_state/joystick_state_generated.h"
 #include "frc971/control_loops/drivetrain/drivetrain_status_generated.h"
+#include "frc971/input/joystick_state_generated.h"
 #include "y2020/constants.h"
 #include "y2020/control_loops/superstructure/climber.h"
 #include "y2020/control_loops/superstructure/shooter/shooter.h"

y2020/control_loops/superstructure/turret/aiming.h

diff --git a/y2020/control_loops/superstructure/turret/aiming.h b/y2020/control_loops/superstructure/turret/aiming.h
index 854518c..7f69d48 100644
--- a/y2020/control_loops/superstructure/turret/aiming.h
+++ b/y2020/control_loops/superstructure/turret/aiming.h
@@ -2,10 +2,10 @@
 #define y2020_CONTROL_LOOPS_SUPERSTRUCTURE_TURRET_AIMING_H_
 
 #include "aos/flatbuffers.h"
-#include "aos/robot_state/joystick_state_generated.h"
 #include "frc971/control_loops/drivetrain/drivetrain_status_generated.h"
 #include "frc971/control_loops/pose.h"
 #include "frc971/control_loops/profiled_subsystem_generated.h"
+#include "frc971/input/joystick_state_generated.h"
 #include "y2020/control_loops/superstructure/superstructure_status_generated.h"
 
 namespace y2020 {
@@ -66,7 +66,7 @@
   bool aiming_for_inner_port_ = false;
   // Distance of the shot to the virtual target, used for calculating hood
   // position and shooter speed.
-  double shot_distance_ = 0.0;    // meters
+  double shot_distance_ = 0.0;  // meters
   // Real-world distance to the target.
   double target_distance_ = 0.0;  // meters
 };