mirror of
https://github.com/paparazzi/paparazzi.git
synced 2026-05-31 20:38:27 +08:00
[conf] cleanup INS_ and AHRS_PROPAGATE_FREQUENCY
This commit is contained in:
@@ -124,7 +124,6 @@
|
||||
|
||||
<!-- Magnetic field for Toulouse (declination -16°) -->
|
||||
<!--section name="AHRS" prefix="AHRS_">
|
||||
<define name="PROPAGATE_FREQUENCY" value="512"/>
|
||||
<define name="PROPAGATE_LOW_PASS_RATES" value="1"/>
|
||||
<define name="H_X" value=" 0.513081"/>
|
||||
<define name="H_Y" value="-0.00242783"/>
|
||||
|
||||
@@ -7,8 +7,6 @@
|
||||
<target name="ap" board="ardrone2_raw">
|
||||
<define name="USE_INS_NAV_INIT"/>
|
||||
<configure name="AHRS_PROPAGATE_FREQUENCY" value="200"/>
|
||||
<define name="AHRS_PROPAGATE_FREQUENCY" value="200"/>
|
||||
<define name="INS_PROPAGATE_FREQUENCY" value="200"/>
|
||||
<define name="AUTOPILOT_DISABLE_AHRS_KILL"/>
|
||||
|
||||
<define name="LINK_HOST" value="\\\"192.168.2.255\\\""/>
|
||||
|
||||
@@ -193,7 +193,6 @@
|
||||
</section>
|
||||
|
||||
<section name="AHRS" prefix="AHRS_">
|
||||
<define name="PROPAGATE_FREQUENCY" value="512"/>
|
||||
<define name="H_X" value=" 0.3723657"/>
|
||||
<define name="H_Y" value=" 0.1515225"/>
|
||||
<define name="H_Z" value="-0.9156335"/>
|
||||
|
||||
@@ -210,7 +210,6 @@
|
||||
</section>
|
||||
|
||||
<section name="AHRS" prefix="AHRS_">
|
||||
<define name="PROPAGATE_FREQUENCY" value="512"/>
|
||||
<define name="H_X" value=" 0.3723657"/>
|
||||
<define name="H_Y" value=" 0.1515225"/>
|
||||
<define name="H_Z" value="-0.9156335"/>
|
||||
|
||||
@@ -168,7 +168,6 @@
|
||||
</section>
|
||||
|
||||
<section name="AHRS" prefix="AHRS_">
|
||||
<define name="PROPAGATE_FREQUENCY" value="512"/>
|
||||
<define name="H_X" value=" 0.47577"/>
|
||||
<define name="H_Y" value=" 0.11811"/>
|
||||
<define name="H_Z" value=" 0.87161"/>
|
||||
|
||||
@@ -182,7 +182,6 @@
|
||||
</section>
|
||||
|
||||
<section name="AHRS" prefix="AHRS_">
|
||||
<define name="PROPAGATE_FREQUENCY" value="512"/>
|
||||
<define name="H_X" value=" 0.47577"/>
|
||||
<define name="H_Y" value=" 0.11811"/>
|
||||
<define name="H_Z" value=" 0.87161"/>
|
||||
|
||||
@@ -143,7 +143,6 @@
|
||||
</section>
|
||||
|
||||
<section name="AHRS" prefix="AHRS_">
|
||||
<define name="PROPAGATE_FREQUENCY" value="512"/>
|
||||
<define name="H_X" value=" 0.47577"/>
|
||||
<define name="H_Y" value=" 0.11811"/>
|
||||
<define name="H_Z" value=" 0.87161"/>
|
||||
|
||||
@@ -150,7 +150,6 @@
|
||||
</section>
|
||||
|
||||
<section name="AHRS" prefix="AHRS_">
|
||||
<define name="PROPAGATE_FREQUENCY" value="512"/>
|
||||
<define name="H_X" value=" 0.47577"/>
|
||||
<define name="H_Y" value=" 0.11811"/>
|
||||
<define name="H_Z" value=" 0.87161"/>
|
||||
|
||||
@@ -176,7 +176,6 @@
|
||||
</section>
|
||||
|
||||
<section name="AHRS" prefix="AHRS_">
|
||||
<define name="PROPAGATE_FREQUENCY" value="512"/>
|
||||
<define name="H_X" value=" 0.47577"/>
|
||||
<define name="H_Y" value=" 0.11811"/>
|
||||
<define name="H_Z" value=" 0.87161"/>
|
||||
|
||||
@@ -178,7 +178,6 @@
|
||||
</section>
|
||||
|
||||
<section name="AHRS" prefix="AHRS_">
|
||||
<define name="PROPAGATE_FREQUENCY" value="512"/>
|
||||
<define name="H_X" value=" 0.47577"/>
|
||||
<define name="H_Y" value=" 0.11811"/>
|
||||
<define name="H_Z" value=" 0.87161"/>
|
||||
|
||||
@@ -139,7 +139,6 @@
|
||||
</section>
|
||||
|
||||
<section name="AHRS" prefix="AHRS_">
|
||||
<define name="PROPAGATE_FREQUENCY" value="512"/>
|
||||
<define name="H_X" value=" 0.47577"/>
|
||||
<define name="H_Y" value=" 0.11811"/>
|
||||
<define name="H_Z" value=" 0.87161"/>
|
||||
|
||||
@@ -139,7 +139,6 @@
|
||||
</section>
|
||||
|
||||
<section name="AHRS" prefix="AHRS_">
|
||||
<define name="PROPAGATE_FREQUENCY" value="512"/>
|
||||
<define name="H_X" value=" 0.47577"/>
|
||||
<define name="H_Y" value=" 0.11811"/>
|
||||
<define name="H_Z" value=" 0.87161"/>
|
||||
|
||||
@@ -201,7 +201,6 @@ More information on the Quadshot can be found at transition-robotics.com -->
|
||||
</section>
|
||||
|
||||
<section name="AHRS" prefix="AHRS_">
|
||||
<define name="PROPAGATE_FREQUENCY" value="512"/>
|
||||
<define name="H_X" value=" 0.47577"/>
|
||||
<define name="H_Y" value=" 0.11811"/>
|
||||
<define name="H_Z" value=" 0.87161"/>
|
||||
|
||||
@@ -181,7 +181,6 @@
|
||||
</section>
|
||||
|
||||
<section name="AHRS" prefix="AHRS_">
|
||||
<define name="PROPAGATE_FREQUENCY" value="512"/>
|
||||
<define name="H_X" value=" 0.51562740288882"/>
|
||||
<define name="H_Y" value="-0.05707735220832"/>
|
||||
<define name="H_Z" value=" 0.85490967783446"/>
|
||||
|
||||
@@ -153,7 +153,6 @@
|
||||
</section>
|
||||
|
||||
<section name="AHRS" prefix="AHRS_">
|
||||
<define name="PROPAGATE_FREQUENCY" value="512"/>
|
||||
<define name="H_X" value=" 0.51562740288882"/>
|
||||
<define name="H_Y" value="-0.05707735220832"/>
|
||||
<define name="H_Z" value=" 0.85490967783446"/>
|
||||
|
||||
@@ -113,7 +113,6 @@
|
||||
</section>
|
||||
|
||||
<section name="AHRS" prefix="AHRS_">
|
||||
<define name="PROPAGATE_FREQUENCY" value="512"/>
|
||||
<define name="H_X" value=" 0.51562740288882"/>
|
||||
<define name="H_Y" value="-0.05707735220832"/>
|
||||
<define name="H_Z" value=" 0.85490967783446"/>
|
||||
|
||||
@@ -196,8 +196,6 @@ AP_MODE_NAV
|
||||
</section>
|
||||
|
||||
<section name="AHRS" prefix="AHRS_">
|
||||
<define name="PROPAGATE_FREQUENCY" value="512"/>
|
||||
<define name="MAG_UPDATE_YAW_ONLY" value="1"/>
|
||||
<!-- magnetic field for Santa cruz from http://www.ngdc.noaa.gov/geomagmodels/IGRFWMM.jsp -->
|
||||
<define name="H_X" value=" 0.47577"/>
|
||||
<define name="H_Y" value=" 0.11811"/>
|
||||
|
||||
@@ -111,7 +111,6 @@
|
||||
</section>
|
||||
|
||||
<section name="AHRS" prefix="AHRS_">
|
||||
<define name="PROPAGATE_FREQUENCY" value="512"/>
|
||||
<!-- Ostheim v.d. Rhoen -->
|
||||
<define name="H_X" value="0.405857063"/>
|
||||
<define name="H_Y" value="0.014454969"/>
|
||||
|
||||
@@ -75,7 +75,6 @@
|
||||
</section>
|
||||
|
||||
<section name="AHRS" prefix="AHRS_">
|
||||
<define name="PROPAGATE_FREQUENCY" value="512"/>
|
||||
<define name="H_X" value="0.3770441"/>
|
||||
<define name="H_Y" value="0.0193986"/>
|
||||
<define name="H_Z" value="0.9259921"/>
|
||||
|
||||
@@ -82,7 +82,6 @@
|
||||
</section>
|
||||
|
||||
<section name="AHRS" prefix="AHRS_">
|
||||
<define name="PROPAGATE_FREQUENCY" value="512"/>
|
||||
<define name="H_X" value="0.3770441"/>
|
||||
<define name="H_Y" value="0.0193986"/>
|
||||
<define name="H_Z" value="0.9259921"/>
|
||||
|
||||
@@ -27,18 +27,17 @@ AHRS_SRCS += subsystems/ahrs.c
|
||||
AHRS_SRCS += subsystems/ahrs/ahrs_float_cmpl.c
|
||||
AHRS_SRCS += subsystems/ahrs/ahrs_aligner.c
|
||||
|
||||
ifdef AHRS_PROPAGATE_FREQUENCY
|
||||
AHRS_CFLAGS += -DAHRS_PROPAGATE_FREQUENCY=$(AHRS_PROPAGATE_FREQUENCY)
|
||||
endif
|
||||
|
||||
ifdef AHRS_CORRECT_FREQUENCY
|
||||
AHRS_CFLAGS += -DAHRS_CORRECT_FREQUENCY=$(AHRS_CORRECT_FREQUENCY)
|
||||
endif
|
||||
|
||||
ap.CFLAGS += $(AHRS_CFLAGS)
|
||||
ap.srcs += $(AHRS_SRCS)
|
||||
|
||||
# for fixedwings this is already added in autopilot.makefile
|
||||
#ifdef AHRS_PROPAGATE_FREQUENCY
|
||||
#ap.CFLAGS += -DAHRS_PROPAGATE_FREQUENCY=$(AHRS_PROPAGATE_FREQUENCY)
|
||||
#endif
|
||||
#
|
||||
#ifdef AHRS_CORRECT_FREQUENCY
|
||||
#ap.CFLAGS += -DAHRS_CORRECT_FREQUENCY=$(AHRS_CORRECT_FREQUENCY)
|
||||
#endif
|
||||
|
||||
#
|
||||
# NPS uses the real algorithm
|
||||
#
|
||||
|
||||
@@ -27,18 +27,18 @@ AHRS_SRCS += subsystems/ahrs.c
|
||||
AHRS_SRCS += subsystems/ahrs/ahrs_int_cmpl_quat.c
|
||||
AHRS_SRCS += subsystems/ahrs/ahrs_aligner.c
|
||||
|
||||
|
||||
ifdef AHRS_PROPAGATE_FREQUENCY
|
||||
AHRS_CFLAGS += -DAHRS_PROPAGATE_FREQUENCY=$(AHRS_PROPAGATE_FREQUENCY)
|
||||
endif
|
||||
|
||||
ifdef AHRS_CORRECT_FREQUENCY
|
||||
AHRS_CFLAGS += -DAHRS_CORRECT_FREQUENCY=$(AHRS_CORRECT_FREQUENCY)
|
||||
endif
|
||||
|
||||
ap.CFLAGS += $(AHRS_CFLAGS)
|
||||
ap.srcs += $(AHRS_SRCS)
|
||||
|
||||
# for fixedwings this is already added in autopilot.makefile
|
||||
#ifdef AHRS_PROPAGATE_FREQUENCY
|
||||
#ap.CFLAGS += -DAHRS_PROPAGATE_FREQUENCY=$(AHRS_PROPAGATE_FREQUENCY)
|
||||
#endif
|
||||
#
|
||||
#ifdef AHRS_CORRECT_FREQUENCY
|
||||
#ap.CFLAGS += -DAHRS_CORRECT_FREQUENCY=$(AHRS_CORRECT_FREQUENCY)
|
||||
#endif
|
||||
|
||||
#
|
||||
# NPS uses the real algorithm
|
||||
#
|
||||
|
||||
@@ -165,14 +165,6 @@ ap_srcs += subsystems/air_data.c
|
||||
# BARO
|
||||
include $(CFG_SHARED)/baro_board.makefile
|
||||
|
||||
# ahrs frequencies if configured
|
||||
ifdef AHRS_PROPAGATE_FREQUENCY
|
||||
ap_CFLAGS += -DAHRS_PROPAGATE_FREQUENCY=$(AHRS_PROPAGATE_FREQUENCY)
|
||||
endif
|
||||
ifdef AHRS_CORRECT_FREQUENCY
|
||||
ap_CFLAGS += -DAHRS_CORRECT_FREQUENCY=$(AHRS_CORRECT_FREQUENCY)
|
||||
endif
|
||||
|
||||
|
||||
######################################################################
|
||||
##
|
||||
|
||||
@@ -9,3 +9,6 @@ $(TARGET).srcs += $(SRC_SUBSYSTEMS)/ins/ins_int.c
|
||||
# vertical filter float version
|
||||
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/ins/vf_float.c
|
||||
|
||||
ifdef INS_PROPAGATE_FREQUENCY
|
||||
$(TARGET).CFLAGS += -DINS_PROPAGATE_FREQUENCY=$(INS_PROPAGATE_FREQUENCY)
|
||||
endif
|
||||
|
||||
@@ -10,3 +10,6 @@ $(TARGET).srcs += $(SRC_SUBSYSTEMS)/ins/ins_int.c
|
||||
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/ins/vf_extended_float.c
|
||||
$(TARGET).CFLAGS += -DUSE_VFF_EXTENDED
|
||||
|
||||
ifdef INS_PROPAGATE_FREQUENCY
|
||||
$(TARGET).CFLAGS += -DINS_PROPAGATE_FREQUENCY=$(INS_PROPAGATE_FREQUENCY)
|
||||
endif
|
||||
|
||||
@@ -21,9 +21,9 @@ IMU_KROOZ_SRCS += peripherals/hmc58xx.c
|
||||
AHRS_PROPAGATE_FREQUENCY ?= 512
|
||||
AHRS_CORRECT_FREQUENCY ?= 512
|
||||
AHRS_MAG_CORRECT_FREQUENCY ?= 75
|
||||
ap.CFLAGS += -DAHRS_PROPAGATE_FREQUENCY=$(AHRS_PROPAGATE_FREQUENCY)
|
||||
ap.CFLAGS += -DAHRS_CORRECT_FREQUENCY=$(AHRS_CORRECT_FREQUENCY)
|
||||
ap.CFLAGS += -DAHRS_MAG_CORRECT_FREQUENCY=$(AHRS_MAG_CORRECT_FREQUENCY)
|
||||
IMU_KROOZ_CFLAGS += -DAHRS_PROPAGATE_FREQUENCY=$(AHRS_PROPAGATE_FREQUENCY)
|
||||
IMU_KROOZ_CFLAGS += -DAHRS_CORRECT_FREQUENCY=$(AHRS_CORRECT_FREQUENCY)
|
||||
IMU_KROOZ_CFLAGS += -DAHRS_MAG_CORRECT_FREQUENCY=$(AHRS_MAG_CORRECT_FREQUENCY)
|
||||
|
||||
ap.CFLAGS += $(IMU_KROOZ_CFLAGS)
|
||||
ap.srcs += $(IMU_KROOZ_SRCS)
|
||||
|
||||
@@ -26,9 +26,9 @@ IMU_KROOZ_SRCS += peripherals/hmc58xx.c
|
||||
AHRS_PROPAGATE_FREQUENCY ?= 512
|
||||
AHRS_CORRECT_FREQUENCY ?= 512
|
||||
AHRS_MAG_CORRECT_FREQUENCY ?= 75
|
||||
ap.CFLAGS += -DAHRS_PROPAGATE_FREQUENCY=$(AHRS_PROPAGATE_FREQUENCY)
|
||||
ap.CFLAGS += -DAHRS_CORRECT_FREQUENCY=$(AHRS_CORRECT_FREQUENCY)
|
||||
ap.CFLAGS += -DAHRS_MAG_CORRECT_FREQUENCY=$(AHRS_MAG_CORRECT_FREQUENCY)
|
||||
IMU_KROOZ_CFLAGS += -DAHRS_PROPAGATE_FREQUENCY=$(AHRS_PROPAGATE_FREQUENCY)
|
||||
IMU_KROOZ_CFLAGS += -DAHRS_CORRECT_FREQUENCY=$(AHRS_CORRECT_FREQUENCY)
|
||||
IMU_KROOZ_CFLAGS += -DAHRS_MAG_CORRECT_FREQUENCY=$(AHRS_MAG_CORRECT_FREQUENCY)
|
||||
|
||||
ap.CFLAGS += $(IMU_KROOZ_CFLAGS)
|
||||
ap.srcs += $(IMU_KROOZ_SRCS)
|
||||
|
||||
Reference in New Issue
Block a user