From d837bf4a0a614caf30b4e50900e8032d6c5042ee Mon Sep 17 00:00:00 2001 From: Thomas Gubler Date: Sun, 3 May 2015 08:47:42 +0200 Subject: fix ecl roll yaw controller includes --- src/lib/ecl/attitude_fw/ecl_roll_controller.cpp | 2 +- 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 #include "ecl_roll_controller.h" #include #include 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 #include #include -#include +#include 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(); } } -- cgit v1.2.3