Removed Common
Change-Id: I01ea8f07220375c2ad9bc0092281d4f27c642303
diff --git a/frc971/analysis/logentry.py b/frc971/analysis/logentry.py
index 3069af0..0d703e3 100644
--- a/frc971/analysis/logentry.py
+++ b/frc971/analysis/logentry.py
@@ -268,7 +268,7 @@
print(line)
print(line.ParseStruct())
- line = ParseLine('claw(2263)(19404): DEBUG at 0000000820.00000s: ../../aos/common/controls/control_loop-tmpl.h: 104: position: .frc971.control_loops.ClawGroup.Position{top:.frc971.control_loops.HalfClawPosition{position:1.672153, front:.frc971.HallEffectStruct{current:f, posedge_count:0, negedge_count:52}, calibration:.frc971.HallEffectStruct{current:f, posedge_count:6, negedge_count:13}, back:.frc971.HallEffectStruct{current:f, posedge_count:0, negedge_count:62}, posedge_value:0.642681, negedge_value:0.922207}, bottom:.frc971.control_loops.HalfClawPosition{position:1.353539, front:.frc971.HallEffectStruct{current:f, posedge_count:2, negedge_count:150}, calibration:.frc971.HallEffectStruct{current:f, posedge_count:8, negedge_count:18}, back:.frc971.HallEffectStruct{current:f, posedge_count:0, negedge_count:6}, posedge_value:0.434514, negedge_value:0.759491}}')
+ line = ParseLine('claw(2263)(19404): DEBUG at 0000000820.00000s: ../../aos/controls/control_loop-tmpl.h: 104: position: .frc971.control_loops.ClawGroup.Position{top:.frc971.control_loops.HalfClawPosition{position:1.672153, front:.frc971.HallEffectStruct{current:f, posedge_count:0, negedge_count:52}, calibration:.frc971.HallEffectStruct{current:f, posedge_count:6, negedge_count:13}, back:.frc971.HallEffectStruct{current:f, posedge_count:0, negedge_count:62}, posedge_value:0.642681, negedge_value:0.922207}, bottom:.frc971.control_loops.HalfClawPosition{position:1.353539, front:.frc971.HallEffectStruct{current:f, posedge_count:2, negedge_count:150}, calibration:.frc971.HallEffectStruct{current:f, posedge_count:8, negedge_count:18}, back:.frc971.HallEffectStruct{current:f, posedge_count:0, negedge_count:6}, posedge_value:0.434514, negedge_value:0.759491}}')
print(line.ParseStruct())
line = ParseLine('joystick_proxy(2255)(39560): DEBUG at 0000000820.00730s: ../../aos/prime/input/joystick_input.cc: 61: sending: .aos.RobotState{joysticks:[.aos.Joystick{buttons:0, axis:[0.000000, 1.000000, 1.000000, 0.000000]}, .aos.Joystick{buttons:0, axis:[-0.401575, 1.000000, -1.007874, 0.000000]}, .aos.Joystick{buttons:0, axis:[0.007874, 0.000000, 1.000000, -1.007874]}, .aos.Joystick{buttons:0, axis:[0.000000, 0.000000, 0.000000, 0.000000]}], test_mode:f, fms_attached:f, enabled:T, autonomous:f, team_id:971, fake:f}')
diff --git a/frc971/autonomous/BUILD b/frc971/autonomous/BUILD
index 5fe1455..003ceb6 100644
--- a/frc971/autonomous/BUILD
+++ b/frc971/autonomous/BUILD
@@ -8,7 +8,7 @@
'auto.q',
],
deps = [
- '//aos/common/actions:action_queue',
+ '//aos/actions:action_queue',
],
)
@@ -22,9 +22,9 @@
],
deps = [
':auto_queue',
- '//aos/common/actions:action_lib',
- '//aos/common/util:phased_loop',
- '//aos/common/logging',
+ '//aos/actions:action_lib',
+ '//aos/util:phased_loop',
+ '//aos/logging',
'//frc971/control_loops/drivetrain:drivetrain_config',
'//frc971/control_loops/drivetrain:drivetrain_queue',
],
diff --git a/frc971/autonomous/auto.q b/frc971/autonomous/auto.q
index 1f639b1..b72688e 100644
--- a/frc971/autonomous/auto.q
+++ b/frc971/autonomous/auto.q
@@ -1,6 +1,6 @@
package frc971.autonomous;
-import "aos/common/actions/actions.q";
+import "aos/actions/actions.q";
message AutoControl {
// True if auto mode should be running, false otherwise.
diff --git a/frc971/autonomous/base_autonomous_actor.cc b/frc971/autonomous/base_autonomous_actor.cc
index 3363125..df558ab 100644
--- a/frc971/autonomous/base_autonomous_actor.cc
+++ b/frc971/autonomous/base_autonomous_actor.cc
@@ -5,8 +5,8 @@
#include <chrono>
#include <cmath>
-#include "aos/common/util/phased_loop.h"
-#include "aos/common/logging/logging.h"
+#include "aos/util/phased_loop.h"
+#include "aos/logging/logging.h"
#include "frc971/control_loops/drivetrain/drivetrain.q.h"
diff --git a/frc971/autonomous/base_autonomous_actor.h b/frc971/autonomous/base_autonomous_actor.h
index c8f6398..dd53a7d 100644
--- a/frc971/autonomous/base_autonomous_actor.h
+++ b/frc971/autonomous/base_autonomous_actor.h
@@ -3,8 +3,8 @@
#include <memory>
-#include "aos/common/actions/actions.h"
-#include "aos/common/actions/actor.h"
+#include "aos/actions/actions.h"
+#include "aos/actions/actor.h"
#include "frc971/autonomous/auto.q.h"
#include "frc971/control_loops/drivetrain/drivetrain.q.h"
#include "frc971/control_loops/drivetrain/drivetrain_config.h"
diff --git a/frc971/codelab/BUILD b/frc971/codelab/BUILD
index 2823200..252e01d 100644
--- a/frc971/codelab/BUILD
+++ b/frc971/codelab/BUILD
@@ -9,8 +9,8 @@
':basic_queue',
':basic',
'//aos/testing:googletest',
- '//aos/common:queues',
- '//aos/common/controls:control_loop_test',
+ '//aos:queues',
+ '//aos/controls:control_loop_test',
'//frc971/control_loops:state_feedback_loop',
'//frc971/control_loops:team_number_test_environment',
],
@@ -23,7 +23,7 @@
hdrs = ['basic.h'],
deps = [
':basic_queue',
- '//aos/common/controls:control_loop',
+ '//aos/controls:control_loop',
],
)
@@ -33,7 +33,7 @@
'basic.q',
],
deps = [
- '//aos/common/controls:control_loop_queues',
+ '//aos/controls:control_loop_queues',
'//frc971/control_loops:queues',
],
)
diff --git a/frc971/codelab/basic.h b/frc971/codelab/basic.h
index b67fdbd..0332168 100644
--- a/frc971/codelab/basic.h
+++ b/frc971/codelab/basic.h
@@ -1,8 +1,8 @@
#ifndef FRC971_CODELAB_BASIC_H_
#define FRC971_CODELAB_BASIC_H_
-#include "aos/common/controls/control_loop.h"
-#include "aos/common/time.h"
+#include "aos/controls/control_loop.h"
+#include "aos/time/time.h"
#include "frc971/codelab/basic.q.h"
diff --git a/frc971/codelab/basic.q b/frc971/codelab/basic.q
index 8183271..58fd69e 100644
--- a/frc971/codelab/basic.q
+++ b/frc971/codelab/basic.q
@@ -1,6 +1,6 @@
package frc971.codelab;
-import "aos/common/controls/control_loops.q";
+import "aos/controls/control_loops.q";
import "frc971/control_loops/control_loops.q";
// The theme of this basic test is a simple intake system.
diff --git a/frc971/codelab/basic_test.cc b/frc971/codelab/basic_test.cc
index 0acf9e7..0761cb2 100644
--- a/frc971/codelab/basic_test.cc
+++ b/frc971/codelab/basic_test.cc
@@ -5,8 +5,8 @@
#include <chrono>
#include <memory>
-#include "aos/common/controls/control_loop_test.h"
-#include "aos/common/queue.h"
+#include "aos/controls/control_loop_test.h"
+#include "aos/queue.h"
#include "frc971/codelab/basic.q.h"
#include "frc971/control_loops/team_number_test_environment.h"
#include "gtest/gtest.h"
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 {
diff --git a/frc971/wpilib/ADIS16448.cc b/frc971/wpilib/ADIS16448.cc
index 043d15f..9633626 100644
--- a/frc971/wpilib/ADIS16448.cc
+++ b/frc971/wpilib/ADIS16448.cc
@@ -7,9 +7,9 @@
#include <math.h>
#include <chrono>
-#include "aos/common/logging/queue_logging.h"
-#include "aos/common/messages/robot_state.q.h"
-#include "aos/common/time.h"
+#include "aos/logging/queue_logging.h"
+#include "aos/robot_state/robot_state.q.h"
+#include "aos/time/time.h"
#include "aos/linux_code/init.h"
#include "frc971/wpilib/imu.q.h"
#include "frc971/zeroing/averager.h"
diff --git a/frc971/wpilib/ADIS16448.h b/frc971/wpilib/ADIS16448.h
index 52090a1..0d5c93a 100644
--- a/frc971/wpilib/ADIS16448.h
+++ b/frc971/wpilib/ADIS16448.h
@@ -11,7 +11,7 @@
#include "DigitalOutput.h"
#undef ERROR
-#include "aos/common/logging/logging.h"
+#include "aos/logging/logging.h"
#include "frc971/wpilib/spi_rx_clearer.h"
namespace frc971 {
diff --git a/frc971/wpilib/BUILD b/frc971/wpilib/BUILD
index ae9d10a..61d19f3 100644
--- a/frc971/wpilib/BUILD
+++ b/frc971/wpilib/BUILD
@@ -21,8 +21,8 @@
deps = [
":dma",
":dma_edge_counting",
- "//aos/common:mutex",
- "//aos/common/logging",
+ "//aos/mutex:mutex",
+ "//aos/logging",
"//aos/linux_code:init",
"//third_party:wpilib",
],
@@ -39,7 +39,7 @@
restricted_to = ["//tools:roborio"],
deps = [
":dma",
- "//aos/common/logging",
+ "//aos/logging",
"//third_party:wpilib",
],
)
@@ -54,9 +54,9 @@
],
restricted_to = ["//tools:roborio"],
deps = [
- "//aos/common:stl_mutex",
- "//aos/common:time",
- "//aos/common/logging",
+ "//aos/stl_mutex:stl_mutex",
+ "//aos/time:time",
+ "//aos/logging",
"//aos/linux_code:init",
"//third_party:wpilib",
],
@@ -74,7 +74,7 @@
],
restricted_to = ["//tools:roborio"],
deps = [
- "//aos/common/logging",
+ "//aos/logging",
"//third_party:wpilib",
],
)
@@ -89,8 +89,8 @@
],
restricted_to = ["//tools:roborio"],
deps = [
- "//aos/common:time",
- "//aos/common/logging",
+ "//aos/time:time",
+ "//aos/logging",
"//third_party:wpilib",
],
)
@@ -106,11 +106,11 @@
restricted_to = ["//tools:roborio"],
deps = [
":gyro_interface",
- "//aos/common:time",
- "//aos/common/logging",
- "//aos/common/logging:queue_logging",
- "//aos/common/messages:robot_state",
- "//aos/common/util:phased_loop",
+ "//aos/time:time",
+ "//aos/logging",
+ "//aos/logging:queue_logging",
+ "//aos/robot_state:robot_state",
+ "//aos/util:phased_loop",
"//aos/linux_code:init",
"//frc971/queues:gyro",
"//frc971/zeroing:averager",
@@ -127,8 +127,8 @@
],
restricted_to = ["//tools:roborio"],
deps = [
- "//aos/common:mutex",
- "//aos/common:time",
+ "//aos/mutex:mutex",
+ "//aos/time:time",
"//frc971/queues:gyro",
"//third_party:wpilib",
],
@@ -143,10 +143,10 @@
"loop_output_handler.h",
],
deps = [
- "//aos/common:scoped_fd",
- "//aos/common:time",
- "//aos/common/messages:robot_state",
- "//aos/common/util:log_interval",
+ "//aos/scoped:scoped_fd",
+ "//aos/time:time",
+ "//aos/robot_state:robot_state",
+ "//aos/util:log_interval",
"//aos/linux_code:init",
],
)
@@ -161,9 +161,9 @@
],
restricted_to = ["//tools:roborio"],
deps = [
- "//aos/common/logging:queue_logging",
- "//aos/common/messages:robot_state",
- "//aos/common/network:team_number",
+ "//aos/logging:queue_logging",
+ "//aos/robot_state:robot_state",
+ "//aos/network:team_number",
"//aos/linux_code:init",
"//third_party:wpilib",
],
@@ -179,8 +179,8 @@
],
restricted_to = ["//tools:roborio"],
deps = [
- "//aos/common/logging:queue_logging",
- "//aos/common/messages:robot_state",
+ "//aos/logging:queue_logging",
+ "//aos/robot_state:robot_state",
"//third_party:wpilib",
],
)
@@ -203,8 +203,8 @@
restricted_to = ["//tools:roborio"],
deps = [
":pdp_values",
- "//aos/common/logging:queue_logging",
- "//aos/common/util:phased_loop",
+ "//aos/logging:queue_logging",
+ "//aos/util:phased_loop",
"//aos/linux_code:init",
"//third_party:wpilib",
],
@@ -240,10 +240,10 @@
deps = [
":imu_queue",
":spi_rx_clearer",
- "//aos/common:time",
- "//aos/common/logging",
- "//aos/common/logging:queue_logging",
- "//aos/common/messages:robot_state",
+ "//aos/time:time",
+ "//aos/logging",
+ "//aos/logging:queue_logging",
+ "//aos/robot_state:robot_state",
"//aos/linux_code:init",
"//frc971/zeroing:averager",
"//third_party:wpilib",
@@ -273,6 +273,6 @@
"spi_rx_clearer.h",
],
deps = [
- "//aos/common/logging",
+ "//aos/logging",
],
)
diff --git a/frc971/wpilib/LPD8806.h b/frc971/wpilib/LPD8806.h
index 84c4667..91915bf 100644
--- a/frc971/wpilib/LPD8806.h
+++ b/frc971/wpilib/LPD8806.h
@@ -4,7 +4,7 @@
#include <memory>
#include <atomic>
-#include "aos/common/mutex.h"
+#include "aos/mutex/mutex.h"
#include "SPI.h"
#undef ERROR
diff --git a/frc971/wpilib/buffered_pcm.cc b/frc971/wpilib/buffered_pcm.cc
index bd52079..9625073 100644
--- a/frc971/wpilib/buffered_pcm.cc
+++ b/frc971/wpilib/buffered_pcm.cc
@@ -5,7 +5,7 @@
#include <HAL/HAL.h>
#include <HAL/Ports.h>
#include <HAL/Solenoid.h>
-#include "aos/common/logging/logging.h"
+#include "aos/logging/logging.h"
namespace frc971 {
namespace wpilib {
diff --git a/frc971/wpilib/dma_edge_counting.cc b/frc971/wpilib/dma_edge_counting.cc
index 8ea3071..9fffebe 100644
--- a/frc971/wpilib/dma_edge_counting.cc
+++ b/frc971/wpilib/dma_edge_counting.cc
@@ -1,6 +1,6 @@
#include "frc971/wpilib/dma_edge_counting.h"
-#include "aos/common/logging/logging.h"
+#include "aos/logging/logging.h"
namespace frc971 {
namespace wpilib {
diff --git a/frc971/wpilib/dma_edge_counting.h b/frc971/wpilib/dma_edge_counting.h
index c8a00ea..779e78a 100644
--- a/frc971/wpilib/dma_edge_counting.h
+++ b/frc971/wpilib/dma_edge_counting.h
@@ -4,7 +4,7 @@
#include <memory>
#include <vector>
-#include "aos/common/macros.h"
+#include "aos/macros.h"
#include "frc971/wpilib/dma.h"
diff --git a/frc971/wpilib/encoder_and_potentiometer.cc b/frc971/wpilib/encoder_and_potentiometer.cc
index 1787c3f..cee54e5 100644
--- a/frc971/wpilib/encoder_and_potentiometer.cc
+++ b/frc971/wpilib/encoder_and_potentiometer.cc
@@ -1,7 +1,7 @@
#include "frc971/wpilib/encoder_and_potentiometer.h"
#include "aos/linux_code/init.h"
-#include "aos/common/logging/logging.h"
+#include "aos/logging/logging.h"
namespace frc971 {
namespace wpilib {
diff --git a/frc971/wpilib/encoder_and_potentiometer.h b/frc971/wpilib/encoder_and_potentiometer.h
index 3cce77d..ec45657 100644
--- a/frc971/wpilib/encoder_and_potentiometer.h
+++ b/frc971/wpilib/encoder_and_potentiometer.h
@@ -4,8 +4,8 @@
#include <atomic>
#include <thread>
-#include "aos/common/macros.h"
-#include "aos/common/mutex.h"
+#include "aos/macros.h"
+#include "aos/mutex/mutex.h"
#include "Encoder.h"
#include "DigitalSource.h"
diff --git a/frc971/wpilib/gyro_interface.cc b/frc971/wpilib/gyro_interface.cc
index 9b7bb8b..a892d6a 100644
--- a/frc971/wpilib/gyro_interface.cc
+++ b/frc971/wpilib/gyro_interface.cc
@@ -3,8 +3,8 @@
#include <inttypes.h>
#include <chrono>
-#include "aos/common/logging/logging.h"
-#include "aos/common/time.h"
+#include "aos/logging/logging.h"
+#include "aos/time/time.h"
#ifndef M_PI
#define M_PI 3.14159265358979323846
diff --git a/frc971/wpilib/gyro_sender.cc b/frc971/wpilib/gyro_sender.cc
index 5128110..c210038 100644
--- a/frc971/wpilib/gyro_sender.cc
+++ b/frc971/wpilib/gyro_sender.cc
@@ -7,11 +7,11 @@
#include <chrono>
-#include "aos/common/logging/logging.h"
-#include "aos/common/logging/queue_logging.h"
-#include "aos/common/util/phased_loop.h"
-#include "aos/common/messages/robot_state.q.h"
-#include "aos/common/time.h"
+#include "aos/logging/logging.h"
+#include "aos/logging/queue_logging.h"
+#include "aos/util/phased_loop.h"
+#include "aos/robot_state/robot_state.q.h"
+#include "aos/time/time.h"
#include "aos/linux_code/init.h"
#include "frc971/queues/gyro.q.h"
diff --git a/frc971/wpilib/interrupt_edge_counting.cc b/frc971/wpilib/interrupt_edge_counting.cc
index 3f81501..903296b 100644
--- a/frc971/wpilib/interrupt_edge_counting.cc
+++ b/frc971/wpilib/interrupt_edge_counting.cc
@@ -2,7 +2,7 @@
#include <chrono>
-#include "aos/common/time.h"
+#include "aos/time/time.h"
#include "aos/linux_code/init.h"
namespace frc971 {
diff --git a/frc971/wpilib/interrupt_edge_counting.h b/frc971/wpilib/interrupt_edge_counting.h
index 987e01d..e4eec35 100644
--- a/frc971/wpilib/interrupt_edge_counting.h
+++ b/frc971/wpilib/interrupt_edge_counting.h
@@ -6,8 +6,8 @@
#include <thread>
#include <vector>
-#include "aos/common/stl_mutex.h"
-#include "aos/common/macros.h"
+#include "aos/stl_mutex/stl_mutex.h"
+#include "aos/macros.h"
#include "DigitalInput.h"
#include "Encoder.h"
diff --git a/frc971/wpilib/joystick_sender.cc b/frc971/wpilib/joystick_sender.cc
index 741b49c..034b838 100644
--- a/frc971/wpilib/joystick_sender.cc
+++ b/frc971/wpilib/joystick_sender.cc
@@ -1,9 +1,9 @@
#include "frc971/wpilib/joystick_sender.h"
-#include "aos/common/messages/robot_state.q.h"
+#include "aos/robot_state/robot_state.q.h"
#include "aos/linux_code/init.h"
-#include "aos/common/network/team_number.h"
-#include "aos/common/logging/queue_logging.h"
+#include "aos/network/team_number.h"
+#include "aos/logging/queue_logging.h"
#include "DriverStation.h"
#if defined(WPILIB2017) || defined(WPILIB2018)
diff --git a/frc971/wpilib/loop_output_handler.cc b/frc971/wpilib/loop_output_handler.cc
index 59770be..dfe63d9 100644
--- a/frc971/wpilib/loop_output_handler.cc
+++ b/frc971/wpilib/loop_output_handler.cc
@@ -7,7 +7,7 @@
#include <thread>
#include "aos/linux_code/init.h"
-#include "aos/common/messages/robot_state.q.h"
+#include "aos/robot_state/robot_state.q.h"
namespace frc971 {
namespace wpilib {
diff --git a/frc971/wpilib/loop_output_handler.h b/frc971/wpilib/loop_output_handler.h
index 14a5cc5..27c96e7 100644
--- a/frc971/wpilib/loop_output_handler.h
+++ b/frc971/wpilib/loop_output_handler.h
@@ -4,9 +4,9 @@
#include <atomic>
#include <chrono>
-#include "aos/common/scoped_fd.h"
-#include "aos/common/time.h"
-#include "aos/common/util/log_interval.h"
+#include "aos/scoped/scoped_fd.h"
+#include "aos/time/time.h"
+#include "aos/util/log_interval.h"
namespace frc971 {
namespace wpilib {
diff --git a/frc971/wpilib/pdp_fetcher.cc b/frc971/wpilib/pdp_fetcher.cc
index 846de60..ae720e6 100644
--- a/frc971/wpilib/pdp_fetcher.cc
+++ b/frc971/wpilib/pdp_fetcher.cc
@@ -2,9 +2,9 @@
#include <chrono>
-#include "aos/common/logging/queue_logging.h"
+#include "aos/logging/queue_logging.h"
#include "aos/linux_code/init.h"
-#include "aos/common/util/phased_loop.h"
+#include "aos/util/phased_loop.h"
#include "frc971/wpilib/pdp_values.q.h"
namespace frc971 {
diff --git a/frc971/wpilib/spi_rx_clearer.cc b/frc971/wpilib/spi_rx_clearer.cc
index fda8d7c..dfe7e8b 100644
--- a/frc971/wpilib/spi_rx_clearer.cc
+++ b/frc971/wpilib/spi_rx_clearer.cc
@@ -5,7 +5,7 @@
#include <sys/mman.h>
#include <unistd.h>
-#include "aos/common/logging/logging.h"
+#include "aos/logging/logging.h"
namespace frc971 {
namespace wpilib {
diff --git a/frc971/wpilib/wpilib_interface.cc b/frc971/wpilib/wpilib_interface.cc
index c886907..8db81e1 100644
--- a/frc971/wpilib/wpilib_interface.cc
+++ b/frc971/wpilib/wpilib_interface.cc
@@ -1,7 +1,7 @@
#include "frc971/wpilib/wpilib_interface.h"
-#include "aos/common/messages/robot_state.q.h"
-#include "aos/common/logging/queue_logging.h"
+#include "aos/robot_state/robot_state.q.h"
+#include "aos/logging/queue_logging.h"
#include <HAL/HAL.h>
diff --git a/frc971/zeroing/BUILD b/frc971/zeroing/BUILD
index 96315c7..db5507b 100644
--- a/frc971/zeroing/BUILD
+++ b/frc971/zeroing/BUILD
@@ -43,8 +43,8 @@
],
deps = [
":zeroing",
- "//aos/common:die",
- "//aos/common/util:thread",
+ "//aos:die",
+ "//aos/util:thread",
"//aos/testing:googletest",
"//aos/testing:test_shm",
"//frc971/control_loops:position_sensor_sim",
diff --git a/frc971/zeroing/zeroing_test.cc b/frc971/zeroing/zeroing_test.cc
index 549b3ed..7948bf4 100644
--- a/frc971/zeroing/zeroing_test.cc
+++ b/frc971/zeroing/zeroing_test.cc
@@ -8,8 +8,8 @@
#include "frc971/zeroing/zeroing.h"
#include "frc971/control_loops/control_loops.q.h"
#include "aos/testing/test_shm.h"
-#include "aos/common/util/thread.h"
-#include "aos/common/die.h"
+#include "aos/util/thread.h"
+#include "aos/die.h"
#include "frc971/control_loops/position_sensor_sim.h"
namespace frc971 {