paparazzi-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[paparazzi-commits] [6013] use full ahrs include path


From: Felix Ruess
Subject: [paparazzi-commits] [6013] use full ahrs include path
Date: Tue, 28 Sep 2010 14:48:52 +0000

Revision: 6013
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6013
Author:   flixr
Date:     2010-09-28 14:48:52 +0000 (Tue, 28 Sep 2010)
Log Message:
-----------
use full ahrs include path

Modified Paths:
--------------
    paparazzi3/trunk/sw/airborne/booz/booz2_telemetry.h
    paparazzi3/trunk/sw/airborne/booz/booz_fms.c
    
paparazzi3/trunk/sw/airborne/booz/stabilization/booz_stabilization_attitude_euler_float.c
    
paparazzi3/trunk/sw/airborne/booz/stabilization/booz_stabilization_attitude_euler_int.c
    
paparazzi3/trunk/sw/airborne/booz/stabilization/booz_stabilization_attitude_quat_float.c
    
paparazzi3/trunk/sw/airborne/booz/stabilization/booz_stabilization_attitude_ref_quat_float.c
    paparazzi3/trunk/sw/airborne/booz/stabilization/booz_stabilization_rate.c
    paparazzi3/trunk/sw/airborne/booz/test/test_mlkf.c
    paparazzi3/trunk/sw/airborne/csc/mercury_xsens.h
    paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/ahrs.c
    paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
    paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
    paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/ins.c
    paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/main.c
    paparazzi3/trunk/sw/airborne/modules/cam_control/booz_cam.c
    paparazzi3/trunk/sw/airborne/modules/cam_control/cam_track.c
    paparazzi3/trunk/sw/simulator/nps/nps_autopilot_booz.c
    paparazzi3/trunk/sw/simulator/old_booz/booz2_sim_main.c

Modified: paparazzi3/trunk/sw/airborne/booz/booz2_telemetry.h
===================================================================
--- paparazzi3/trunk/sw/airborne/booz/booz2_telemetry.h 2010-09-28 14:48:44 UTC 
(rev 6012)
+++ paparazzi3/trunk/sw/airborne/booz/booz2_telemetry.h 2010-09-28 14:48:52 UTC 
(rev 6013)
@@ -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 @@
 #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 @@
 
 
 #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 @@
 #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,                   \

Modified: paparazzi3/trunk/sw/airborne/booz/booz_fms.c
===================================================================
--- paparazzi3/trunk/sw/airborne/booz/booz_fms.c        2010-09-28 14:48:44 UTC 
(rev 6012)
+++ paparazzi3/trunk/sw/airborne/booz/booz_fms.c        2010-09-28 14:48:52 UTC 
(rev 6013)
@@ -25,7 +25,7 @@
 
 #include <firmwares/rotorcraft/imu.h>
 #include "booz_gps.h"
-#include "ahrs.h"
+#include <firmwares/rotorcraft/ahrs.h>
 
 #include "airframe.h"
 

Modified: 
paparazzi3/trunk/sw/airborne/booz/stabilization/booz_stabilization_attitude_euler_float.c
===================================================================
--- 
paparazzi3/trunk/sw/airborne/booz/stabilization/booz_stabilization_attitude_euler_float.c
   2010-09-28 14:48:44 UTC (rev 6012)
+++ 
paparazzi3/trunk/sw/airborne/booz/stabilization/booz_stabilization_attitude_euler_float.c
   2010-09-28 14:48:52 UTC (rev 6013)
@@ -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"

Modified: 
paparazzi3/trunk/sw/airborne/booz/stabilization/booz_stabilization_attitude_euler_int.c
===================================================================
--- 
paparazzi3/trunk/sw/airborne/booz/stabilization/booz_stabilization_attitude_euler_int.c
     2010-09-28 14:48:44 UTC (rev 6012)
+++ 
paparazzi3/trunk/sw/airborne/booz/stabilization/booz_stabilization_attitude_euler_int.c
     2010-09-28 14:48:52 UTC (rev 6013)
@@ -22,7 +22,7 @@
  */
 
 #include "booz_stabilization.h"
-#include "ahrs.h"
+#include <firmwares/rotorcraft/ahrs.h>
 #include "booz_radio_control.h"
 
 

Modified: 
paparazzi3/trunk/sw/airborne/booz/stabilization/booz_stabilization_attitude_quat_float.c
===================================================================
--- 
paparazzi3/trunk/sw/airborne/booz/stabilization/booz_stabilization_attitude_quat_float.c
    2010-09-28 14:48:44 UTC (rev 6012)
+++ 
paparazzi3/trunk/sw/airborne/booz/stabilization/booz_stabilization_attitude_quat_float.c
    2010-09-28 14:48:52 UTC (rev 6013)
@@ -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];

Modified: 
paparazzi3/trunk/sw/airborne/booz/stabilization/booz_stabilization_attitude_ref_quat_float.c
===================================================================
--- 
paparazzi3/trunk/sw/airborne/booz/stabilization/booz_stabilization_attitude_ref_quat_float.c
        2010-09-28 14:48:44 UTC (rev 6012)
+++ 
paparazzi3/trunk/sw/airborne/booz/stabilization/booz_stabilization_attitude_ref_quat_float.c
        2010-09-28 14:48:52 UTC (rev 6013)
@@ -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"

Modified: 
paparazzi3/trunk/sw/airborne/booz/stabilization/booz_stabilization_rate.c
===================================================================
--- paparazzi3/trunk/sw/airborne/booz/stabilization/booz_stabilization_rate.c   
2010-09-28 14:48:44 UTC (rev 6012)
+++ paparazzi3/trunk/sw/airborne/booz/stabilization/booz_stabilization_rate.c   
2010-09-28 14:48:52 UTC (rev 6013)
@@ -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"

Modified: paparazzi3/trunk/sw/airborne/booz/test/test_mlkf.c
===================================================================
--- paparazzi3/trunk/sw/airborne/booz/test/test_mlkf.c  2010-09-28 14:48:44 UTC 
(rev 6012)
+++ paparazzi3/trunk/sw/airborne/booz/test/test_mlkf.c  2010-09-28 14:48:52 UTC 
(rev 6013)
@@ -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);

Modified: paparazzi3/trunk/sw/airborne/csc/mercury_xsens.h
===================================================================
--- paparazzi3/trunk/sw/airborne/csc/mercury_xsens.h    2010-09-28 14:48:44 UTC 
(rev 6012)
+++ paparazzi3/trunk/sw/airborne/csc/mercury_xsens.h    2010-09-28 14:48:52 UTC 
(rev 6013)
@@ -62,7 +62,7 @@
 
 extern int xsens_setzero;
 
-#include "ahrs.h"
+#include <firmwares/rotorcraft/ahrs.h>
 
 #define PERIODIC_SEND_BOOZ2_GYRO() {                   \
     DOWNLINK_SEND_BOOZ2_GYRO(&imu.gyro.p,              \

Modified: paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/ahrs.c
===================================================================
--- paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/ahrs.c    2010-09-28 
14:48:44 UTC (rev 6012)
+++ paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/ahrs.c    2010-09-28 
14:48:52 UTC (rev 6013)
@@ -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;

Modified: 
paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
===================================================================
--- paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c     
2010-09-28 14:48:44 UTC (rev 6012)
+++ paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c     
2010-09-28 14:48:52 UTC (rev 6013)
@@ -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>

Modified: 
paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
===================================================================
--- paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c     
2010-09-28 14:48:44 UTC (rev 6012)
+++ paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c     
2010-09-28 14:48:52 UTC (rev 6013)
@@ -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"
 

Modified: paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/ins.c
===================================================================
--- paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/ins.c     2010-09-28 
14:48:44 UTC (rev 6012)
+++ paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/ins.c     2010-09-28 
14:48:52 UTC (rev 6013)
@@ -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"

Modified: paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/main.c
===================================================================
--- paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/main.c    2010-09-28 
14:48:44 UTC (rev 6012)
+++ paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/main.c    2010-09-28 
14:48:52 UTC (rev 6013)
@@ -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

Modified: paparazzi3/trunk/sw/airborne/modules/cam_control/booz_cam.c
===================================================================
--- paparazzi3/trunk/sw/airborne/modules/cam_control/booz_cam.c 2010-09-28 
14:48:44 UTC (rev 6012)
+++ paparazzi3/trunk/sw/airborne/modules/cam_control/booz_cam.c 2010-09-28 
14:48:52 UTC (rev 6013)
@@ -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"

Modified: paparazzi3/trunk/sw/airborne/modules/cam_control/cam_track.c
===================================================================
--- paparazzi3/trunk/sw/airborne/modules/cam_control/cam_track.c        
2010-09-28 14:48:44 UTC (rev 6012)
+++ paparazzi3/trunk/sw/airborne/modules/cam_control/cam_track.c        
2010-09-28 14:48:52 UTC (rev 6013)
@@ -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"

Modified: paparazzi3/trunk/sw/simulator/nps/nps_autopilot_booz.c
===================================================================
--- paparazzi3/trunk/sw/simulator/nps/nps_autopilot_booz.c      2010-09-28 
14:48:44 UTC (rev 6012)
+++ paparazzi3/trunk/sw/simulator/nps/nps_autopilot_booz.c      2010-09-28 
14:48:52 UTC (rev 6013)
@@ -74,7 +74,7 @@
 }
 
 #include "nps_fdm.h"
-#include "ahrs.h"
+#include <firmwares/rotorcraft/ahrs.h>
 #include "math/pprz_algebra.h"
 void sim_overwrite_ahrs(void) {
 

Modified: paparazzi3/trunk/sw/simulator/old_booz/booz2_sim_main.c
===================================================================
--- paparazzi3/trunk/sw/simulator/old_booz/booz2_sim_main.c     2010-09-28 
14:48:44 UTC (rev 6012)
+++ paparazzi3/trunk/sw/simulator/old_booz/booz2_sim_main.c     2010-09-28 
14:48:52 UTC (rev 6013)
@@ -125,7 +125,7 @@
 }
   
 
-#include "ahrs.h"
+#include <firmwares/rotorcraft/ahrs.h>
 
 static void sim_run_one_step(void) {
 
@@ -195,7 +195,7 @@
 
 #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]);




reply via email to

[Prev in Thread] Current Thread [Next in Thread]