[conf] fix non-compiling airframes

This commit is contained in:
Christophe De Wagter
2016-12-14 17:37:02 +01:00
parent a78cbadc30
commit 51f5e2ccf0
3 changed files with 13 additions and 14 deletions
+1 -1
View File
@@ -84,7 +84,7 @@
telemetry="telemetry/default_fixedwing_imu_9k6.xml"
flight_plan="flight_plans/OPENUAS/openuas_obc2014_kingaroy.xml"
settings="settings/control/ctl_energy.xml settings/estimation/ac_char.xml settings/fixedwing_basic.xml"
settings_modules="modules/gps.xml modules/air_data.xml modules/gps_ubx_ucenter.xml modules/airspeed_adc.xml modules/tune_airspeed.xml modules/photogrammetry_calculator.xml modules/digital_cam_uart.xml modules/nav_survey_poly_osam.xml modules/nav_smooth.xml"
settings_modules="modules/imu_common.xml modules/ahrs_int_cmpl_quat.xml modules/gps.xml modules/gps_ubx_ucenter.xml modules/air_data.xml modules/airspeed_adc.xml modules/tune_airspeed.xml modules/photogrammetry_calculator.xml modules/digital_cam_uart.xml modules/nav_survey_poly_osam.xml modules/nav_smooth.xml"
gui_color="#fffffac7c07a"
/>
</conf>
+1 -2
View File
@@ -92,6 +92,7 @@
<configure name="GPS_PORT" value="UART3"/>
<configure name="GPS_BAUD" value="B38400"/>
</module>
<module name="gps" type="ubx_ucenter"/><!-- WARNING: make sure to disable SBAS for Australia -->
<!-- * Add Navigation routines -->
<module name="navigation"/>
@@ -201,8 +202,6 @@
<define name="AIR_DATA_CALC_AMSL_BARO" value="TRUE" />
</module>
<!-- CDW: module name="obc2014"/-->
<!-- GPS -->
<module name="gps" type="ubx_ucenter"/><!-- WARNING: make sure to disable SBAS for Australia -->
<!-- Load -->
<!-- module name="sys_mon"/> -->
<!--
+11 -11
View File
@@ -120,6 +120,17 @@
settings_modules="modules/gps_ubx_ucenter.xml modules/imu_common.xml modules/gps.xml modules/ahrs_int_cmpl_quat.xml"
gui_color="blue"
/>
<aircraft
name="DelftaCopter"
ac_id="6"
airframe="airframes/TUDELFT/tudelft_outback.xml"
radio="radios/dummy.xml"
telemetry="telemetry/TUDELFT/tudelft_outback.xml"
flight_plan="flight_plans/rotorcraft_basic.xml"
settings="settings/rotorcraft_basic.xml settings/control/stabilization_att_int.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_rate.xml"
settings_modules="modules/imu_common.xml modules/gps.xml modules/ahrs_int_cmpl_quat.xml modules/opa_controller.xml modules/geo_mag.xml modules/air_data.xml modules/temp_adc.xml modules/logger_sd_spi_direct.xml modules/gps_ubx_ucenter.xml"
gui_color="#ffffdffac31f"
/>
<aircraft
name="GeniusDD"
ac_id="129"
@@ -252,17 +263,6 @@
settings_modules="modules/imu_common.xml modules/ahrs_int_cmpl_quat.xml modules/gps.xml modules/air_data.xml modules/geo_mag.xml modules/gps_ubx_ucenter.xml modules/light.xml modules/digital_cam.xml"
gui_color="white"
/>
<aircraft
name="Outback"
ac_id="6"
airframe="airframes/TUDELFT/tudelft_outback.xml"
radio="radios/dummy.xml"
telemetry="telemetry/TUDELFT/tudelft_outback.xml"
flight_plan="flight_plans/TUDELFT/obc2016/obc2016.xml"
settings="settings/rotorcraft_basic.xml settings/control/stabilization_att_int.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_rate.xml"
settings_modules="modules/imu_common.xml modules/gps.xml modules/ahrs_int_cmpl_quat.xml modules/opa_controller.xml modules/air_data.xml modules/temp_adc.xml modules/logger_sd_spi_direct.xml modules/gps_ubx_ucenter.xml"
gui_color="#ffffdffac31f"
/>
<aircraft
name="Quad_Navstik"
ac_id="50"