Removed Common
Change-Id: I01ea8f07220375c2ad9bc0092281d4f27c642303
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"