diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2015-05-03 10:13:38 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-05-03 10:13:38 +0200 |
| commit | 0b5e6bdf9755cf530bf425b0b77db2c5374a279c (patch) | |
| tree | 1bf24a6af901bd62ef081a539bc651c588530c02 | |
| parent | 731bd97f392d875b0fc3f6319e9beb8f22fe514c (diff) | |
| parent | d837bf4a0a614caf30b4e50900e8032d6c5042ee (diff) | |
| download | px4-firmware-0b5e6bdf9755cf530bf425b0b77db2c5374a279c.tar.gz px4-firmware-0b5e6bdf9755cf530bf425b0b77db2c5374a279c.tar.bz2 px4-firmware-0b5e6bdf9755cf530bf425b0b77db2c5374a279c.zip | |
Merge pull request #2117 from PX4/fwattincludes
fix ecl roll yaw controller includes
| -rw-r--r-- | src/lib/ecl/attitude_fw/ecl_roll_controller.cpp | 2 | ||||
| -rw-r--r-- | src/lib/ecl/attitude_fw/ecl_yaw_controller.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/ecl/attitude_fw/ecl_roll_controller.cpp b/src/lib/ecl/attitude_fw/ecl_roll_controller.cpp index 160dc5cad..1c43e7ebf 100644 --- a/src/lib/ecl/attitude_fw/ecl_roll_controller.cpp +++ b/src/lib/ecl/attitude_fw/ecl_roll_controller.cpp @@ -38,7 +38,7 @@ * Authors and acknowledgements in header. */ -#include "../ecl.h" +#include <ecl/ecl.h> #include "ecl_roll_controller.h" #include <stdint.h> #include <float.h> diff --git a/src/lib/ecl/attitude_fw/ecl_yaw_controller.cpp b/src/lib/ecl/attitude_fw/ecl_yaw_controller.cpp index f3379b245..4dd409283 100644 --- a/src/lib/ecl/attitude_fw/ecl_yaw_controller.cpp +++ b/src/lib/ecl/attitude_fw/ecl_yaw_controller.cpp @@ -45,7 +45,7 @@ #include <ecl/ecl.h> #include <mathlib/mathlib.h> #include <systemlib/err.h> -#include <drivers/drv_hrt.h> +#include <ecl/ecl.h> ECL_YawController::ECL_YawController() : ECL_Controller("yaw"), @@ -70,9 +70,9 @@ float ECL_YawController::control_attitude(const struct ECL_ControlData &ctl_data default: static hrt_abstime last_print = 0; - if (hrt_elapsed_time(&last_print) > 5e6) { + if (ecl_elapsed_time(&last_print) > 5e6) { warnx("invalid param setting FW_YCO_METHOD"); - last_print = hrt_absolute_time(); + last_print = ecl_absolute_time(); } } @@ -89,9 +89,9 @@ float ECL_YawController::control_bodyrate(const struct ECL_ControlData &ctl_data default: static hrt_abstime last_print = 0; - if (hrt_elapsed_time(&last_print) > 5e6) { + if (ecl_elapsed_time(&last_print) > 5e6) { warnx("invalid param setting FW_YCO_METHOD"); - last_print = hrt_absolute_time(); + last_print = ecl_absolute_time(); } } |