Removed Common
Change-Id: I01ea8f07220375c2ad9bc0092281d4f27c642303
diff --git a/y2014/actors/BUILD b/y2014/actors/BUILD
index eb9e0f9..37de2c9 100644
--- a/y2014/actors/BUILD
+++ b/y2014/actors/BUILD
@@ -16,7 +16,7 @@
'shoot_action.q',
],
deps = [
- '//aos/common/actions:action_queue',
+ '//aos/actions:action_queue',
],
)
@@ -30,9 +30,9 @@
],
deps = [
':shoot_action_queue',
- '//aos/common/actions:action_lib',
+ '//aos/actions:action_lib',
'//y2014/queues:profile_params',
- '//aos/common/logging',
+ '//aos/logging',
'//y2014/control_loops/shooter:shooter_queue',
'//y2014/control_loops/claw:claw_queue',
'//frc971/control_loops/drivetrain:drivetrain_queue',
@@ -58,7 +58,7 @@
'drivetrain_action.q',
],
deps = [
- '//aos/common/actions:action_queue',
+ '//aos/actions:action_queue',
],
)
@@ -73,14 +73,14 @@
deps = [
':drivetrain_action_queue',
'//y2014:constants',
- '//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/time:time',
+ '//aos:math',
+ '//aos/util:phased_loop',
+ '//aos/logging',
+ '//aos/actions:action_lib',
+ '//aos/logging:queue_logging',
'//third_party/eigen',
- '//aos/common/util:trapezoid_profile',
+ '//aos/util:trapezoid_profile',
'//frc971/control_loops/drivetrain:drivetrain_queue',
'//frc971/control_loops:state_feedback_loop',
],
diff --git a/y2014/actors/drivetrain_action.q b/y2014/actors/drivetrain_action.q
index 2f3eb15..458a3e5 100644
--- a/y2014/actors/drivetrain_action.q
+++ b/y2014/actors/drivetrain_action.q
@@ -1,6 +1,6 @@
package y2014.actors;
-import "aos/common/actions/actions.q";
+import "aos/actions/actions.q";
// Parameters to send with start.
struct DrivetrainActionParams {
diff --git a/y2014/actors/drivetrain_actor.cc b/y2014/actors/drivetrain_actor.cc
index 418b591..6aec414 100644
--- a/y2014/actors/drivetrain_actor.cc
+++ b/y2014/actors/drivetrain_actor.cc
@@ -5,11 +5,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 "frc971/control_loops/drivetrain/drivetrain.q.h"
#include "y2014/actors/drivetrain_actor.h"
diff --git a/y2014/actors/drivetrain_actor.h b/y2014/actors/drivetrain_actor.h
index 2a9e307..454a41e 100644
--- a/y2014/actors/drivetrain_actor.h
+++ b/y2014/actors/drivetrain_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 "y2014/actors/drivetrain_action.q.h"
diff --git a/y2014/actors/shoot_action.q b/y2014/actors/shoot_action.q
index 9c56e99..ccf6dcf 100644
--- a/y2014/actors/shoot_action.q
+++ b/y2014/actors/shoot_action.q
@@ -1,6 +1,6 @@
package y2014.actors;
-import "aos/common/actions/actions.q";
+import "aos/actions/actions.q";
queue_group ShootActionQueueGroup {
implements frc971.actions.ActionQueueGroup;
diff --git a/y2014/actors/shoot_actor.cc b/y2014/actors/shoot_actor.cc
index 743a4c3..ca5168f 100644
--- a/y2014/actors/shoot_actor.cc
+++ b/y2014/actors/shoot_actor.cc
@@ -2,7 +2,7 @@
#include <functional>
-#include "aos/common/logging/logging.h"
+#include "aos/logging/logging.h"
#include "y2014/control_loops/shooter/shooter.q.h"
#include "y2014/control_loops/claw/claw.q.h"
diff --git a/y2014/actors/shoot_actor.h b/y2014/actors/shoot_actor.h
index 4ede888..804feee 100644
--- a/y2014/actors/shoot_actor.h
+++ b/y2014/actors/shoot_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 "y2014/actors/shoot_action.q.h"