aboutsummaryrefslogtreecommitdiff
path: root/apps/examples
diff options
context:
space:
mode:
authorpx4dev <px4@purgatory.org>2013-01-06 15:04:30 -0800
committerpx4dev <px4@purgatory.org>2013-01-06 15:04:30 -0800
commitfaced6bfe3826a4fdcfcd72171edbb501226814a (patch)
tree42714ce675153555255e30894408ece40f4d26c9 /apps/examples
parent950d104c8d7e335b88c0a7944628c14293a0f676 (diff)
downloadpx4-firmware-faced6bfe3826a4fdcfcd72171edbb501226814a.tar.gz
px4-firmware-faced6bfe3826a4fdcfcd72171edbb501226814a.tar.bz2
px4-firmware-faced6bfe3826a4fdcfcd72171edbb501226814a.zip
Merge James's controllib bits into a separate library module.
Add a top-level mathlib header to avoid having to dig around for specific headers.
Diffstat (limited to 'apps/examples')
-rw-r--r--apps/examples/control_demo/control_demo.cpp2
-rw-r--r--apps/examples/math_demo/math_demo.cpp7
2 files changed, 2 insertions, 7 deletions
diff --git a/apps/examples/control_demo/control_demo.cpp b/apps/examples/control_demo/control_demo.cpp
index c60c5e8b9..d9c773c05 100644
--- a/apps/examples/control_demo/control_demo.cpp
+++ b/apps/examples/control_demo/control_demo.cpp
@@ -43,7 +43,7 @@
#include <stdlib.h>
#include <string.h>
#include <systemlib/systemlib.h>
-#include <systemlib/control/fixedwing.hpp>
+#include <controllib/fixedwing.hpp>
#include <systemlib/param/param.h>
#include <drivers/drv_hrt.h>
#include <math.h>
diff --git a/apps/examples/math_demo/math_demo.cpp b/apps/examples/math_demo/math_demo.cpp
index 0dc4b3750..a9c556748 100644
--- a/apps/examples/math_demo/math_demo.cpp
+++ b/apps/examples/math_demo/math_demo.cpp
@@ -43,12 +43,7 @@
#include <stdlib.h>
#include <string.h>
#include <systemlib/systemlib.h>
-#include <mathlib/math/Vector.hpp>
-#include <mathlib/math/Matrix.hpp>
-#include <mathlib/math/Quaternion.hpp>
-#include <mathlib/math/Vector3.hpp>
-#include <mathlib/math/Dcm.hpp>
-#include <mathlib/math/EulerAngles.hpp>
+#include <mathlib/mathlib.h>
/**
* Management function.