Removed Common
Change-Id: I01ea8f07220375c2ad9bc0092281d4f27c642303
diff --git a/y2017/BUILD b/y2017/BUILD
index f294aaa..25777a4 100644
--- a/y2017/BUILD
+++ b/y2017/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:constants",
"//frc971/shooter_interpolation:interpolation",
"//y2017/control_loops/drivetrain:polydrivetrain_plants",
@@ -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:drivetrain_input",
"//aos/input:joystick_input",
"//aos/linux_code:init",
@@ -54,16 +54,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/y2017/actors/BUILD b/y2017/actors/BUILD
index 95dc87a..3f37300 100644
--- a/y2017/actors/BUILD
+++ b/y2017/actors/BUILD
@@ -18,9 +18,9 @@
'autonomous_actor.h',
],
deps = [
- '//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',
'//frc971/control_loops/drivetrain:drivetrain_config',
diff --git a/y2017/actors/autonomous_actor.cc b/y2017/actors/autonomous_actor.cc
index c5114a3..c123612 100644
--- a/y2017/actors/autonomous_actor.cc
+++ b/y2017/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 "y2017/control_loops/drivetrain/drivetrain_base.h"
diff --git a/y2017/actors/autonomous_actor.h b/y2017/actors/autonomous_actor.h
index d099725..a27c27e 100644
--- a/y2017/actors/autonomous_actor.h
+++ b/y2017/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/y2017/constants.cc b/y2017/constants.cc
index 9530e27..6f77838 100644
--- a/y2017/constants.cc
+++ b/y2017/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 "y2017/control_loops/drivetrain/drivetrain_dog_motor_plant.h"
diff --git a/y2017/control_loops/python/BUILD b/y2017/control_loops/python/BUILD
index 47c24e8..5d7a002 100644
--- a/y2017/control_loops/python/BUILD
+++ b/y2017/control_loops/python/BUILD
@@ -86,7 +86,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",
@@ -103,7 +103,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",
@@ -120,7 +120,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",
@@ -135,7 +135,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",
diff --git a/y2017/control_loops/python/column.py b/y2017/control_loops/python/column.py
index 4cbf4dd..1f8bd76 100755
--- a/y2017/control_loops/python/column.py
+++ b/y2017/control_loops/python/column.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
from y2017.control_loops.python import turret
diff --git a/y2017/control_loops/python/hood.py b/y2017/control_loops/python/hood.py
index 2704216..fb5aa4e 100755
--- a/y2017/control_loops/python/hood.py
+++ b/y2017/control_loops/python/hood.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/y2017/control_loops/python/intake.py b/y2017/control_loops/python/intake.py
index 5f557f1..64998c7 100755
--- a/y2017/control_loops/python/intake.py
+++ b/y2017/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/y2017/control_loops/python/turret.py b/y2017/control_loops/python/turret.py
index f07e7a5..e8829eb 100755
--- a/y2017/control_loops/python/turret.py
+++ b/y2017/control_loops/python/turret.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/y2017/control_loops/superstructure/BUILD b/y2017/control_loops/superstructure/BUILD
index 37136c8..e7836b3 100644
--- a/y2017/control_loops/superstructure/BUILD
+++ b/y2017/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:profiled_subsystem_queue',
'//frc971/control_loops:queues',
],
@@ -25,7 +25,7 @@
deps = [
':vision_distance_average',
':superstructure_queue',
- '//aos/common/controls:control_loop',
+ '//aos/controls:control_loop',
'//y2017/control_loops/superstructure/column',
'//y2017/control_loops/superstructure/hood',
'//y2017/control_loops/superstructure/intake',
@@ -42,10 +42,10 @@
deps = [
':superstructure_queue',
':superstructure_lib',
- '//aos/common/controls:control_loop_test',
- '//aos/common:math',
- '//aos/common:queues',
- '//aos/common:time',
+ '//aos/controls:control_loop_test',
+ '//aos:math',
+ '//aos:queues',
+ '//aos/time:time',
'//aos/testing:googletest',
'//frc971/control_loops:position_sensor_sim',
'//frc971/control_loops:team_number_test_environment',
@@ -78,7 +78,7 @@
],
deps = [
':superstructure_queue',
- '//aos/common:ring_buffer',
+ '//aos/ring_buffer:ring_buffer',
'//frc971/control_loops/drivetrain:drivetrain_queue',
'//y2017/control_loops/drivetrain:polydrivetrain_plants',
'//y2017/vision:vision_queue',
@@ -92,7 +92,7 @@
],
deps = [
':vision_time_adjuster',
- '//aos/common:time',
+ '//aos/time:time',
'//aos/testing:googletest',
'//aos/testing:test_shm',
],
@@ -104,8 +104,8 @@
'vision_distance_average.h',
],
deps = [
- '//aos/common:time',
- '//aos/common:ring_buffer',
+ '//aos/time:time',
+ '//aos/ring_buffer:ring_buffer',
'//y2017/vision:vision_queue',
],
)
@@ -117,7 +117,7 @@
],
deps = [
':vision_distance_average',
- '//aos/common:time',
+ '//aos/time:time',
'//aos/testing:googletest',
],
)
diff --git a/y2017/control_loops/superstructure/column/BUILD b/y2017/control_loops/superstructure/column/BUILD
index 149ef32..694dd47 100644
--- a/y2017/control_loops/superstructure/column/BUILD
+++ b/y2017/control_loops/superstructure/column/BUILD
@@ -44,8 +44,8 @@
deps = [
':column_plants',
':column_zeroing',
- '//aos/common/controls:control_loop',
- '//aos/common:math',
+ '//aos/controls:control_loop',
+ '//aos:math',
'//frc971/control_loops:profiled_subsystem',
'//y2017/control_loops/superstructure/intake:intake',
'//y2017/control_loops/superstructure:superstructure_queue',
diff --git a/y2017/control_loops/superstructure/column/column.cc b/y2017/control_loops/superstructure/column/column.cc
index 346a5d5..aaca601 100644
--- a/y2017/control_loops/superstructure/column/column.cc
+++ b/y2017/control_loops/superstructure/column/column.cc
@@ -7,7 +7,7 @@
#include "Eigen/Dense"
-#include "aos/common/commonmath.h"
+#include "aos/commonmath.h"
#include "frc971/constants.h"
#include "frc971/control_loops/profiled_subsystem.h"
#include "frc971/control_loops/state_feedback_loop.h"
diff --git a/y2017/control_loops/superstructure/column/column_zeroing_test.cc b/y2017/control_loops/superstructure/column/column_zeroing_test.cc
index e6739fc..3cc9c2e 100644
--- a/y2017/control_loops/superstructure/column/column_zeroing_test.cc
+++ b/y2017/control_loops/superstructure/column/column_zeroing_test.cc
@@ -2,7 +2,7 @@
#include <memory>
#include <random>
-#include "aos/common/die.h"
+#include "aos/die.h"
#include "aos/testing/test_shm.h"
#include "frc971/control_loops/position_sensor_sim.h"
#include "frc971/control_loops/team_number_test_environment.h"
diff --git a/y2017/control_loops/superstructure/shooter/BUILD b/y2017/control_loops/superstructure/shooter/BUILD
index 3f9b17e..cb7fa54 100644
--- a/y2017/control_loops/superstructure/shooter/BUILD
+++ b/y2017/control_loops/superstructure/shooter/BUILD
@@ -42,7 +42,7 @@
],
deps = [
':shooter_plants',
- '//aos/common/controls:control_loop',
+ '//aos/controls:control_loop',
'//third_party/eigen',
'//y2017/control_loops/superstructure:superstructure_queue',
],
diff --git a/y2017/control_loops/superstructure/shooter/shooter.cc b/y2017/control_loops/superstructure/shooter/shooter.cc
index f8bfecf..fee9124 100644
--- a/y2017/control_loops/superstructure/shooter/shooter.cc
+++ b/y2017/control_loops/superstructure/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 "y2017/control_loops/superstructure/shooter/shooter.h"
diff --git a/y2017/control_loops/superstructure/shooter/shooter.h b/y2017/control_loops/superstructure/shooter/shooter.h
index 3a9f3f9..e8f7789 100644
--- a/y2017/control_loops/superstructure/shooter/shooter.h
+++ b/y2017/control_loops/superstructure/shooter/shooter.h
@@ -4,8 +4,8 @@
#include <array>
#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 "third_party/eigen/Eigen/Dense"
diff --git a/y2017/control_loops/superstructure/superstructure.cc b/y2017/control_loops/superstructure/superstructure.cc
index 18f9606..054fab4 100644
--- a/y2017/control_loops/superstructure/superstructure.cc
+++ b/y2017/control_loops/superstructure/superstructure.cc
@@ -1,7 +1,7 @@
#include "y2017/control_loops/superstructure/superstructure.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 "frc971/control_loops/drivetrain/drivetrain.q.h"
#include "y2017/constants.h"
#include "y2017/control_loops/superstructure/column/column.h"
diff --git a/y2017/control_loops/superstructure/superstructure.h b/y2017/control_loops/superstructure/superstructure.h
index 263d4b0..399e166 100644
--- a/y2017/control_loops/superstructure/superstructure.h
+++ b/y2017/control_loops/superstructure/superstructure.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"
#include "y2017/control_loops/superstructure/column/column.h"
#include "y2017/control_loops/superstructure/hood/hood.h"
diff --git a/y2017/control_loops/superstructure/superstructure.q b/y2017/control_loops/superstructure/superstructure.q
index bac9051..60c5e16 100644
--- a/y2017/control_loops/superstructure/superstructure.q
+++ b/y2017/control_loops/superstructure/superstructure.q
@@ -1,6 +1,6 @@
package y2017.control_loops;
-import "aos/common/controls/control_loops.q";
+import "aos/controls/control_loops.q";
import "frc971/control_loops/profiled_subsystem.q";
// TODO(austin): Add this back in when the queue compiler supports diamond
// inheritance.
diff --git a/y2017/control_loops/superstructure/superstructure_lib_test.cc b/y2017/control_loops/superstructure/superstructure_lib_test.cc
index e4e391c..d538dc8 100644
--- a/y2017/control_loops/superstructure/superstructure_lib_test.cc
+++ b/y2017/control_loops/superstructure/superstructure_lib_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/control_loops/position_sensor_sim.h"
#include "frc971/control_loops/team_number_test_environment.h"
#include "gtest/gtest.h"
diff --git a/y2017/control_loops/superstructure/vision_distance_average.h b/y2017/control_loops/superstructure/vision_distance_average.h
index ed0664e..22464b7 100644
--- a/y2017/control_loops/superstructure/vision_distance_average.h
+++ b/y2017/control_loops/superstructure/vision_distance_average.h
@@ -4,8 +4,8 @@
#include <stdint.h>
#include <chrono>
-#include "aos/common/ring_buffer.h"
-#include "aos/common/time.h"
+#include "aos/ring_buffer/ring_buffer.h"
+#include "aos/time/time.h"
#include "y2017/vision/vision.q.h"
namespace y2017 {
diff --git a/y2017/control_loops/superstructure/vision_time_adjuster.h b/y2017/control_loops/superstructure/vision_time_adjuster.h
index 46c7f89..52e7d70 100644
--- a/y2017/control_loops/superstructure/vision_time_adjuster.h
+++ b/y2017/control_loops/superstructure/vision_time_adjuster.h
@@ -3,8 +3,8 @@
#include <stdint.h>
-#include "aos/common/ring_buffer.h"
-#include "aos/common/time.h"
+#include "aos/ring_buffer/ring_buffer.h"
+#include "aos/time/time.h"
#include "y2017/vision/vision.q.h"
namespace y2017 {
diff --git a/y2017/control_loops/superstructure/vision_time_adjuster_test.cc b/y2017/control_loops/superstructure/vision_time_adjuster_test.cc
index c6dcd25..8dc3998 100644
--- a/y2017/control_loops/superstructure/vision_time_adjuster_test.cc
+++ b/y2017/control_loops/superstructure/vision_time_adjuster_test.cc
@@ -2,7 +2,7 @@
#include "gtest/gtest.h"
-#include "aos/common/time.h"
+#include "aos/time/time.h"
#include "aos/testing/test_shm.h"
#include "frc971/control_loops/drivetrain/drivetrain.q.h"
#include "y2017/control_loops/drivetrain/drivetrain_dog_motor_plant.h"
diff --git a/y2017/joystick_reader.cc b/y2017/joystick_reader.cc
index b47c733..b9bbe3d 100644
--- a/y2017/joystick_reader.cc
+++ b/y2017/joystick_reader.cc
@@ -3,11 +3,11 @@
#include <string.h>
#include <unistd.h>
-#include "aos/common/actions/actions.h"
-#include "aos/common/input/driver_station_data.h"
-#include "aos/common/logging/logging.h"
-#include "aos/common/time.h"
-#include "aos/common/util/log_interval.h"
+#include "aos/actions/actions.h"
+#include "aos/input/driver_station_data.h"
+#include "aos/logging/logging.h"
+#include "aos/time/time.h"
+#include "aos/util/log_interval.h"
#include "aos/input/drivetrain_input.h"
#include "aos/input/joystick_input.h"
#include "aos/linux_code/init.h"
diff --git a/y2017/vision/BUILD b/y2017/vision/BUILD
index 2cb41ed..f4c4346 100644
--- a/y2017/vision/BUILD
+++ b/y2017/vision/BUILD
@@ -34,9 +34,9 @@
':vision_result',
':vision_config',
':target_finder',
- '//aos/common/logging:logging',
- '//aos/common/logging:implementations',
- '//aos/common:time',
+ '//aos/logging:logging',
+ '//aos/logging:implementations',
+ '//aos/time:time',
'//aos/vision/image:reader',
'//aos/vision/image:jpeg_routines',
'//aos/vision/image:image_stream',
@@ -57,15 +57,15 @@
],
visibility = ['//visibility:public'],
deps = [
- '//aos/common/logging',
- '//aos/common/logging:queue_logging',
+ '//aos/logging',
+ '//aos/logging:queue_logging',
'//aos/linux_code:init',
- '//aos/common:time',
+ '//aos/time:time',
'//aos/vision/events:udp',
':vision_queue',
':vision_result',
':target_finder',
- '//aos/common:mutex',
+ '//aos/mutex:mutex',
],
)
diff --git a/y2017/vision/target_receiver.cc b/y2017/vision/target_receiver.cc
index 556ae2a..56076c7 100644
--- a/y2017/vision/target_receiver.cc
+++ b/y2017/vision/target_receiver.cc
@@ -1,8 +1,8 @@
#include <netdb.h>
-#include "aos/common/logging/logging.h"
-#include "aos/common/logging/queue_logging.h"
-#include "aos/common/time.h"
+#include "aos/logging/logging.h"
+#include "aos/logging/queue_logging.h"
+#include "aos/time/time.h"
#include "aos/linux_code/init.h"
#include "aos/vision/events/udp.h"
#include "y2017/vision/target_finder.h"
diff --git a/y2017/vision/target_sender.cc b/y2017/vision/target_sender.cc
index 8eb13f5..261c397 100644
--- a/y2017/vision/target_sender.cc
+++ b/y2017/vision/target_sender.cc
@@ -9,9 +9,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/blob/codec.h"
#include "aos/vision/blob/find_blob.h"
#include "aos/vision/blob/range_image.h"
diff --git a/y2017/wpilib_interface.cc b/y2017/wpilib_interface.cc
index 08ce044..52a6989 100644
--- a/y2017/wpilib_interface.cc
+++ b/y2017/wpilib_interface.cc
@@ -21,16 +21,16 @@
#include "VictorSP.h"
#undef ERROR
-#include "aos/common/commonmath.h"
-#include "aos/common/logging/logging.h"
-#include "aos/common/logging/queue_logging.h"
-#include "aos/common/messages/robot_state.q.h"
-#include "aos/common/stl_mutex.h"
-#include "aos/common/time.h"
-#include "aos/common/util/compiler_memory_barrier.h"
-#include "aos/common/util/log_interval.h"
-#include "aos/common/util/phased_loop.h"
-#include "aos/common/util/wrapping_counter.h"
+#include "aos/commonmath.h"
+#include "aos/logging/logging.h"
+#include "aos/logging/queue_logging.h"
+#include "aos/robot_state/robot_state.q.h"
+#include "aos/stl_mutex/stl_mutex.h"
+#include "aos/time/time.h"
+#include "aos/util/compiler_memory_barrier.h"
+#include "aos/util/log_interval.h"
+#include "aos/util/phased_loop.h"
+#include "aos/util/wrapping_counter.h"
#include "aos/linux_code/init.h"
#include "frc971/autonomous/auto.q.h"