Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-09 22:49:53 +08:00
Code Issues Actions 30 Packages Projects Releases Wiki Activity

Modules recommends and suggests (#3005)

Browse Source 
Add two new items in module's dependency:
- recommends: a recommended module tells the sorting algo that if the module is found, it should be sorted accordingly. It is useful for optional dependencies, like shell or mission in some modules
- suggests: if a functionality is not provided by the user, a module can suggest a list of modules that can provide them. It is a convenient way to have "default" modules.

As a result the former autoload node is removed and replaced by suggested modules.
This commit is contained in:
Gautier Hattenberger
2023-03-07 17:14:15 +01:00
committed by GitHub
parent 7a3440fc3f
commit 62646d68de
104 changed files with 135 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/conf_tests.xml
+1 -1
View File
@@ -84,7 +84,7 @@
telemetry="telemetry/default_rotorcraft_mavlink.xml"
flight_plan="flight_plans/rotorcraft_basic.xml"
settings="settings/rotorcraft_basic.xml settings/estimation/ahrs_secondary.xml"
settings_modules="modules/ahrs_float_mlkf.xml modules/ahrs_int_cmpl_quat.xml modules/air_data.xml modules/geo_mag.xml modules/gps.xml modules/gps_ubx_ucenter.xml modules/guidance_rotorcraft.xml modules/imu_common.xml modules/nav_basic_rotorcraft.xml modules/stabilization_int_quat.xml"
settings_modules="modules/ahrs_float_mlkf.xml modules/ahrs_int_cmpl_quat.xml modules/air_data.xml modules/geo_mag.xml modules/gps.xml modules/gps_ublox.xml modules/gps_ubx_ucenter.xml modules/guidance_pid_rotorcraft.xml modules/guidance_rotorcraft.xml modules/imu_common.xml modules/nav_rotorcraft.xml modules/stabilization_int_quat.xml"
gui_color="blue"
/>
</conf>
conf/modules/actuators_ardrone2.xml
-1
View File
@@ -10,7 +10,6 @@
<depends>actuators</depends>
<provides>actuators</provides>
</dep>
<autoload name="actuators" type="nps"/>
<header>
<file name="actuators.h" dir="boards/ardrone"/>
</header>
conf/modules/actuators_bebop.xml
-1
View File
@@ -11,7 +11,6 @@
<depends>i2c,actuators</depends>
<provides>actuators</provides>
</dep>
<autoload name="actuators" type="nps"/>
<header>
<file name="actuators.h" dir="boards/bebop"/>
</header>
conf/modules/actuators_disco.xml
-1
View File
@@ -10,7 +10,6 @@
<depends>i2c,actuators</depends>
<provides>actuators</provides>
</dep>
<autoload name="actuators" type="nps"/>
<header>
<file name="actuators.h" dir="boards/disco"/>
</header>
conf/modules/actuators_uavcan.xml
-1
View File
@@ -11,7 +11,6 @@
<depends>uavcan,actuators</depends>
<provides>actuators</provides>
</dep>
<autoload name="actuators" type="nps"/>
<header>
<file name="actuators_uavcan.h"/>
</header>
conf/modules/ahrs_chimu_spi.xml
-1
View File
@@ -9,7 +9,6 @@
<depends>spi_slave_hs</depends>
<provides>ahrs,imu</provides>
</dep>
<autoload name="ahrs_sim"/>
<header>
<file name="ins_module.h" dir="modules/ins"/>
</header>
conf/modules/ahrs_float_cmpl_quat.xml
-1
View File
@@ -39,7 +39,6 @@
<depends>ahrs_common,@imu,@gps|@mag</depends>
<provides>ahrs</provides>
</dep>
<autoload name="ahrs_sim"/>
<makefile target="!sim|fbw" firmware="fixedwing">
<configure name="USE_MAGNETOMETER" default="0"/>
<define name="AHRS_USE_GPS_HEADING" cond="ifneq (,$(findstring $(USE_MAGNETOMETER),0 FALSE))"/>
conf/modules/ahrs_float_cmpl_rmat.xml
-1
View File
@@ -35,7 +35,6 @@
<depends>ahrs_common,@imu,@gps|@mag</depends>
<provides>ahrs</provides>
</dep>
<autoload name="ahrs_sim"/>
<makefile target="!sim|fbw" firmware="fixedwing">
<configure name="USE_MAGNETOMETER" default="0"/>
<define name="AHRS_USE_GPS_HEADING" cond="ifneq (,$(findstring $(USE_MAGNETOMETER),0 FALSE))"/>
conf/modules/ahrs_float_dcm.xml
-1
View File
@@ -34,7 +34,6 @@
<depends>ahrs_common,@imu,@gps</depends>
<provides>ahrs</provides>
</dep>
<autoload name="ahrs_sim"/>
<makefile target="!sim|fbw">
<configure name="USE_MAGNETOMETER" default="0"/>
conf/modules/ahrs_float_mlkf.xml
-1
View File
@@ -29,7 +29,6 @@
<depends>ahrs_common,@imu,@mag</depends>
<provides>ahrs</provides>
</dep>
<autoload name="ahrs_sim"/>
<makefile target="!sim|fbw">
<configure name="USE_MAGNETOMETER" default="1"/>
<define name="USE_MAGNETOMETER" cond="ifeq (,$(findstring $(USE_MAGNETOMETER),0 FALSE))"/>
conf/modules/ahrs_int_cmpl_quat.xml
-1
View File
@@ -51,7 +51,6 @@
<depends>ahrs_common,@imu,@mag|@gps</depends>
<provides>ahrs</provides>
</dep>
<autoload name="ahrs_sim"/>
<makefile target="!sim|fbw" firmware="fixedwing">
<configure name="USE_MAGNETOMETER" default="0"/>
conf/modules/ahrs_vectornav.xml
-1
View File
@@ -12,7 +12,6 @@
<depends>uart</depends>
<provides>ahrs,imu</provides>
</dep>
<autoload name="ahrs_sim"/>
<header>
<file name="ahrs.h"/>
</header>
conf/modules/board_matek_f405_wing.xml
+1 -2
View File
@@ -13,9 +13,8 @@
</description>
</doc>
<dep>
<depends>spi_master,osd_max7456,baro_bmp280_i2c</depends>
<depends>spi_master,osd_max7456,baro_bmp280_i2c,imu_mpu6000</depends>
</dep>
<autoload name="imu" type="mpu6000"/>
<makefile target="!sim|nps|fbw">
<!-- IMU CONFIGURATION -->
conf/modules/board_matek_f765_car.xml
+1 -2
View File
@@ -14,9 +14,8 @@
<configure name="BOARD_MATEK_ROTATED" value="FALSE|TRUE" description="if TRUE, the board is not using is default orientation and axis can be redefined by hand"/>
</doc>
<dep>
<depends>spi_master,baro_bmp280_i2c,current_sensor</depends>
<depends>spi_master,baro_bmp280_i2c,current_sensor,imu_mpu6000</depends>
</dep>
<autoload name="imu" type="mpu6000"/>
<makefile target="!sim|nps|fbw">
<!-- IMU CONFIGURATION -->
conf/modules/board_matek_f765_wing.xml
+1 -2
View File
@@ -14,9 +14,8 @@
<configure name="BOARD_MATEK_ROTATED" value="FALSE|TRUE" description="if TRUE, the board is not using is default orientation and axis can be redefined by hand"/>
</doc>
<dep>
<depends>spi_master,osd_max7456,baro_bmp280_i2c,current_sensor</depends>
<depends>spi_master,osd_max7456,baro_bmp280_i2c,current_sensor,imu_mpu6000</depends>
</dep>
<autoload name="imu" type="mpu6000"/>
<makefile target="!sim|nps|fbw">
<!-- IMU CONFIGURATION -->
conf/modules/board_tawaki.xml
+1 -2
View File
@@ -13,9 +13,8 @@
<configure name="BOARD_TAWAKI_ROTATED" value="FALSE|TRUE" description="if TRUE, the board is not using is default orientation and axis can be redefined by hand"/>
</doc>
<dep>
<depends>baro_bmp3,mag_lis3mdl</depends>
<depends>baro_bmp3,mag_lis3mdl,imu_mpu6000</depends>
</dep>
<autoload name="imu" type="mpu6000"/>
<makefile target="!sim|nps|fbw">
<define name="IMU_MPU_GYRO_RANGE" value="MPU60X0_GYRO_RANGE_1000"/>
<define name="IMU_MPU_ACCEL_RANGE" value="MPU60X0_ACCEL_RANGE_8G"/>
conf/modules/boards/bebop.xml
+1 -1
View File
@@ -7,7 +7,7 @@
</description>
</doc>
<dep>
<depends>baro_ms5611_i2c</depends>
<depends>baro_ms5611_i2c,sonar_bebop</depends>
</dep>
<makefile target="!sim|nps|fbw">
<configure name="MS5611_I2C_DEV" value="i2c1"/>
conf/modules/boards/bebop2.xml
+1 -1
View File
@@ -7,7 +7,7 @@
</description>
</doc>
<dep>
<depends>baro_ms5611_i2c</depends>
<depends>baro_ms5611_i2c,sonar_bebop</depends>
</dep>
<makefile target="!sim|nps|fbw">
<configure name="MS5611_I2C_DEV" value="i2c1"/>
conf/modules/boards/disco.xml
+1 -1
View File
@@ -7,7 +7,7 @@
</description>
</doc>
<dep>
<depends>baro_ms5611_i2c</depends>
<depends>baro_ms5611_i2c,sonar_bebop</depends>
</dep>
<makefile target="!sim|nps|fbw">
<define name="MS5611_TYPE_MS5607" value="TRUE"/>
conf/modules/firmwares/fixedwing.xml
+1
View File
@@ -9,6 +9,7 @@
</doc>
<dep>
<depends>system_core,autopilot_gnc_fw,actuators_pwm</depends>
<suggests>nav_basic_fw</suggests>
</dep>
<makefile>
<configure name="PERIODIC_FREQUENCY" default="60"/>
conf/modules/firmwares/rotorcraft.xml
+2 -1
View File
@@ -7,7 +7,8 @@
</description>
</doc>
<dep>
<depends>system_core,autopilot_gnc,guidance_rotorcraft</depends>
<depends>system_core,autopilot_gnc</depends>
<suggests>nav_basic_rotorcraft,guidance_pid_rotorcraft</suggests>
</dep>
<makefile>
<configure name="PERIODIC_FREQUENCY" default="512"/>
conf/modules/firmwares/rover.xml
+1
View File
@@ -8,6 +8,7 @@
</doc>
<dep>
<depends>system_core,autopilot_gnc</depends>
<suggests>nav_rover_base</suggests>
</dep>
<makefile>
<configure name="PERIODIC_FREQUENCY" default="100"/>
conf/modules/gps_datalink.xml
-2
View File
@@ -11,8 +11,6 @@
<depends>gps,@datalink</depends>
<provides>gps</provides>
</dep>
<autoload name="gps_nps"/>
<autoload name="gps_sim"/>
<header>
<file name="gps.h"/>
</header>
conf/modules/gps_furuno.xml
-2
View File
@@ -13,8 +13,6 @@
<depends>uart,gps</depends>
<provides>gps</provides>
</dep>
<autoload name="gps_nps"/>
<autoload name="gps_sim"/>
<header>
<file name="gps.h"/>
</header>
conf/modules/gps_intermcu.xml
-2
View File
@@ -11,8 +11,6 @@
<depends>gps,@datalink</depends>
<provides>gps</provides>
</dep>
<autoload name="gps_nps"/>
<autoload name="gps_sim"/>
<header>
<file name="gps.h"/>
</header>
conf/modules/gps_mediatek_diy.xml
-2
View File
@@ -13,8 +13,6 @@
<depends>uart,gps</depends>
<provides>gps</provides>
</dep>
<autoload name="gps_nps"/>
<autoload name="gps_sim"/>
<header>
<file name="gps.h"/>
</header>
conf/modules/gps_nmea.xml
-2
View File
@@ -13,8 +13,6 @@
<depends>uart,gps</depends>
<provides>gps</provides>
</dep>
<autoload name="gps_nps"/>
<autoload name="gps_sim"/>
<header>
<file name="gps.h"/>
</header>
conf/modules/gps_optitrack.xml
-2
View File
@@ -13,8 +13,6 @@
<depends>gps_datalink</depends>
<provides>gps</provides>
</dep>
<autoload name="gps_nps"/>
<autoload name="gps_sim"/>
<makefile target="ap">
<define name="AHRS_HEADING_UPDATE_GPS_MIN_SPEED" value="0"/>
<test/>
conf/modules/gps_piksi.xml
-2
View File
@@ -13,8 +13,6 @@
<depends>uart,gps</depends>
<provides>gps</provides>
</dep>
<autoload name="gps_nps"/>
<autoload name="gps_sim"/>
<header>
<file name="gps.h"/>
</header>
conf/modules/gps_sim_hitl.xml
-1
View File
@@ -11,7 +11,6 @@
<depends>gps</depends>
<provides>gps</provides>
</dep>
<autoload name="gps_nps"/>
<header>
<file name="gps.h"/>
</header>
conf/modules/gps_sirf.xml
-2
View File
@@ -13,8 +13,6 @@
<depends>uart,gps</depends>
<provides>gps</provides>
</dep>
<autoload name="gps_nps"/>
<autoload name="gps_sim"/>
<header>
<file name="gps.h"/>
</header>
conf/modules/gps_skytraq.xml
-2
View File
@@ -13,8 +13,6 @@
<depends>uart,gps</depends>
<provides>gps</provides>
</dep>
<autoload name="gps_nps"/>
<autoload name="gps_sim"/>
<header>
<file name="gps.h"/>
</header>
conf/modules/gps_ublox.xml
-2
View File
@@ -28,8 +28,6 @@
<depends>uart,gps</depends>
<provides>gps</provides>
</dep>
<autoload name="gps_nps"/>
<autoload name="gps_sim"/>
<header>
<file name="gps.h"/>
</header>
conf/modules/gps_ubx_i2c.xml
-2
View File
@@ -13,8 +13,6 @@
<depends>i2c,gps_ublox</depends>
<provides>gps</provides>
</dep>
<autoload name="gps_nps"/>
<autoload name="gps_sim"/>
<header>
<file name="gps_ubx_i2c.h"/>
</header>
conf/modules/gps_udp.xml
-2
View File
@@ -14,8 +14,6 @@
<depends>udp,gps</depends>
<provides>gps</provides>
</dep>
<autoload name="gps_nps"/>
<autoload name="gps_sim"/>
<header>
<file name="gps.h"/>
</header>
conf/modules/guidance_indi.xml
+1 -1
View File
@@ -16,7 +16,7 @@
</dl_settings>
</settings>
<dep>
<depends>@navigation</depends>
<depends>@navigation,guidance_rotorcraft</depends>
<provides>guidance,attitude_command</provides>
</dep>
<header>
conf/modules/guidance_indi_hybrid.xml
+1 -1
View File
@@ -24,7 +24,7 @@
</dl_settings>
</settings>
<dep>
<depends>@navigation</depends>
<depends>@navigation,guidance_rotorcraft</depends>
<provides>guidance,attitude_command</provides>
</dep>
<header>
conf/modules/guidance_pid_rotorcraft.xml
+1 -1
View File
@@ -38,7 +38,7 @@
</dl_settings>
</settings>
<dep>
<depends>@stabilization</depends>
<depends>@stabilization,guidance_rotorcraft</depends>
<provides>guidance,attitude_command</provides>
</dep>
<header>
conf/modules/guidance_rotorcraft.xml
+1 -2
View File
@@ -28,8 +28,7 @@
</dl_settings>
</settings>
<dep>
<!--depends>@navigation</depends-->
<depends>nav_basic_rotorcraft,guidance_pid_rotorcraft,@stabilization</depends>
<depends>@navigation,@stabilization</depends>
<provides>guidance,attitude_command</provides>
</dep>
<header>
conf/modules/imu_apogee.xml
-2
View File
@@ -11,8 +11,6 @@
<depends>i2c,imu_common</depends>
<provides>imu</provides>
</dep>
<autoload name="imu_nps"/>
<autoload name="imu_sim"/>
<header>
<file name="imu_apogee.h" dir="boards/apogee"/>
</header>
conf/modules/imu_apogee_mpu9150.xml
+1 -3
View File
@@ -17,11 +17,9 @@
</section>
</doc>
<dep>
<depends>i2c</depends>
<depends>i2c,imu_apogee</depends>
<provides>imu,mag</provides>
</dep>
<autoload name="imu_nps"/>
<autoload name="imu_apogee"/>
<header>
<file name="imu_apogee.h" dir="boards/apogee"/>
</header>
conf/modules/imu_ardrone2.xml
-2
View File
@@ -10,8 +10,6 @@
<depends>uart,imu_common</depends>
<provides>imu,mag,sonar</provides>
</dep>
<autoload name="imu_nps"/>
<autoload name="imu_sim"/>
<header>
<file name="imu_ardrone2.h"/>
</header>
conf/modules/imu_aspirin_common.xml
-2
View File
@@ -25,8 +25,6 @@
<depends>spi_master,i2c,imu_common</depends>
<provides>imu,mag</provides>
</dep>
<autoload name="imu_nps"/>
<autoload name="imu_sim"/>
<header>
<file name="imu_aspirin.h"/>
</header>
conf/modules/imu_aspirin_i2c_common.xml
-2
View File
@@ -23,8 +23,6 @@
<depends>i2c,imu_common</depends>
<provides>imu,mag</provides>
</dep>
<autoload name="imu_nps"/>
<autoload name="imu_sim"/>
<header>
<file name="imu_aspirin_i2c.h"/>
</header>
conf/modules/imu_aspirin_i2c_v1.0.xml
-2
View File
@@ -23,8 +23,6 @@
<depends>imu_aspirin_i2c_common</depends>
<provides>imu</provides>
</dep>
<autoload name="imu_nps"/>
<autoload name="imu_sim"/>
<makefile target="!sim|nps|fbw">
<define name="IMU_ASPIRIN_VERSION_1_0"/>
</makefile>
conf/modules/imu_aspirin_i2c_v1.5.xml
-2
View File
@@ -14,8 +14,6 @@
<depends>imu_aspirin_i2c_common</depends>
<provides>imu</provides>
</dep>
<autoload name="imu_nps"/>
<autoload name="imu_sim"/>
<makefile target="!sim|nps|fbw">
<define name="IMU_ASPIRIN_VERSION_1_5"/>
</makefile>
conf/modules/imu_aspirin_v1.0.xml
-2
View File
@@ -14,8 +14,6 @@
<depends>imu_aspirin_common</depends>
<provides>imu</provides>
</dep>
<autoload name="imu_nps"/>
<autoload name="imu_sim"/>
<makefile target="!sim|nps|fbw">
<define name="IMU_ASPIRIN_VERSION_1_0"/>
</makefile>
conf/modules/imu_aspirin_v1.5.xml
+4 -1
View File
@@ -10,7 +10,10 @@
For configuration see the imu_aspirin_common module
</description>
</doc>
<autoload name="imu_aspirin_common"/>
<dep>
<depends>imu_aspirin_common</depends>
<provides>imu</provides>
</dep>
<makefile target="!sim|nps|fbw">
<define name="IMU_ASPIRIN_VERSION_1_5"/>
</makefile>
conf/modules/imu_aspirin_v2.1.xml
-2
View File
@@ -13,8 +13,6 @@
<depends>imu_aspirin_v2_common</depends>
<provides>imu</provides>
</dep>
<autoload name="imu_nps"/>
<autoload name="imu_sim"/>
<makefile target="!sim|nps|fbw">
</makefile>
</module>
conf/modules/imu_aspirin_v2_common.xml
-2
View File
@@ -24,8 +24,6 @@
<depends>spi_master,imu_common</depends>
<provides>imu,mag</provides>
</dep>
<autoload name="imu_nps"/>
<autoload name="imu_sim"/>
<header>
<file name="imu_aspirin_2_spi.h"/>
</header>

Some files were not shown because too many files have changed in this diff Show More