Merge pull request #1471 from paparazzi/load_modules_from_firmware

[build] Modules can be used like subsystems in airframe files
This commit is contained in:
Gautier Hattenberger
2015-12-11 21:54:18 +01:00
9 changed files with 475 additions and 472 deletions
+29 -30
View File
@@ -158,52 +158,51 @@
<firmware name="fixedwing">
<target name="sim" board="pc" />
<target name="ap" board="tiny_1.1"/>
<target name="ap" board="tiny_1.1">
<module name="tune_airspeed"/>
<module name="digital_cam" type="servo">
<define name="DC_SHUTTER_SERVO" value="COMMAND_SHUTTER" />
</module>
<module name="openlog"/>
</target>
<define name="AGR_CLIMB" />
<define name="LOITER_TRIM" />
<subsystem name="radio_control" type="ppm"/>
<module name="radio_control" type="ppm"/>
<!-- Communication -->
<subsystem name="telemetry" type="xbee_api">
<module name="telemetry" type="xbee_api">
<configure name="MODEM_BAUD" value="B9600"/>
</subsystem>
</module>
<subsystem name="control"/>
<!-- Sensors -->
<subsystem name="imu" type="analog">
<module name="imu" type="analog">
<configure name="GYRO_P" value="ADC_3"/>
</subsystem>
<subsystem name="gps" type="ublox_utm"/>
<subsystem name="navigation"/>
<subsystem name="ins" type="alt_float"/>
</module>
<module name="gps" type="ublox_utm"/>
<module name="infrared_adc"/>
<module name="ahrs" type="infrared"/>
<module name="ins" type="alt_float"/>
<module name="control"/>
<module name="navigation"/>
<module name="nav" type="survey_polygon"/>
<module name="nav" type="line_border"/>
<module name="nav" type="line"/>
<module name="nav" type="smooth"/>
<module name="nav" type="flower"/>
<module name="nav" type="line_osam"/>
<module name="nav" type="survey_poly_osam"/>
<module name="nav" type="vertical_raster"/>
<module name="nav" type="bungee_takeoff"/>
</firmware>
<section name="GCS">
<define name="AC_ICON" value="flyingwing"/>
</section>
<modules>
<load name="openlog.xml"/>
<load name="nav_survey_polygon.xml"/>
<load name="nav_line_border.xml"/>
<load name="nav_line.xml"/>
<load name="nav_smooth.xml"/>
<load name="nav_flower.xml"/>
<load name="nav_line_osam.xml"/>
<load name="nav_survey_poly_osam.xml"/>
<load name="nav_vertical_raster.xml"/>
<load name="nav_bungee_takeoff.xml"/>
<load name="infrared_adc.xml"/>
<load name="ahrs_infrared.xml"/>
<load name="tune_airspeed.xml"/>
<load name="digital_cam_servo.xml">
<define name="DC_SHUTTER_SERVO" value="COMMAND_SHUTTER" />
</load>
</modules>
<firmware name="setup">
<target name="tunnel" board="tiny_1.1" />
<target name="usb_tunnel" board="tiny_1.1">