Skip to content

Commit

Permalink
Enac conf cleaning (#3223)
Browse files Browse the repository at this point in the history
move boards test files to separated folder
  • Loading branch information
gautierhattenberger committed Dec 20, 2023
1 parent c1ab6d5 commit 378b936
Show file tree
Hide file tree
Showing 37 changed files with 1,596 additions and 1,794 deletions.
140 changes: 37 additions & 103 deletions conf/airframes/ENAC/conf_enac.xml
Original file line number Diff line number Diff line change
@@ -1,41 +1,8 @@
<conf>
<aircraft
name="APOGEE"
ac_id="3"
airframe="airframes/ENAC/fixed-wing/apogee.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/fixedwing_flight_recorder.xml"
flight_plan="flight_plans/basic.xml"
settings="settings/fixedwing_basic.xml"
settings_modules="modules/ahrs_float_dcm.xml modules/gps.xml modules/guidance_basic_fw.xml modules/imu_common.xml modules/nav_basic_fw.xml modules/power_switch.xml modules/stabilization_attitude_fw.xml"
gui_color="blue"
/>
<aircraft
name="CHIMERA"
ac_id="23"
airframe="airframes/ENAC/fixed-wing/chimera.xml"
radio="radios/T10CG_SBUS.xml"
telemetry="telemetry/fixedwing_flight_recorder.xml"
flight_plan="flight_plans/basic.xml"
settings="settings/fixedwing_basic.xml"
settings_modules="modules/ahrs_float_dcm.xml modules/air_data.xml modules/airspeed_ms45xx_i2c.xml modules/gps.xml modules/guidance_full_pid_fw.xml modules/imu_common.xml modules/nav_basic_fw.xml modules/stabilization_adaptive_fw.xml"
gui_color="#fdeb90060000"
/>
<aircraft
name="CRAZYFLIE"
ac_id="5"
airframe="airframes/ENAC/quadrotor/crazyflie_2.1.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/ENAC/crazyflie_multi_ranger_test.xml"
settings="settings/rotorcraft_basic.xml"
settings_modules="modules/ahrs_madgwick.xml modules/air_data.xml modules/electrical.xml modules/gps.xml modules/gps_ublox.xml modules/guidance_pid_rotorcraft.xml modules/guidance_rotorcraft.xml modules/imu_common.xml modules/ins_extended.xml modules/nav_rotorcraft.xml modules/opticflow_pmw3901.xml modules/range_forcefield.xml modules/sonar_vl53l1x.xml modules/stabilization_int_quat.xml"
gui_color="blue"
/>
<aircraft
name="CYFOAM"
ac_id="6"
airframe="airframes/ENAC/cyfoam.xml"
airframe="airframes/ENAC/hybrid/cyfoam.xml"
radio="radios/T10CG_SBUS.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/rotorcraft_basic.xml"
Expand All @@ -44,70 +11,15 @@
gui_color="#ffff7f7f0000"
/>
<aircraft
name="JP"
name="ZAGI"
ac_id="12"
airframe="airframes/ENAC/fixed-wing/jp.xml"
airframe="airframes/ENAC/fixed-wing/zagi_test.xml"
radio="radios/R617FS_5ch_neg.xml"
telemetry="telemetry/default_fixedwing_imu.xml"
flight_plan="flight_plans/basic.xml"
settings="settings/fixedwing_basic.xml [settings/nps.xml]"
settings_modules="modules/ahrs_float_dcm.xml modules/airspeed_adc.xml modules/gps.xml modules/gps_ublox.xml [modules/gps_ubx_ucenter.xml] modules/guidance_full_pid_fw.xml modules/imu_common.xml modules/ins_float_invariant.xml modules/nav_basic_fw.xml modules/power_switch.xml modules/stabilization_adaptive_fw.xml"
gui_color="#ffff7d7d0000"
/>
<aircraft
name="LISAMX"
ac_id="10"
airframe="airframes/examples/quadrotor_lisa_mx.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/rotorcraft_basic.xml"
settings="settings/rotorcraft_basic.xml"
settings_modules="modules/ahrs_float_mlkf.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 modules/stabilization_rate.xml"
gui_color="blue"
/>
<aircraft
name="MATEK"
ac_id="7"
airframe="airframes/ENAC/fixed-wing/matek_f765_wing.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_fixedwing.xml"
flight_plan="flight_plans/basic.xml"
settings="settings/fixedwing_basic.xml"
settings_modules="modules/ahrs_float_dcm.xml modules/air_data.xml modules/gps.xml modules/guidance_full_pid_fw.xml modules/imu_common.xml modules/nav_basic_fw.xml modules/stabilization_adaptive_fw.xml"
gui_color="blue"
/>
<aircraft
name="NUCLEO"
ac_id="4"
airframe="airframes/ENAC/nucleo144_test.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_fixedwing.xml"
flight_plan="flight_plans/basic.xml"
settings="settings/fixedwing_basic.xml"
settings_modules="modules/ahrs_float_cmpl_quat.xml modules/ahrs_float_dcm.xml modules/air_data.xml modules/electrical.xml modules/gps.xml modules/gps_ublox.xml modules/guidance_full_pid_fw.xml modules/imu_common.xml modules/nav_basic_fw.xml modules/stabilization_adaptive_fw.xml"
gui_color="blue"
/>
<aircraft
name="PX4FMUv5"
ac_id="8"
airframe="airframes/tudelft/mentor.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_fixedwing.xml"
flight_plan="flight_plans/basic.xml"
settings="settings/fixedwing_basic.xml"
settings_modules="modules/ahrs_int_cmpl_quat.xml modules/air_data.xml modules/gps.xml modules/gps_ubx_ucenter.xml modules/guidance_energy.xml modules/imu_common.xml modules/nav_basic_fw.xml modules/stabilization_attitude_fw.xml"
gui_color="blue"
/>
<aircraft
name="TAWAKI"
ac_id="1"
airframe="airframes/ENAC/fixed-wing/tawaki.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/fixedwing_flight_recorder.xml"
flight_plan="flight_plans/basic.xml"
settings="settings/fixedwing_basic.xml"
settings_modules="modules/ahrs_float_cmpl_quat.xml modules/ahrs_float_dcm.xml modules/air_data.xml modules/gps.xml modules/guidance_full_pid_fw.xml modules/imu_common.xml modules/ins_float_invariant.xml modules/nav_basic_fw.xml modules/stabilization_adaptive_fw.xml"
gui_color="blue"
settings_modules="modules/ahrs_float_dcm.xml modules/airspeed_adc.xml modules/electrical.xml modules/gps.xml modules/gps_ublox.xml [modules/gps_ubx_ucenter.xml] modules/guidance_full_pid_fw.xml modules/imu_common.xml modules/ins_float_invariant.xml modules/nav_basic_fw.xml modules/power_switch.xml modules/stabilization_adaptive_fw.xml"
gui_color="#ffff7d7d0000"
/>
<aircraft
name="RoBoBee"
Expand Down Expand Up @@ -143,25 +55,47 @@
gui_color="#c6d33e3ef958"
/>
<aircraft
name="matek"
ac_id="9"
airframe="airframes/examples/matek_h743_slim.xml"
name="CobraV2"
ac_id="11"
airframe="airframes/ENAC/quadrotor/cobraV2.xml"
radio="radios/FrSky_X-Lite.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/rotorcraft_basic.xml"
settings="settings/rotorcraft_basic.xml"
settings_modules="modules/ahrs_int_cmpl_quat.xml modules/air_data.xml modules/electrical.xml modules/gps.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="red"
settings_modules="modules/electrical.xml modules/gps.xml modules/guidance_indi.xml modules/guidance_rotorcraft.xml modules/imu_common.xml modules/ins_ekf2.xml modules/jevois.xml modules/logger_sd_chibios.xml modules/nav_rotorcraft.xml modules/preflight_checks.xml modules/stabilization_indi.xml modules/switch_servo.xml modules/tag_tracking.xml"
gui_color="#55005500ff00"
/>
<aircraft
name="CobraV2"
ac_id="11"
airframe="airframes/ENAC/quadrotor/cobraV2.xml"
name="MAYA"
ac_id="1"
airframe="airframes/ENAC/quadrotor/maya_outdoor.xml"
radio="radios/FrSky_X-Lite.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/competitions/IMAV2023_dynamic.xml"
settings="settings/rotorcraft_basic.xml"
settings_modules="modules/ahrs_int_cmpl_quat.xml modules/air_data.xml modules/electrical.xml modules/gps.xml modules/gps_ublox.xml modules/guidance_indi.xml modules/guidance_rotorcraft.xml modules/imu_common.xml modules/jevois.xml modules/logger_sd_chibios.xml modules/nav_rotorcraft.xml modules/stabilization_indi.xml modules/switch_servo.xml modules/tag_tracking.xml"
gui_color="#c6d33e3ef958"
/>
<aircraft
name="FALCON_V2"
ac_id="3"
airframe="airframes/ENAC/hybrid/falcon_v2.xml"
radio="radios/T10CG_SBUS.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/rotorcraft_basic.xml"
settings="settings/rotorcraft_basic.xml"
settings_modules="modules/electrical.xml modules/gps.xml modules/guidance_indi.xml modules/guidance_rotorcraft.xml modules/imu_common.xml modules/ins_ekf2.xml modules/jevois.xml modules/logger_sd_chibios.xml modules/nav_rotorcraft.xml modules/preflight_checks.xml modules/stabilization_indi.xml modules/switch_servo.xml modules/tag_tracking.xml"
gui_color="#55005500ff00"
settings_modules="modules/air_data.xml modules/airspeed_sdp3x.xml modules/electrical.xml modules/gps.xml modules/gps_ublox.xml modules/guidance_indi_hybrid.xml modules/guidance_rotorcraft.xml modules/imu_common.xml modules/ins_ekf2.xml modules/logger_sd_chibios.xml modules/nav_hybrid.xml modules/nav_rotorcraft.xml modules/stabilization_indi.xml"
gui_color="#ffff7f7f0000"
/>
<aircraft
name="PANACHE_1"
ac_id="4"
airframe="airframes/ENAC/fixed-wing/panache_1.xml"
radio="radios/T10CG_SBUS.xml"
telemetry="telemetry/fixedwing_flight_recorder.xml"
flight_plan="flight_plans/basic.xml"
settings="settings/fixedwing_basic.xml"
settings_modules="modules/ahrs_float_dcm.xml modules/air_data.xml modules/e_identification_fr.xml modules/electrical.xml modules/gps.xml modules/gps_ublox.xml modules/guidance_full_pid_fw.xml modules/imu_common.xml modules/logger_sd_chibios.xml modules/nav_basic_fw.xml modules/stabilization_adaptive_fw.xml"
gui_color="#ffff7d7d0000"
/>
</conf>
10 changes: 4 additions & 6 deletions conf/airframes/ENAC/fixed-wing/crrcsim.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
<!DOCTYPE airframe SYSTEM "../../airframe.dtd">

<!-- Funjet Multiplex (http://www.multiplex-rc.de/)
UBX GPS
Airspeed sensor
Digital camera
-->

<airframe name="CRRCSIM demo">

<description>
Demo for the CRRCSIM simulator with NPS
</description>

<firmware name="fixedwing">
<define name="AGR_CLIMB"/>
<define name="LOITER_TRIM"/>
Expand Down
199 changes: 199 additions & 0 deletions conf/airframes/ENAC/fixed-wing/panache_1.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,199 @@
<!DOCTYPE airframe SYSTEM "../../airframe.dtd">

<airframe name="Panache_1">

<description>
Talon GT Rebel
Project Panache
AP: Tawaki
GPS: Ublox
Modem: XBee
</description>

<firmware name="fixedwing">
<configure name="PERIODIC_FREQUENCY" value="100"/>

<target name="ap" board="tawaki_1.1">
<module name="radio_control" type="sbus"/>
<define name="USE_PWM5"/>
<define name="USE_PWM_TIM4"/>
</target>
<target name="nps" board="pc">
<module name="radio_control" type="ppm"/>
<module name="fdm" type="jsbsim"/>

<!-- to use real panache board in simulation, remove target="ap" from extra_dl.xml -->
<module name="uart"/>
<define name="UART6_DEV" value="/dev/ttyUSB0"/>
</target>
<module name="telemetry" type="xbee_api"/>
<module name="board" type="tawaki"/>
<module name="ahrs" type="float_dcm"/> <!--Attitude and heading reference system-->
<module name="ins" type="alt_float"/><!--Inertial navigation system-->
<module name="air_data"/>
<module name="gps" type="ublox">
<configure name="GPS_BAUD" value="B115200"/>
</module>
<module name="control" type="new"/>
<module name="navigation"/>

<module name="e_identification_fr">
<configure name="E_ID_PORT" value="UART3"/>
<configure name="E_ID_BAUD" value="B115200"/>
</module>

<module name="flight_recorder"/>

<!-- panache_sensor depends on flight_recorder and extra_dl >-->
<!--module name="panache_sensor">
<configure name="PANACHE_PORT" value="uart3"/>
<configure name="PANACHE_BAUD" value="B230400"/>
</module-->

</firmware>

<commands>
<axis name="THROTTLE" failsafe_value="0"/>
<axis name="ROLL" failsafe_value="0"/>
<axis name="PITCH" failsafe_value="0"/>
<axis name="YAW" failsafe_value="0"/>
</commands>

<servos>
<servo name="TAIL_RIGHT" no="1" min="1000" neutral="1400" max="1800"/>
<servo name="TAIL_LEFT" no="2" min="1950" neutral="1550" max="1150"/>
<servo name="AILERON_RIGHT" no="3" min="1960" neutral="1660" max="1260"/>
<servo name="AILERON_LEFT" no="4" min="1780" neutral="1380" max="1080"/>
<servo name="MOTOR" no="5" min="1000" neutral="1000" max="2000"/>
</servos>

<rc_commands>
<set command="THROTTLE" value="@THROTTLE"/>
<set command="ROLL" value="@ROLL"/>
<set command="PITCH" value="@PITCH"/>
<set command="YAW" value="@YAW"/>
</rc_commands>

<section name="MIXER">
<define name="AILERON_RATE" value="0.85"/>
<define name="ELEVATOR_RATE" value="0.85"/>
<define name="RUDDER_RATE" value="0.75"/>
</section>

<command_laws>
<set servo="MOTOR" value="@THROTTLE"/>
<set servo="AILERON_LEFT" value="@ROLL * AILERON_RATE"/>
<set servo="AILERON_RIGHT" value="@ROLL * AILERON_RATE"/>
<set servo="TAIL_LEFT" value="- @PITCH * ELEVATOR_RATE - @YAW * RUDDER_RATE"/>
<set servo="TAIL_RIGHT" value="- @PITCH * ELEVATOR_RATE + @YAW * RUDDER_RATE"/>
</command_laws>

<section name="GVF" prefix="GVF_">
<define name="LINE_KE" value="2.5"/>
<define name="ELLIPSE_KE" value="0.8"/>
<define name="ELLIPSE_KN" value="0.6"/>
</section>

<section name="GVF_PARAMETRIC" prefix="GVF_PARAMETRIC_">
<define name="3D_LISSAJOUS_KX" value="0.001"/>
<define name="3D_LISSAJOUS_KY" value="0.001"/>
<define name="3D_LISSAJOUS_KZ" value="0.001"/>
</section>

<section name="AUTO1" prefix="AUTO1_">
<define name="MAX_ROLL" value="45." unit="deg"/>
<define name="MAX_PITCH" value="30." unit="deg"/>
</section>

<section name="IMU" prefix="IMU_">
<define name="ACCEL_X_NEUTRAL" value="-89"/>
<define name="ACCEL_Y_NEUTRAL" value="40"/>
<define name="ACCEL_Z_NEUTRAL" value="42"/>
<define name="ACCEL_X_SENS" value="2.5489897051228363" integer="16"/>
<define name="ACCEL_Y_SENS" value="2.4490240616062073" integer="16"/>
<define name="ACCEL_Z_SENS" value="2.4604910680255285" integer="16"/>

<define name="BODY_TO_IMU_PHI" value="0" unit="deg"/>
<define name="BODY_TO_IMU_THETA" value="0" unit="deg"/>
<define name="BODY_TO_IMU_PSI" value="180" unit="deg"/>
</section>

<include href="conf/mag/toulouse_muret.xml"/>

<section name="BAT">
<define name="CATASTROPHIC_BAT_LEVEL" value="12.6" unit="V"/>
<define name="MAX_BAT_LEVEL" value="16.8"/>
<define name="BAT_NB_CELLS" value="4"/>
</section>

<section name="MISC">
<define name="NOMINAL_AIRSPEED" value="18." unit="m/s"/>
<define name="CARROT" value="5." unit="s"/>
<define name="DEFAULT_CIRCLE_RADIUS" value="100."/>
</section>

<section name="VERTICAL CONTROL" prefix="V_CTL_">
<!-- outer loop proportional gain -->
<define name="ALTITUDE_PGAIN" value="0.06"/>
<!-- outer loop saturation -->
<define name="ALTITUDE_MAX_CLIMB" value="3."/>
<!-- auto throttle inner loop -->
<define name="AUTO_THROTTLE_NOMINAL_CRUISE_THROTTLE" value="0.45"/>
<define name="AUTO_THROTTLE_MIN_CRUISE_THROTTLE" value="0.25"/>
<define name="AUTO_THROTTLE_MAX_CRUISE_THROTTLE" value="0.6"/>
<define name="AUTO_THROTTLE_CLIMB_THROTTLE_INCREMENT" value="0.08" unit="%/(m/s)"/>
<define name="AUTO_THROTTLE_PGAIN" value="0.003"/>
<define name="AUTO_THROTTLE_IGAIN" value="0.005"/>
<define name="AUTO_THROTTLE_PITCH_OF_VZ_PGAIN" value="0.09"/>
<define name="AUTO_PITCH_PGAIN" value="0.024"/>
<define name="AUTO_PITCH_DGAIN" value="0.013"/>
<define name="AUTO_PITCH_IGAIN" value="0.0"/>
<define name="AUTO_PITCH_MAX_PITCH" value="20" unit="deg"/>
<define name="AUTO_PITCH_MIN_PITCH" value="-20" unit="deg"/>
<define name="PITCH_TRIM" value="-0.4" unit="deg"/>
</section>

<section name="HORIZONTAL CONTROL" prefix="H_CTL_">
<define name="COURSE_PGAIN" value="0.4"/>
<define name="PITCH_MAX_SETPOINT" value="30." unit="deg"/>
<define name="PITCH_MIN_SETPOINT" value="-30." unit="deg"/>
<define name="PITCH_PGAIN" value="10210"/>
<define name="PITCH_IGAIN" value="322"/>
<define name="PITCH_DGAIN" value="1485"/>

<define name="ROLL_RATE_GAIN" value="1000"/>

<define name="ROLL_MAX_SETPOINT" value="40" unit="deg"/>
<define name="ROLL_ATTITUDE_GAIN" value="11770"/>
</section>

<section name="CATAPULT" prefix="NAV_CATAPULT_">
<define name="ACCELERATION_THRESHOLD" value="1.2" description="acceleration threshold in multiples of g" unit="g"/>
<define name="ACCELERATION_DETECTION" value="2" description="number acceleration measurments above threshold for launch detection"/>
<define name="MOTOR_DELAY" value="0.5" description="delay until motor is turned on in seconds" unit="s"/>
<define name="HEADING_DELAY" value="3.0" description="delay until heading is unlocked in seconds" unit="s"/>
<define name="INITIAL_PITCH" value="15." description="inital pitch in radians (default 10deg)" unit="deg"/>
<define name="INITIAL_THROTTLE" value="1.0" description="initial throttle (0.0 to 1.0)" unit="%"/>
<define name="CLIMB_DISTANCE" value="200" description="distance of the climb waypoint in front of the catapult" unit="m"/>
<define name="TIMEOUT" value="30." description="timeout to disarm the high freq module" unit="s"/>
</section>


<section name="NAV_LANDING" prefix="NAV_LANDING_">
<define name="AF_HEIGHT" value="25"/>
<define name="FLARE_HEIGHT" value="8"/>
</section>

<section name="FAILSAFE" prefix="FAILSAFE_">
<define name="DELAY_WITHOUT_GPS" value="2" unit="s"/>
<define name="DEFAULT_THROTTLE" value="0.3" unit="%"/>
<define name="DEFAULT_ROLL" value="10." unit="deg"/>
<define name="DEFAULT_PITCH" value="4." unit="deg"/>
<define name="HOME_RADIUS" value="100" unit="m"/>
</section>

<section name="SIMULATOR" prefix="NPS_">
<define name="JSBSIM_LAUNCHSPEED" value="15"/>
<define name="JSBSIM_MODEL" value="easystar" type="string"/>
</section>
</airframe>

0 comments on commit 378b936

Please sign in to comment.