use full ahrs include path

This commit is contained in:
Felix Ruess
2010-09-28 14:48:52 +00:00
parent 21de0f6db2
commit 1cb5c50581
18 changed files with 23 additions and 23 deletions
+4 -4
View File
@@ -49,7 +49,7 @@
#include <firmwares/rotorcraft/imu.h>
#include "booz_gps.h"
#include <firmwares/rotorcraft/ins.h>
#include "ahrs.h"
#include <firmwares/rotorcraft/ahrs.h>
#include "i2c_hw.h"
@@ -301,7 +301,7 @@ extern uint8_t telemetry_mode_Main_DefaultChannel;
#endif /* STABILISATION_ATTITUDE_TYPE_FLOAT */
#include "ahrs/ahrs_aligner.h"
#include <firmwares/rotorcraft/ahrs/ahrs_aligner.h>
#define PERIODIC_SEND_BOOZ2_FILTER_ALIGNER(_chan) { \
DOWNLINK_SEND_BOOZ2_FILTER_ALIGNER(_chan, \
&ahrs_aligner.lp_gyro.p, \
@@ -325,7 +325,7 @@ extern uint8_t telemetry_mode_Main_DefaultChannel;
#ifdef USE_AHRS_CMPL
#include "ahrs/ahrs_cmpl_euler.h"
#include <firmwares/rotorcraft/ahrs/ahrs_cmpl_euler.h>
#define PERIODIC_SEND_BOOZ2_FILTER(_chan) { \
DOWNLINK_SEND_BOOZ2_FILTER(_chan, \
&ahrs.ltp_to_imu_euler.phi, \
@@ -349,7 +349,7 @@ extern uint8_t telemetry_mode_Main_DefaultChannel;
#endif
#ifdef USE_AHRS_LKF
#include "ahrs.h"
#include <firmwares/rotorcraft/ahrs.h>
#include "ahrs/ahrs_float_lkf.h"
#define PERIODIC_SEND_AHRS_LKF(_chan) { \
DOWNLINK_SEND_AHRS_LKF(&bafl_eulers.phi, \
+1 -1
View File
@@ -25,7 +25,7 @@
#include <firmwares/rotorcraft/imu.h>
#include "booz_gps.h"
#include "ahrs.h"
#include <firmwares/rotorcraft/ahrs.h>
#include "airframe.h"
@@ -24,7 +24,7 @@
#include "booz_stabilization.h"
#include "math/pprz_algebra_float.h"
#include "ahrs.h"
#include <firmwares/rotorcraft/ahrs.h>
#include "booz_radio_control.h"
#include "airframe.h"
@@ -22,7 +22,7 @@
*/
#include "booz_stabilization.h"
#include "ahrs.h"
#include <firmwares/rotorcraft/ahrs.h>
#include "booz_radio_control.h"
@@ -30,7 +30,7 @@
#include <stdio.h>
#include "math/pprz_algebra_float.h"
#include "math/pprz_algebra_int.h"
#include "ahrs.h"
#include <firmwares/rotorcraft/ahrs.h>
#include "airframe.h"
struct FloatAttitudeGains booz_stabilization_gains[BOOZ_STABILIZATION_ATTITUDE_GAIN_NB];
@@ -28,7 +28,7 @@
#include "airframe.h"
#include "booz_stabilization.h"
#include "ahrs.h"
#include <firmwares/rotorcraft/ahrs.h>
#include "booz_stabilization_attitude_ref_float.h"
#include "quat_setpoint.h"
@@ -24,7 +24,7 @@
#include "booz_stabilization.h"
#include "ahrs.h"
#include <firmwares/rotorcraft/ahrs.h>
#include <firmwares/rotorcraft/imu.h>
#include "booz_radio_control.h"
+1 -1
View File
@@ -3,7 +3,7 @@
#include "math/pprz_algebra_double.h"
#include <firmwares/rotorcraft/imu.h>
#include "ahrs.h"
#include <firmwares/rotorcraft/ahrs.h>
#include "ahrs/ahrs_mlkf.h"
static void read_data(const char* filename);
+1 -1
View File
@@ -62,7 +62,7 @@ extern uint16_t xsens_time_stamp[XSENS_COUNT];
extern int xsens_setzero;
#include "ahrs.h"
#include <firmwares/rotorcraft/ahrs.h>
#define PERIODIC_SEND_BOOZ2_GYRO() { \
DOWNLINK_SEND_BOOZ2_GYRO(&imu.gyro.p, \
+1 -1
View File
@@ -21,7 +21,7 @@
* Boston, MA 02111-1307, USA.
*/
#include "ahrs.h"
#include <firmwares/rotorcraft/ahrs.h>
#include <firmwares/rotorcraft/imu.h>
struct Ahrs ahrs;
@@ -25,7 +25,7 @@
//#define GUIDANCE_H_USE_REF
#include <firmwares/rotorcraft/guidance/guidance_h.h>
#include "ahrs.h"
#include <firmwares/rotorcraft/ahrs.h>
#include "booz_stabilization.h"
#include "booz_fms.h"
#include <firmwares/rotorcraft/ins.h>
@@ -28,7 +28,7 @@
#include "booz_radio_control.h"
#include "booz_stabilization.h"
#include "ahrs.h"
#include <firmwares/rotorcraft/ahrs.h>
#include "booz_fms.h"
#include "booz2_navigation.h"
+1 -1
View File
@@ -32,7 +32,7 @@
#include "math/pprz_algebra_int.h"
#include "math/pprz_algebra_float.h"
#include "ahrs.h"
#include <firmwares/rotorcraft/ahrs.h>
#ifdef USE_VFF
#include "ins/vf_float.h"
+2 -2
View File
@@ -47,12 +47,12 @@
#include "booz2_battery.h"
#include "booz_fms.h"
#include "autopilot.h"
#include <firmwares/rotorcraft/autopilot.h>
#include "booz_stabilization.h"
#include <firmwares/rotorcraft/guidance.h>
#include "ahrs.h"
#include <firmwares/rotorcraft/ahrs.h>
#include <firmwares/rotorcraft/ins.h>
#if defined USE_CAM || USE_DROP
+1 -1
View File
@@ -24,7 +24,7 @@
#include "cam_control/booz_cam.h"
#include "booz2_pwm_hw.h"
#include "ahrs.h"
#include <firmwares/rotorcraft/ahrs.h>
#include "booz2_navigation.h"
#include <firmwares/rotorcraft/ins.h>
#include "flight_plan.h"
+1 -1
View File
@@ -25,7 +25,7 @@
#include "cam_track.h"
#include <firmwares/rotorcraft/ins.h>
#include "ahrs.h"
#include <firmwares/rotorcraft/ahrs.h>
#ifdef USE_HFF
#include "ins/hf_float.h"
+1 -1
View File
@@ -74,7 +74,7 @@ void nps_autopilot_run_step(double time __attribute__ ((unused))) {
}
#include "nps_fdm.h"
#include "ahrs.h"
#include <firmwares/rotorcraft/ahrs.h>
#include "math/pprz_algebra.h"
void sim_overwrite_ahrs(void) {
+2 -2
View File
@@ -125,7 +125,7 @@ static gboolean booz2_sim_periodic(gpointer data __attribute__ ((unused))) {
}
#include "ahrs.h"
#include <firmwares/rotorcraft/ahrs.h>
static void sim_run_one_step(void) {
@@ -195,7 +195,7 @@ static void sim_run_one_step(void) {
#ifdef BYPASS_AHRS
#include "booz_geometry_mixed.h"
#include "ahrs.h"
#include <firmwares/rotorcraft/ahrs.h>
static void sim_overwrite_ahrs(void) {
ahrs.ltp_to_body_euler.phi = BOOZ_ANGLE_I_OF_F(bfm.eulers->ve[AXIS_X]);
ahrs.ltp_to_body_euler.theta = BOOZ_ANGLE_I_OF_F(bfm.eulers->ve[AXIS_Y]);