commit 33858a37b0aebf19bad51e664b5238f57f95af4c
author John Park <johnhenryp@icloud.com> Fri Sep 28 23:05:48 2018 -0700
committer John Park <johnhenryp@icloud.com> Sat Oct 13 19:36:22 2018 -0700
tree abc7fdd2817cd432500e4dd689a7dfcd1055f8ec
parent db4e8e58ee12c58d663ff152b5f6f6f55fb948b2

Removed Common

Change-Id: I01ea8f07220375c2ad9bc0092281d4f27c642303

y2018/control_loops/superstructure/intake/BUILD

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",

y2018/control_loops/superstructure/intake/intake.cc

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"

y2018/control_loops/superstructure/intake/intake.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"