Removed Common
Change-Id: I01ea8f07220375c2ad9bc0092281d4f27c642303
diff --git a/frc971/control_loops/BUILD b/frc971/control_loops/BUILD
index 12d3a4b..a25a2e8 100644
--- a/frc971/control_loops/BUILD
+++ b/frc971/control_loops/BUILD
@@ -13,7 +13,7 @@
"team_number_test_environment.h",
],
deps = [
- "//aos/common/network:team_number",
+ "//aos/network:team_number",
"//aos/testing:googletest",
],
)
@@ -57,7 +57,7 @@
deps = [
":position_sensor_sim",
":queues",
- "//aos/common/logging",
+ "//aos/logging",
"//aos/testing:googletest",
],
)
@@ -104,7 +104,7 @@
],
restricted_to = mcu_cpus,
deps = [
- "//aos/common/controls:polytope_uc",
+ "//aos/controls:polytope_uc",
"//third_party/eigen",
],
)
@@ -121,7 +121,7 @@
"-lm",
],
deps = [
- "//aos/common/controls:polytope",
+ "//aos/controls:polytope",
"//third_party/eigen",
],
)
@@ -135,7 +135,7 @@
],
restricted_to = mcu_cpus,
deps = [
- "//aos/common:macros",
+ "//aos:macros",
"//third_party/eigen",
],
)
@@ -149,8 +149,8 @@
"//tools:armhf-debian",
],
deps = [
- "//aos/common:macros",
- "//aos/common/logging",
+ "//aos:macros",
+ "//aos/logging",
"//third_party/eigen",
],
)
@@ -162,9 +162,9 @@
],
deps = [
":state_feedback_loop",
- "//aos/common:macros",
- "//aos/common/controls:control_loop",
- "//aos/common/logging",
+ "//aos:macros",
+ "//aos/controls:control_loop",
+ "//aos/logging",
"//third_party/eigen",
],
)
@@ -224,8 +224,8 @@
":profiled_subsystem_queue",
":simple_capped_state_feedback_loop",
":state_feedback_loop",
- "//aos/common/controls:control_loop",
- "//aos/common/util:trapezoid_profile",
+ "//aos/controls:control_loop",
+ "//aos/util:trapezoid_profile",
"//frc971/zeroing",
],
)
diff --git a/frc971/control_loops/coerce_goal.cc b/frc971/control_loops/coerce_goal.cc
index d98df09..311d882 100644
--- a/frc971/control_loops/coerce_goal.cc
+++ b/frc971/control_loops/coerce_goal.cc
@@ -2,7 +2,7 @@
#include "Eigen/Dense"
-#include "aos/common/controls/polytope.h"
+#include "aos/controls/polytope.h"
namespace frc971 {
namespace control_loops {
diff --git a/frc971/control_loops/coerce_goal.h b/frc971/control_loops/coerce_goal.h
index b1d5c3c..801135a 100644
--- a/frc971/control_loops/coerce_goal.h
+++ b/frc971/control_loops/coerce_goal.h
@@ -3,7 +3,7 @@
#include "Eigen/Dense"
-#include "aos/common/controls/polytope.h"
+#include "aos/controls/polytope.h"
namespace frc971 {
namespace control_loops {
diff --git a/frc971/control_loops/drivetrain/BUILD b/frc971/control_loops/drivetrain/BUILD
index 64d1d9d..16c6340 100644
--- a/frc971/control_loops/drivetrain/BUILD
+++ b/frc971/control_loops/drivetrain/BUILD
@@ -10,7 +10,7 @@
],
deps = [
":drivetrain_queue",
- "//aos/common/controls:replay_control_loop",
+ "//aos/controls:replay_control_loop",
"//aos/linux_code:init",
"//frc971/queues:gyro",
],
@@ -25,7 +25,7 @@
"//tools:armhf-debian",
],
deps = [
- "//aos/common/controls:control_loop_queues",
+ "//aos/controls:control_loop_queues",
"//frc971/control_loops:queues",
],
)
@@ -61,14 +61,14 @@
":drivetrain_config",
":drivetrain_queue",
":gear",
- "//aos/common:math",
- "//aos/common/controls:control_loop",
- "//aos/common/controls:polytope",
- "//aos/common/logging:matrix_logging",
- "//aos/common/logging:queue_logging",
- "//aos/common/messages:robot_state",
- "//aos/common/util:log_interval",
- "//aos/common/util:trapezoid_profile",
+ "//aos:math",
+ "//aos/controls:control_loop",
+ "//aos/controls:polytope",
+ "//aos/logging:matrix_logging",
+ "//aos/logging:queue_logging",
+ "//aos/robot_state:robot_state",
+ "//aos/util:log_interval",
+ "//aos/util:trapezoid_profile",
"//frc971:shifter_hall_effect",
"//frc971/control_loops:coerce_goal",
"//frc971/control_loops:state_feedback_loop",
@@ -87,12 +87,12 @@
":drivetrain_config",
":drivetrain_queue",
":gear",
- "//aos/common:math",
- "//aos/common/controls:polytope",
- "//aos/common/logging:matrix_logging",
- "//aos/common/logging:queue_logging",
- "//aos/common/messages:robot_state",
- "//aos/common/util:log_interval",
+ "//aos:math",
+ "//aos/controls:polytope",
+ "//aos/logging:matrix_logging",
+ "//aos/logging:queue_logging",
+ "//aos/robot_state:robot_state",
+ "//aos/util:log_interval",
"//frc971/control_loops:coerce_goal",
"//frc971/control_loops:state_feedback_loop",
],
@@ -124,8 +124,8 @@
deps = [
":drivetrain_config_uc",
":gear",
- "//aos/common:math",
- "//aos/common/controls:polytope_uc",
+ "//aos:math",
+ "//aos/controls:polytope_uc",
"//frc971/control_loops:coerce_goal_uc",
"//frc971/control_loops:state_feedback_loop_uc",
],
@@ -171,10 +171,10 @@
":gear",
":polydrivetrain",
":ssdrivetrain",
- "//aos/common/controls:control_loop",
- "//aos/common/logging:matrix_logging",
- "//aos/common/logging:queue_logging",
- "//aos/common/util:log_interval",
+ "//aos/controls:control_loop",
+ "//aos/logging:matrix_logging",
+ "//aos/logging:queue_logging",
+ "//aos/util:log_interval",
"//frc971/queues:gyro",
"//frc971/wpilib:imu_queue",
],
@@ -189,8 +189,8 @@
":drivetrain_config",
":drivetrain_lib",
":drivetrain_queue",
- "//aos/common:queues",
- "//aos/common/controls:control_loop_test",
+ "//aos:queues",
+ "//aos/controls:control_loop_test",
"//aos/testing:googletest",
"//frc971/control_loops:state_feedback_loop",
"//frc971/queues:gyro",
diff --git a/frc971/control_loops/drivetrain/drivetrain.cc b/frc971/control_loops/drivetrain/drivetrain.cc
index 14c1a42..a4401ea 100644
--- a/frc971/control_loops/drivetrain/drivetrain.cc
+++ b/frc971/control_loops/drivetrain/drivetrain.cc
@@ -6,9 +6,9 @@
#include <memory>
#include "Eigen/Dense"
-#include "aos/common/logging/logging.h"
-#include "aos/common/logging/queue_logging.h"
-#include "aos/common/logging/matrix_logging.h"
+#include "aos/logging/logging.h"
+#include "aos/logging/queue_logging.h"
+#include "aos/logging/matrix_logging.h"
#include "frc971/control_loops/drivetrain/drivetrain.q.h"
#include "frc971/control_loops/drivetrain/polydrivetrain.h"
diff --git a/frc971/control_loops/drivetrain/drivetrain.h b/frc971/control_loops/drivetrain/drivetrain.h
index 83e6c52..3f6c32f 100644
--- a/frc971/control_loops/drivetrain/drivetrain.h
+++ b/frc971/control_loops/drivetrain/drivetrain.h
@@ -3,9 +3,9 @@
#include "Eigen/Dense"
-#include "aos/common/controls/control_loop.h"
-#include "aos/common/controls/polytope.h"
-#include "aos/common/util/log_interval.h"
+#include "aos/controls/control_loop.h"
+#include "aos/controls/polytope.h"
+#include "aos/util/log_interval.h"
#include "frc971/control_loops/drivetrain/drivetrain.q.h"
#include "frc971/control_loops/drivetrain/drivetrain_config.h"
#include "frc971/control_loops/drivetrain/gear.h"
diff --git a/frc971/control_loops/drivetrain/drivetrain.q b/frc971/control_loops/drivetrain/drivetrain.q
index a1c60c0..ed659c3 100644
--- a/frc971/control_loops/drivetrain/drivetrain.q
+++ b/frc971/control_loops/drivetrain/drivetrain.q
@@ -1,6 +1,6 @@
package frc971.control_loops;
-import "aos/common/controls/control_loops.q";
+import "aos/controls/control_loops.q";
import "frc971/control_loops/control_loops.q";
// For logging information about what the code is doing with the shifters.
diff --git a/frc971/control_loops/drivetrain/drivetrain_lib_test.cc b/frc971/control_loops/drivetrain/drivetrain_lib_test.cc
index 06b4f21..1c11ae2 100644
--- a/frc971/control_loops/drivetrain/drivetrain_lib_test.cc
+++ b/frc971/control_loops/drivetrain/drivetrain_lib_test.cc
@@ -3,10 +3,10 @@
#include <chrono>
#include <memory>
-#include "aos/common/controls/control_loop_test.h"
-#include "aos/common/controls/polytope.h"
-#include "aos/common/network/team_number.h"
-#include "aos/common/time.h"
+#include "aos/controls/control_loop_test.h"
+#include "aos/controls/polytope.h"
+#include "aos/network/team_number.h"
+#include "aos/time/time.h"
#include "gtest/gtest.h"
#include "frc971/control_loops/coerce_goal.h"
diff --git a/frc971/control_loops/drivetrain/drivetrain_uc.q.h b/frc971/control_loops/drivetrain/drivetrain_uc.q.h
index e93af26..7fcdea1 100644
--- a/frc971/control_loops/drivetrain/drivetrain_uc.q.h
+++ b/frc971/control_loops/drivetrain/drivetrain_uc.q.h
@@ -1,7 +1,7 @@
#ifndef FRC971_CONTROL_LOOPS_DRIVETRAIN_DRIVETRAIN_Q_H_
#define FRC971_CONTROL_LOOPS_DRIVETRAIN_DRIVETRAIN_Q_H_
#include <array>
-#include "aos/common/macros.h"
+#include "aos/macros.h"
namespace frc971 {
namespace control_loops {
diff --git a/frc971/control_loops/drivetrain/polydrivetrain.cc b/frc971/control_loops/drivetrain/polydrivetrain.cc
index 266acd5..c213b06 100644
--- a/frc971/control_loops/drivetrain/polydrivetrain.cc
+++ b/frc971/control_loops/drivetrain/polydrivetrain.cc
@@ -1,7 +1,7 @@
#include "frc971/control_loops/drivetrain/polydrivetrain.h"
-#include "aos/common/commonmath.h"
-#include "aos/common/controls/polytope.h"
+#include "aos/commonmath.h"
+#include "aos/controls/polytope.h"
#include "frc971/control_loops/coerce_goal.h"
#ifdef __linux__
#include "frc971/control_loops/drivetrain/drivetrain.q.h"
diff --git a/frc971/control_loops/drivetrain/polydrivetrain.h b/frc971/control_loops/drivetrain/polydrivetrain.h
index b93c1de..c09c527 100644
--- a/frc971/control_loops/drivetrain/polydrivetrain.h
+++ b/frc971/control_loops/drivetrain/polydrivetrain.h
@@ -1,17 +1,17 @@
#ifndef FRC971_CONTROL_LOOPS_DRIVETRAIN_POLYDRIVETRAIN_H_
#define FRC971_CONTROL_LOOPS_DRIVETRAIN_POLYDRIVETRAIN_H_
-#include "aos/common/controls/polytope.h"
+#include "aos/controls/polytope.h"
-#include "aos/common/commonmath.h"
+#include "aos/commonmath.h"
#include "frc971/control_loops/coerce_goal.h"
#include "frc971/control_loops/drivetrain/gear.h"
#ifdef __linux__
#include "frc971/control_loops/drivetrain/drivetrain.q.h"
-#include "aos/common/logging/logging.h"
-#include "aos/common/logging/matrix_logging.h"
-#include "aos/common/logging/queue_logging.h"
-#include "aos/common/messages/robot_state.q.h"
+#include "aos/logging/logging.h"
+#include "aos/logging/matrix_logging.h"
+#include "aos/logging/queue_logging.h"
+#include "aos/robot_state/robot_state.q.h"
#else
#include "frc971/control_loops/drivetrain/drivetrain_uc.q.h"
#endif // __linux__
diff --git a/frc971/control_loops/drivetrain/replay_drivetrain.cc b/frc971/control_loops/drivetrain/replay_drivetrain.cc
index c535607..55e18ad 100644
--- a/frc971/control_loops/drivetrain/replay_drivetrain.cc
+++ b/frc971/control_loops/drivetrain/replay_drivetrain.cc
@@ -1,4 +1,4 @@
-#include "aos/common/controls/replay_control_loop.h"
+#include "aos/controls/replay_control_loop.h"
#include "aos/linux_code/init.h"
#include "frc971/control_loops/drivetrain/drivetrain.q.h"
diff --git a/frc971/control_loops/drivetrain/ssdrivetrain.cc b/frc971/control_loops/drivetrain/ssdrivetrain.cc
index ad86b1f..925256b 100644
--- a/frc971/control_loops/drivetrain/ssdrivetrain.cc
+++ b/frc971/control_loops/drivetrain/ssdrivetrain.cc
@@ -1,8 +1,8 @@
#include "frc971/control_loops/drivetrain/ssdrivetrain.h"
-#include "aos/common/commonmath.h"
-#include "aos/common/controls/polytope.h"
-#include "aos/common/logging/matrix_logging.h"
+#include "aos/commonmath.h"
+#include "aos/controls/polytope.h"
+#include "aos/logging/matrix_logging.h"
#include "frc971/control_loops/coerce_goal.h"
#include "frc971/control_loops/drivetrain/drivetrain.q.h"
diff --git a/frc971/control_loops/drivetrain/ssdrivetrain.h b/frc971/control_loops/drivetrain/ssdrivetrain.h
index 5e261e9..ee8d145 100644
--- a/frc971/control_loops/drivetrain/ssdrivetrain.h
+++ b/frc971/control_loops/drivetrain/ssdrivetrain.h
@@ -1,11 +1,11 @@
#ifndef FRC971_CONTROL_LOOPS_DRIVETRAIN_SSDRIVETRAIN_H_
#define FRC971_CONTROL_LOOPS_DRIVETRAIN_SSDRIVETRAIN_H_
-#include "aos/common/commonmath.h"
-#include "aos/common/controls/control_loop.h"
-#include "aos/common/controls/polytope.h"
-#include "aos/common/logging/matrix_logging.h"
-#include "aos/common/util/trapezoid_profile.h"
+#include "aos/commonmath.h"
+#include "aos/controls/control_loop.h"
+#include "aos/controls/polytope.h"
+#include "aos/logging/matrix_logging.h"
+#include "aos/util/trapezoid_profile.h"
#include "frc971/control_loops/state_feedback_loop.h"
#include "frc971/control_loops/coerce_goal.h"
diff --git a/frc971/control_loops/hybrid_state_feedback_loop.h b/frc971/control_loops/hybrid_state_feedback_loop.h
index 971f0b8..0fb803f 100644
--- a/frc971/control_loops/hybrid_state_feedback_loop.h
+++ b/frc971/control_loops/hybrid_state_feedback_loop.h
@@ -12,9 +12,9 @@
#include "Eigen/Dense"
#include "unsupported/Eigen/MatrixFunctions"
-#include "aos/common/controls/control_loop.h"
-#include "aos/common/logging/logging.h"
-#include "aos/common/macros.h"
+#include "aos/controls/control_loop.h"
+#include "aos/logging/logging.h"
+#include "aos/macros.h"
#include "frc971/control_loops/state_feedback_loop.h"
template <int number_of_states, int number_of_inputs, int number_of_outputs,
diff --git a/frc971/control_loops/position_sensor_sim_test.cc b/frc971/control_loops/position_sensor_sim_test.cc
index 0f09f7f..e68feee 100644
--- a/frc971/control_loops/position_sensor_sim_test.cc
+++ b/frc971/control_loops/position_sensor_sim_test.cc
@@ -7,7 +7,7 @@
#include "gtest/gtest.h"
#include "frc971/control_loops/control_loops.q.h"
#include "frc971/control_loops/position_sensor_sim.h"
-#include "aos/common/die.h"
+#include "aos/die.h"
namespace frc971 {
namespace control_loops {
diff --git a/frc971/control_loops/profiled_subsystem.h b/frc971/control_loops/profiled_subsystem.h
index fe64b75..d98b5c9 100644
--- a/frc971/control_loops/profiled_subsystem.h
+++ b/frc971/control_loops/profiled_subsystem.h
@@ -8,8 +8,8 @@
#include "Eigen/Dense"
-#include "aos/common/controls/control_loop.h"
-#include "aos/common/util/trapezoid_profile.h"
+#include "aos/controls/control_loop.h"
+#include "aos/util/trapezoid_profile.h"
#include "frc971/control_loops/control_loops.q.h"
#include "frc971/control_loops/profiled_subsystem.q.h"
#include "frc971/control_loops/simple_capped_state_feedback_loop.h"
diff --git a/frc971/control_loops/state_feedback_loop.h b/frc971/control_loops/state_feedback_loop.h
index fe224cc..dd581bf 100644
--- a/frc971/control_loops/state_feedback_loop.h
+++ b/frc971/control_loops/state_feedback_loop.h
@@ -13,9 +13,9 @@
#include "unsupported/Eigen/MatrixFunctions"
#if defined(__linux__)
-#include "aos/common/logging/logging.h"
+#include "aos/logging/logging.h"
#endif
-#include "aos/common/macros.h"
+#include "aos/macros.h"
template <int number_of_states, int number_of_inputs, int number_of_outputs,
typename PlantType, typename ObserverType, typename Scalar>
diff --git a/frc971/control_loops/team_number_test_environment.cc b/frc971/control_loops/team_number_test_environment.cc
index 624a119..a8f4ca7 100644
--- a/frc971/control_loops/team_number_test_environment.cc
+++ b/frc971/control_loops/team_number_test_environment.cc
@@ -1,6 +1,6 @@
#include "frc971/control_loops/team_number_test_environment.h"
-#include "aos/common/network/team_number.h"
+#include "aos/network/team_number.h"
namespace frc971 {
namespace control_loops {
diff --git a/frc971/control_loops/voltage_cap/voltage_cap_test.cc b/frc971/control_loops/voltage_cap/voltage_cap_test.cc
index 23e2f34..9ef4036 100644
--- a/frc971/control_loops/voltage_cap/voltage_cap_test.cc
+++ b/frc971/control_loops/voltage_cap/voltage_cap_test.cc
@@ -4,7 +4,7 @@
#include "gtest/gtest.h"
-#include "aos/common/queue.h"
+#include "aos/queue.h"
#include "aos/testing/test_shm.h"
namespace frc971 {
diff --git a/frc971/control_loops/zeroed_joint.h b/frc971/control_loops/zeroed_joint.h
index fcfd29f..75d0b56 100644
--- a/frc971/control_loops/zeroed_joint.h
+++ b/frc971/control_loops/zeroed_joint.h
@@ -3,7 +3,7 @@
#include <memory>
-#include "aos/common/controls/control_loop.h"
+#include "aos/controls/control_loop.h"
#include "frc971/control_loops/state_feedback_loop.h"
namespace frc971 {