aos/common/{control_loop=>controls} and moved polytope.h into it
diff --git a/frc971/control_loops/drivetrain/drivetrain.cc b/frc971/control_loops/drivetrain/drivetrain.cc
index c8b943c..092f66e 100644
--- a/frc971/control_loops/drivetrain/drivetrain.cc
+++ b/frc971/control_loops/drivetrain/drivetrain.cc
@@ -8,7 +8,7 @@
#include "aos/common/logging/logging.h"
#include "aos/common/queue.h"
-#include "aos/controls/polytope.h"
+#include "aos/common/controls/polytope.h"
#include "aos/common/commonmath.h"
#include "aos/common/logging/queue_logging.h"
#include "aos/common/logging/matrix_logging.h"
diff --git a/frc971/control_loops/drivetrain/drivetrain.gyp b/frc971/control_loops/drivetrain/drivetrain.gyp
index bf73d9f..339e01e 100644
--- a/frc971/control_loops/drivetrain/drivetrain.gyp
+++ b/frc971/control_loops/drivetrain/drivetrain.gyp
@@ -42,7 +42,7 @@
'drivetrain_loop',
'<(AOS)/common/common.gyp:controls',
'<(DEPTH)/frc971/frc971.gyp:constants',
- '<(DEPTH)/aos/build/externals.gyp:libcdd',
+ '<(AOS)/common/controls/controls.gyp:polytope',
'<(DEPTH)/frc971/control_loops/control_loops.gyp:state_feedback_loop',
'<(DEPTH)/frc971/control_loops/control_loops.gyp:coerce_goal',
'<(DEPTH)/frc971/queues/queues.gyp:queues',
@@ -51,7 +51,7 @@
'<(AOS)/common/logging/logging.gyp:matrix_logging',
],
'export_dependent_settings': [
- '<(DEPTH)/aos/build/externals.gyp:libcdd',
+ '<(AOS)/common/controls/controls.gyp:polytope',
'<(DEPTH)/frc971/control_loops/control_loops.gyp:state_feedback_loop',
'<(DEPTH)/frc971/control_loops/control_loops.gyp:coerce_goal',
'<(AOS)/common/common.gyp:controls',
diff --git a/frc971/control_loops/drivetrain/drivetrain.h b/frc971/control_loops/drivetrain/drivetrain.h
index 1d4c8e4..0130828 100644
--- a/frc971/control_loops/drivetrain/drivetrain.h
+++ b/frc971/control_loops/drivetrain/drivetrain.h
@@ -3,9 +3,9 @@
#include "Eigen/Dense"
-#include "aos/controls/polytope.h"
-#include "aos/common/control_loop/control_loop.h"
-#include "aos/controls/polytope.h"
+#include "aos/common/controls/polytope.h"
+#include "aos/common/controls/control_loop.h"
+#include "aos/common/controls/polytope.h"
#include "frc971/control_loops/drivetrain/drivetrain.q.h"
#include "aos/common/util/log_interval.h"
diff --git a/frc971/control_loops/drivetrain/drivetrain.q b/frc971/control_loops/drivetrain/drivetrain.q
index 50d9dbf..a3706bc 100644
--- a/frc971/control_loops/drivetrain/drivetrain.q
+++ b/frc971/control_loops/drivetrain/drivetrain.q
@@ -1,6 +1,6 @@
package frc971.control_loops;
-import "aos/common/control_loop/control_loops.q";
+import "aos/common/controls/control_loops.q";
struct GearLogging {
int8_t controller_index;
diff --git a/frc971/control_loops/drivetrain/drivetrain_lib_test.cc b/frc971/control_loops/drivetrain/drivetrain_lib_test.cc
index 0827fec..a2567e4 100644
--- a/frc971/control_loops/drivetrain/drivetrain_lib_test.cc
+++ b/frc971/control_loops/drivetrain/drivetrain_lib_test.cc
@@ -6,7 +6,7 @@
#include "aos/common/network/team_number.h"
#include "aos/common/queue.h"
#include "aos/common/queue_testutils.h"
-#include "aos/controls/polytope.h"
+#include "aos/common/controls/polytope.h"
#include "frc971/control_loops/drivetrain/drivetrain.q.h"
#include "frc971/control_loops/drivetrain/drivetrain.h"