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/frc971/wpilib/BUILD b/frc971/wpilib/BUILD
index 00896bb..4f8bca0 100644
--- a/frc971/wpilib/BUILD
+++ b/frc971/wpilib/BUILD
@@ -115,7 +115,7 @@
"//aos/events:event_loop",
"//aos/events:shm_event_loop",
"//aos/logging",
- "//aos/robot_state:robot_state_fbs",
+ "//frc971/input:robot_state_fbs",
"//aos/time",
"//aos/util:phased_loop",
"//frc971/queues:gyro_fbs",
@@ -167,7 +167,7 @@
deps = [
"//aos:init",
"//aos/events:event_loop",
- "//aos/robot_state:robot_state_fbs",
+ "//frc971/input:robot_state_fbs",
"//aos/scoped:scoped_fd",
"//aos/time",
"//aos/util:log_interval",
@@ -204,9 +204,9 @@
deps = [
"//aos:init",
"//aos/events:shm_event_loop",
- "//aos/input:driver_station_data",
+ "//frc971/input:driver_station_data",
"//aos/network:team_number",
- "//aos/robot_state:joystick_state_fbs",
+ "//frc971/input:joystick_state_fbs",
"//third_party:wpilib",
],
)
@@ -222,7 +222,7 @@
target_compatible_with = ["//tools/platforms/hardware:roborio"],
deps = [
"//aos/events:event_loop",
- "//aos/robot_state:robot_state_fbs",
+ "//frc971/input:robot_state_fbs",
"//third_party:wpilib",
],
)
diff --git a/frc971/wpilib/gyro_sender.cc b/frc971/wpilib/gyro_sender.cc
index 2bdcc76..3061c3b 100644
--- a/frc971/wpilib/gyro_sender.cc
+++ b/frc971/wpilib/gyro_sender.cc
@@ -10,9 +10,8 @@
#include "aos/events/shm_event_loop.h"
#include "aos/init.h"
#include "aos/logging/logging.h"
-#include "aos/robot_state/robot_state_generated.h"
#include "aos/time/time.h"
-
+#include "frc971/input/robot_state_generated.h"
#include "frc971/queues/gyro_generated.h"
#include "frc971/queues/gyro_uid_generated.h"
#include "frc971/zeroing/averager.h"
@@ -31,9 +30,9 @@
gyro_reading_sender_(
event_loop_->MakeSender<frc971::sensors::GyroReading>(
"/drivetrain")) {
- AOS_PCHECK(
- system("busybox ps -ef | grep '\\[spi0\\]' | awk '{print $1}' | xargs chrt -f -p "
- "33") == 0);
+ AOS_PCHECK(system("busybox ps -ef | grep '\\[spi0\\]' | awk '{print $1}' | "
+ "xargs chrt -f -p "
+ "33") == 0);
event_loop->set_name("Gyro");
event_loop_->SetRuntimeRealtimePriority(33);
diff --git a/frc971/wpilib/gyro_sender.h b/frc971/wpilib/gyro_sender.h
index a0048fb..91257c9 100644
--- a/frc971/wpilib/gyro_sender.h
+++ b/frc971/wpilib/gyro_sender.h
@@ -7,7 +7,7 @@
#include "aos/events/event_loop.h"
#include "aos/events/shm_event_loop.h"
-#include "aos/robot_state/robot_state_generated.h"
+#include "frc971/input/robot_state_generated.h"
#include "frc971/queues/gyro_generated.h"
#include "frc971/queues/gyro_uid_generated.h"
#include "frc971/wpilib/gyro_interface.h"
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);
}
diff --git a/frc971/wpilib/joystick_sender.h b/frc971/wpilib/joystick_sender.h
index 6622d85..c9eb4cd 100644
--- a/frc971/wpilib/joystick_sender.h
+++ b/frc971/wpilib/joystick_sender.h
@@ -4,7 +4,7 @@
#include <atomic>
#include "aos/events/shm_event_loop.h"
-#include "aos/robot_state/joystick_state_generated.h"
+#include "frc971/input/joystick_state_generated.h"
namespace frc971 {
namespace wpilib {
diff --git a/frc971/wpilib/sensor_reader.h b/frc971/wpilib/sensor_reader.h
index 39b83fa..8efdf75 100644
--- a/frc971/wpilib/sensor_reader.h
+++ b/frc971/wpilib/sensor_reader.h
@@ -6,10 +6,10 @@
#include "aos/events/event_loop.h"
#include "aos/events/shm_event_loop.h"
-#include "aos/robot_state/robot_state_generated.h"
#include "aos/stl_mutex/stl_mutex.h"
#include "aos/time/time.h"
#include "frc971/control_loops/control_loops_generated.h"
+#include "frc971/input/robot_state_generated.h"
#include "frc971/wpilib/ahal/DigitalGlitchFilter.h"
#include "frc971/wpilib/ahal/DigitalInput.h"
#include "frc971/wpilib/ahal/DriverStation.h"
diff --git a/frc971/wpilib/wpilib_interface.cc b/frc971/wpilib/wpilib_interface.cc
index 8772af1..2a59019 100644
--- a/frc971/wpilib/wpilib_interface.cc
+++ b/frc971/wpilib/wpilib_interface.cc
@@ -2,8 +2,7 @@
#include "aos/events/event_loop.h"
#include "aos/logging/logging.h"
-#include "aos/robot_state/robot_state_generated.h"
-
+#include "frc971/input/robot_state_generated.h"
#include "hal/HAL.h"
namespace frc971 {
diff --git a/frc971/wpilib/wpilib_interface.h b/frc971/wpilib/wpilib_interface.h
index 104ab84..8ab92ef 100644
--- a/frc971/wpilib/wpilib_interface.h
+++ b/frc971/wpilib/wpilib_interface.h
@@ -4,7 +4,7 @@
#include <stdint.h>
#include "aos/events/event_loop.h"
-#include "aos/robot_state/robot_state_generated.h"
+#include "frc971/input/robot_state_generated.h"
namespace frc971 {
namespace wpilib {