Removed Common
Change-Id: I01ea8f07220375c2ad9bc0092281d4f27c642303
diff --git a/y2016/BUILD b/y2016/BUILD
index 24f83e1..e839562 100644
--- a/y2016/BUILD
+++ b/y2016/BUILD
@@ -14,9 +14,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:constants",
"//frc971:shifter_hall_effect",
"//frc971/control_loops:state_feedback_loop",
@@ -31,10 +31,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",
@@ -106,16 +106,16 @@
restricted_to = ["//tools:roborio"],
deps = [
":constants",
- "//aos/common:math",
- "//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:math",
+ "//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/autonomous:auto_queue",
"//frc971/control_loops:queues",
diff --git a/y2016/actors/BUILD b/y2016/actors/BUILD
index b21722a..89431c1 100644
--- a/y2016/actors/BUILD
+++ b/y2016/actors/BUILD
@@ -16,7 +16,7 @@
'superstructure_action.q',
],
deps = [
- '//aos/common/actions:action_queue',
+ '//aos/actions:action_queue',
],
)
@@ -30,9 +30,9 @@
],
deps = [
':superstructure_action_queue',
- '//aos/common/util:phased_loop',
- '//aos/common/logging',
- '//aos/common/actions:action_lib',
+ '//aos/util:phased_loop',
+ '//aos/logging',
+ '//aos/actions:action_lib',
'//y2016/control_loops/superstructure:superstructure_queue',
],
)
@@ -59,9 +59,9 @@
],
deps = [
':vision_align_action_lib',
- '//aos/common/util:phased_loop',
- '//aos/common/logging',
- '//aos/common/actions:action_lib',
+ '//aos/util:phased_loop',
+ '//aos/logging',
+ '//aos/actions:action_lib',
'//frc971/autonomous:base_autonomous_actor',
'//frc971/control_loops/drivetrain:drivetrain_queue',
'//y2016/queues:ball_detector',
@@ -90,7 +90,7 @@
'vision_align_action.q',
],
deps = [
- '//aos/common/actions:action_queue',
+ '//aos/actions:action_queue',
],
)
@@ -104,13 +104,13 @@
],
deps = [
':vision_align_action_queue',
- '//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/common/util:trapezoid_profile',
+ '//aos/time:time',
+ '//aos:math',
+ '//aos/util:phased_loop',
+ '//aos/logging',
+ '//aos/actions:action_lib',
+ '//aos/logging:queue_logging',
+ '//aos/util:trapezoid_profile',
'//frc971/control_loops/drivetrain:drivetrain_queue',
'//third_party/eigen',
'//y2016:constants',
diff --git a/y2016/actors/autonomous_actor.cc b/y2016/actors/autonomous_actor.cc
index 727f5de..ea90944 100644
--- a/y2016/actors/autonomous_actor.cc
+++ b/y2016/actors/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"
#include "y2016/control_loops/drivetrain/drivetrain_base.h"
diff --git a/y2016/actors/autonomous_actor.h b/y2016/actors/autonomous_actor.h
index 24df091..0a8eae2 100644
--- a/y2016/actors/autonomous_actor.h
+++ b/y2016/actors/autonomous_actor.h
@@ -4,8 +4,8 @@
#include <chrono>
#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/base_autonomous_actor.h"
#include "frc971/control_loops/drivetrain/drivetrain.q.h"
#include "frc971/control_loops/drivetrain/drivetrain_config.h"
diff --git a/y2016/actors/superstructure_action.q b/y2016/actors/superstructure_action.q
index 231f5e7..eb23397 100644
--- a/y2016/actors/superstructure_action.q
+++ b/y2016/actors/superstructure_action.q
@@ -1,6 +1,6 @@
package y2016.actors;
-import "aos/common/actions/actions.q";
+import "aos/actions/actions.q";
// Parameters to send with start.
struct SuperstructureActionParams {
diff --git a/y2016/actors/superstructure_actor.cc b/y2016/actors/superstructure_actor.cc
index d621b9d..d8537ce 100644
--- a/y2016/actors/superstructure_actor.cc
+++ b/y2016/actors/superstructure_actor.cc
@@ -2,8 +2,8 @@
#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 "y2016/actors/superstructure_actor.h"
#include "y2016/control_loops/superstructure/superstructure.q.h"
diff --git a/y2016/actors/superstructure_actor.h b/y2016/actors/superstructure_actor.h
index 4d5e372..d48fc71 100644
--- a/y2016/actors/superstructure_actor.h
+++ b/y2016/actors/superstructure_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 "y2016/actors/superstructure_action.q.h"
namespace y2016 {
diff --git a/y2016/actors/vision_align_action.q b/y2016/actors/vision_align_action.q
index 742d936..e822bf4 100644
--- a/y2016/actors/vision_align_action.q
+++ b/y2016/actors/vision_align_action.q
@@ -1,6 +1,6 @@
package y2016.actors;
-import "aos/common/actions/actions.q";
+import "aos/actions/actions.q";
// Parameters to send with start.
struct VisionAlignActionParams {
diff --git a/y2016/actors/vision_align_actor.cc b/y2016/actors/vision_align_actor.cc
index 0c9a2d9..f921c8e 100644
--- a/y2016/actors/vision_align_actor.cc
+++ b/y2016/actors/vision_align_actor.cc
@@ -6,11 +6,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 "y2016/actors/vision_align_actor.h"
#include "y2016/constants.h"
diff --git a/y2016/actors/vision_align_actor.h b/y2016/actors/vision_align_actor.h
index 5c9a812..a1f07fa 100644
--- a/y2016/actors/vision_align_actor.h
+++ b/y2016/actors/vision_align_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 "y2016/actors/vision_align_action.q.h"
diff --git a/y2016/constants.cc b/y2016/constants.cc
index 8bbda56..d4f61c1 100644
--- a/y2016/constants.cc
+++ b/y2016/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 "y2016/control_loops/drivetrain/polydrivetrain_dog_motor_plant.h"
diff --git a/y2016/control_loops/python/BUILD b/y2016/control_loops/python/BUILD
index adb3150..08a34e8 100644
--- a/y2016/control_loops/python/BUILD
+++ b/y2016/control_loops/python/BUILD
@@ -70,7 +70,7 @@
restricted_to = ["//tools:k8"],
deps = [
":python_init",
- "//aos/common/util:py_trapezoid_profile",
+ "//aos/util:py_trapezoid_profile",
"//external:python-gflags",
"//external:python-glog",
"//frc971/control_loops/python:controls",
@@ -87,7 +87,7 @@
restricted_to = ["//tools:k8"],
deps = [
":python_init",
- "//aos/common/util:py_trapezoid_profile",
+ "//aos/util:py_trapezoid_profile",
"//external:python-gflags",
"//external:python-glog",
"//frc971/control_loops/python:controls",
@@ -104,7 +104,7 @@
restricted_to = ["//tools:k8"],
deps = [
":python_init",
- "//aos/common/util:py_trapezoid_profile",
+ "//aos/util:py_trapezoid_profile",
"//external:python-gflags",
"//external:python-glog",
"//frc971/control_loops/python:controls",
@@ -119,7 +119,7 @@
],
restricted_to = ["//tools:k8"],
deps = [
- "//aos/common/util:py_trapezoid_profile",
+ "//aos/util:py_trapezoid_profile",
"//external:python-gflags",
"//external:python-glog",
"//frc971/control_loops/python:controls",
@@ -133,7 +133,7 @@
],
restricted_to = ["//tools:k8"],
deps = [
- "//aos/common/util:py_trapezoid_profile",
+ "//aos/util:py_trapezoid_profile",
"//external:python-gflags",
"//external:python-glog",
"//frc971/control_loops/python:controls",
@@ -150,7 +150,7 @@
deps = [
":shoulder_lib",
":wrist_lib",
- "//aos/common/util:py_trapezoid_profile",
+ "//aos/util:py_trapezoid_profile",
"//external:python-gflags",
"//external:python-glog",
"//frc971/control_loops/python:controls",
@@ -169,7 +169,7 @@
":python_init",
":shoulder_lib",
":wrist_lib",
- "//aos/common/util:py_trapezoid_profile",
+ "//aos/util:py_trapezoid_profile",
"//external:python-gflags",
"//external:python-glog",
"//frc971/control_loops/python:controls",
diff --git a/y2016/control_loops/python/arm.py b/y2016/control_loops/python/arm.py
index 8908038..5c5793b 100755
--- a/y2016/control_loops/python/arm.py
+++ b/y2016/control_loops/python/arm.py
@@ -9,7 +9,7 @@
from y2016.control_loops.python.shoulder import Shoulder, IntegralShoulder
from y2016.control_loops.python.wrist import Wrist, IntegralWrist
-from aos.common.util.trapezoid_profile import TrapezoidProfile
+from aos.util.trapezoid_profile import TrapezoidProfile
from matplotlib import pylab
import gflags
diff --git a/y2016/control_loops/python/intake.py b/y2016/control_loops/python/intake.py
index 02c1ada..abb755c 100755
--- a/y2016/control_loops/python/intake.py
+++ b/y2016/control_loops/python/intake.py
@@ -1,6 +1,6 @@
#!/usr/bin/python
-from aos.common.util.trapezoid_profile import TrapezoidProfile
+from aos.util.trapezoid_profile import TrapezoidProfile
from frc971.control_loops.python import control_loop
from frc971.control_loops.python import controls
import numpy
diff --git a/y2016/control_loops/shooter/BUILD b/y2016/control_loops/shooter/BUILD
index ad967d3..794a35b 100644
--- a/y2016/control_loops/shooter/BUILD
+++ b/y2016/control_loops/shooter/BUILD
@@ -8,7 +8,7 @@
'shooter.q',
],
deps = [
- '//aos/common/controls:control_loop_queues',
+ '//aos/controls:control_loop_queues',
'//frc971/control_loops:queues',
],
)
@@ -54,7 +54,7 @@
deps = [
':shooter_queue',
':shooter_plants',
- '//aos/common/controls:control_loop',
+ '//aos/controls:control_loop',
],
)
@@ -67,8 +67,8 @@
':shooter_queue',
':shooter_lib',
'//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',
],
diff --git a/y2016/control_loops/shooter/shooter.cc b/y2016/control_loops/shooter/shooter.cc
index 7b64f99..a047f55 100644
--- a/y2016/control_loops/shooter/shooter.cc
+++ b/y2016/control_loops/shooter/shooter.cc
@@ -2,9 +2,9 @@
#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 "y2016/control_loops/shooter/shooter_plant.h"
diff --git a/y2016/control_loops/shooter/shooter.h b/y2016/control_loops/shooter/shooter.h
index aafc472..ac5b2d7 100644
--- a/y2016/control_loops/shooter/shooter.h
+++ b/y2016/control_loops/shooter/shooter.h
@@ -3,8 +3,8 @@
#include <memory>
-#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/control_loops/state_feedback_loop.h"
#include "y2016/control_loops/shooter/shooter_integral_plant.h"
diff --git a/y2016/control_loops/shooter/shooter.q b/y2016/control_loops/shooter/shooter.q
index 0e00a02..f6f9298 100644
--- a/y2016/control_loops/shooter/shooter.q
+++ b/y2016/control_loops/shooter/shooter.q
@@ -1,6 +1,6 @@
package y2016.control_loops.shooter;
-import "aos/common/controls/control_loops.q";
+import "aos/controls/control_loops.q";
import "frc971/control_loops/control_loops.q";
struct ShooterSideStatus {
diff --git a/y2016/control_loops/shooter/shooter_lib_test.cc b/y2016/control_loops/shooter/shooter_lib_test.cc
index 5cd7ce5..c5d5aa7 100644
--- a/y2016/control_loops/shooter/shooter_lib_test.cc
+++ b/y2016/control_loops/shooter/shooter_lib_test.cc
@@ -6,8 +6,8 @@
#include <memory>
#include "gtest/gtest.h"
-#include "aos/common/queue.h"
-#include "aos/common/controls/control_loop_test.h"
+#include "aos/queue.h"
+#include "aos/controls/control_loop_test.h"
#include "frc971/control_loops/team_number_test_environment.h"
#include "y2016/control_loops/shooter/shooter.q.h"
#include "y2016/control_loops/shooter/shooter.h"
diff --git a/y2016/control_loops/superstructure/BUILD b/y2016/control_loops/superstructure/BUILD
index fb0750b..38f20d2 100644
--- a/y2016/control_loops/superstructure/BUILD
+++ b/y2016/control_loops/superstructure/BUILD
@@ -8,7 +8,7 @@
'superstructure.q',
],
deps = [
- '//aos/common/controls:control_loop_queues',
+ '//aos/controls:control_loop_queues',
'//frc971/control_loops:queues',
],
)
@@ -75,9 +75,9 @@
deps = [
':superstructure_queue',
':superstructure_plants',
- '//aos/common/controls:control_loop',
- '//aos/common/util:trapezoid_profile',
- '//aos/common:math',
+ '//aos/controls:control_loop',
+ '//aos/util:trapezoid_profile',
+ '//aos:math',
'//frc971/control_loops:profiled_subsystem',
'//frc971/control_loops:simple_capped_state_feedback_loop',
'//frc971/control_loops:state_feedback_loop',
@@ -96,10 +96,10 @@
':superstructure_queue',
':superstructure_lib',
'//aos/testing:googletest',
- '//aos/common:queues',
- '//aos/common/controls:control_loop_test',
- '//aos/common:math',
- '//aos/common:time',
+ '//aos:queues',
+ '//aos/controls:control_loop_test',
+ '//aos:math',
+ '//aos/time:time',
'//frc971/control_loops:position_sensor_sim',
'//frc971/control_loops:team_number_test_environment',
],
diff --git a/y2016/control_loops/superstructure/superstructure.cc b/y2016/control_loops/superstructure/superstructure.cc
index 2366fb7..1bcac52 100644
--- a/y2016/control_loops/superstructure/superstructure.cc
+++ b/y2016/control_loops/superstructure/superstructure.cc
@@ -1,9 +1,9 @@
#include "y2016/control_loops/superstructure/superstructure.h"
#include "y2016/control_loops/superstructure/superstructure_controls.h"
-#include "aos/common/commonmath.h"
-#include "aos/common/controls/control_loops.q.h"
-#include "aos/common/logging/logging.h"
+#include "aos/commonmath.h"
+#include "aos/controls/control_loops.q.h"
+#include "aos/logging/logging.h"
#include "y2016/control_loops/superstructure/integral_intake_plant.h"
#include "y2016/control_loops/superstructure/integral_arm_plant.h"
diff --git a/y2016/control_loops/superstructure/superstructure.h b/y2016/control_loops/superstructure/superstructure.h
index eb16405..17a1547 100644
--- a/y2016/control_loops/superstructure/superstructure.h
+++ b/y2016/control_loops/superstructure/superstructure.h
@@ -3,8 +3,8 @@
#include <memory>
-#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/state_feedback_loop.h"
#include "frc971/zeroing/zeroing.h"
diff --git a/y2016/control_loops/superstructure/superstructure.q b/y2016/control_loops/superstructure/superstructure.q
index 76c9850..1431d23 100644
--- a/y2016/control_loops/superstructure/superstructure.q
+++ b/y2016/control_loops/superstructure/superstructure.q
@@ -1,6 +1,6 @@
package y2016.control_loops;
-import "aos/common/controls/control_loops.q";
+import "aos/controls/control_loops.q";
import "frc971/control_loops/control_loops.q";
struct JointState {
diff --git a/y2016/control_loops/superstructure/superstructure_controls.cc b/y2016/control_loops/superstructure/superstructure_controls.cc
index a522e40..e787f79 100644
--- a/y2016/control_loops/superstructure/superstructure_controls.cc
+++ b/y2016/control_loops/superstructure/superstructure_controls.cc
@@ -1,7 +1,7 @@
#include "y2016/control_loops/superstructure/superstructure_controls.h"
-#include "aos/common/controls/control_loops.q.h"
-#include "aos/common/logging/logging.h"
+#include "aos/controls/control_loops.q.h"
+#include "aos/logging/logging.h"
#include "y2016/control_loops/superstructure/integral_intake_plant.h"
#include "y2016/control_loops/superstructure/integral_arm_plant.h"
diff --git a/y2016/control_loops/superstructure/superstructure_controls.h b/y2016/control_loops/superstructure/superstructure_controls.h
index 5d8c85a..49c8097 100644
--- a/y2016/control_loops/superstructure/superstructure_controls.h
+++ b/y2016/control_loops/superstructure/superstructure_controls.h
@@ -3,8 +3,8 @@
#include <memory>
-#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/profiled_subsystem.h"
#include "frc971/control_loops/simple_capped_state_feedback_loop.h"
#include "frc971/control_loops/state_feedback_loop.h"
diff --git a/y2016/control_loops/superstructure/superstructure_lib_test.cc b/y2016/control_loops/superstructure/superstructure_lib_test.cc
index b3e980d..824f291 100644
--- a/y2016/control_loops/superstructure/superstructure_lib_test.cc
+++ b/y2016/control_loops/superstructure/superstructure_lib_test.cc
@@ -5,10 +5,10 @@
#include <chrono>
#include <memory>
-#include "aos/common/commonmath.h"
-#include "aos/common/controls/control_loop_test.h"
-#include "aos/common/queue.h"
-#include "aos/common/time.h"
+#include "aos/commonmath.h"
+#include "aos/controls/control_loop_test.h"
+#include "aos/queue.h"
+#include "aos/time/time.h"
#include "frc971/control_loops/position_sensor_sim.h"
#include "frc971/control_loops/team_number_test_environment.h"
#include "gtest/gtest.h"
diff --git a/y2016/dashboard/BUILD b/y2016/dashboard/BUILD
index a926350..aa26aef 100644
--- a/y2016/dashboard/BUILD
+++ b/y2016/dashboard/BUILD
@@ -25,9 +25,9 @@
deps = [
':gen_embedded',
'//aos/linux_code:init',
- '//aos/common/logging',
- '//aos/common/util:phased_loop',
- '//aos/common:time',
+ '//aos/logging',
+ '//aos/util:phased_loop',
+ '//aos/time:time',
'//frc971/autonomous:auto_queue',
'//third_party/seasocks',
'//y2016/vision:vision_queue',
diff --git a/y2016/dashboard/dashboard.cc b/y2016/dashboard/dashboard.cc
index 4b4c0e9..5882eea 100644
--- a/y2016/dashboard/dashboard.cc
+++ b/y2016/dashboard/dashboard.cc
@@ -11,10 +11,10 @@
#include "seasocks/Server.h"
#include "aos/linux_code/init.h"
-#include "aos/common/logging/logging.h"
-#include "aos/common/time.h"
-#include "aos/common/util/phased_loop.h"
-#include "aos/common/mutex.h"
+#include "aos/logging/logging.h"
+#include "aos/time/time.h"
+#include "aos/util/phased_loop.h"
+#include "aos/mutex/mutex.h"
#include "frc971/autonomous/auto.q.h"
diff --git a/y2016/dashboard/dashboard.h b/y2016/dashboard/dashboard.h
index e093cb9..a95c476 100644
--- a/y2016/dashboard/dashboard.h
+++ b/y2016/dashboard/dashboard.h
@@ -12,9 +12,9 @@
#include "seasocks/WebSocket.h"
#include "aos/linux_code/init.h"
-#include "aos/common/time.h"
-#include "aos/common/util/phased_loop.h"
-#include "aos/common/mutex.h"
+#include "aos/time/time.h"
+#include "aos/util/phased_loop.h"
+#include "aos/mutex/mutex.h"
namespace y2016 {
namespace dashboard {
diff --git a/y2016/joystick_reader.cc b/y2016/joystick_reader.cc
index 7b48512..bc90a51 100644
--- a/y2016/joystick_reader.cc
+++ b/y2016/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/autonomous/auto.q.h"
#include "frc971/control_loops/drivetrain/drivetrain.q.h"
diff --git a/y2016/vision/BUILD b/y2016/vision/BUILD
index 1220946..da3c7b2 100644
--- a/y2016/vision/BUILD
+++ b/y2016/vision/BUILD
@@ -87,7 +87,7 @@
],
deps = [
":calibration",
- "//aos/common/logging",
+ "//aos/logging",
"//aos/vision/math:vector",
],
)
@@ -103,9 +103,9 @@
":calibration",
":stereo_geometry",
":vision_data",
- "//aos/common:time",
- "//aos/common/logging",
- "//aos/common/logging:implementations",
+ "//aos/time:time",
+ "//aos/logging",
+ "//aos/logging:implementations",
"//aos/vision/events:epoll_events",
"//aos/vision/events:socket_types",
"//aos/vision/events:udp",
@@ -149,10 +149,10 @@
":stereo_geometry",
":vision_data",
":vision_queue",
- "//aos/common:mutex",
- "//aos/common:time",
- "//aos/common/logging",
- "//aos/common/logging:queue_logging",
+ "//aos/mutex:mutex",
+ "//aos/time:time",
+ "//aos/logging",
+ "//aos/logging:queue_logging",
"//aos/linux_code:init",
"//aos/vision/events:udp",
"//frc971/control_loops/drivetrain:drivetrain_queue",
diff --git a/y2016/vision/stereo_geometry.h b/y2016/vision/stereo_geometry.h
index a758f1c..f1ffe51 100644
--- a/y2016/vision/stereo_geometry.h
+++ b/y2016/vision/stereo_geometry.h
@@ -3,7 +3,7 @@
#include <string>
-#include "aos/common/logging/logging.h"
+#include "aos/logging/logging.h"
#include "aos/vision/math/vector.h"
#include "y2016/vision/calibration.pb.h"
diff --git a/y2016/vision/target_receiver.cc b/y2016/vision/target_receiver.cc
index 3e4465d..3f2fbbc 100644
--- a/y2016/vision/target_receiver.cc
+++ b/y2016/vision/target_receiver.cc
@@ -10,10 +10,10 @@
#include <thread>
#include <vector>
-#include "aos/common/logging/logging.h"
-#include "aos/common/logging/queue_logging.h"
-#include "aos/common/mutex.h"
-#include "aos/common/time.h"
+#include "aos/logging/logging.h"
+#include "aos/logging/queue_logging.h"
+#include "aos/mutex/mutex.h"
+#include "aos/time/time.h"
#include "aos/linux_code/init.h"
#include "aos/vision/events/udp.h"
diff --git a/y2016/vision/target_sender.cc b/y2016/vision/target_sender.cc
index 85e62c4..d9208ec 100644
--- a/y2016/vision/target_sender.cc
+++ b/y2016/vision/target_sender.cc
@@ -7,9 +7,9 @@
#include <thread>
#include <vector>
-#include "aos/common/logging/implementations.h"
-#include "aos/common/logging/logging.h"
-#include "aos/common/time.h"
+#include "aos/logging/implementations.h"
+#include "aos/logging/logging.h"
+#include "aos/time/time.h"
#include "aos/vision/events/socket_types.h"
#include "aos/vision/events/udp.h"
#include "aos/vision/image/image_stream.h"
diff --git a/y2016/wpilib_interface.cc b/y2016/wpilib_interface.cc
index 2f37bcb..4e95934 100644
--- a/y2016/wpilib_interface.cc
+++ b/y2016/wpilib_interface.cc
@@ -21,16 +21,16 @@
#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/common/commonmath.h"
+#include "aos/robot_state/robot_state.q.h"
+#include "aos/commonmath.h"
#include "frc971/autonomous/auto.q.h"
#include "frc971/control_loops/control_loops.q.h"