Removed Common
Change-Id: I01ea8f07220375c2ad9bc0092281d4f27c642303
diff --git a/y2014/BUILD b/y2014/BUILD
index a57bb72..61a3c4f 100644
--- a/y2014/BUILD
+++ b/y2014/BUILD
@@ -11,9 +11,9 @@
visibility = ["//visibility:public"],
deps = [
"//aos:once",
- "//aos/common:mutex",
- "//aos/common/logging",
- "//aos/common/network:team_number",
+ "//aos/mutex:mutex",
+ "//aos/logging",
+ "//aos/network:team_number",
"//frc971:shifter_hall_effect",
"//frc971/control_loops:state_feedback_loop",
"//y2014/control_loops/drivetrain:polydrivetrain_plants",
@@ -27,10 +27,10 @@
],
deps = [
":constants",
- "//aos/common:time",
- "//aos/common/actions:action_lib",
- "//aos/common/logging",
- "//aos/common/util:log_interval",
+ "//aos/time:time",
+ "//aos/actions:action_lib",
+ "//aos/logging",
+ "//aos/util:log_interval",
"//aos/input:joystick_input",
"//aos/linux_code:init",
"//frc971/autonomous:auto_queue",
@@ -67,9 +67,9 @@
"hot_goal_reader.cc",
],
deps = [
- "//aos/common:time",
- "//aos/common/logging",
- "//aos/common/logging:queue_logging",
+ "//aos/time:time",
+ "//aos/logging",
+ "//aos/logging:queue_logging",
"//aos/linux_code:init",
"//y2014/queues:hot_goal",
],
@@ -83,15 +83,15 @@
restricted_to = ["//tools:roborio"],
deps = [
":constants",
- "//aos/common:stl_mutex",
- "//aos/common:time",
- "//aos/common/controls:control_loop",
- "//aos/common/logging",
- "//aos/common/logging:queue_logging",
- "//aos/common/messages:robot_state",
- "//aos/common/util:log_interval",
- "//aos/common/util:phased_loop",
- "//aos/common/util:wrapping_counter",
+ "//aos/stl_mutex:stl_mutex",
+ "//aos/time:time",
+ "//aos/controls:control_loop",
+ "//aos/logging",
+ "//aos/logging:queue_logging",
+ "//aos/robot_state:robot_state",
+ "//aos/util:log_interval",
+ "//aos/util:phased_loop",
+ "//aos/util:wrapping_counter",
"//aos/linux_code:init",
"//frc971/control_loops:queues",
"//frc971/control_loops/drivetrain:drivetrain_queue",
diff --git a/y2014/actors/BUILD b/y2014/actors/BUILD
index eb9e0f9..37de2c9 100644
--- a/y2014/actors/BUILD
+++ b/y2014/actors/BUILD
@@ -16,7 +16,7 @@
'shoot_action.q',
],
deps = [
- '//aos/common/actions:action_queue',
+ '//aos/actions:action_queue',
],
)
@@ -30,9 +30,9 @@
],
deps = [
':shoot_action_queue',
- '//aos/common/actions:action_lib',
+ '//aos/actions:action_lib',
'//y2014/queues:profile_params',
- '//aos/common/logging',
+ '//aos/logging',
'//y2014/control_loops/shooter:shooter_queue',
'//y2014/control_loops/claw:claw_queue',
'//frc971/control_loops/drivetrain:drivetrain_queue',
@@ -58,7 +58,7 @@
'drivetrain_action.q',
],
deps = [
- '//aos/common/actions:action_queue',
+ '//aos/actions:action_queue',
],
)
@@ -73,14 +73,14 @@
deps = [
':drivetrain_action_queue',
'//y2014:constants',
- '//aos/common:time',
- '//aos/common:math',
- '//aos/common/util:phased_loop',
- '//aos/common/logging',
- '//aos/common/actions:action_lib',
- '//aos/common/logging:queue_logging',
+ '//aos/time:time',
+ '//aos:math',
+ '//aos/util:phased_loop',
+ '//aos/logging',
+ '//aos/actions:action_lib',
+ '//aos/logging:queue_logging',
'//third_party/eigen',
- '//aos/common/util:trapezoid_profile',
+ '//aos/util:trapezoid_profile',
'//frc971/control_loops/drivetrain:drivetrain_queue',
'//frc971/control_loops:state_feedback_loop',
],
diff --git a/y2014/actors/drivetrain_action.q b/y2014/actors/drivetrain_action.q
index 2f3eb15..458a3e5 100644
--- a/y2014/actors/drivetrain_action.q
+++ b/y2014/actors/drivetrain_action.q
@@ -1,6 +1,6 @@
package y2014.actors;
-import "aos/common/actions/actions.q";
+import "aos/actions/actions.q";
// Parameters to send with start.
struct DrivetrainActionParams {
diff --git a/y2014/actors/drivetrain_actor.cc b/y2014/actors/drivetrain_actor.cc
index 418b591..6aec414 100644
--- a/y2014/actors/drivetrain_actor.cc
+++ b/y2014/actors/drivetrain_actor.cc
@@ -5,11 +5,11 @@
#include <Eigen/Dense>
-#include "aos/common/util/phased_loop.h"
-#include "aos/common/logging/logging.h"
-#include "aos/common/util/trapezoid_profile.h"
-#include "aos/common/commonmath.h"
-#include "aos/common/time.h"
+#include "aos/util/phased_loop.h"
+#include "aos/logging/logging.h"
+#include "aos/util/trapezoid_profile.h"
+#include "aos/commonmath.h"
+#include "aos/time/time.h"
#include "frc971/control_loops/drivetrain/drivetrain.q.h"
#include "y2014/actors/drivetrain_actor.h"
diff --git a/y2014/actors/drivetrain_actor.h b/y2014/actors/drivetrain_actor.h
index 2a9e307..454a41e 100644
--- a/y2014/actors/drivetrain_actor.h
+++ b/y2014/actors/drivetrain_actor.h
@@ -3,8 +3,8 @@
#include <memory>
-#include "aos/common/actions/actor.h"
-#include "aos/common/actions/actions.h"
+#include "aos/actions/actor.h"
+#include "aos/actions/actions.h"
#include "frc971/control_loops/state_feedback_loop.h"
#include "y2014/actors/drivetrain_action.q.h"
diff --git a/y2014/actors/shoot_action.q b/y2014/actors/shoot_action.q
index 9c56e99..ccf6dcf 100644
--- a/y2014/actors/shoot_action.q
+++ b/y2014/actors/shoot_action.q
@@ -1,6 +1,6 @@
package y2014.actors;
-import "aos/common/actions/actions.q";
+import "aos/actions/actions.q";
queue_group ShootActionQueueGroup {
implements frc971.actions.ActionQueueGroup;
diff --git a/y2014/actors/shoot_actor.cc b/y2014/actors/shoot_actor.cc
index 743a4c3..ca5168f 100644
--- a/y2014/actors/shoot_actor.cc
+++ b/y2014/actors/shoot_actor.cc
@@ -2,7 +2,7 @@
#include <functional>
-#include "aos/common/logging/logging.h"
+#include "aos/logging/logging.h"
#include "y2014/control_loops/shooter/shooter.q.h"
#include "y2014/control_loops/claw/claw.q.h"
diff --git a/y2014/actors/shoot_actor.h b/y2014/actors/shoot_actor.h
index 4ede888..804feee 100644
--- a/y2014/actors/shoot_actor.h
+++ b/y2014/actors/shoot_actor.h
@@ -3,8 +3,8 @@
#include <memory>
-#include "aos/common/actions/actor.h"
-#include "aos/common/actions/actions.h"
+#include "aos/actions/actor.h"
+#include "aos/actions/actions.h"
#include "y2014/actors/shoot_action.q.h"
diff --git a/y2014/autonomous/BUILD b/y2014/autonomous/BUILD
index 984b110..7d171dc 100644
--- a/y2014/autonomous/BUILD
+++ b/y2014/autonomous/BUILD
@@ -10,20 +10,20 @@
],
deps = [
'//frc971/autonomous:auto_queue',
- '//aos/common/controls:control_loop',
+ '//aos/controls:control_loop',
'//frc971/control_loops/drivetrain:drivetrain_queue',
'//y2014/control_loops/shooter:shooter_queue',
'//y2014/control_loops/claw:claw_queue',
'//y2014:constants',
- '//aos/common:time',
- '//aos/common/util:phased_loop',
- '//aos/common/util:trapezoid_profile',
- '//aos/common/logging',
- '//aos/common/actions:action_lib',
+ '//aos/time:time',
+ '//aos/util:phased_loop',
+ '//aos/util:trapezoid_profile',
+ '//aos/logging',
+ '//aos/actions:action_lib',
'//y2014/actors:shoot_action_lib',
'//y2014/actors:drivetrain_action_lib',
'//y2014/queues:hot_goal',
- '//aos/common/logging:queue_logging',
+ '//aos/logging:queue_logging',
'//y2014/queues:profile_params',
'//y2014/queues:auto_mode',
],
diff --git a/y2014/autonomous/auto.cc b/y2014/autonomous/auto.cc
index 96c7132..e5bd9bc 100644
--- a/y2014/autonomous/auto.cc
+++ b/y2014/autonomous/auto.cc
@@ -3,12 +3,12 @@
#include <chrono>
#include <memory>
-#include "aos/common/util/phased_loop.h"
-#include "aos/common/time.h"
-#include "aos/common/util/trapezoid_profile.h"
-#include "aos/common/logging/logging.h"
-#include "aos/common/logging/queue_logging.h"
-#include "aos/common/actions/actions.h"
+#include "aos/util/phased_loop.h"
+#include "aos/time/time.h"
+#include "aos/util/trapezoid_profile.h"
+#include "aos/logging/logging.h"
+#include "aos/logging/queue_logging.h"
+#include "aos/actions/actions.h"
#include "frc971/autonomous/auto.q.h"
#include "frc971/control_loops/drivetrain/drivetrain.q.h"
diff --git a/y2014/autonomous/auto_main.cc b/y2014/autonomous/auto_main.cc
index 747747a..81c5d34 100644
--- a/y2014/autonomous/auto_main.cc
+++ b/y2014/autonomous/auto_main.cc
@@ -1,8 +1,8 @@
#include <stdio.h>
-#include "aos/common/time.h"
+#include "aos/time/time.h"
#include "aos/linux_code/init.h"
-#include "aos/common/logging/logging.h"
+#include "aos/logging/logging.h"
#include "frc971/autonomous/auto.q.h"
#include "y2014/autonomous/auto.h"
diff --git a/y2014/constants.cc b/y2014/constants.cc
index 8354e57..6981e48 100644
--- a/y2014/constants.cc
+++ b/y2014/constants.cc
@@ -10,9 +10,9 @@
#include "sanitizer/lsan_interface.h"
#endif
-#include "aos/common/logging/logging.h"
-#include "aos/common/mutex.h"
-#include "aos/common/network/team_number.h"
+#include "aos/logging/logging.h"
+#include "aos/mutex/mutex.h"
+#include "aos/network/team_number.h"
#include "aos/once.h"
#include "y2014/control_loops/drivetrain/polydrivetrain_dog_motor_plant.h"
diff --git a/y2014/control_loops/claw/BUILD b/y2014/control_loops/claw/BUILD
index 1c0d157..252edce 100644
--- a/y2014/control_loops/claw/BUILD
+++ b/y2014/control_loops/claw/BUILD
@@ -9,7 +9,7 @@
],
deps = [
':claw_queue',
- '//aos/common/controls:replay_control_loop',
+ '//aos/controls:replay_control_loop',
'//aos/linux_code:init',
],
)
@@ -20,7 +20,7 @@
'claw.q',
],
deps = [
- '//aos/common/controls:control_loop_queues',
+ '//aos/controls:control_loop_queues',
'//frc971/control_loops:queues',
],
)
@@ -50,11 +50,11 @@
],
deps = [
':claw_queue',
- '//aos/common/controls:control_loop',
- '//aos/common/controls:polytope',
- '//aos/common/logging:queue_logging',
- '//aos/common/logging:matrix_logging',
- '//aos/common:math',
+ '//aos/controls:control_loop',
+ '//aos/controls:polytope',
+ '//aos/logging:queue_logging',
+ '//aos/logging:matrix_logging',
+ '//aos:math',
'//frc971/control_loops:state_feedback_loop',
'//frc971/control_loops:coerce_goal',
'//frc971/control_loops:hall_effect_tracker',
@@ -73,7 +73,7 @@
deps = [
':claw_lib',
':claw_queue',
- '//aos/common/controls:control_loop_test',
+ '//aos/controls:control_loop_test',
'//aos/testing:googletest',
'//frc971/control_loops:state_feedback_loop',
'//frc971/control_loops:team_number_test_environment',
@@ -88,7 +88,7 @@
deps = [
'//aos/linux_code:init',
':claw_queue',
- '//aos/common/controls:control_loop',
+ '//aos/controls:control_loop',
'//y2014:constants',
],
)
diff --git a/y2014/control_loops/claw/claw.cc b/y2014/control_loops/claw/claw.cc
index 11dbd80..088472c 100644
--- a/y2014/control_loops/claw/claw.cc
+++ b/y2014/control_loops/claw/claw.cc
@@ -2,11 +2,11 @@
#include <algorithm>
-#include "aos/common/controls/control_loops.q.h"
-#include "aos/common/logging/logging.h"
-#include "aos/common/logging/queue_logging.h"
-#include "aos/common/logging/matrix_logging.h"
-#include "aos/common/commonmath.h"
+#include "aos/controls/control_loops.q.h"
+#include "aos/logging/logging.h"
+#include "aos/logging/queue_logging.h"
+#include "aos/logging/matrix_logging.h"
+#include "aos/commonmath.h"
#include "y2014/constants.h"
#include "y2014/control_loops/claw/claw_motor_plant.h"
diff --git a/y2014/control_loops/claw/claw.h b/y2014/control_loops/claw/claw.h
index 88f038f..7995512 100644
--- a/y2014/control_loops/claw/claw.h
+++ b/y2014/control_loops/claw/claw.h
@@ -3,8 +3,8 @@
#include <memory>
-#include "aos/common/controls/control_loop.h"
-#include "aos/common/controls/polytope.h"
+#include "aos/controls/control_loop.h"
+#include "aos/controls/polytope.h"
#include "y2014/constants.h"
#include "frc971/control_loops/state_feedback_loop.h"
#include "frc971/control_loops/coerce_goal.h"
diff --git a/y2014/control_loops/claw/claw.q b/y2014/control_loops/claw/claw.q
index 1afdd85..efe445d 100644
--- a/y2014/control_loops/claw/claw.q
+++ b/y2014/control_loops/claw/claw.q
@@ -1,6 +1,6 @@
package y2014.control_loops;
-import "aos/common/controls/control_loops.q";
+import "aos/controls/control_loops.q";
import "frc971/control_loops/control_loops.q";
struct HalfClawPosition {
diff --git a/y2014/control_loops/claw/claw_lib_test.cc b/y2014/control_loops/claw/claw_lib_test.cc
index 8a7e9c3..753c087 100644
--- a/y2014/control_loops/claw/claw_lib_test.cc
+++ b/y2014/control_loops/claw/claw_lib_test.cc
@@ -3,7 +3,7 @@
#include <chrono>
#include <memory>
-#include "aos/common/controls/control_loop_test.h"
+#include "aos/controls/control_loop_test.h"
#include "frc971/control_loops/team_number_test_environment.h"
#include "gtest/gtest.h"
#include "y2014/constants.h"
diff --git a/y2014/control_loops/claw/replay_claw.cc b/y2014/control_loops/claw/replay_claw.cc
index 15cc9d9..21b44dd 100644
--- a/y2014/control_loops/claw/replay_claw.cc
+++ b/y2014/control_loops/claw/replay_claw.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 "y2014/control_loops/claw/claw.q.h"
diff --git a/y2014/control_loops/shooter/BUILD b/y2014/control_loops/shooter/BUILD
index 6ab2a8b..c7e9ccc 100644
--- a/y2014/control_loops/shooter/BUILD
+++ b/y2014/control_loops/shooter/BUILD
@@ -9,7 +9,7 @@
],
deps = [
':shooter_queue',
- '//aos/common/controls:replay_control_loop',
+ '//aos/controls:replay_control_loop',
'//aos/linux_code:init',
],
)
@@ -20,7 +20,7 @@
'shooter.q',
],
deps = [
- '//aos/common/controls:control_loop_queues',
+ '//aos/controls:control_loop_queues',
'//frc971/control_loops:queues',
],
)
@@ -54,10 +54,10 @@
],
deps = [
':shooter_queue',
- '//aos/common/controls:control_loop',
+ '//aos/controls:control_loop',
'//y2014:constants',
'//frc971/control_loops:state_feedback_loop',
- '//aos/common/logging:queue_logging',
+ '//aos/logging:queue_logging',
],
linkopts = [
'-lm',
@@ -72,7 +72,7 @@
deps = [
':shooter_lib',
':shooter_queue',
- '//aos/common/controls:control_loop_test',
+ '//aos/controls:control_loop_test',
'//aos/testing:googletest',
'//frc971/control_loops:state_feedback_loop',
'//frc971/control_loops:team_number_test_environment',
diff --git a/y2014/control_loops/shooter/replay_shooter.cc b/y2014/control_loops/shooter/replay_shooter.cc
index 1263f8a..2f42875 100644
--- a/y2014/control_loops/shooter/replay_shooter.cc
+++ b/y2014/control_loops/shooter/replay_shooter.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 "y2014/control_loops/shooter/shooter.q.h"
diff --git a/y2014/control_loops/shooter/shooter.cc b/y2014/control_loops/shooter/shooter.cc
index 70a6cad..e2f104c 100644
--- a/y2014/control_loops/shooter/shooter.cc
+++ b/y2014/control_loops/shooter/shooter.cc
@@ -6,9 +6,9 @@
#include <limits>
#include <chrono>
-#include "aos/common/controls/control_loops.q.h"
-#include "aos/common/logging/logging.h"
-#include "aos/common/logging/queue_logging.h"
+#include "aos/controls/control_loops.q.h"
+#include "aos/logging/logging.h"
+#include "aos/logging/queue_logging.h"
#include "y2014/constants.h"
#include "y2014/control_loops/shooter/shooter_motor_plant.h"
diff --git a/y2014/control_loops/shooter/shooter.h b/y2014/control_loops/shooter/shooter.h
index f2ddbc8..0530012 100644
--- a/y2014/control_loops/shooter/shooter.h
+++ b/y2014/control_loops/shooter/shooter.h
@@ -3,9 +3,9 @@
#include <memory>
-#include "aos/common/controls/control_loop.h"
+#include "aos/controls/control_loop.h"
#include "frc971/control_loops/state_feedback_loop.h"
-#include "aos/common/time.h"
+#include "aos/time/time.h"
#include "y2014/constants.h"
#include "y2014/control_loops/shooter/shooter_motor_plant.h"
diff --git a/y2014/control_loops/shooter/shooter.q b/y2014/control_loops/shooter/shooter.q
index ab8f590..5624d84 100644
--- a/y2014/control_loops/shooter/shooter.q
+++ b/y2014/control_loops/shooter/shooter.q
@@ -1,6 +1,6 @@
package y2014.control_loops;
-import "aos/common/controls/control_loops.q";
+import "aos/controls/control_loops.q";
import "frc971/control_loops/control_loops.q";
queue_group ShooterQueue {
diff --git a/y2014/control_loops/shooter/shooter_lib_test.cc b/y2014/control_loops/shooter/shooter_lib_test.cc
index 851e617..2869331 100644
--- a/y2014/control_loops/shooter/shooter_lib_test.cc
+++ b/y2014/control_loops/shooter/shooter_lib_test.cc
@@ -3,8 +3,8 @@
#include <chrono>
#include <memory>
-#include "aos/common/controls/control_loop_test.h"
-#include "aos/common/network/team_number.h"
+#include "aos/controls/control_loop_test.h"
+#include "aos/network/team_number.h"
#include "frc971/control_loops/team_number_test_environment.h"
#include "gtest/gtest.h"
#include "y2014/constants.h"
diff --git a/y2014/hot_goal_reader.cc b/y2014/hot_goal_reader.cc
index 6c76c12..14538a2 100644
--- a/y2014/hot_goal_reader.cc
+++ b/y2014/hot_goal_reader.cc
@@ -6,11 +6,11 @@
#include <arpa/inet.h>
#include <unistd.h>
-#include "aos/common/time.h"
-#include "aos/common/logging/queue_logging.h"
-#include "aos/common/logging/logging.h"
+#include "aos/time/time.h"
+#include "aos/logging/queue_logging.h"
+#include "aos/logging/logging.h"
#include "aos/linux_code/init.h"
-#include "aos/common/byteorder.h"
+#include "aos/byteorder.h"
#include "y2014/queues/hot_goal.q.h"
diff --git a/y2014/joystick_reader.cc b/y2014/joystick_reader.cc
index 7516c97..e485d2e 100644
--- a/y2014/joystick_reader.cc
+++ b/y2014/joystick_reader.cc
@@ -5,11 +5,11 @@
#include "aos/linux_code/init.h"
#include "aos/input/joystick_input.h"
-#include "aos/common/input/driver_station_data.h"
-#include "aos/common/logging/logging.h"
-#include "aos/common/util/log_interval.h"
-#include "aos/common/time.h"
-#include "aos/common/actions/actions.h"
+#include "aos/input/driver_station_data.h"
+#include "aos/logging/logging.h"
+#include "aos/util/log_interval.h"
+#include "aos/time/time.h"
+#include "aos/actions/actions.h"
#include "frc971/control_loops/drivetrain/drivetrain.q.h"
#include "y2014/constants.h"
diff --git a/y2014/wpilib_interface.cc b/y2014/wpilib_interface.cc
index d5f7e5e..a97b758 100644
--- a/y2014/wpilib_interface.cc
+++ b/y2014/wpilib_interface.cc
@@ -20,15 +20,15 @@
#endif
#undef ERROR
-#include "aos/common/logging/logging.h"
-#include "aos/common/logging/queue_logging.h"
-#include "aos/common/time.h"
-#include "aos/common/util/log_interval.h"
-#include "aos/common/util/phased_loop.h"
-#include "aos/common/util/wrapping_counter.h"
-#include "aos/common/stl_mutex.h"
+#include "aos/logging/logging.h"
+#include "aos/logging/queue_logging.h"
+#include "aos/time/time.h"
+#include "aos/util/log_interval.h"
+#include "aos/util/phased_loop.h"
+#include "aos/util/wrapping_counter.h"
+#include "aos/stl_mutex/stl_mutex.h"
#include "aos/linux_code/init.h"
-#include "aos/common/messages/robot_state.q.h"
+#include "aos/robot_state/robot_state.q.h"
#include "frc971/shifter_hall_effect.h"