Removed Common
Change-Id: I01ea8f07220375c2ad9bc0092281d4f27c642303
diff --git a/y2016/control_loops/python/BUILD b/y2016/control_loops/python/BUILD
index adb3150..08a34e8 100644
--- a/y2016/control_loops/python/BUILD
+++ b/y2016/control_loops/python/BUILD
@@ -70,7 +70,7 @@
restricted_to = ["//tools:k8"],
deps = [
":python_init",
- "//aos/common/util:py_trapezoid_profile",
+ "//aos/util:py_trapezoid_profile",
"//external:python-gflags",
"//external:python-glog",
"//frc971/control_loops/python:controls",
@@ -87,7 +87,7 @@
restricted_to = ["//tools:k8"],
deps = [
":python_init",
- "//aos/common/util:py_trapezoid_profile",
+ "//aos/util:py_trapezoid_profile",
"//external:python-gflags",
"//external:python-glog",
"//frc971/control_loops/python:controls",
@@ -104,7 +104,7 @@
restricted_to = ["//tools:k8"],
deps = [
":python_init",
- "//aos/common/util:py_trapezoid_profile",
+ "//aos/util:py_trapezoid_profile",
"//external:python-gflags",
"//external:python-glog",
"//frc971/control_loops/python:controls",
@@ -119,7 +119,7 @@
],
restricted_to = ["//tools:k8"],
deps = [
- "//aos/common/util:py_trapezoid_profile",
+ "//aos/util:py_trapezoid_profile",
"//external:python-gflags",
"//external:python-glog",
"//frc971/control_loops/python:controls",
@@ -133,7 +133,7 @@
],
restricted_to = ["//tools:k8"],
deps = [
- "//aos/common/util:py_trapezoid_profile",
+ "//aos/util:py_trapezoid_profile",
"//external:python-gflags",
"//external:python-glog",
"//frc971/control_loops/python:controls",
@@ -150,7 +150,7 @@
deps = [
":shoulder_lib",
":wrist_lib",
- "//aos/common/util:py_trapezoid_profile",
+ "//aos/util:py_trapezoid_profile",
"//external:python-gflags",
"//external:python-glog",
"//frc971/control_loops/python:controls",
@@ -169,7 +169,7 @@
":python_init",
":shoulder_lib",
":wrist_lib",
- "//aos/common/util:py_trapezoid_profile",
+ "//aos/util:py_trapezoid_profile",
"//external:python-gflags",
"//external:python-glog",
"//frc971/control_loops/python:controls",
diff --git a/y2016/control_loops/python/arm.py b/y2016/control_loops/python/arm.py
index 8908038..5c5793b 100755
--- a/y2016/control_loops/python/arm.py
+++ b/y2016/control_loops/python/arm.py
@@ -9,7 +9,7 @@
from y2016.control_loops.python.shoulder import Shoulder, IntegralShoulder
from y2016.control_loops.python.wrist import Wrist, IntegralWrist
-from aos.common.util.trapezoid_profile import TrapezoidProfile
+from aos.util.trapezoid_profile import TrapezoidProfile
from matplotlib import pylab
import gflags
diff --git a/y2016/control_loops/python/intake.py b/y2016/control_loops/python/intake.py
index 02c1ada..abb755c 100755
--- a/y2016/control_loops/python/intake.py
+++ b/y2016/control_loops/python/intake.py
@@ -1,6 +1,6 @@
#!/usr/bin/python
-from aos.common.util.trapezoid_profile import TrapezoidProfile
+from aos.util.trapezoid_profile import TrapezoidProfile
from frc971.control_loops.python import control_loop
from frc971.control_loops.python import controls
import numpy
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',
],
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"
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"
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 {
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"
diff --git a/y2016/control_loops/superstructure/BUILD b/y2016/control_loops/superstructure/BUILD
index fb0750b..38f20d2 100644
--- a/y2016/control_loops/superstructure/BUILD
+++ b/y2016/control_loops/superstructure/BUILD
@@ -8,7 +8,7 @@
'superstructure.q',
],
deps = [
- '//aos/common/controls:control_loop_queues',
+ '//aos/controls:control_loop_queues',
'//frc971/control_loops:queues',
],
)
@@ -75,9 +75,9 @@
deps = [
':superstructure_queue',
':superstructure_plants',
- '//aos/common/controls:control_loop',
- '//aos/common/util:trapezoid_profile',
- '//aos/common:math',
+ '//aos/controls:control_loop',
+ '//aos/util:trapezoid_profile',
+ '//aos:math',
'//frc971/control_loops:profiled_subsystem',
'//frc971/control_loops:simple_capped_state_feedback_loop',
'//frc971/control_loops:state_feedback_loop',
@@ -96,10 +96,10 @@
':superstructure_queue',
':superstructure_lib',
'//aos/testing:googletest',
- '//aos/common:queues',
- '//aos/common/controls:control_loop_test',
- '//aos/common:math',
- '//aos/common:time',
+ '//aos:queues',
+ '//aos/controls:control_loop_test',
+ '//aos:math',
+ '//aos/time:time',
'//frc971/control_loops:position_sensor_sim',
'//frc971/control_loops:team_number_test_environment',
],
diff --git a/y2016/control_loops/superstructure/superstructure.cc b/y2016/control_loops/superstructure/superstructure.cc
index 2366fb7..1bcac52 100644
--- a/y2016/control_loops/superstructure/superstructure.cc
+++ b/y2016/control_loops/superstructure/superstructure.cc
@@ -1,9 +1,9 @@
#include "y2016/control_loops/superstructure/superstructure.h"
#include "y2016/control_loops/superstructure/superstructure_controls.h"
-#include "aos/common/commonmath.h"
-#include "aos/common/controls/control_loops.q.h"
-#include "aos/common/logging/logging.h"
+#include "aos/commonmath.h"
+#include "aos/controls/control_loops.q.h"
+#include "aos/logging/logging.h"
#include "y2016/control_loops/superstructure/integral_intake_plant.h"
#include "y2016/control_loops/superstructure/integral_arm_plant.h"
diff --git a/y2016/control_loops/superstructure/superstructure.h b/y2016/control_loops/superstructure/superstructure.h
index eb16405..17a1547 100644
--- a/y2016/control_loops/superstructure/superstructure.h
+++ b/y2016/control_loops/superstructure/superstructure.h
@@ -3,8 +3,8 @@
#include <memory>
-#include "aos/common/controls/control_loop.h"
-#include "aos/common/util/trapezoid_profile.h"
+#include "aos/controls/control_loop.h"
+#include "aos/util/trapezoid_profile.h"
#include "frc971/control_loops/state_feedback_loop.h"
#include "frc971/zeroing/zeroing.h"
diff --git a/y2016/control_loops/superstructure/superstructure.q b/y2016/control_loops/superstructure/superstructure.q
index 76c9850..1431d23 100644
--- a/y2016/control_loops/superstructure/superstructure.q
+++ b/y2016/control_loops/superstructure/superstructure.q
@@ -1,6 +1,6 @@
package y2016.control_loops;
-import "aos/common/controls/control_loops.q";
+import "aos/controls/control_loops.q";
import "frc971/control_loops/control_loops.q";
struct JointState {
diff --git a/y2016/control_loops/superstructure/superstructure_controls.cc b/y2016/control_loops/superstructure/superstructure_controls.cc
index a522e40..e787f79 100644
--- a/y2016/control_loops/superstructure/superstructure_controls.cc
+++ b/y2016/control_loops/superstructure/superstructure_controls.cc
@@ -1,7 +1,7 @@
#include "y2016/control_loops/superstructure/superstructure_controls.h"
-#include "aos/common/controls/control_loops.q.h"
-#include "aos/common/logging/logging.h"
+#include "aos/controls/control_loops.q.h"
+#include "aos/logging/logging.h"
#include "y2016/control_loops/superstructure/integral_intake_plant.h"
#include "y2016/control_loops/superstructure/integral_arm_plant.h"
diff --git a/y2016/control_loops/superstructure/superstructure_controls.h b/y2016/control_loops/superstructure/superstructure_controls.h
index 5d8c85a..49c8097 100644
--- a/y2016/control_loops/superstructure/superstructure_controls.h
+++ b/y2016/control_loops/superstructure/superstructure_controls.h
@@ -3,8 +3,8 @@
#include <memory>
-#include "aos/common/controls/control_loop.h"
-#include "aos/common/util/trapezoid_profile.h"
+#include "aos/controls/control_loop.h"
+#include "aos/util/trapezoid_profile.h"
#include "frc971/control_loops/profiled_subsystem.h"
#include "frc971/control_loops/simple_capped_state_feedback_loop.h"
#include "frc971/control_loops/state_feedback_loop.h"
diff --git a/y2016/control_loops/superstructure/superstructure_lib_test.cc b/y2016/control_loops/superstructure/superstructure_lib_test.cc
index b3e980d..824f291 100644
--- a/y2016/control_loops/superstructure/superstructure_lib_test.cc
+++ b/y2016/control_loops/superstructure/superstructure_lib_test.cc
@@ -5,10 +5,10 @@
#include <chrono>
#include <memory>
-#include "aos/common/commonmath.h"
-#include "aos/common/controls/control_loop_test.h"
-#include "aos/common/queue.h"
-#include "aos/common/time.h"
+#include "aos/commonmath.h"
+#include "aos/controls/control_loop_test.h"
+#include "aos/queue.h"
+#include "aos/time/time.h"
#include "frc971/control_loops/position_sensor_sim.h"
#include "frc971/control_loops/team_number_test_environment.h"
#include "gtest/gtest.h"