Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-22 04:13:39 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

[conf] update airframe files

Browse Source 
minimal changes, mostly to move the 'modules' node inside firmware
section
This commit is contained in:
Gautier Hattenberger
2021-05-14 10:32:30 +02:00
parent d32a1584eb
commit 11ac07d385
20 changed files with 84 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/airframes/ENAC/fixed-wing/apogee.xml
-6
View File
@@ -17,12 +17,6 @@
<module name="radio_control" type="ppm"/>
</target>
<define name="USE_I2C1"/>
<!--define name="USE_I2C2"/-->
<!--define name="AGR_CLIMB"/-->
<!--define name="LOITER_TRIM"/-->
<!--define name="PITCH_TRIM"/-->
<!-- Communication -->
<module name="telemetry" type="xbee_api"/>
<module name="tlsf"/>
conf/airframes/ENAC/fixed-wing/tawaki.xml
+1 -3
View File
@@ -41,6 +41,7 @@
<module name="board" type="tawaki">
<configure name="BOARD_TAWAKI_ROTATED" value="TRUE"/>
</module>
<module name="actuators" type="pwm"/>
<module name="gps" type="ublox">
<configure name="GPS_BAUD" value="B115200"/>
@@ -55,9 +56,6 @@
</module>
<!--configure name="SDLOG_USE_RTC" value="FALSE"/-->
<!--module name="tlsf"/>
<module name="pprzlog"/>
<module name="logger" type="sd_chibios"/-->
<module name="flight_recorder"/>
</firmware>
conf/airframes/ENAC/quadrotor/crazyflie_2.1.xml
+1 -1
View File
@@ -9,7 +9,7 @@
<configure name="RTOS_DEBUG" value="0"/>
<target name="ap" board="crazyflie_2.1">
<!--module name="gps" type="datalink"/-->
<module name="gps" type="datalink"/>
<module name="cf_deck" type="multi_ranger"/>
<module name="range_forcefield">
<define name="RANGE_FORCEFIELD_MAX_VEL" value="0.1"/>
conf/airframes/ESDEN/esden_cocto_lm2a2.xml
+4 -8
View File
@@ -186,14 +186,6 @@ B2L -> CW
<define name="SENSORS_PARAMS" value="nps_sensors_params_default.h" type="string"/>
</section>
<modules main_freq="512">
<module name="gps" type="ubx_ucenter"/>
<module name="led_safety_status">
<define name="SAFETY_WARNING_LED" value="5"/>
</module>
</modules>
<firmware name="rotorcraft">
<target name="ap" board="lisa_m_2.0">
<module name="radio_control" type="spektrum">
@@ -217,12 +209,16 @@ B2L -> CW
<module name="telemetry" type="transparent"/>
<module name="imu" type="aspirin_v2.1"/>
<module name="gps" type="ublox"/>
<module name="gps" type="ubx_ucenter"/>
<module name="stabilization" type="int_quat"/>
<module name="ahrs" type="int_cmpl_quat"/>
<module name="ins"/>
<!--define name="USE_INS_NAV_INIT"/-->
<!--module name="stabilization" type="int_euler"/>
<module name="ahrs" type="int_cmpl_euler"/-->
<module name="led_safety_status">
<define name="SAFETY_WARNING_LED" value="5"/>
</module>
</firmware>
</airframe>
conf/airframes/ESDEN/esden_gain_scheduling_example.xml
+6 -10
View File
@@ -173,16 +173,6 @@
<define name="SENSORS_PARAMS" value="nps_sensors_params_default.h" type="string"/>
</section>
<!--//////////////INCLUDE THE GAIN SCHEDULING MODULE\\\\\\\\\\\\\\\\-->
<modules main_freq="512">
<module name="gps" type="ubx_ucenter"/>
<module name="led_safety_status">
<define name="USE_LED_BODY" value="1"/>
<define name="SAFETY_WARNING_LED" value="BODY"/>
</module>
<!-- FIXME <module name="gain_scheduling"/>-->
</modules>
<firmware name="rotorcraft">
<target name="ap" board="lisa_m_2.0">
<module name="radio_control" type="ppm">
@@ -206,7 +196,9 @@
<module name="imu" type="aspirin_v2.1"/>
<!--module name="imu" type="aspirin_v1.0"/-->
<module name="gps" type="ublox"/>
<module name="gps" type="ubx_ucenter"/>
<module name="stabilization" type="int_quat"/>
<!-- FIXME <module name="gain_scheduling"/>-->
<module name="ahrs" type="int_cmpl_quat">
<configure name="USE_MAGNETOMETER" value="0"/>
<define name="AHRS_USE_GPS_HEADING" value="1"/>
@@ -215,5 +207,9 @@
<!--define name="USE_INS_NAV_INIT"/-->
<!--module name="stabilization" type="int_euler"/>
<module name="ahrs" type="int_cmpl_euler"/-->
<module name="led_safety_status">
<define name="USE_LED_BODY" value="1"/>
<define name="SAFETY_WARNING_LED" value="BODY"/>
</module>
</firmware>
</airframe>
conf/airframes/ESDEN/esden_hexy_ll11a2pwm.xml
+4 -7
View File
@@ -183,13 +183,6 @@
<define name="SENSORS_PARAMS" value="nps_sensors_params_default.h" type="string"/>
</section>
<modules main_freq="512">
<module name="gps" type="ubx_ucenter"/>
<module name="led_safety_status">
<define name="SAFETY_WARNING_LED" value="5"/>
</module>
</modules>
<firmware name="rotorcraft">
<target name="ap" board="lisa_l_1.1">
<module name="radio_control" type="spektrum">
@@ -213,12 +206,16 @@
<module name="telemetry" type="transparent"/>
<module name="imu" type="aspirin_v2.1"/>
<module name="gps" type="ublox"/>
<module name="gps" type="ubx_ucenter"/>
<module name="stabilization" type="int_quat"/>
<module name="ahrs" type="int_cmpl_quat"/>
<module name="ins"/>
<!--define name="USE_INS_NAV_INIT"/-->
<!--module name="stabilization" type="int_euler"/>
<module name="ahrs" type="int_cmpl_euler"/-->
<module name="led_safety_status">
<define name="SAFETY_WARNING_LED" value="5"/>
</module>
</firmware>
</airframe>
conf/airframes/ESDEN/esden_hexy_lm2a2pwm.xml
+1 -4
View File
@@ -144,10 +144,6 @@
<define name="SENSORS_PARAMS" value="nps_sensors_params_default.h" type="string"/>
</section>
<modules main_freq="512">
<module name="gps" type="ubx_ucenter"/>
</modules>
<firmware name="rotorcraft">
<target name="ap" board="lisa_m_2.0">
<module name="radio_control" type="spektrum">
@@ -172,6 +168,7 @@
<module name="imu" type="aspirin_v2.1"/>
<define name="LISA_M_LONGITUDINAL_X"/>
<module name="gps" type="ublox"/>
<module name="gps" type="ubx_ucenter"/>
<module name="stabilization" type="int_quat"/>
<module name="ahrs" type="int_cmpl_quat"/>
<module name="ins"/>
conf/airframes/ESDEN/esden_lisa2_hex.xml
+5 -8
View File
@@ -158,14 +158,6 @@
<define name="SENSORS_PARAMS" value="nps_sensors_params_default.h" type="string"/>
</section>
<modules main_freq="512">
<module name="gps" type="ubx_ucenter"/>
<module name="led_safety_status">
<define name="USE_LED_BODY" value="1"/>
<define name="SAFETY_WARNING_LED" value="5"/>
</module>
</modules>
<firmware name="rotorcraft">
<target name="ap" board="lisa_m_2.0">
<module name="radio_control" type="ppm">
@@ -188,6 +180,7 @@
<module name="imu" type="aspirin_v2.1"/>
<define name="LISA_M_LONGITUDINAL_X"/>
<module name="gps" type="ublox"/>
<module name="gps" type="ubx_ucenter"/>
<module name="stabilization" type="int_quat"/>
<module name="ahrs" type="int_cmpl_quat">
<configure name="USE_MAGNETOMETER" value="0"/>
@@ -196,6 +189,10 @@
<!--define name="USE_INS_NAV_INIT"/-->
<!--module name="stabilization" type="int_euler"/>
<module name="ahrs" type="int_cmpl_euler"/-->
<module name="led_safety_status">
<define name="USE_LED_BODY" value="1"/>
<define name="SAFETY_WARNING_LED" value="5"/>
</module>
</firmware>
</airframe>
conf/airframes/ESDEN/esden_qs_asp22.xml
+6 -9
View File
@@ -183,15 +183,6 @@
<define name="SENSORS_PARAMS" value="nps_sensors_params_default.h" type="string"/>
</section>
<modules main_freq="512">
<module name="gps" type="ubx_ucenter"/>
<module name="led_safety_status">
<define name="USE_LED_BODY" value="1"/>
<define name="SAFETY_WARNING_LED" value="BODY"/>
</module>
<!--module name="gain_scheduling"/-->
</modules>
<firmware name="rotorcraft">
<target name="ap" board="lisa_m_2.0">
<module name="radio_control" type="ppm">
@@ -215,7 +206,9 @@
<module name="imu" type="aspirin_v2.2"/>
<!-- <module name="imu" type="aspirin_v1.5"/> -->
<module name="gps" type="ublox"/>
<module name="gps" type="ubx_ucenter"/>
<module name="stabilization" type="int_quat"/>
<!--module name="gain_scheduling"/-->
<module name="ahrs" type="int_cmpl_quat">
<configure name="USE_MAGNETOMETER" value="0"/>
<define name="AHRS_USE_GPS_HEADING" value="0"/>
@@ -224,5 +217,9 @@
<!--define name="USE_INS_NAV_INIT"/-->
<!--module name="stabilization" type="int_euler"/>
<module name="ahrs" type="int_cmpl_euler"/-->
<module name="led_safety_status">
<define name="USE_LED_BODY" value="1"/>
<define name="SAFETY_WARNING_LED" value="BODY"/>
</module>
</firmware>
</airframe>
conf/airframes/ESDEN/esden_quady_ll11a2pwm.xml
+1 -4
View File
@@ -179,10 +179,6 @@
<define name="SENSORS_PARAMS" value="nps_sensors_params_default.h" type="string"/>
</section>
<modules main_freq="512">
<module name="gps" type="ubx_ucenter"/>
</modules>
<firmware name="rotorcraft">
<target name="ap" board="lisa_l_1.1">
<module name="radio_control" type="spektrum">
@@ -206,6 +202,7 @@
<module name="telemetry" type="transparent"/>
<module name="imu" type="aspirin_v2.1"/>
<module name="gps" type="ublox"/>
<module name="gps" type="ubx_ucenter"/>
<module name="stabilization" type="int_quat"/>
<module name="ahrs" type="int_cmpl_quat"/>
<module name="ins"/>
conf/airframes/ESDEN/esden_quady_lm1a1pwm.xml
+28 -31
View File
@@ -140,38 +140,35 @@
<define name="SENSORS_PARAMS" value="nps_sensors_params_default.h" type="string"/>
</section>
<modules main_freq="512">
<firmware name="rotorcraft">
<target name="ap" board="lisa_m_1.0">
<module name="radio_control" type="spektrum">
<define name="RADIO_MODE" value="RADIO_FLAP"/>
<define name="RADIO_KILL_SWITCH" value="RADIO_GEAR"/>
<configure name="USE_SECONDARY_SPEKTRUM_RECEIVER" value="1"/>
</module>
</target>
<target name="nps" board="pc">
<module name="fdm" type="jsbsim"/>
<module name="radio_control" type="ppm"/>
</target>
<module name="motor_mixing"/>
<module name="actuators" type="pwm">
<define name="SERVO_HZ" value="400"/>
<define name="USE_SERVOS_7AND8"/>
</module>
<module name="telemetry" type="transparent"/>
<module name="imu" type="aspirin_v1.0"/>
<module name="gps" type="ublox"/>
<module name="gps" type="ubx_ucenter"/>
</modules>
<firmware name="rotorcraft">
<target name="ap" board="lisa_m_1.0">
<module name="radio_control" type="spektrum">
<define name="RADIO_MODE" value="RADIO_FLAP"/>
<define name="RADIO_KILL_SWITCH" value="RADIO_GEAR"/>
<configure name="USE_SECONDARY_SPEKTRUM_RECEIVER" value="1"/>
</module>
</target>
<target name="nps" board="pc">
<module name="fdm" type="jsbsim"/>
<module name="radio_control" type="ppm"/>
</target>
<module name="motor_mixing"/>
<module name="actuators" type="pwm">
<define name="SERVO_HZ" value="400"/>
<define name="USE_SERVOS_7AND8"/>
</module>
<module name="telemetry" type="transparent"/>
<module name="imu" type="aspirin_v1.0"/>
<module name="gps" type="ublox"/>
<module name="stabilization" type="int_quat"/>
<module name="ahrs" type="int_cmpl_quat"/>
<module name="ins"/>
<!--define name="USE_INS_NAV_INIT"/-->
<!--module name="stabilization" type="int_euler"/>
<module name="stabilization" type="int_quat"/>
<module name="ahrs" type="int_cmpl_quat"/>
<module name="ins"/>
<!--define name="USE_INS_NAV_INIT"/-->
<!--module name="stabilization" type="int_euler"/>
<module name="ahrs" type="int_cmpl_euler"/-->
</firmware>
conf/airframes/ESDEN/esden_quady_lm2a2pwm.xml
+4 -8
View File
@@ -143,14 +143,6 @@
<define name="SENSORS_PARAMS" value="nps_sensors_params_default.h" type="string"/>
</section>
<modules main_freq="512">
<module name="gps" type="ubx_ucenter"/>
<module name="led_safety_status">
<define name="SAFETY_WARNING_LED" value="5"/>
</module>
</modules>
<firmware name="rotorcraft">
<target name="ap" board="lisa_m_2.0">
<module name="radio_control" type="spektrum">
@@ -175,12 +167,16 @@
<module name="telemetry" type="transparent"/>
<module name="imu" type="aspirin_v2.1"/>
<module name="gps" type="ublox"/>
<module name="gps" type="ubx_ucenter"/>
<module name="stabilization" type="int_quat"/>
<module name="ahrs" type="int_cmpl_quat"/>
<module name="ins"/>
<!--define name="USE_INS_NAV_INIT"/-->
<!--module name="stabilization" type="int_euler"/>
<module name="ahrs" type="int_cmpl_euler"/-->
<module name="led_safety_status">
<define name="SAFETY_WARNING_LED" value="5"/>
</module>
</firmware>
</airframe>
conf/airframes/ESDEN/esden_quady_lm2a2pwmppm.xml
+4 -8
View File
@@ -140,14 +140,6 @@
<define name="SENSORS_PARAMS" value="nps_sensors_params_default.h" type="string"/>
</section>
<modules main_freq="512">
<module name="gps" type="ubx_ucenter"/>
<module name="led_safety_status">
<define name="SAFETY_WARNING_LED" value="5"/>
</module>
</modules>
<firmware name="rotorcraft">
<target name="ap" board="lisa_m_2.0">
<module name="radio_control" type="ppm">
@@ -169,12 +161,16 @@
<module name="telemetry" type="transparent"/>
<module name="imu" type="aspirin_v2.1"/>
<module name="gps" type="ublox"/>
<module name="gps" type="ubx_ucenter"/>
<module name="stabilization" type="int_quat"/>
<module name="ahrs" type="int_cmpl_quat"/>
<module name="ins"/>
<!--define name="USE_INS_NAV_INIT"/-->
<!--module name="stabilization" type="int_euler"/>
<module name="ahrs" type="int_cmpl_euler"/-->
<module name="led_safety_status">
<define name="SAFETY_WARNING_LED" value="5"/>
</module>
</firmware>
</airframe>
conf/airframes/ESDEN/esden_quady_ls10pwm.xml
+1 -4
View File
@@ -143,10 +143,6 @@
<define name="SENSORS_PARAMS" value="nps_sensors_params_default.h" type="string"/>
</section>
<modules main_freq="512">
<module name="gps" type="ubx_ucenter"/>
</modules>
<firmware name="rotorcraft">
<target name="ap" board="lisa_s_1.0">
<module name="radio_control" type="superbitrf_rc">
@@ -172,6 +168,7 @@
<module name="telemetry" type="transparent"/>
<module name="imu" type="lisa_s_v1.0"/>
<module name="gps" type="ublox"/>
<module name="gps" type="ubx_ucenter"/>
<module name="stabilization" type="int_quat"/>
<module name="ahrs" type="int_cmpl_quat"/>
<module name="ins"/>
conf/airframes/MM/bebop.xml
+1 -3
View File
@@ -29,9 +29,7 @@
<module name="stabilization" type="int_quat"/>
<module name="ahrs" type="float_mlkf"/>
<module name="ins" type="extended"/>
</firmware>
<modules main_freq="512">
<module name="geo_mag"/>
<module name="air_data"/>
<module name="send_imu_mag_current"/>
@@ -56,7 +54,7 @@
<!--module name="ir_mlx">
<define name="MLX_I2C_DEV" value="i2c3"/>
</module-->
</modules>
</firmware>
<commands>
<axis name="PITCH" failsafe_value="0"/>
conf/airframes/MM/bebop2_lum1_xbee.xml
+1 -3
View File
@@ -35,9 +35,7 @@
<define name="AHRS_USE_GPS_HEADING" value="FALSE"/>
</module>
<module name="ins" type="extended"/>
</firmware>
<modules main_freq="512">
<!--module name="wind_estimator"/-->
<module name="geo_mag"/>
<module name="air_data"/>
@@ -50,7 +48,7 @@
<configure name="SHT_UART" value="UART5"/>
</module>
<module name="imu_temp_ctrl"/>
</modules>
</firmware>
<commands>
<axis name="PITCH" failsafe_value="0"/>
conf/airframes/OPENUAS/openuas_itsybitsy.xml
+5 -8
View File
@@ -188,14 +188,6 @@
<define name="SENSORS_PARAMS" value="nps_sensors_params_default.h" type="string"/>
</section>
<modules main_freq="512">
<module name="gps" type="ubx_ucenter"/>
<module name="geo_mag"/>
<module name="air_data"/>
<!-- below temporary until tsted then remove it-->
<module name="send_imu_mag_current"/>
</modules>
<firmware name="rotorcraft">
<target name="ap" board="lisa_s_1.0">
<module name="radio_control" type="superbitrf_rc"> <!-- type="ppm" -->
@@ -240,10 +232,15 @@
<define name="LISA_S_UPSIDE_DOWN"/> <!-- Upside down is a relative term. :) -->
</module>
<module name="gps" type="ublox"/>
<module name="gps" type="ubx_ucenter"/>
<module name="geo_mag"/>
<module name="air_data"/>
<module name="stabilization" type="int_quat"/>
<module name="ahrs" type="int_cmpl_quat"/>
<!-- <configure name="USE_MAGNETOMETER" value="TRUE"/>
<define name="AHRS_USE_GPS_HEADING" value="FALSE"/>-->
<module name="ins"/>
<!-- below temporary until tsted then remove it-->
<module name="send_imu_mag_current"/>
</firmware>
</airframe>
conf/airframes/OPENUAS/openuas_own_mavtec.xml
+8 -13
View File
@@ -29,18 +29,6 @@
<module name="stabilization" type="int_quat"/>
<module name="ahrs" type="float_mlkf"/>
<module name="ins" type="hff"/>
</firmware>
<section name="AUTOPILOT">
<define name="MODE_STARTUP" value="AP_MODE_NAV"/>
<define name="MODE_MANUAL" value="AP_MODE_ATTITUDE_DIRECT"/>
<define name="MODE_AUTO1" value="AP_MODE_ATTITUDE_Z_HOLD"/>
<define name="MODE_AUTO2" value="AP_MODE_NAV"/>
</section>
<!-- ************************* MODULES ************************* -->
<modules main_freq="512">
<!-- <module name="logger_spi_link"/>
<module name="imu_quality_assessment"/> -->
<module name="switch" type="servo"/>
@@ -49,7 +37,14 @@
<module name="nav" type="survey_rectangle_rotorcraft"/>
<module name="nav" type="survey_poly_rotorcraft"/>
<module name="geo_mag"/>
</modules>
</firmware>
<section name="AUTOPILOT">
<define name="MODE_STARTUP" value="AP_MODE_NAV"/>
<define name="MODE_MANUAL" value="AP_MODE_ATTITUDE_DIRECT"/>
<define name="MODE_AUTO1" value="AP_MODE_ATTITUDE_Z_HOLD"/>
<define name="MODE_AUTO2" value="AP_MODE_NAV"/>
</section>
<!-- ************************* ACTUATORS ************************* -->
conf/airframes/examples/microjet_lisa_m_xsens.xml
+2 -1
View File
@@ -28,8 +28,9 @@
<module name="control"/>
<module name="navigation"/>
<module name="sys_mon"/>
<module name="nav" type="line"/>
<module name="sys_mon"/>
</firmware>
<servos>
conf/airframes/max/microjet_lisa_m.xml
+1 -3
View File
@@ -65,9 +65,7 @@
<configure name="ADC_CHANNEL_GENERIC1" value="ADC_1"/>
<configure name="ADC_CHANNEL_GENERIC2" value="ADC_2"/>
</module>
</firmware>
<modules>
<module name="sys_mon"/>
<module name="baro_sim"/>
<module name="air_data">
@@ -77,7 +75,7 @@
<module name="digital_cam_servo">
<define name="DC_SHUTTER_SERVO" value="COMMAND_SHUTTER"/>
</module>
</modules>
</firmware>
<servos>