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

y2016/control_loops/shooter/BUILD

diff --git a/y2016/control_loops/shooter/BUILD b/y2016/control_loops/shooter/BUILD
index ad967d3..794a35b 100644
--- a/y2016/control_loops/shooter/BUILD
+++ b/y2016/control_loops/shooter/BUILD
@@ -8,7 +8,7 @@
     'shooter.q',
   ],
   deps = [
-    '//aos/common/controls:control_loop_queues',
+    '//aos/controls:control_loop_queues',
     '//frc971/control_loops:queues',
   ],
 )
@@ -54,7 +54,7 @@
   deps = [
     ':shooter_queue',
     ':shooter_plants',
-    '//aos/common/controls:control_loop',
+    '//aos/controls:control_loop',
   ],
 )
 
@@ -67,8 +67,8 @@
     ':shooter_queue',
     ':shooter_lib',
     '//aos/testing:googletest',
-    '//aos/common:queues',
-    '//aos/common/controls:control_loop_test',
+    '//aos:queues',
+    '//aos/controls:control_loop_test',
     '//frc971/control_loops:state_feedback_loop',
     '//frc971/control_loops:team_number_test_environment',
   ],

y2016/control_loops/shooter/shooter.cc

diff --git a/y2016/control_loops/shooter/shooter.cc b/y2016/control_loops/shooter/shooter.cc
index 7b64f99..a047f55 100644
--- a/y2016/control_loops/shooter/shooter.cc
+++ b/y2016/control_loops/shooter/shooter.cc
@@ -2,9 +2,9 @@
 
 #include <chrono>
 
-#include "aos/common/controls/control_loops.q.h"
-#include "aos/common/logging/logging.h"
-#include "aos/common/logging/queue_logging.h"
+#include "aos/controls/control_loops.q.h"
+#include "aos/logging/logging.h"
+#include "aos/logging/queue_logging.h"
 
 #include "y2016/control_loops/shooter/shooter_plant.h"
 

y2016/control_loops/shooter/shooter.h

diff --git a/y2016/control_loops/shooter/shooter.h b/y2016/control_loops/shooter/shooter.h
index aafc472..ac5b2d7 100644
--- a/y2016/control_loops/shooter/shooter.h
+++ b/y2016/control_loops/shooter/shooter.h
@@ -3,8 +3,8 @@
 
 #include <memory>
 
-#include "aos/common/controls/control_loop.h"
-#include "aos/common/time.h"
+#include "aos/controls/control_loop.h"
+#include "aos/time/time.h"
 #include "frc971/control_loops/state_feedback_loop.h"
 
 #include "y2016/control_loops/shooter/shooter_integral_plant.h"

y2016/control_loops/shooter/shooter.q

diff --git a/y2016/control_loops/shooter/shooter.q b/y2016/control_loops/shooter/shooter.q
index 0e00a02..f6f9298 100644
--- a/y2016/control_loops/shooter/shooter.q
+++ b/y2016/control_loops/shooter/shooter.q
@@ -1,6 +1,6 @@
 package y2016.control_loops.shooter;
 
-import "aos/common/controls/control_loops.q";
+import "aos/controls/control_loops.q";
 import "frc971/control_loops/control_loops.q";
 
 struct ShooterSideStatus {

y2016/control_loops/shooter/shooter_lib_test.cc

diff --git a/y2016/control_loops/shooter/shooter_lib_test.cc b/y2016/control_loops/shooter/shooter_lib_test.cc
index 5cd7ce5..c5d5aa7 100644
--- a/y2016/control_loops/shooter/shooter_lib_test.cc
+++ b/y2016/control_loops/shooter/shooter_lib_test.cc
@@ -6,8 +6,8 @@
 #include <memory>
 
 #include "gtest/gtest.h"
-#include "aos/common/queue.h"
-#include "aos/common/controls/control_loop_test.h"
+#include "aos/queue.h"
+#include "aos/controls/control_loop_test.h"
 #include "frc971/control_loops/team_number_test_environment.h"
 #include "y2016/control_loops/shooter/shooter.q.h"
 #include "y2016/control_loops/shooter/shooter.h"