yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-22 01:12:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2117 from PX4/fwattincludes

Browse Source 
fix ecl roll yaw controller includes
This commit is contained in:
Thomas Gubler
2015-05-03 10:13:38 +02:00
parent 731bd97f39 d837bf4a0a
commit 0b5e6bdf97
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/ecl/attitude_fw/ecl_roll_controller.cpp
View File

@@ -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>

10
src/lib/ecl/attitude_fw/ecl_yaw_controller.cpp
View File

@@ -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();
}
}