commit a6553edc74b75e864d4f4cef57e913707ab55568
author Brian <brians> Wed Apr 02 21:26:46 2014 -0700
committer Brian <brians> Wed Apr 02 21:26:46 2014 -0700
tree 9df836d43a6aacc349ecfa5d8271bac5a8121ed0
parent 9040b4e6475f1d3dabd38777a8a0958cd4b9ec88

aos/common/{control_loop=>controls} and moved polytope.h into it

frc971/control_loops/claw/claw.cc

diff --git a/frc971/control_loops/claw/claw.cc b/frc971/control_loops/claw/claw.cc
index 611dd0e..dc7e112 100644
--- a/frc971/control_loops/claw/claw.cc
+++ b/frc971/control_loops/claw/claw.cc
@@ -2,7 +2,7 @@
 
 #include <algorithm>
 
-#include "aos/common/control_loop/control_loops.q.h"
+#include "aos/common/controls/control_loops.q.h"
 #include "aos/common/logging/logging.h"
 #include "aos/common/logging/queue_logging.h"
 #include "aos/common/logging/matrix_logging.h"

frc971/control_loops/claw/claw.gyp

diff --git a/frc971/control_loops/claw/claw.gyp b/frc971/control_loops/claw/claw.gyp
index 5982378..65472d6 100644
--- a/frc971/control_loops/claw/claw.gyp
+++ b/frc971/control_loops/claw/claw.gyp
@@ -29,7 +29,7 @@
         '<(AOS)/common/common.gyp:controls',
         '<(DEPTH)/frc971/frc971.gyp:constants',
         '<(DEPTH)/frc971/control_loops/control_loops.gyp:state_feedback_loop',
-        '<(DEPTH)/aos/build/externals.gyp:libcdd',
+        '<(AOS)/common/controls/controls.gyp:polytope',
         '<(DEPTH)/frc971/control_loops/control_loops.gyp:coerce_goal',
         '<(AOS)/common/logging/logging.gyp:queue_logging',
         '<(AOS)/common/logging/logging.gyp:matrix_logging',
@@ -38,7 +38,7 @@
         'claw_loop',
         '<(AOS)/common/common.gyp:controls',
         '<(DEPTH)/frc971/control_loops/control_loops.gyp:state_feedback_loop',
-        '<(DEPTH)/aos/build/externals.gyp:libcdd',
+        '<(AOS)/common/controls/controls.gyp:polytope',
         '<(DEPTH)/frc971/control_loops/control_loops.gyp:coerce_goal',
       ],
     },

frc971/control_loops/claw/claw.h

diff --git a/frc971/control_loops/claw/claw.h b/frc971/control_loops/claw/claw.h
index 366565f..89f36f6 100644
--- a/frc971/control_loops/claw/claw.h
+++ b/frc971/control_loops/claw/claw.h
@@ -3,8 +3,8 @@
 
 #include <memory>
 
-#include "aos/common/control_loop/control_loop.h"
-#include "aos/controls/polytope.h"
+#include "aos/common/controls/control_loop.h"
+#include "aos/common/controls/polytope.h"
 #include "frc971/constants.h"
 #include "frc971/control_loops/state_feedback_loop.h"
 #include "frc971/control_loops/coerce_goal.h"

frc971/control_loops/claw/claw.q

diff --git a/frc971/control_loops/claw/claw.q b/frc971/control_loops/claw/claw.q
index 53289ee..ef3db90 100644
--- a/frc971/control_loops/claw/claw.q
+++ b/frc971/control_loops/claw/claw.q
@@ -1,6 +1,6 @@
 package frc971.control_loops;
 
-import "aos/common/control_loop/control_loops.q";
+import "aos/common/controls/control_loops.q";
 import "frc971/control_loops/control_loops.q";
 
 struct HalfClawPosition {