Move aos/input and aos/robot_state to frc971/input
Neither folder makes any sense as part of aos/.
Change-Id: I10e0532da4e688c18a9354012b783c43566fd2a1
diff --git a/y2021_bot3/BUILD b/y2021_bot3/BUILD
index 4e226c0..9429be4 100644
--- a/y2021_bot3/BUILD
+++ b/y2021_bot3/BUILD
@@ -51,7 +51,7 @@
"//aos/controls:control_loop",
"//aos/events:shm_event_loop",
"//aos/logging",
- "//aos/robot_state:robot_state_fbs",
+ "//frc971/input:robot_state_fbs",
"//aos/stl_mutex",
"//aos/time",
"//aos/util:log_interval",
@@ -87,9 +87,9 @@
deps = [
"//aos:init",
"//aos/actions:action_lib",
- "//aos/input:action_joystick_input",
- "//aos/input:drivetrain_input",
- "//aos/input:joystick_input",
+ "//frc971/input:action_joystick_input",
+ "//frc971/input:drivetrain_input",
+ "//frc971/input:joystick_input",
"//aos/logging",
"//frc971/autonomous:auto_fbs",
"//frc971/autonomous:base_autonomous_actor",
@@ -111,7 +111,7 @@
],
visibility = ["//visibility:public"],
deps = [
- "//aos/robot_state:config",
+ "//frc971/input:config",
"//frc971/autonomous:config",
"//frc971/control_loops/drivetrain:config",
"//frc971/wpilib:config",
diff --git a/y2021_bot3/joystick_reader.cc b/y2021_bot3/joystick_reader.cc
index accb031..88d16b2 100644
--- a/y2021_bot3/joystick_reader.cc
+++ b/y2021_bot3/joystick_reader.cc
@@ -5,22 +5,22 @@
#include "aos/actions/actions.h"
#include "aos/init.h"
-#include "aos/input/action_joystick_input.h"
-#include "aos/input/driver_station_data.h"
-#include "aos/input/drivetrain_input.h"
-#include "aos/input/joystick_input.h"
#include "aos/logging/logging.h"
#include "aos/network/team_number.h"
#include "aos/util/log_interval.h"
#include "frc971/autonomous/base_autonomous_actor.h"
+#include "frc971/input/action_joystick_input.h"
+#include "frc971/input/driver_station_data.h"
+#include "frc971/input/drivetrain_input.h"
+#include "frc971/input/joystick_input.h"
#include "y2021_bot3/control_loops/drivetrain/drivetrain_base.h"
#include "y2021_bot3/control_loops/superstructure/superstructure_goal_generated.h"
#include "y2021_bot3/control_loops/superstructure/superstructure_status_generated.h"
-using aos::input::driver_station::ButtonLocation;
-using aos::input::driver_station::ControlBit;
-using aos::input::driver_station::JoystickAxis;
-using aos::input::driver_station::POVLocation;
+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 y2021_bot3 {
namespace input {
@@ -28,13 +28,13 @@
namespace superstructure = y2021_bot3::control_loops::superstructure;
-class Reader : public ::aos::input::ActionJoystickInput {
+class Reader : public ::frc971::input::ActionJoystickInput {
public:
Reader(::aos::EventLoop *event_loop)
- : ::aos::input::ActionJoystickInput(
+ : ::frc971::input::ActionJoystickInput(
event_loop,
::y2021_bot3::control_loops::drivetrain::GetDrivetrainConfig(),
- ::aos::input::DrivetrainInputReader::InputType::kPistol, {}),
+ ::frc971::input::DrivetrainInputReader::InputType::kPistol, {}),
superstructure_goal_sender_(
event_loop->MakeSender<superstructure::Goal>("/superstructure")),
superstructure_status_fetcher_(
@@ -44,7 +44,7 @@
void AutoEnded() override { AOS_LOG(INFO, "Auto ended.\n"); }
void HandleTeleop(
- const ::aos::input::driver_station::Data & /*data*/) override {
+ const ::frc971::input::driver_station::Data & /*data*/) override {
superstructure_status_fetcher_.Fetch();
if (!superstructure_status_fetcher_.get()) {
AOS_LOG(ERROR, "Got no superstructure status message.\n");
diff --git a/y2021_bot3/wpilib_interface.cc b/y2021_bot3/wpilib_interface.cc
index 3dfcfb7..4e07842 100644
--- a/y2021_bot3/wpilib_interface.cc
+++ b/y2021_bot3/wpilib_interface.cc
@@ -27,7 +27,6 @@
#include "aos/logging/logging.h"
#include "aos/make_unique.h"
#include "aos/realtime.h"
-#include "aos/robot_state/robot_state_generated.h"
#include "aos/time/time.h"
#include "aos/util/log_interval.h"
#include "aos/util/phased_loop.h"
@@ -35,6 +34,7 @@
#include "ctre/phoenix/motorcontrol/can/TalonSRX.h"
#include "frc971/autonomous/auto_mode_generated.h"
#include "frc971/control_loops/drivetrain/drivetrain_position_generated.h"
+#include "frc971/input/robot_state_generated.h"
#include "frc971/wpilib/ADIS16448.h"
#include "frc971/wpilib/buffered_pcm.h"
#include "frc971/wpilib/buffered_solenoid.h"
diff --git a/y2021_bot3/y2021_bot3.json b/y2021_bot3/y2021_bot3.json
index d96ca09..e9b7faf 100644
--- a/y2021_bot3/y2021_bot3.json
+++ b/y2021_bot3/y2021_bot3.json
@@ -31,7 +31,7 @@
}
],
"imports": [
- "../aos/robot_state/robot_state_config.json",
+ "../frc971/input/robot_state_config.json",
"../frc971/control_loops/drivetrain/drivetrain_config.json",
"../frc971/autonomous/autonomous_config.json",
"../frc971/wpilib/wpilib_config.json"