[airframes] harmonize airframes, test all flightplans and test compile all nederdrones (#3082)

This commit is contained in:
Christophe De Wagter
2023-09-20 13:31:02 +02:00
committed by GitHub
parent 528f5d5b10
commit b7fca88f8d
7 changed files with 44 additions and 30 deletions
+16 -11
View File
@@ -18,11 +18,6 @@
<configure name="FLASH_MODE" value="SWD"/>
<define name="USE_BARO_BOARD" value="1"/>
<module name="eff_scheduling_nederdrone">
<!-- Trims -->
<define name="INDI_SCHEDULING_TRIM_ELEVATOR" value="840"/>
</module>
<module name="radio_control" type="sbus">
<configure name="SBUS_PORT" value="UART3"/>
</module>
@@ -43,8 +38,9 @@
<module name="logger" type="sd_chibios"/>
<module name="flight_recorder"/>
<!-- Chibios monitor -->
<!-- Monitoring -->
<module name="sys_mon"/>
<!--module name="status_nederdrone"/-->
<define name="ADC_CURRENT_DISABLE" value="TRUE"/>
@@ -67,8 +63,6 @@
</target>
<target name="nps" board="pc">
<module name="eff_scheduling_nederdrone"/>
<module name="radio_control" type="datalink"/>
<module name="fdm" type="jsbsim"/>
@@ -83,6 +77,12 @@
<define name="RADIO_KILL_SWITCH" value="0"/>
</target>
<module name="eff_scheduling_nederdrone">
<!-- Trims -->
<define name="INDI_SCHEDULING_TRIM_ELEVATOR" value="840"/>
<define name="INDI_SCHEDULING_PREF_FLAPS_FACTOR" value="1.0"/>
</module>
<!--module name="follow_me">
<define name="FOLLOW_ME_DISTANCE" value="60"/>
<define name="FOLLOW_ME_HEIGHT" value="40"/>
@@ -94,9 +94,12 @@
<module name="approach_moving_target">
<define name="AMT_ERR_SLOWDOWN_GAIN" value="0.25"/>
<define name="CUTOFF_FREQ_FILTERS_HZ" value="0.25"/>
</module>
<module name="ins" type="ekf2" />
<module name="ins" type="ekf2">
<define name="USE_INS_NAV_INIT" value="FALSE"/>
</module>
<module name="actuators" type="uavcan">
<configure name="UAVCAN_USE_CAN1" value="TRUE"/>
@@ -114,7 +117,8 @@
</module>
<module name="stabilization" type="rate_indi"/>
<module name="air_data" >
<module name="air_data">
<define name="AIR_DATA_BARO_DIFF_ID" value="MS45XX_SENDER_ID"/> <!-- UAVCAN_SENDER_ID -->
<define name="AIR_DATA_CALC_AMSL_BARO" value="TRUE" />
</module>
@@ -383,6 +387,7 @@
<define name="ACT_DYN" value="{0.0354, 0.0354, 0.0354, 0.0354, 0.05, 0.05, 0.05, 0.05}"/>
<define name="ACT_RATE_LIMIT" value="{9600, 9600, 9600, 9600, 170, 170, 170, 170}"/>
<define name="ACT_IS_SERVO" value="{0, 0, 0, 0, 1, 1, 1, 1}"/>
<define name="WLS_WU" value="{1.,1.,1.,1.,1.,1.,1.,1.}"/>
<!-- Adaptive Learning Rate -->
<define name="USE_ADAPTIVE" value="FALSE"/>
@@ -432,4 +437,4 @@
<define name="BAT_NB_CELLS" value="6"/>
</section>
</airframe>
</airframe>
+7 -1
View File
@@ -35,6 +35,7 @@
<module name="airspeed" type="ms45xx_i2c">
<define name="USE_I2C4"/>
<define name="MS45XX_I2C_DEV" value="i2c4"/>
<define name="I2C4_CLOCK_SPEED" value="100000"/>
</module>
<!--module name="airspeed" type="uavcan"/-->
@@ -80,6 +81,7 @@
<module name="eff_scheduling_nederdrone">
<!-- Trims -->
<define name="INDI_SCHEDULING_TRIM_ELEVATOR" value="0"/>
<define name="INDI_SCHEDULING_PREF_FLAPS_FACTOR" value="1.0"/>
</module>
<module name="telemetry" type="transparent">
@@ -88,9 +90,12 @@
<module name="approach_moving_target">
<define name="AMT_ERR_SLOWDOWN_GAIN" value="0.25"/>
<define name="CUTOFF_FREQ_FILTERS_HZ" value="0.25"/>
</module>
<module name="ins" type="ekf2" />
<module name="ins" type="ekf2">
<define name="USE_INS_NAV_INIT" value="FALSE"/>
</module>
<module name="actuators" type="uavcan">
<configure name="UAVCAN_USE_CAN1" value="TRUE"/>
@@ -349,6 +354,7 @@
<define name="ACT_DYN" value="{0.028, 0.028, 0.028, 0.028, 0.05, 0.05, 0.05, 0.05}"/>
<define name="ACT_RATE_LIMIT" value="{9600, 9600, 9600, 9600, 170, 170, 170, 170}"/>
<define name="ACT_IS_SERVO" value="{0, 0, 0, 0, 1, 1, 1, 1}"/>
<define name="WLS_WU" value="{1.,1.,1.,1.,1.,1.,1.,1.}"/>
<!-- Adaptive Learning Rate -->
<define name="USE_ADAPTIVE" value="FALSE"/>
+7 -2
View File
@@ -1,7 +1,7 @@
<!DOCTYPE airframe SYSTEM "../airframe.dtd">
<!-- This is a Nedderdrone with Trailing edge motors
* Airframe: TUD00???
* Airframe: TUD00343
* Autopilot: Pixhawk 4
* Actuators: 12x T-Motor ESC + Motors and 8x Servos (all CAN)
* Datalink: Herelink
@@ -81,6 +81,7 @@
<module name="eff_scheduling_nederdrone">
<!-- Trims -->
<define name="INDI_SCHEDULING_TRIM_ELEVATOR" value="0"/>
<define name="INDI_SCHEDULING_PREF_FLAPS_FACTOR" value="1.0"/>
</module>
<module name="telemetry" type="transparent">
@@ -89,9 +90,12 @@
<module name="approach_moving_target">
<define name="AMT_ERR_SLOWDOWN_GAIN" value="0.25"/>
<define name="CUTOFF_FREQ_FILTERS_HZ" value="0.25"/>
</module>
<module name="ins" type="ekf2" />
<module name="ins" type="ekf2">
<define name="USE_INS_NAV_INIT" value="FALSE"/>
</module>
<module name="actuators" type="uavcan">
<configure name="UAVCAN_USE_CAN1" value="TRUE"/>
@@ -350,6 +354,7 @@
<define name="ACT_DYN" value="{0.028, 0.028, 0.028, 0.028, 0.05, 0.05, 0.05, 0.05}"/>
<define name="ACT_RATE_LIMIT" value="{9600, 9600, 9600, 9600, 170, 170, 170, 170}"/>
<define name="ACT_IS_SERVO" value="{0, 0, 0, 0, 1, 1, 1, 1}"/>
<define name="WLS_WU" value="{1.,1.,1.,1.,1.,1.,1.,1.}"/>
<!-- Adaptive Learning Rate -->
<define name="USE_ADAPTIVE" value="FALSE"/>
+4 -4
View File
@@ -1,7 +1,7 @@
<!DOCTYPE airframe SYSTEM "../airframe.dtd">
<!-- This is a Nedderdrone with Trailing edge motors
* Airframe: TUD00???
* Airframe: TUD00344
* Autopilot: Pixhawk 4
* Actuators: 12x T-Motor ESC + Motors and 8x Servos (all CAN)
* Datalink: Herelink
@@ -282,7 +282,7 @@
<define name="MPU_Y_SIGN" value="1"/>
<define name="MPU_Z_SIGN" value="1"/>
<!-- Calibated 2022-08-30 (Next to cyberzoo body only) -->
<!-- Calibrated 2022-08-30 (Next to cyberzoo body only) -->
<define name="ACCEL_X_NEUTRAL" value="-40"/>
<define name="ACCEL_Y_NEUTRAL" value="45"/>
<define name="ACCEL_Z_NEUTRAL" value="-34"/>
@@ -348,9 +348,9 @@
<define name="ESTIMATION_FILT_CUTOFF" value="5.0"/>
<define name="FILT_CUTOFF_P" value="20."/>
<define name="FILT_CUTOFF_Q" value="20."/>
<define name="FILT_CUTOFF_R" value="4."/>
<define name="FILT_CUTOFF_R" value="4.0"/>
<!-- first order actuator dynamics -->
<!--define name="ACT_DYN" value="{0.009, 0.009, 0.009, 0.009, 0.05, 0.05, 0.05, 0.05}"/-->
<define name="ACT_DYN" value="{0.028, 0.028, 0.028, 0.028, 0.05, 0.05, 0.05, 0.05}"/>
<define name="ACT_RATE_LIMIT" value="{9600, 9600, 9600, 9600, 170, 170, 170, 170}"/>
<define name="ACT_IS_SERVO" value="{0, 0, 0, 0, 1, 1, 1, 1}"/>