aos/common/{control_loop=>controls} and moved polytope.h into it
diff --git a/aos/common/common.gyp b/aos/common/common.gyp
index 693c7ae..becf20f 100644
--- a/aos/common/common.gyp
+++ b/aos/common/common.gyp
@@ -157,9 +157,9 @@
{
'target_name': 'control_loop_queues',
'type': 'static_library',
- 'sources': [ '<(AOS)/common/control_loop/control_loops.q' ],
+ 'sources': [ '<(AOS)/common/controls/control_loops.q' ],
'variables': {
- 'header_path': 'aos/common/control_loop',
+ 'header_path': 'aos/common/controls',
},
'dependencies': [
'<(AOS)/common/common.gyp:queues',
@@ -170,7 +170,7 @@
'target_name': 'controls',
'type': 'static_library',
'sources': [
- 'control_loop/control_loop.cc',
+ 'controls/control_loop.cc',
],
'dependencies': [
'<(AOS)/common/messages/messages.gyp:robot_state',
diff --git a/aos/common/control_loop/control_loop-tmpl.h b/aos/common/controls/control_loop-tmpl.h
similarity index 100%
rename from aos/common/control_loop/control_loop-tmpl.h
rename to aos/common/controls/control_loop-tmpl.h
diff --git a/aos/common/control_loop/control_loop.cc b/aos/common/controls/control_loop.cc
similarity index 84%
rename from aos/common/control_loop/control_loop.cc
rename to aos/common/controls/control_loop.cc
index 4a8ab91..11d7a47 100644
--- a/aos/common/control_loop/control_loop.cc
+++ b/aos/common/controls/control_loop.cc
@@ -1,4 +1,4 @@
-#include "aos/common/control_loop/control_loop.h"
+#include "aos/common/controls/control_loop.h"
namespace aos {
namespace control_loops {
diff --git a/aos/common/control_loop/control_loop.h b/aos/common/controls/control_loop.h
similarity index 98%
rename from aos/common/control_loop/control_loop.h
rename to aos/common/controls/control_loop.h
index 67af8a3..0889b48 100644
--- a/aos/common/control_loop/control_loop.h
+++ b/aos/common/controls/control_loop.h
@@ -180,6 +180,6 @@
} // namespace control_loops
} // namespace aos
-#include "aos/common/control_loop/control_loop-tmpl.h" // IWYU pragma: export
+#include "aos/common/controls/control_loop-tmpl.h" // IWYU pragma: export
#endif
diff --git a/aos/common/control_loop/control_loops.q b/aos/common/controls/control_loops.q
similarity index 100%
rename from aos/common/control_loop/control_loops.q
rename to aos/common/controls/control_loops.q
diff --git a/aos/controls/polytope.h b/aos/common/controls/polytope.h
similarity index 96%
rename from aos/controls/polytope.h
rename to aos/common/controls/polytope.h
index c3f66cc..6afe04b 100644
--- a/aos/controls/polytope.h
+++ b/aos/common/controls/polytope.h
@@ -1,5 +1,5 @@
-#ifndef _AOS_CONTROLS_POLYTOPE_H_
-#define _AOS_CONTROLS_POLYTOPE_H_
+#ifndef AOS_COMMON_CONTROLS_POLYTOPE_H_
+#define AOS_COMMON_CONTROLS_POLYTOPE_H_
#include "Eigen/Dense"
#include "libcdd-094g-prefix/include/setoper.h"
@@ -123,4 +123,4 @@
} // namespace controls
} // namespace aos
-#endif // _AOS_CONTROLS_POLYTOPE_H_
+#endif // AOS_COMMON_CONTROLS_POLYTOPE_H_