Removed Common
Change-Id: I01ea8f07220375c2ad9bc0092281d4f27c642303
diff --git a/y2018/BUILD b/y2018/BUILD
index cccc2cf..51bffd2 100644
--- a/y2018/BUILD
+++ b/y2018/BUILD
@@ -43,12 +43,12 @@
],
deps = [
":vision_proto",
- "//aos/common:stl_mutex",
- "//aos/common:time",
- "//aos/common/actions:action_lib",
- "//aos/common/logging",
- "//aos/common/network:team_number",
- "//aos/common/util:log_interval",
+ "//aos/stl_mutex:stl_mutex",
+ "//aos/time:time",
+ "//aos/actions:action_lib",
+ "//aos/logging",
+ "//aos/network:team_number",
+ "//aos/util:log_interval",
"//aos/input:drivetrain_input",
"//aos/input:joystick_input",
"//aos/linux_code:init",
@@ -73,9 +73,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",
"//y2018/control_loops/drivetrain:polydrivetrain_plants",
@@ -92,16 +92,16 @@
restricted_to = ["//tools:roborio"],
deps = [
":status_light",
- "//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/y2018/actors/BUILD b/y2018/actors/BUILD
index fa772b8..876d8e4 100644
--- a/y2018/actors/BUILD
+++ b/y2018/actors/BUILD
@@ -9,9 +9,9 @@
"autonomous_actor.h",
],
deps = [
- "//aos/common/actions:action_lib",
- "//aos/common/logging",
- "//aos/common/util:phased_loop",
+ "//aos/actions:action_lib",
+ "//aos/logging",
+ "//aos/util:phased_loop",
"//frc971/autonomous:base_autonomous_actor",
"//frc971/control_loops/drivetrain:drivetrain_config",
"//frc971/control_loops/drivetrain:drivetrain_queue",
diff --git a/y2018/actors/autonomous_actor.cc b/y2018/actors/autonomous_actor.cc
index cb1dd9c..783a166 100644
--- a/y2018/actors/autonomous_actor.cc
+++ b/y2018/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 "y2018/control_loops/drivetrain/drivetrain_base.h"
diff --git a/y2018/actors/autonomous_actor.h b/y2018/actors/autonomous_actor.h
index 32f8287..0cff3f3 100644
--- a/y2018/actors/autonomous_actor.h
+++ b/y2018/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/y2018/constants.cc b/y2018/constants.cc
index 70c58f0..408a058 100644
--- a/y2018/constants.cc
+++ b/y2018/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 "y2018/control_loops/drivetrain/drivetrain_dog_motor_plant.h"
diff --git a/y2018/control_loops/superstructure/BUILD b/y2018/control_loops/superstructure/BUILD
index cc179d5..569e3a1 100644
--- a/y2018/control_loops/superstructure/BUILD
+++ b/y2018/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",
],
)
@@ -23,7 +23,7 @@
],
deps = [
":superstructure_queue",
- "//aos/common/controls:control_loop",
+ "//aos/controls:control_loop",
"//frc971/control_loops:queues",
"//frc971/control_loops/drivetrain:drivetrain_queue",
"//y2018:constants",
@@ -42,10 +42,10 @@
deps = [
":superstructure_lib",
":superstructure_queue",
- "//aos/common:math",
- "//aos/common:queues",
- "//aos/common:time",
- "//aos/common/controls:control_loop_test",
+ "//aos:math",
+ "//aos:queues",
+ "//aos/time:time",
+ "//aos/controls:control_loop_test",
"//aos/testing:googletest",
"//frc971/control_loops:position_sensor_sim",
"//frc971/control_loops:team_number_test_environment",
diff --git a/y2018/control_loops/superstructure/arm/BUILD b/y2018/control_loops/superstructure/arm/BUILD
index 1ec7ad7..bf30121 100644
--- a/y2018/control_loops/superstructure/arm/BUILD
+++ b/y2018/control_loops/superstructure/arm/BUILD
@@ -9,7 +9,7 @@
visibility = ["//visibility:public"],
deps = [
":dynamics",
- "//aos/common/logging",
+ "//aos/logging",
"//frc971/control_loops:dlqr",
"//frc971/control_loops:jacobian",
"//third_party/eigen",
@@ -129,7 +129,7 @@
":generated_graph",
":graph",
":trajectory",
- "//aos/common/logging:queue_logging",
+ "//aos/logging:queue_logging",
"//frc971/zeroing",
"//y2018:constants",
"//y2018/control_loops/superstructure:superstructure_queue",
diff --git a/y2018/control_loops/superstructure/arm/arm.cc b/y2018/control_loops/superstructure/arm/arm.cc
index a8c00cb..f3f58f8 100644
--- a/y2018/control_loops/superstructure/arm/arm.cc
+++ b/y2018/control_loops/superstructure/arm/arm.cc
@@ -3,8 +3,8 @@
#include <chrono>
#include <iostream>
-#include "aos/common/logging/logging.h"
-#include "aos/common/logging/queue_logging.h"
+#include "aos/logging/logging.h"
+#include "aos/logging/queue_logging.h"
#include "y2018/constants.h"
#include "y2018/control_loops/superstructure/arm/demo_path.h"
#include "y2018/control_loops/superstructure/arm/dynamics.h"
diff --git a/y2018/control_loops/superstructure/arm/trajectory.cc b/y2018/control_loops/superstructure/arm/trajectory.cc
index 48140dd..d251330 100644
--- a/y2018/control_loops/superstructure/arm/trajectory.cc
+++ b/y2018/control_loops/superstructure/arm/trajectory.cc
@@ -1,7 +1,7 @@
#include "y2018/control_loops/superstructure/arm/trajectory.h"
#include "Eigen/Dense"
-#include "aos/common/logging/logging.h"
+#include "aos/logging/logging.h"
#include "frc971/control_loops/dlqr.h"
#include "frc971/control_loops/jacobian.h"
#include "third_party/gflags/include/gflags/gflags.h"
diff --git a/y2018/control_loops/superstructure/intake/BUILD b/y2018/control_loops/superstructure/intake/BUILD
index ff2f16e..ca1289e 100644
--- a/y2018/control_loops/superstructure/intake/BUILD
+++ b/y2018/control_loops/superstructure/intake/BUILD
@@ -39,9 +39,9 @@
visibility = ["//visibility:public"],
deps = [
":intake_plants",
- "//aos/common:math",
- "//aos/common/controls:control_loop",
- "//aos/common/logging:queue_logging",
+ "//aos:math",
+ "//aos/controls:control_loop",
+ "//aos/logging:queue_logging",
"//frc971/control_loops:queues",
"//frc971/zeroing",
"//y2018:constants",
diff --git a/y2018/control_loops/superstructure/intake/intake.cc b/y2018/control_loops/superstructure/intake/intake.cc
index 080720a..6707356 100644
--- a/y2018/control_loops/superstructure/intake/intake.cc
+++ b/y2018/control_loops/superstructure/intake/intake.cc
@@ -2,10 +2,10 @@
#include <chrono>
-#include "aos/common/commonmath.h"
-#include "aos/common/controls/control_loops.q.h"
-#include "aos/common/logging/logging.h"
-#include "aos/common/logging/queue_logging.h"
+#include "aos/commonmath.h"
+#include "aos/controls/control_loops.q.h"
+#include "aos/logging/logging.h"
+#include "aos/logging/queue_logging.h"
#include "y2018/constants.h"
#include "y2018/control_loops/superstructure/intake/intake_delayed_plant.h"
diff --git a/y2018/control_loops/superstructure/intake/intake.h b/y2018/control_loops/superstructure/intake/intake.h
index e570c50..dff0adc 100644
--- a/y2018/control_loops/superstructure/intake/intake.h
+++ b/y2018/control_loops/superstructure/intake/intake.h
@@ -1,8 +1,8 @@
#ifndef Y2018_CONTROL_LOOPS_SUPERSTRUCTURE_INTAKE_INTAKE_H_
#define Y2018_CONTROL_LOOPS_SUPERSTRUCTURE_INTAKE_INTAKE_H_
-#include "aos/common/commonmath.h"
-#include "aos/common/controls/control_loop.h"
+#include "aos/commonmath.h"
+#include "aos/controls/control_loop.h"
#include "frc971/control_loops/control_loops.q.h"
#include "frc971/zeroing/zeroing.h"
#include "y2018/constants.h"
diff --git a/y2018/control_loops/superstructure/superstructure.cc b/y2018/control_loops/superstructure/superstructure.cc
index 26f75be..c2d0bcf 100644
--- a/y2018/control_loops/superstructure/superstructure.cc
+++ b/y2018/control_loops/superstructure/superstructure.cc
@@ -2,8 +2,8 @@
#include <chrono>
-#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/control_loops.q.h"
#include "frc971/control_loops/drivetrain/drivetrain.q.h"
#include "y2018/constants.h"
diff --git a/y2018/control_loops/superstructure/superstructure.h b/y2018/control_loops/superstructure/superstructure.h
index ec0c9e1..4f8f4d5 100644
--- a/y2018/control_loops/superstructure/superstructure.h
+++ b/y2018/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 "y2018/control_loops/superstructure/arm/arm.h"
#include "y2018/control_loops/superstructure/intake/intake.h"
diff --git a/y2018/control_loops/superstructure/superstructure.q b/y2018/control_loops/superstructure/superstructure.q
index fc1d935..ee38539 100644
--- a/y2018/control_loops/superstructure/superstructure.q
+++ b/y2018/control_loops/superstructure/superstructure.q
@@ -1,6 +1,6 @@
package y2018.control_loops;
-import "aos/common/controls/control_loops.q";
+import "aos/controls/control_loops.q";
import "frc971/control_loops/control_loops.q";
struct IntakeSideStatus {
diff --git a/y2018/control_loops/superstructure/superstructure_lib_test.cc b/y2018/control_loops/superstructure/superstructure_lib_test.cc
index d21d1ce..62b20f8 100644
--- a/y2018/control_loops/superstructure/superstructure_lib_test.cc
+++ b/y2018/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/drivetrain/drivetrain.q.h"
#include "frc971/control_loops/position_sensor_sim.h"
#include "frc971/control_loops/team_number_test_environment.h"
diff --git a/y2018/joystick_reader.cc b/y2018/joystick_reader.cc
index 45b7302..de8f1f6 100644
--- a/y2018/joystick_reader.cc
+++ b/y2018/joystick_reader.cc
@@ -5,13 +5,13 @@
#include <mutex>
#include <google/protobuf/stubs/stringprintf.h>
-#include "aos/common/actions/actions.h"
-#include "aos/common/input/driver_station_data.h"
-#include "aos/common/logging/logging.h"
-#include "aos/common/network/team_number.h"
-#include "aos/common/stl_mutex.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/network/team_number.h"
+#include "aos/stl_mutex/stl_mutex.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/y2018/vision/BUILD b/y2018/vision/BUILD
index dfe5ebb..4093ebc 100644
--- a/y2018/vision/BUILD
+++ b/y2018/vision/BUILD
@@ -4,8 +4,8 @@
name = "image_streamer",
srcs = ["image_streamer.cc"],
deps = [
- "//aos/common/logging",
- "//aos/common/logging:implementations",
+ "//aos/logging",
+ "//aos/logging:implementations",
"//aos/vision/blob:codec",
"//aos/vision/events:epoll_events",
"//aos/vision/events:socket_types",
@@ -33,9 +33,9 @@
visibility = ["//visibility:public"],
deps = [
":vision_queue",
- "//aos/common:time",
- "//aos/common/logging",
- "//aos/common/logging:queue_logging",
+ "//aos/time:time",
+ "//aos/logging",
+ "//aos/logging:queue_logging",
"//aos/linux_code:init",
"//aos/vision/events:udp",
"//y2018:vision_proto",
diff --git a/y2018/vision/image_streamer.cc b/y2018/vision/image_streamer.cc
index f6da93c..dea6a77 100644
--- a/y2018/vision/image_streamer.cc
+++ b/y2018/vision/image_streamer.cc
@@ -5,8 +5,8 @@
#include <fstream>
#include <string>
-#include "aos/common/logging/implementations.h"
-#include "aos/common/logging/logging.h"
+#include "aos/logging/implementations.h"
+#include "aos/logging/logging.h"
#include "aos/vision/blob/codec.h"
#include "aos/vision/events/socket_types.h"
#include "aos/vision/events/udp.h"
diff --git a/y2018/vision/vision_status.cc b/y2018/vision/vision_status.cc
index e8ac6db..6234659 100644
--- a/y2018/vision/vision_status.cc
+++ b/y2018/vision/vision_status.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 "y2018/vision.pb.h"
diff --git a/y2018/wpilib_interface.cc b/y2018/wpilib_interface.cc
index ec54da8..4cb6de0 100644
--- a/y2018/wpilib_interface.cc
+++ b/y2018/wpilib_interface.cc
@@ -21,16 +21,16 @@
#include "ctre/phoenix/CANifier.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"