A3XX: Many FBW Pitch improvements, and prepare for G load
This commit is contained in:
Joshua Davidson
parent
2654eb0341
commit
4881636c67
4 changed files with 230 additions and 15 deletions
|
|
@ -273,17 +273,23 @@
|
||||||
<condition>
|
<condition>
|
||||||
<and>
|
<and>
|
||||||
<equals>
|
<equals>
|
||||||
<property>it-autoflight/output/fd2</property>
|
<property>it-autoflight/output/fd1</property>
|
||||||
<value>1</value>
|
<value>1</value>
|
||||||
</equals>
|
</equals>
|
||||||
<not><property>gear/gear[1]/wow</property></not>
|
<not><property>gear/gear[1]/wow</property></not>
|
||||||
<not><property>gear/gear[2]/wow</property></not>
|
<not><property>gear/gear[2]/wow</property></not>
|
||||||
<not><property>gear/gear[3]/wowa</property></not>
|
|
||||||
<not><property>gear/gear[4]/wowa</property></not>
|
|
||||||
<equals>
|
<equals>
|
||||||
<property>it-autoflight/custom/trk-fpa</property>
|
<property>it-autoflight/custom/trk-fpa</property>
|
||||||
<value>0</value>
|
<value>0</value>
|
||||||
</equals>
|
</equals>
|
||||||
|
<less-than>
|
||||||
|
<property>orientation/pitch-deg</property>
|
||||||
|
<value>25</value>
|
||||||
|
</less-than>
|
||||||
|
<greater-than>
|
||||||
|
<property>orientation/pitch-deg</property>
|
||||||
|
<value>-13</value>
|
||||||
|
</greater-than>
|
||||||
<less-than>
|
<less-than>
|
||||||
<property>orientation/roll-deg</property>
|
<property>orientation/roll-deg</property>
|
||||||
<value>45</value>
|
<value>45</value>
|
||||||
|
|
@ -302,15 +308,13 @@
|
||||||
<condition>
|
<condition>
|
||||||
<and>
|
<and>
|
||||||
<equals>
|
<equals>
|
||||||
<property>it-autoflight/output/fd2</property>
|
<property>it-autoflight/output/fd1</property>
|
||||||
<value>1</value>
|
<value>1</value>
|
||||||
</equals>
|
</equals>
|
||||||
<or>
|
<or>
|
||||||
<and>
|
<and>
|
||||||
<not><property>gear/gear[1]/wow</property></not>
|
<not><property>gear/gear[1]/wow</property></not>
|
||||||
<not><property>gear/gear[2]/wow</property></not>
|
<not><property>gear/gear[2]/wow</property></not>
|
||||||
<not><property>gear/gear[3]/wowa</property></not>
|
|
||||||
<not><property>gear/gear[4]/wowa</property></not>
|
|
||||||
</and>
|
</and>
|
||||||
<equals>
|
<equals>
|
||||||
<property>modes/pfd/fma/pitch-mode</property>
|
<property>modes/pfd/fma/pitch-mode</property>
|
||||||
|
|
@ -321,6 +325,14 @@
|
||||||
<property>it-autoflight/custom/trk-fpa</property>
|
<property>it-autoflight/custom/trk-fpa</property>
|
||||||
<value>0</value>
|
<value>0</value>
|
||||||
</equals>
|
</equals>
|
||||||
|
<less-than>
|
||||||
|
<property>orientation/pitch-deg</property>
|
||||||
|
<value>25</value>
|
||||||
|
</less-than>
|
||||||
|
<greater-than>
|
||||||
|
<property>orientation/pitch-deg</property>
|
||||||
|
<value>-13</value>
|
||||||
|
</greater-than>
|
||||||
<less-than>
|
<less-than>
|
||||||
<property>orientation/roll-deg</property>
|
<property>orientation/roll-deg</property>
|
||||||
<value>45</value>
|
<value>45</value>
|
||||||
|
|
@ -335,8 +347,22 @@
|
||||||
|
|
||||||
<animation>
|
<animation>
|
||||||
<type>select</type>
|
<type>select</type>
|
||||||
<object-name>fpd</object-name>
|
<object-name>fpv</object-name>
|
||||||
<object-name>fpv</object-name>
|
<condition>
|
||||||
|
<and>
|
||||||
|
<not><property>gear/gear[1]/wow</property></not>
|
||||||
|
<not><property>gear/gear[2]/wow</property></not>
|
||||||
|
<equals>
|
||||||
|
<property>it-autoflight/custom/trk-fpa</property>
|
||||||
|
<value>1</value>
|
||||||
|
</equals>
|
||||||
|
</and>
|
||||||
|
</condition>
|
||||||
|
</animation>
|
||||||
|
|
||||||
|
<animation>
|
||||||
|
<type>select</type>
|
||||||
|
<object-name>fpd</object-name>
|
||||||
<condition>
|
<condition>
|
||||||
<and>
|
<and>
|
||||||
<equals>
|
<equals>
|
||||||
|
|
@ -349,6 +375,14 @@
|
||||||
<property>it-autoflight/custom/trk-fpa</property>
|
<property>it-autoflight/custom/trk-fpa</property>
|
||||||
<value>1</value>
|
<value>1</value>
|
||||||
</equals>
|
</equals>
|
||||||
|
<less-than>
|
||||||
|
<property>orientation/pitch-deg</property>
|
||||||
|
<value>25</value>
|
||||||
|
</less-than>
|
||||||
|
<greater-than>
|
||||||
|
<property>orientation/pitch-deg</property>
|
||||||
|
<value>-13</value>
|
||||||
|
</greater-than>
|
||||||
<less-than>
|
<less-than>
|
||||||
<property>orientation/roll-deg</property>
|
<property>orientation/roll-deg</property>
|
||||||
<value>45</value>
|
<value>45</value>
|
||||||
|
|
|
||||||
|
|
@ -278,12 +278,18 @@
|
||||||
</equals>
|
</equals>
|
||||||
<not><property>gear/gear[1]/wow</property></not>
|
<not><property>gear/gear[1]/wow</property></not>
|
||||||
<not><property>gear/gear[2]/wow</property></not>
|
<not><property>gear/gear[2]/wow</property></not>
|
||||||
<not><property>gear/gear[3]/wowa</property></not>
|
|
||||||
<not><property>gear/gear[4]/wowa</property></not>
|
|
||||||
<equals>
|
<equals>
|
||||||
<property>it-autoflight/custom/trk-fpa</property>
|
<property>it-autoflight/custom/trk-fpa</property>
|
||||||
<value>0</value>
|
<value>0</value>
|
||||||
</equals>
|
</equals>
|
||||||
|
<less-than>
|
||||||
|
<property>orientation/pitch-deg</property>
|
||||||
|
<value>25</value>
|
||||||
|
</less-than>
|
||||||
|
<greater-than>
|
||||||
|
<property>orientation/pitch-deg</property>
|
||||||
|
<value>-13</value>
|
||||||
|
</greater-than>
|
||||||
<less-than>
|
<less-than>
|
||||||
<property>orientation/roll-deg</property>
|
<property>orientation/roll-deg</property>
|
||||||
<value>45</value>
|
<value>45</value>
|
||||||
|
|
@ -309,8 +315,6 @@
|
||||||
<and>
|
<and>
|
||||||
<not><property>gear/gear[1]/wow</property></not>
|
<not><property>gear/gear[1]/wow</property></not>
|
||||||
<not><property>gear/gear[2]/wow</property></not>
|
<not><property>gear/gear[2]/wow</property></not>
|
||||||
<not><property>gear/gear[3]/wowa</property></not>
|
|
||||||
<not><property>gear/gear[4]/wowa</property></not>
|
|
||||||
</and>
|
</and>
|
||||||
<equals>
|
<equals>
|
||||||
<property>modes/pfd/fma/pitch-mode</property>
|
<property>modes/pfd/fma/pitch-mode</property>
|
||||||
|
|
@ -321,6 +325,14 @@
|
||||||
<property>it-autoflight/custom/trk-fpa</property>
|
<property>it-autoflight/custom/trk-fpa</property>
|
||||||
<value>0</value>
|
<value>0</value>
|
||||||
</equals>
|
</equals>
|
||||||
|
<less-than>
|
||||||
|
<property>orientation/pitch-deg</property>
|
||||||
|
<value>25</value>
|
||||||
|
</less-than>
|
||||||
|
<greater-than>
|
||||||
|
<property>orientation/pitch-deg</property>
|
||||||
|
<value>-13</value>
|
||||||
|
</greater-than>
|
||||||
<less-than>
|
<less-than>
|
||||||
<property>orientation/roll-deg</property>
|
<property>orientation/roll-deg</property>
|
||||||
<value>45</value>
|
<value>45</value>
|
||||||
|
|
@ -335,8 +347,22 @@
|
||||||
|
|
||||||
<animation>
|
<animation>
|
||||||
<type>select</type>
|
<type>select</type>
|
||||||
<object-name>fpd</object-name>
|
<object-name>fpv</object-name>
|
||||||
<object-name>fpv</object-name>
|
<condition>
|
||||||
|
<and>
|
||||||
|
<not><property>gear/gear[1]/wow</property></not>
|
||||||
|
<not><property>gear/gear[2]/wow</property></not>
|
||||||
|
<equals>
|
||||||
|
<property>it-autoflight/custom/trk-fpa</property>
|
||||||
|
<value>1</value>
|
||||||
|
</equals>
|
||||||
|
</and>
|
||||||
|
</condition>
|
||||||
|
</animation>
|
||||||
|
|
||||||
|
<animation>
|
||||||
|
<type>select</type>
|
||||||
|
<object-name>fpd</object-name>
|
||||||
<condition>
|
<condition>
|
||||||
<and>
|
<and>
|
||||||
<equals>
|
<equals>
|
||||||
|
|
@ -349,6 +375,14 @@
|
||||||
<property>it-autoflight/custom/trk-fpa</property>
|
<property>it-autoflight/custom/trk-fpa</property>
|
||||||
<value>1</value>
|
<value>1</value>
|
||||||
</equals>
|
</equals>
|
||||||
|
<less-than>
|
||||||
|
<property>orientation/pitch-deg</property>
|
||||||
|
<value>25</value>
|
||||||
|
</less-than>
|
||||||
|
<greater-than>
|
||||||
|
<property>orientation/pitch-deg</property>
|
||||||
|
<value>-13</value>
|
||||||
|
</greater-than>
|
||||||
<less-than>
|
<less-than>
|
||||||
<property>orientation/roll-deg</property>
|
<property>orientation/roll-deg</property>
|
||||||
<value>45</value>
|
<value>45</value>
|
||||||
|
|
|
||||||
|
|
@ -663,6 +663,13 @@
|
||||||
<entry><ind>-1</ind><dep>-5.0</dep></entry>
|
<entry><ind>-1</ind><dep>-5.0</dep></entry>
|
||||||
</table>
|
</table>
|
||||||
</product>
|
</product>
|
||||||
|
<table>
|
||||||
|
<property>/orientation/pitch-deg</property>
|
||||||
|
<entry><ind>-18</ind><dep> 4</dep></entry>
|
||||||
|
<entry><ind>-15</ind><dep> 0</dep></entry>
|
||||||
|
<entry><ind> 30</ind><dep> 0</dep></entry>
|
||||||
|
<entry><ind> 33</ind><dep>-4</dep></entry>
|
||||||
|
</table>
|
||||||
</sum>
|
</sum>
|
||||||
</expression>
|
</expression>
|
||||||
</input>
|
</input>
|
||||||
|
|
@ -687,6 +694,25 @@
|
||||||
<output>/it-fbw/pitch-rate</output>
|
<output>/it-fbw/pitch-rate</output>
|
||||||
</filter>
|
</filter>
|
||||||
|
|
||||||
|
<!--filter>
|
||||||
|
<name>IT-FBW: LOAD FACTOR COMMAND</name>
|
||||||
|
<type>gain</type>
|
||||||
|
<gain>1</gain>
|
||||||
|
<input>
|
||||||
|
<expression>
|
||||||
|
<sum>
|
||||||
|
<table>
|
||||||
|
<property>/controls/flight/elevator-input</property>
|
||||||
|
<entry><ind> 1</ind><dep>0.0</dep></entry>
|
||||||
|
<entry><ind> 0</ind><dep>1.0</dep></entry>
|
||||||
|
<entry><ind>-1</ind><dep>2.0</dep></entry>
|
||||||
|
</table>
|
||||||
|
</sum>
|
||||||
|
</expression>
|
||||||
|
</input>
|
||||||
|
<output>/it-fbw/load-target</output>
|
||||||
|
</filter-->
|
||||||
|
|
||||||
<filter>
|
<filter>
|
||||||
<name>IT-FBW: PITCH KP (P Gain)</name>
|
<name>IT-FBW: PITCH KP (P Gain)</name>
|
||||||
<type>gain</type>
|
<type>gain</type>
|
||||||
|
|
@ -709,6 +735,34 @@
|
||||||
<enable>
|
<enable>
|
||||||
<condition>
|
<condition>
|
||||||
<and>
|
<and>
|
||||||
|
<!--or>
|
||||||
|
<and>
|
||||||
|
<greater-than-equals>
|
||||||
|
<property>/controls/flight/elevator-input</property>
|
||||||
|
<value>-0.04</value>
|
||||||
|
</greater-than-equals>
|
||||||
|
<less-than-equals>
|
||||||
|
<property>/controls/flight/elevator-input</property>
|
||||||
|
<value>0.04</value>
|
||||||
|
</less-than-equals>
|
||||||
|
</and>
|
||||||
|
<greater-than-equals>
|
||||||
|
<property>/orientation/pitch-deg</property>
|
||||||
|
<value>30</value>
|
||||||
|
</greater-than-equals>
|
||||||
|
<less-than-equals>
|
||||||
|
<property>/orientation/pitch-deg</property>
|
||||||
|
<value>-15</value>
|
||||||
|
</less-than-equals>
|
||||||
|
<equals>
|
||||||
|
<property>/it-autoflight/output/ap1</property>
|
||||||
|
<value>1</value>
|
||||||
|
</equals>
|
||||||
|
<equals>
|
||||||
|
<property>/it-autoflight/output/ap2</property>
|
||||||
|
<value>1</value>
|
||||||
|
</equals>
|
||||||
|
</or-->
|
||||||
<equals>
|
<equals>
|
||||||
<property>/gear/gear[1]/wow</property>
|
<property>/gear/gear[1]/wow</property>
|
||||||
<value>0</value>
|
<value>0</value>
|
||||||
|
|
@ -765,6 +819,99 @@
|
||||||
</config>
|
</config>
|
||||||
</pid-controller>
|
</pid-controller>
|
||||||
|
|
||||||
|
<!--pid-controller>
|
||||||
|
<name>IT-FBW: LOAD FACTOR PITCH</name>
|
||||||
|
<debug>false</debug>
|
||||||
|
<enable>
|
||||||
|
<condition>
|
||||||
|
<and>
|
||||||
|
<or>
|
||||||
|
<greater-than>
|
||||||
|
<property>/controls/flight/elevator-input</property>
|
||||||
|
<value>0.04</value>
|
||||||
|
</greater-than>
|
||||||
|
<less-than>
|
||||||
|
<property>/controls/flight/elevator-input</property>
|
||||||
|
<value>-0.04</value>
|
||||||
|
</less-than>
|
||||||
|
</or>
|
||||||
|
<less-than>
|
||||||
|
<property>/orientation/pitch-deg</property>
|
||||||
|
<value>30</value>
|
||||||
|
</less-than>
|
||||||
|
<greater-than>
|
||||||
|
<property>/orientation/pitch-deg</property>
|
||||||
|
<value>-15</value>
|
||||||
|
</greater-than>
|
||||||
|
<equals>
|
||||||
|
<property>/it-autoflight/output/ap1</property>
|
||||||
|
<value>0</value>
|
||||||
|
</equals>
|
||||||
|
<equals>
|
||||||
|
<property>/it-autoflight/output/ap2</property>
|
||||||
|
<value>0</value>
|
||||||
|
</equals>
|
||||||
|
<equals>
|
||||||
|
<property>/gear/gear[1]/wow</property>
|
||||||
|
<value>0</value>
|
||||||
|
</equals>
|
||||||
|
<equals>
|
||||||
|
<property>/gear/gear[2]/wow</property>
|
||||||
|
<value>0</value>
|
||||||
|
</equals>
|
||||||
|
<equals>
|
||||||
|
<property>/it-fbw/spd-hold</property>
|
||||||
|
<value>0</value>
|
||||||
|
</equals>
|
||||||
|
<less-than>
|
||||||
|
<property>/orientation/roll-deg</property>
|
||||||
|
<value>40</value>
|
||||||
|
</less-than>
|
||||||
|
<greater-than>
|
||||||
|
<property>/orientation/roll-deg</property>
|
||||||
|
<value>-40</value>
|
||||||
|
</greater-than>
|
||||||
|
<or>
|
||||||
|
<equals>
|
||||||
|
<property>/it-fbw/law</property>
|
||||||
|
<value>0</value>
|
||||||
|
</equals>
|
||||||
|
<equals>
|
||||||
|
<property>/it-fbw/law</property>
|
||||||
|
<value>1</value>
|
||||||
|
</equals>
|
||||||
|
</or>
|
||||||
|
</and>
|
||||||
|
</condition>
|
||||||
|
</enable>
|
||||||
|
<input>
|
||||||
|
<property>/accelerations/pilot-g</property>
|
||||||
|
</input>
|
||||||
|
<reference>
|
||||||
|
<property>/it-fbw/load-target</property>
|
||||||
|
</reference>
|
||||||
|
<output>
|
||||||
|
<property>/controls/flight/elevator-fbw-cmd</property>
|
||||||
|
</output>
|
||||||
|
<config>
|
||||||
|
<Kp>
|
||||||
|
<expression>
|
||||||
|
<sum>
|
||||||
|
<property>/it-fbw/pitch-kp</property>
|
||||||
|
<value>0.04</value>
|
||||||
|
</sum>
|
||||||
|
</expression>
|
||||||
|
</Kp>
|
||||||
|
<beta>1</beta>
|
||||||
|
<alpha>0.1</alpha>
|
||||||
|
<gamma>0</gamma>
|
||||||
|
<Ti>0.45</Ti>
|
||||||
|
<Td>0.02</Td>
|
||||||
|
<u_min>-1</u_min>
|
||||||
|
<u_max>1</u_max>
|
||||||
|
</config>
|
||||||
|
</pid-controller-->
|
||||||
|
|
||||||
<filter>
|
<filter>
|
||||||
<name>IT-FBW: SPD PITCH TARGET CMD</name>
|
<name>IT-FBW: SPD PITCH TARGET CMD</name>
|
||||||
<type>noise-spike</type>
|
<type>noise-spike</type>
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
1508
|
1509
|
||||||
Reference in a new issue