Removed Common
Change-Id: I01ea8f07220375c2ad9bc0092281d4f27c642303
diff --git a/y2012/BUILD b/y2012/BUILD
index 097ea57..acc60d4 100644
--- a/y2012/BUILD
+++ b/y2012/BUILD
@@ -6,10 +6,10 @@
"joystick_reader.cc",
],
deps = [
- "//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",
@@ -41,15 +41,15 @@
],
restricted_to = ["//tools:roborio"],
deps = [
- "//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/y2012/control_loops/accessories/BUILD b/y2012/control_loops/accessories/BUILD
index 921d694..878024a 100644
--- a/y2012/control_loops/accessories/BUILD
+++ b/y2012/control_loops/accessories/BUILD
@@ -10,7 +10,7 @@
deps = [
':accessories_queue',
'//aos/linux_code:init',
- '//aos/common/controls:control_loop',
+ '//aos/controls:control_loop',
],
)
@@ -20,6 +20,6 @@
'accessories.q',
],
deps = [
- '//aos/common/controls:control_loop_queues',
+ '//aos/controls:control_loop_queues',
],
)
diff --git a/y2012/control_loops/accessories/accessories.cc b/y2012/control_loops/accessories/accessories.cc
index 1c0dcbc..2bbe4c8 100644
--- a/y2012/control_loops/accessories/accessories.cc
+++ b/y2012/control_loops/accessories/accessories.cc
@@ -1,7 +1,7 @@
#include "y2012/control_loops/accessories/accessories.q.h"
#include "aos/linux_code/init.h"
-#include "aos/common/controls/control_loop.h"
+#include "aos/controls/control_loop.h"
namespace y2012 {
namespace control_loops {
diff --git a/y2012/control_loops/accessories/accessories.q b/y2012/control_loops/accessories/accessories.q
index 79f9820..dbcb33b 100644
--- a/y2012/control_loops/accessories/accessories.q
+++ b/y2012/control_loops/accessories/accessories.q
@@ -1,6 +1,6 @@
package y2012.control_loops;
-import "aos/common/controls/control_loops.q";
+import "aos/controls/control_loops.q";
queue_group AccessoriesQueue {
implements aos.control_loops.ControlLoop;
diff --git a/y2012/joystick_reader.cc b/y2012/joystick_reader.cc
index 3b5bc48..30de49e 100644
--- a/y2012/joystick_reader.cc
+++ b/y2012/joystick_reader.cc
@@ -5,10 +5,10 @@
#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/time.h"
-#include "aos/common/actions/actions.h"
+#include "aos/input/driver_station_data.h"
+#include "aos/logging/logging.h"
+#include "aos/time/time.h"
+#include "aos/actions/actions.h"
#include "frc971/control_loops/drivetrain/drivetrain.q.h"
#include "y2012/control_loops/accessories/accessories.q.h"
diff --git a/y2012/wpilib_interface.cc b/y2012/wpilib_interface.cc
index 59e715d..3f74fc1 100644
--- a/y2012/wpilib_interface.cc
+++ b/y2012/wpilib_interface.cc
@@ -21,15 +21,15 @@
#include "PowerDistributionPanel.h"
#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/control_loops/drivetrain/drivetrain.q.h"
#include "frc971/wpilib/buffered_pcm.h"