Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-30 19:47:50 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

Replace THRUST_X_EFF by G-matrix value + Max forward pitch in RotWing (#3301)

Browse Source 
* Update rotwing

fix merge

use same pusher effectiveness in guidance INDI

Correct spaces

Apply suggested fix

* Rotwing default altitude 25kg

* sensible values for max lat accel

---------

Co-authored-by: Ewoud Smeur <e.j.j.smeur@tudelft.nl>
This commit is contained in:
Christophe De Wagter
2024-06-18 11:10:40 +02:00
parent dc46222082
commit 7967299dad
12 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/airframes/tudelft/rot_wing_25kg.xml
+3 -3
View File
@@ -478,7 +478,7 @@
</section>
<section name="GUIDANCE_H" prefix="GUIDANCE_H_">
<define name="MAX_BANK" value="20" unit="deg"/>
<define name="MAX_BANK" value="40" unit="deg"/>
<define name="USE_SPEED_REF" value="TRUE"/>
<!-- Gains -->
@@ -508,7 +508,6 @@
<define name="ZERO_AIRSPEED" value="FALSE"/>
<define name="THRUST_Z_EFF" value="-0.0023"/>
<define name="THRUST_X_EFF" value="0.00055"/>
<define name="MAX_PUSHER_INCREMENT" value="2000"/>
@@ -518,10 +517,11 @@
<define name="CLIMB_SPEED_FWD" value="2.0"/>
<define name="DESCEND_SPEED_FWD" value="-3.0"/>
<define name="QUADPLANE" value="TRUE"/>
<define name="PUSHER_INDEX" value="8"/>
<define name="MAX_PITCH" value="12"/>
<define name="MIN_PITCH" value="-20"/>
<define name="MAX_LAT_ACCEL" value="5.0"/>
<define name="MAX_LAT_ACCEL" value="4.0"/>
</section>
<section name="FORWARD">
conf/airframes/tudelft/rot_wing_v3b.xml
+1 -1
View File
@@ -611,7 +611,6 @@
<define name="PITCH_LIFT_EFF" value="0.0"/>
<define name="THRUST_Z_EFF" value="-0.0023"/>
<define name="THRUST_X_EFF" value="0.00055"/>
<define name="NAV_CIRCLE_DIST" value="60."/>
<define name="NAV_LINE_DIST" value="100"/>
@@ -619,6 +618,7 @@
<define name="CLIMB_SPEED_FWD" value="2.0"/>
<define name="DESCEND_SPEED_FWD" value="-3.0"/>
<define name="QUADPLANE" value="TRUE"/>
<define name="PUSHER_INDEX" value="8"/>
<define name="MAX_PITCH" value="12"/>
<define name="MIN_PITCH" value="-20"/>
conf/airframes/tudelft/rot_wing_v3d.xml
+3 -1
View File
@@ -598,7 +598,8 @@
<define name="PITCH_LIFT_EFF" value="0.0"/>
<define name="THRUST_Z_EFF" value="-0.0023"/>
<define name="THRUST_X_EFF" value="0.00055"/>
<define name="MAX_PUSHER_INCREMENT" value="4000"/>
<define name="NAV_CIRCLE_DIST" value="60."/>
<define name="NAV_LINE_DIST" value="100"/>
@@ -606,6 +607,7 @@
<define name="CLIMB_SPEED_FWD" value="2.0"/>
<define name="DESCEND_SPEED_FWD" value="-3.0"/>
<define name="QUADPLANE" value="TRUE"/>
<define name="PUSHER_INDEX" value="8"/>
<define name="MAX_PITCH" value="12"/>
<define name="MIN_PITCH" value="-20"/>
conf/airframes/tudelft/rot_wing_v3e.xml
+3 -1
View File
@@ -598,7 +598,8 @@
<define name="PITCH_LIFT_EFF" value="0.0"/>
<define name="THRUST_Z_EFF" value="-0.0023"/>
<define name="THRUST_X_EFF" value="0.00055"/>
<define name="MAX_PUSHER_INCREMENT" value="4000"/>
<define name="NAV_CIRCLE_DIST" value="60."/>
<define name="NAV_LINE_DIST" value="100"/>
@@ -606,6 +607,7 @@
<define name="CLIMB_SPEED_FWD" value="2.0"/>
<define name="DESCEND_SPEED_FWD" value="-3.0"/>
<define name="QUADPLANE" value="TRUE"/>
<define name="PUSHER_INDEX" value="8"/>
<define name="MAX_PITCH" value="12"/>
<define name="MIN_PITCH" value="-20"/>
conf/airframes/tudelft/rot_wing_v3f.xml
+3 -1
View File
@@ -598,7 +598,8 @@
<define name="PITCH_LIFT_EFF" value="0.0"/>
<define name="THRUST_Z_EFF" value="-0.0023"/>
<define name="THRUST_X_EFF" value="0.00055"/>
<define name="MAX_PUSHER_INCREMENT" value="4000"/>
<define name="NAV_CIRCLE_DIST" value="60."/>
<define name="NAV_LINE_DIST" value="100"/>
@@ -606,6 +607,7 @@
<define name="CLIMB_SPEED_FWD" value="2.0"/>
<define name="DESCEND_SPEED_FWD" value="-3.0"/>
<define name="QUADPLANE" value="TRUE"/>
<define name="PUSHER_INDEX" value="8"/>
<define name="MAX_PITCH" value="12"/>
<define name="MIN_PITCH" value="-20"/>
conf/airframes/tudelft/rot_wing_v3g.xml
+3 -1
View File
@@ -605,7 +605,8 @@
<define name="PITCH_LIFT_EFF" value="0.0"/>
<define name="THRUST_Z_EFF" value="-0.0023"/>
<define name="THRUST_X_EFF" value="0.00055"/>
<define name="MAX_PUSHER_INCREMENT" value="4000"/>
<define name="NAV_CIRCLE_DIST" value="60."/>
<define name="NAV_LINE_DIST" value="100"/>
@@ -613,6 +614,7 @@
<define name="CLIMB_SPEED_FWD" value="2.0"/>
<define name="DESCEND_SPEED_FWD" value="-3.0"/>
<define name="QUADPLANE" value="TRUE"/>
<define name="PUSHER_INDEX" value="8"/>
<define name="MAX_PITCH" value="12"/>
<define name="MIN_PITCH" value="-20"/>
conf/airframes/tudelft/rot_wing_v3h.xml
+1 -1
View File
@@ -605,7 +605,6 @@
<define name="PITCH_LIFT_EFF" value="0.0"/>
<define name="THRUST_Z_EFF" value="-0.0023"/>
<define name="THRUST_X_EFF" value="0.00055"/>
<define name="NAV_CIRCLE_DIST" value="60."/>
<define name="NAV_LINE_DIST" value="100"/>
@@ -613,6 +612,7 @@
<define name="CLIMB_SPEED_FWD" value="2.0"/>
<define name="DESCEND_SPEED_FWD" value="-3.0"/>
<define name="QUADPLANE" value="TRUE"/>
<define name="PUSHER_INDEX" value="8"/>
<define name="MAX_PITCH" value="12"/>
<define name="MIN_PITCH" value="-20"/>
conf/flight_plans/tudelft/rotating_wing_EHVB.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<!DOCTYPE flight_plan SYSTEM "../flight_plan.dtd">
<flight_plan alt="80" ground_alt="0" lat0="52.1681551" lon0="4.4126468" max_dist_from_home="1070" name="Rotating Wing Valkenburg" security_height="2">
<flight_plan alt="110" ground_alt="0" lat0="52.1681551" lon0="4.4126468" max_dist_from_home="1070" name="Rotating Wing Valkenburg" security_height="2">
<header/>
<waypoints>
<waypoint name="HOME" x="0" y="0"/>