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/wpilib_interface.cc

diff --git a/y2014_bot3/wpilib_interface.cc b/y2014_bot3/wpilib_interface.cc
index ee5fc16..dedeab7 100644
--- a/y2014_bot3/wpilib_interface.cc
+++ b/y2014_bot3/wpilib_interface.cc
@@ -22,7 +22,6 @@
 #include "aos/init.h"
 #include "aos/logging/logging.h"
 #include "aos/make_unique.h"
-#include "aos/robot_state/robot_state_generated.h"
 #include "aos/stl_mutex/stl_mutex.h"
 #include "aos/time/time.h"
 #include "aos/util/log_interval.h"
@@ -30,6 +29,7 @@
 #include "aos/util/wrapping_counter.h"
 #include "frc971/control_loops/drivetrain/drivetrain_output_generated.h"
 #include "frc971/control_loops/drivetrain/drivetrain_position_generated.h"
+#include "frc971/input/robot_state_generated.h"
 #include "frc971/wpilib/buffered_pcm.h"
 #include "frc971/wpilib/buffered_solenoid.h"
 #include "frc971/wpilib/dma.h"
@@ -49,13 +49,13 @@
 #define M_PI 3.14159265358979323846
 #endif
 
+using aos::make_unique;
 using ::aos::util::SimpleLogInterval;
 using ::frc971::wpilib::BufferedPcm;
 using ::frc971::wpilib::BufferedSolenoid;
-using ::frc971::wpilib::LoopOutputHandler;
-using ::frc971::wpilib::JoystickSender;
 using ::frc971::wpilib::GyroSender;
-using aos::make_unique;
+using ::frc971::wpilib::JoystickSender;
+using ::frc971::wpilib::LoopOutputHandler;
 
 namespace y2014_bot3 {
 namespace wpilib {
@@ -231,8 +231,8 @@
 };
 
 // Writes out rollers voltages.
-class RollersWriter : public LoopOutputHandler<
-                          ::y2014_bot3::control_loops::rollers::Output> {
+class RollersWriter
+    : public LoopOutputHandler<::y2014_bot3::control_loops::rollers::Output> {
  public:
   RollersWriter(::aos::EventLoop *event_loop)
       : ::frc971::wpilib::LoopOutputHandler<
@@ -256,8 +256,8 @@
   }
 
  private:
-  virtual void Write(const ::y2014_bot3::control_loops::rollers::Output
-                         &output) override {
+  virtual void Write(
+      const ::y2014_bot3::control_loops::rollers::Output &output) override {
     rollers_front_left_intake_talon_->SetSpeed(output.front_intake_voltage() /
                                                12.0);
     rollers_front_right_intake_talon_->SetSpeed(