diff options
| author | Roman Bapst <romanbapst@yahoo.de> | 2014-09-25 10:24:04 +0200 |
|---|---|---|
| committer | Roman Bapst <romanbapst@yahoo.de> | 2014-09-25 10:24:04 +0200 |
| commit | af290826d9957a75ff62dbd1451988228c603a45 (patch) | |
| tree | 6eaa6aaa7d036cea2039158cc506a64b56910119 /src/lib | |
| parent | 96b22f1ba8980ea8e1cbc405a808ae920102f064 (diff) | |
| download | px4-firmware-af290826d9957a75ff62dbd1451988228c603a45.tar.gz px4-firmware-af290826d9957a75ff62dbd1451988228c603a45.tar.bz2 px4-firmware-af290826d9957a75ff62dbd1451988228c603a45.zip | |
Fixed so that when working with ROS the same err.h is included
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp | 4 | ||||
| -rw-r--r-- | src/lib/ecl/attitude_fw/ecl_roll_controller.cpp | 3 | ||||
| -rw-r--r-- | src/lib/ecl/attitude_fw/ecl_yaw_controller.cpp | 3 |
3 files changed, 3 insertions, 7 deletions
diff --git a/src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp b/src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp index fa0f98e16..d1f79f0ea 100644 --- a/src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp +++ b/src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp @@ -45,13 +45,11 @@ #include <geo/geo.h> #include <ecl/ecl.h> #include <mathlib/mathlib.h> +#include <systemlib/err.h> #ifdef CONFIG_ARCH_ARM -#include <systemlib/err.h> #else -#include<ros_error.h> #include <cmath> -//#define isfinite std::isfinite using namespace std; #endif diff --git a/src/lib/ecl/attitude_fw/ecl_roll_controller.cpp b/src/lib/ecl/attitude_fw/ecl_roll_controller.cpp index 640940c99..30176f92f 100644 --- a/src/lib/ecl/attitude_fw/ecl_roll_controller.cpp +++ b/src/lib/ecl/attitude_fw/ecl_roll_controller.cpp @@ -45,11 +45,10 @@ #include <geo/geo.h> #include <ecl/ecl.h> #include <mathlib/mathlib.h> +#include <systemlib/err.h> #ifdef CONFIG_ARCH_ARM -#include <systemlib/err.h> #else -#include<ros_error.h> #include <cmath> using namespace std; #endif diff --git a/src/lib/ecl/attitude_fw/ecl_yaw_controller.cpp b/src/lib/ecl/attitude_fw/ecl_yaw_controller.cpp index 5f01cecf9..1b4d8486c 100644 --- a/src/lib/ecl/attitude_fw/ecl_yaw_controller.cpp +++ b/src/lib/ecl/attitude_fw/ecl_yaw_controller.cpp @@ -44,11 +44,10 @@ #include <geo/geo.h> #include <ecl/ecl.h> #include <mathlib/mathlib.h> +#include <systemlib/err.h> #ifdef CONFIG_ARCH_ARM -#include <systemlib/err.h> #else -#include<ros_error.h> #include <cmath> using namespace std; #endif |