A3XX: FBW Trim Improvements

This commit is contained in:
Joshua Davidson 2017-11-27 14:01:24 -05:00
parent 66dbaa495f
commit c81e2bcf6d

View file

@ -912,34 +912,6 @@
<enable>
<condition>
<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>
<property>/gear/gear[1]/wow</property>
<value>0</value>
@ -990,93 +962,6 @@
</config>
</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>
<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>
<property>/it-fbw/pitch-ti</property>
</Ti>
<Td>0.03</Td>
<u_min>-1</u_min>
<u_max>1</u_max>
</config>
</pid-controller-->
<filter>
<name>IT-FBW: PITCH OPTION</name>
<debug>false</debug>
@ -1205,10 +1090,38 @@
<value>1</value>
</equals>
</or>
<greater-than-equals>
<property>/position/gear-agl-ft</property>
<value>50</value>
</greater-than-equals>
<or>
<and>
<greater-than-equals>
<property>/position/gear-agl-ft</property>
<value>100</value>
</greater-than-equals>
<or>
<equals>
<property>/it-autoflight/output/ap1</property>
<value>1</value>
</equals>
<equals>
<property>/it-autoflight/output/ap2</property>
<value>1</value>
</equals>
</or>
</and>
<and>
<greater-than-equals>
<property>/position/gear-agl-ft</property>
<value>50</value>
</greater-than-equals>
<equals>
<property>/it-autoflight/output/ap1</property>
<value>0</value>
</equals>
<equals>
<property>/it-autoflight/output/ap2</property>
<value>0</value>
</equals>
</and>
</or>
</and>
</condition>
</enable>
@ -1261,10 +1174,38 @@
<value>1</value>
</equals>
</or>
<greater-than-equals>
<property>/position/gear-agl-ft</property>
<value>50</value>
</greater-than-equals>
<or>
<and>
<greater-than-equals>
<property>/position/gear-agl-ft</property>
<value>100</value>
</greater-than-equals>
<or>
<equals>
<property>/it-autoflight/output/ap1</property>
<value>1</value>
</equals>
<equals>
<property>/it-autoflight/output/ap2</property>
<value>1</value>
</equals>
</or>
</and>
<and>
<greater-than-equals>
<property>/position/gear-agl-ft</property>
<value>50</value>
</greater-than-equals>
<equals>
<property>/it-autoflight/output/ap1</property>
<value>0</value>
</equals>
<equals>
<property>/it-autoflight/output/ap2</property>
<value>0</value>
</equals>
</and>
</or>
</and>
</condition>
</enable>
@ -1308,10 +1249,38 @@
<value>1</value>
</equals>
</or>
<greater-than-equals>
<property>/position/gear-agl-ft</property>
<value>50</value>
</greater-than-equals>
<or>
<and>
<greater-than-equals>
<property>/position/gear-agl-ft</property>
<value>100</value>
</greater-than-equals>
<or>
<equals>
<property>/it-autoflight/output/ap1</property>
<value>1</value>
</equals>
<equals>
<property>/it-autoflight/output/ap2</property>
<value>1</value>
</equals>
</or>
</and>
<and>
<greater-than-equals>
<property>/position/gear-agl-ft</property>
<value>50</value>
</greater-than-equals>
<equals>
<property>/it-autoflight/output/ap1</property>
<value>0</value>
</equals>
<equals>
<property>/it-autoflight/output/ap2</property>
<value>0</value>
</equals>
</and>
</or>
</and>
<less-than>
<property>/orientation/roll-deg</property>