Control: Rework AP, fix lots of stuff
This commit is contained in:
Joshua Davidson
parent
e25c114c62
commit
568fa31d8b
5 changed files with 190 additions and 375 deletions
|
|
@ -10,9 +10,7 @@
|
||||||
|
|
||||||
<PropertyList>
|
<PropertyList>
|
||||||
|
|
||||||
<!-- =============================================================== -->
|
|
||||||
<!-- Predictors -->
|
<!-- Predictors -->
|
||||||
<!-- =============================================================== -->
|
|
||||||
|
|
||||||
<predict-simple>
|
<predict-simple>
|
||||||
<name>IAS 5 SECOND PREDICTOR</name>
|
<name>IAS 5 SECOND PREDICTOR</name>
|
||||||
|
|
@ -68,15 +66,12 @@
|
||||||
<filter-gain>0.0</filter-gain>
|
<filter-gain>0.0</filter-gain>
|
||||||
</predict-simple>
|
</predict-simple>
|
||||||
|
|
||||||
<!-- =============================================================== -->
|
|
||||||
<!-- Autopilot Helpers/Calculators -->
|
<!-- Autopilot Helpers/Calculators -->
|
||||||
<!-- =============================================================== -->
|
|
||||||
|
|
||||||
<filter>
|
<filter>
|
||||||
<name>AUTOLAND FD FPM</name>
|
<name>AUTOLAND FD FPM</name>
|
||||||
<type>gain</type>
|
<type>gain</type>
|
||||||
<gain>1.0</gain>
|
<gain>1.0</gain>
|
||||||
<update-interval-secs type="double">0.05</update-interval-secs>
|
|
||||||
<input>
|
<input>
|
||||||
<expression>
|
<expression>
|
||||||
<table>
|
<table>
|
||||||
|
|
@ -94,7 +89,6 @@
|
||||||
<name>AUTOLAND FPM</name>
|
<name>AUTOLAND FPM</name>
|
||||||
<type>gain</type>
|
<type>gain</type>
|
||||||
<gain>1.0</gain>
|
<gain>1.0</gain>
|
||||||
<update-interval-secs type="double">0.05</update-interval-secs>
|
|
||||||
<input>
|
<input>
|
||||||
<expression>
|
<expression>
|
||||||
<table>
|
<table>
|
||||||
|
|
@ -116,7 +110,6 @@
|
||||||
<name>FMGC MNG SPD</name>
|
<name>FMGC MNG SPD</name>
|
||||||
<type>gain</type>
|
<type>gain</type>
|
||||||
<gain>1.0</gain>
|
<gain>1.0</gain>
|
||||||
<update-interval-secs type="double">0.05</update-interval-secs>
|
|
||||||
<input>
|
<input>
|
||||||
<expression>
|
<expression>
|
||||||
<product>
|
<product>
|
||||||
|
|
@ -138,7 +131,6 @@
|
||||||
<name>FMGC MNG MACH</name>
|
<name>FMGC MNG MACH</name>
|
||||||
<type>gain</type>
|
<type>gain</type>
|
||||||
<gain>1.0</gain>
|
<gain>1.0</gain>
|
||||||
<update-interval-secs type="double">0.05</update-interval-secs>
|
|
||||||
<input>
|
<input>
|
||||||
<expression>
|
<expression>
|
||||||
<product>
|
<product>
|
||||||
|
|
@ -164,7 +156,6 @@
|
||||||
<name>FMGC Target IAS PFD</name>
|
<name>FMGC Target IAS PFD</name>
|
||||||
<type>gain</type>
|
<type>gain</type>
|
||||||
<gain>1.0</gain>
|
<gain>1.0</gain>
|
||||||
<update-interval-secs type="double">0.1</update-interval-secs>
|
|
||||||
<input>
|
<input>
|
||||||
<condition>
|
<condition>
|
||||||
<equals>
|
<equals>
|
||||||
|
|
@ -197,6 +188,7 @@
|
||||||
<filter>
|
<filter>
|
||||||
<name>KTS INPUT FILTER</name>
|
<name>KTS INPUT FILTER</name>
|
||||||
<debug>false</debug>
|
<debug>false</debug>
|
||||||
|
<type>noise-spike</type>
|
||||||
<feedback-if-disabled>true</feedback-if-disabled>
|
<feedback-if-disabled>true</feedback-if-disabled>
|
||||||
<initialize-to>output</initialize-to>
|
<initialize-to>output</initialize-to>
|
||||||
<input>
|
<input>
|
||||||
|
|
@ -218,32 +210,6 @@
|
||||||
<property>/it-autoflight/settings/togaspd</property>
|
<property>/it-autoflight/settings/togaspd</property>
|
||||||
</input>
|
</input>
|
||||||
<output>/it-autoflight/internal/flch-kts</output>
|
<output>/it-autoflight/internal/flch-kts</output>
|
||||||
<type>noise-spike</type>
|
|
||||||
<max-rate-of-change>
|
|
||||||
<condition>
|
|
||||||
<or>
|
|
||||||
<and>
|
|
||||||
<not-equals>
|
|
||||||
<property>/it-autoflight/output/vert</property>
|
|
||||||
<value>4</value>
|
|
||||||
</not-equals>
|
|
||||||
<not-equals>
|
|
||||||
<property>/it-autoflight/output/vert</property>
|
|
||||||
<value>7</value>
|
|
||||||
</not-equals>
|
|
||||||
</and>
|
|
||||||
<equals>
|
|
||||||
<property>/gear/gear[1]/wow</property>
|
|
||||||
<value>1</value>
|
|
||||||
</equals>
|
|
||||||
<equals>
|
|
||||||
<property>/gear/gear[2]/wow</property>
|
|
||||||
<value>1</value>
|
|
||||||
</equals>
|
|
||||||
</or>
|
|
||||||
</condition>
|
|
||||||
<value>100</value>
|
|
||||||
</max-rate-of-change>
|
|
||||||
<max-rate-of-change>
|
<max-rate-of-change>
|
||||||
<condition>
|
<condition>
|
||||||
<and>
|
<and>
|
||||||
|
|
@ -257,6 +223,10 @@
|
||||||
<value>7</value>
|
<value>7</value>
|
||||||
</equals>
|
</equals>
|
||||||
</or>
|
</or>
|
||||||
|
<equals>
|
||||||
|
<property>/it-autoflight/input/kts-mach</property>
|
||||||
|
<value>0</value>
|
||||||
|
</equals>
|
||||||
<equals>
|
<equals>
|
||||||
<property>/gear/gear[1]/wow</property>
|
<property>/gear/gear[1]/wow</property>
|
||||||
<value>0</value>
|
<value>0</value>
|
||||||
|
|
@ -269,44 +239,34 @@
|
||||||
</condition>
|
</condition>
|
||||||
<value>5</value>
|
<value>5</value>
|
||||||
</max-rate-of-change>
|
</max-rate-of-change>
|
||||||
|
<max-rate-of-change>100</max-rate-of-change>
|
||||||
</filter>
|
</filter>
|
||||||
|
|
||||||
<filter>
|
<filter>
|
||||||
<name>MACH INPUT FILTER</name>
|
<name>MACH INPUT FILTER</name>
|
||||||
<debug>false</debug>
|
<debug>false</debug>
|
||||||
|
<type>noise-spike</type>
|
||||||
<feedback-if-disabled>true</feedback-if-disabled>
|
<feedback-if-disabled>true</feedback-if-disabled>
|
||||||
<initialize-to>output</initialize-to>
|
<initialize-to>output</initialize-to>
|
||||||
<input>
|
<input>/it-autoflight/input/spd-mach</input>
|
||||||
<property>/it-autoflight/input/spd-mach</property>
|
|
||||||
</input>
|
|
||||||
<output>/it-autoflight/internal/flch-mach</output>
|
<output>/it-autoflight/internal/flch-mach</output>
|
||||||
<type>noise-spike</type>
|
|
||||||
<max-rate-of-change>
|
|
||||||
<condition>
|
|
||||||
<or>
|
|
||||||
<not-equals>
|
|
||||||
<property>/it-autoflight/output/vert</property>
|
|
||||||
<value>4</value>
|
|
||||||
</not-equals>
|
|
||||||
<equals>
|
|
||||||
<property>/gear/gear[1]/wow</property>
|
|
||||||
<value>1</value>
|
|
||||||
</equals>
|
|
||||||
<equals>
|
|
||||||
<property>/gear/gear[2]/wow</property>
|
|
||||||
<value>1</value>
|
|
||||||
</equals>
|
|
||||||
</or>
|
|
||||||
</condition>
|
|
||||||
<value>1</value>
|
|
||||||
</max-rate-of-change>
|
|
||||||
<max-rate-of-change>
|
<max-rate-of-change>
|
||||||
<condition>
|
<condition>
|
||||||
<and>
|
<and>
|
||||||
|
<or>
|
||||||
<equals>
|
<equals>
|
||||||
<property>/it-autoflight/output/vert</property>
|
<property>/it-autoflight/output/vert</property>
|
||||||
<value>4</value>
|
<value>4</value>
|
||||||
</equals>
|
</equals>
|
||||||
|
<equals>
|
||||||
|
<property>/it-autoflight/output/vert</property>
|
||||||
|
<value>7</value>
|
||||||
|
</equals>
|
||||||
|
</or>
|
||||||
|
<equals>
|
||||||
|
<property>/it-autoflight/input/kts-mach</property>
|
||||||
|
<value>1</value>
|
||||||
|
</equals>
|
||||||
<equals>
|
<equals>
|
||||||
<property>/gear/gear[1]/wow</property>
|
<property>/gear/gear[1]/wow</property>
|
||||||
<value>0</value>
|
<value>0</value>
|
||||||
|
|
@ -319,6 +279,7 @@
|
||||||
</condition>
|
</condition>
|
||||||
<value>0.05</value>
|
<value>0.05</value>
|
||||||
</max-rate-of-change>
|
</max-rate-of-change>
|
||||||
|
<max-rate-of-change>1</max-rate-of-change>
|
||||||
</filter>
|
</filter>
|
||||||
|
|
||||||
<filter>
|
<filter>
|
||||||
|
|
@ -333,7 +294,6 @@
|
||||||
</equals>
|
</equals>
|
||||||
</condition>
|
</condition>
|
||||||
</enable>
|
</enable>
|
||||||
<update-interval-secs type="double">0.5</update-interval-secs>
|
|
||||||
<input>/instrumentation/airspeed-indicator/indicated-speed-kt</input>
|
<input>/instrumentation/airspeed-indicator/indicated-speed-kt</input>
|
||||||
<output>/it-autoflight/input/spd-kts</output>
|
<output>/it-autoflight/input/spd-kts</output>
|
||||||
</filter>
|
</filter>
|
||||||
|
|
@ -350,7 +310,6 @@
|
||||||
</equals>
|
</equals>
|
||||||
</condition>
|
</condition>
|
||||||
</enable>
|
</enable>
|
||||||
<update-interval-secs type="double">0.5</update-interval-secs>
|
|
||||||
<input>/instrumentation/airspeed-indicator/indicated-mach</input>
|
<input>/instrumentation/airspeed-indicator/indicated-mach</input>
|
||||||
<output>/it-autoflight/input/spd-mach</output>
|
<output>/it-autoflight/input/spd-mach</output>
|
||||||
</filter>
|
</filter>
|
||||||
|
|
@ -365,9 +324,7 @@
|
||||||
</condition>
|
</condition>
|
||||||
<property>/orientation/heading-deg</property>
|
<property>/orientation/heading-deg</property>
|
||||||
</input>
|
</input>
|
||||||
<input>
|
<input>/orientation/heading-magnetic-deg</input>
|
||||||
<property>/orientation/heading-magnetic-deg</property>
|
|
||||||
</input>
|
|
||||||
<reference>0</reference>
|
<reference>0</reference>
|
||||||
<output>/it-autoflight/internal/heading-deg</output>
|
<output>/it-autoflight/internal/heading-deg</output>
|
||||||
<output>/instrumentation/pfd/heading-deg</output>
|
<output>/instrumentation/pfd/heading-deg</output>
|
||||||
|
|
@ -522,7 +479,10 @@
|
||||||
<input>
|
<input>
|
||||||
<expression>
|
<expression>
|
||||||
<floor>
|
<floor>
|
||||||
|
<sum>
|
||||||
<property>/it-autoflight/internal/vert-speed-fpm</property>
|
<property>/it-autoflight/internal/vert-speed-fpm</property>
|
||||||
|
<value>0.5</value>
|
||||||
|
</sum>
|
||||||
</floor>
|
</floor>
|
||||||
</expression>
|
</expression>
|
||||||
</input>
|
</input>
|
||||||
|
|
@ -532,31 +492,18 @@
|
||||||
<filter>
|
<filter>
|
||||||
<name>VERT SPEED FILTER</name>
|
<name>VERT SPEED FILTER</name>
|
||||||
<debug>false</debug>
|
<debug>false</debug>
|
||||||
|
<type>noise-spike</type>
|
||||||
<feedback-if-disabled>true</feedback-if-disabled>
|
<feedback-if-disabled>true</feedback-if-disabled>
|
||||||
<initialize-to>output</initialize-to>
|
<initialize-to>output</initialize-to>
|
||||||
<input>
|
<input>/it-autoflight/input/vs</input>
|
||||||
<property>/it-autoflight/input/vs</property>
|
|
||||||
</input>
|
|
||||||
<output>/it-autoflight/internal/vs</output>
|
<output>/it-autoflight/internal/vs</output>
|
||||||
<type>noise-spike</type>
|
|
||||||
<max-rate-of-change>
|
|
||||||
<condition>
|
|
||||||
<or>
|
|
||||||
<equals>
|
|
||||||
<property>/gear/gear[1]/wow</property>
|
|
||||||
<value>1</value>
|
|
||||||
</equals>
|
|
||||||
<equals>
|
|
||||||
<property>/gear/gear[2]/wow</property>
|
|
||||||
<value>1</value>
|
|
||||||
</equals>
|
|
||||||
</or>
|
|
||||||
</condition>
|
|
||||||
<value>2000</value>
|
|
||||||
</max-rate-of-change>
|
|
||||||
<max-rate-of-change>
|
<max-rate-of-change>
|
||||||
<condition>
|
<condition>
|
||||||
<and>
|
<and>
|
||||||
|
<equals>
|
||||||
|
<property>/it-autoflight/output/vert</property>
|
||||||
|
<value>1</value>
|
||||||
|
</equals>
|
||||||
<equals>
|
<equals>
|
||||||
<property>/gear/gear[1]/wow</property>
|
<property>/gear/gear[1]/wow</property>
|
||||||
<value>0</value>
|
<value>0</value>
|
||||||
|
|
@ -569,6 +516,7 @@
|
||||||
</condition>
|
</condition>
|
||||||
<value>300</value>
|
<value>300</value>
|
||||||
</max-rate-of-change>
|
</max-rate-of-change>
|
||||||
|
<max-rate-of-change>2000</max-rate-of-change>
|
||||||
</filter>
|
</filter>
|
||||||
|
|
||||||
<filter>
|
<filter>
|
||||||
|
|
@ -831,48 +779,12 @@
|
||||||
<output>/it-autoflight/internal/fpa</output>
|
<output>/it-autoflight/internal/fpa</output>
|
||||||
</filter>
|
</filter>
|
||||||
|
|
||||||
<!-- =============================================================== -->
|
|
||||||
<!-- Flight Director -->
|
<!-- Flight Director -->
|
||||||
<!-- =============================================================== -->
|
|
||||||
|
|
||||||
<filter>
|
<filter>
|
||||||
<name>IT-CONTROLLER: TARGET ROLL CMD</name>
|
<name>IT-CONTROLLER: TARGET ROLL CMD</name>
|
||||||
<debug>false</debug>
|
<debug>false</debug>
|
||||||
<feedback-if-disabled>true</feedback-if-disabled>
|
|
||||||
<initialize-to>output</initialize-to>
|
|
||||||
<input>
|
|
||||||
<property>/it-autoflight/internal/target-roll-deg</property>
|
|
||||||
</input>
|
|
||||||
<output>/it-autoflight/internal/target-roll-fd</output>
|
|
||||||
<type>noise-spike</type>
|
<type>noise-spike</type>
|
||||||
<max-rate-of-change>15</max-rate-of-change>
|
|
||||||
</filter>
|
|
||||||
|
|
||||||
<filter>
|
|
||||||
<name>FD: ROLL</name>
|
|
||||||
<debug>false</debug>
|
|
||||||
<type>gain</type>
|
|
||||||
<gain>1.0</gain>
|
|
||||||
<input>
|
|
||||||
<condition>
|
|
||||||
<and>
|
|
||||||
<not-equals>
|
|
||||||
<property>/it-autoflight/output/lat</property>
|
|
||||||
<value>4</value>
|
|
||||||
</not-equals>
|
|
||||||
<not-equals>
|
|
||||||
<property>/it-autoflight/output/lat</property>
|
|
||||||
<value>5</value>
|
|
||||||
</not-equals>
|
|
||||||
</and>
|
|
||||||
</condition>
|
|
||||||
<expression>
|
|
||||||
<dif>
|
|
||||||
<property>/it-autoflight/internal/target-roll-fd</property>
|
|
||||||
<property>/orientation/roll-deg</property>
|
|
||||||
</dif>
|
|
||||||
</expression>
|
|
||||||
</input>
|
|
||||||
<input>
|
<input>
|
||||||
<condition>
|
<condition>
|
||||||
<or>
|
<or>
|
||||||
|
|
@ -886,9 +798,37 @@
|
||||||
</equals>
|
</equals>
|
||||||
</or>
|
</or>
|
||||||
</condition>
|
</condition>
|
||||||
|
<value>0</value>
|
||||||
|
</input>
|
||||||
|
<input>/it-autoflight/internal/target-roll-deg</input>
|
||||||
|
<output>/it-autoflight/internal/target-roll-fd</output>
|
||||||
|
<max-rate-of-change>
|
||||||
|
<condition>
|
||||||
|
<and>
|
||||||
|
<not-equals>
|
||||||
|
<property>/it-autoflight/output/fd1</property>
|
||||||
|
<value>1</value>
|
||||||
|
</not-equals>
|
||||||
|
<not-equals>
|
||||||
|
<property>/it-autoflight/output/fd1</property>
|
||||||
|
<value>1</value>
|
||||||
|
</not-equals>
|
||||||
|
</and>
|
||||||
|
</condition>
|
||||||
|
<value>50</value>
|
||||||
|
</max-rate-of-change>
|
||||||
|
<max-rate-of-change>15</max-rate-of-change>
|
||||||
|
</filter>
|
||||||
|
|
||||||
|
<filter>
|
||||||
|
<name>FD: ROLL</name>
|
||||||
|
<debug>false</debug>
|
||||||
|
<type>gain</type>
|
||||||
|
<gain>1.0</gain>
|
||||||
|
<input>
|
||||||
<expression>
|
<expression>
|
||||||
<dif>
|
<dif>
|
||||||
<value>0</value>
|
<property>/it-autoflight/internal/target-roll-fd</property>
|
||||||
<property>/orientation/roll-deg</property>
|
<property>/orientation/roll-deg</property>
|
||||||
</dif>
|
</dif>
|
||||||
</expression>
|
</expression>
|
||||||
|
|
|
||||||
|
|
@ -45,15 +45,9 @@
|
||||||
</condition>
|
</condition>
|
||||||
<property>/it-autoflight/internal/mng-alt</property>
|
<property>/it-autoflight/internal/mng-alt</property>
|
||||||
</reference>
|
</reference>
|
||||||
<output>
|
<output>/it-autoflight/internal/target-fpm</output>
|
||||||
<property>/it-autoflight/internal/target-fpm</property>
|
<min>/it-autoflight/internal/min-vs</min>
|
||||||
</output>
|
<max>/it-autoflight/internal/max-vs</max>
|
||||||
<min>
|
|
||||||
<property>/it-autoflight/internal/min-vs</property>
|
|
||||||
</min>
|
|
||||||
<max>
|
|
||||||
<property>/it-autoflight/internal/max-vs</property>
|
|
||||||
</max>
|
|
||||||
</filter>
|
</filter>
|
||||||
|
|
||||||
<pid-controller>
|
<pid-controller>
|
||||||
|
|
@ -87,15 +81,9 @@
|
||||||
</and>
|
</and>
|
||||||
</condition>
|
</condition>
|
||||||
</enable>
|
</enable>
|
||||||
<input>
|
<input>/it-autoflight/internal/fpa</input>
|
||||||
<property>/it-autoflight/internal/fpa</property>
|
<reference>/it-autoflight/input/fpa</reference>
|
||||||
</input>
|
<output>/it-autoflight/internal/target-fpm-d</output>
|
||||||
<reference>
|
|
||||||
<property>/it-autoflight/input/fpa</property>
|
|
||||||
</reference>
|
|
||||||
<output>
|
|
||||||
<property>/it-autoflight/internal/target-fpm-d</property>
|
|
||||||
</output>
|
|
||||||
<config>
|
<config>
|
||||||
<Kp>
|
<Kp>
|
||||||
<expression>
|
<expression>
|
||||||
|
|
@ -106,9 +94,6 @@
|
||||||
</table>
|
</table>
|
||||||
</expression>
|
</expression>
|
||||||
</Kp>
|
</Kp>
|
||||||
<beta>1.0</beta>
|
|
||||||
<alpha>0.1</alpha>
|
|
||||||
<gamma>0.0</gamma>
|
|
||||||
<Ti>2.0</Ti>
|
<Ti>2.0</Ti>
|
||||||
<Td>0.002</Td>
|
<Td>0.002</Td>
|
||||||
<u_min>
|
<u_min>
|
||||||
|
|
@ -215,9 +200,7 @@
|
||||||
<property>/it-autoflight/internal/flch-mach</property>
|
<property>/it-autoflight/internal/flch-mach</property>
|
||||||
<scale>1000.0</scale>
|
<scale>1000.0</scale>
|
||||||
</reference>
|
</reference>
|
||||||
<output>
|
<output>/it-autoflight/internal/target-fpm-b</output>
|
||||||
<property>/it-autoflight/internal/target-fpm-b</property>
|
|
||||||
</output>
|
|
||||||
<config>
|
<config>
|
||||||
<Kp>
|
<Kp>
|
||||||
<condition>
|
<condition>
|
||||||
|
|
@ -237,9 +220,6 @@
|
||||||
</condition>
|
</condition>
|
||||||
<value>-60</value>
|
<value>-60</value>
|
||||||
</Kp>
|
</Kp>
|
||||||
<beta>1.0</beta>
|
|
||||||
<alpha>0.1</alpha>
|
|
||||||
<gamma>0.0</gamma>
|
|
||||||
<Ti>2.5</Ti>
|
<Ti>2.5</Ti>
|
||||||
<Td>0.001</Td>
|
<Td>0.001</Td>
|
||||||
<u_min>
|
<u_min>
|
||||||
|
|
@ -505,9 +485,7 @@
|
||||||
</and>
|
</and>
|
||||||
</condition>
|
</condition>
|
||||||
</enable>
|
</enable>
|
||||||
<input>
|
<input>/it-autoflight/internal/vert-speed-fpm</input>
|
||||||
<property>/it-autoflight/internal/vert-speed-fpm</property>
|
|
||||||
</input>
|
|
||||||
<reference>
|
<reference>
|
||||||
<condition>
|
<condition>
|
||||||
<or>
|
<or>
|
||||||
|
|
@ -590,9 +568,7 @@
|
||||||
</condition>
|
</condition>
|
||||||
<property>/it-autoflight/internal/nav1-rate-of-climb-fpm</property>
|
<property>/it-autoflight/internal/nav1-rate-of-climb-fpm</property>
|
||||||
</reference>
|
</reference>
|
||||||
<output>
|
<output>/it-autoflight/internal/target-pitch-deg</output>
|
||||||
<property>/it-autoflight/internal/target-pitch-deg</property>
|
|
||||||
</output>
|
|
||||||
<config>
|
<config>
|
||||||
<Kp>
|
<Kp>
|
||||||
<condition>
|
<condition>
|
||||||
|
|
@ -717,15 +693,9 @@
|
||||||
<debug>false</debug>
|
<debug>false</debug>
|
||||||
<type>gain</type>
|
<type>gain</type>
|
||||||
<gain>0.15</gain>
|
<gain>0.15</gain>
|
||||||
<input>
|
<input>/orientation/pitch-deg</input>
|
||||||
<property>/orientation/pitch-deg</property>
|
<reference>/it-autoflight/internal/target-pitch-deg</reference>
|
||||||
</input>
|
<output>/fdm/jsbsim/fbw/fmgc/pitch-cmd</output> <!-- Inputs to the FBW Pitch -->
|
||||||
<reference>
|
|
||||||
<property>/it-autoflight/internal/target-pitch-deg</property>
|
|
||||||
</reference>
|
|
||||||
<output>
|
|
||||||
<property>/fdm/jsbsim/fbw/fmgc/pitch-cmd</property> <!-- Inputs to the FBW Pitch Rate -->
|
|
||||||
</output>
|
|
||||||
<min>-0.3</min>
|
<min>-0.3</min>
|
||||||
<max>0.3</max>
|
<max>0.3</max>
|
||||||
</filter>
|
</filter>
|
||||||
|
|
|
||||||
|
|
@ -51,15 +51,9 @@
|
||||||
</and>
|
</and>
|
||||||
</condition>
|
</condition>
|
||||||
</enable>
|
</enable>
|
||||||
<input>
|
<input>/it-autoflight/internal/heading-error-deg</input>
|
||||||
<property>/it-autoflight/internal/heading-error-deg</property>
|
<reference>0</reference>
|
||||||
</input>
|
<output>/it-autoflight/internal/target-roll-deg</output>
|
||||||
<reference>
|
|
||||||
<value>0</value>
|
|
||||||
</reference>
|
|
||||||
<output>
|
|
||||||
<property>/it-autoflight/internal/target-roll-deg</property>
|
|
||||||
</output>
|
|
||||||
<config>
|
<config>
|
||||||
<Kp>-1.8</Kp>
|
<Kp>-1.8</Kp>
|
||||||
<Ki>-0.000001</Ki>
|
<Ki>-0.000001</Ki>
|
||||||
|
|
@ -67,9 +61,7 @@
|
||||||
<property>/it-autoflight/internal/bank-limit</property>
|
<property>/it-autoflight/internal/bank-limit</property>
|
||||||
<scale>-1</scale>
|
<scale>-1</scale>
|
||||||
</min>
|
</min>
|
||||||
<max>
|
<max>/it-autoflight/internal/bank-limit</max>
|
||||||
<property>/it-autoflight/internal/bank-limit</property>
|
|
||||||
</max>
|
|
||||||
</config>
|
</config>
|
||||||
</pi-simple-controller>
|
</pi-simple-controller>
|
||||||
|
|
||||||
|
|
@ -104,30 +96,9 @@
|
||||||
</and>
|
</and>
|
||||||
</condition>
|
</condition>
|
||||||
</enable>
|
</enable>
|
||||||
<input>
|
<input>/it-autoflight/internal/nav-heading-error-deg</input>
|
||||||
<condition>
|
<reference>0</reference>
|
||||||
<equals>
|
<output>/it-autoflight/internal/target-roll-deg</output>
|
||||||
<property>/it-autoflight/settings/use-backcourse</property>
|
|
||||||
<value>0</value>
|
|
||||||
</equals>
|
|
||||||
</condition>
|
|
||||||
<property>/it-autoflight/internal/nav-heading-error-deg</property>
|
|
||||||
</input>
|
|
||||||
<input>
|
|
||||||
<condition>
|
|
||||||
<equals>
|
|
||||||
<property>/it-autoflight/settings/use-backcourse</property>
|
|
||||||
<value>1</value>
|
|
||||||
</equals>
|
|
||||||
</condition>
|
|
||||||
<property>/it-autoflight/internal/nav-bc-heading-error-deg</property>
|
|
||||||
</input>
|
|
||||||
<reference>
|
|
||||||
<value>0.0</value>
|
|
||||||
</reference>
|
|
||||||
<output>
|
|
||||||
<property>/it-autoflight/internal/target-roll-deg</property>
|
|
||||||
</output>
|
|
||||||
<config>
|
<config>
|
||||||
<Kp>-2.8</Kp>
|
<Kp>-2.8</Kp>
|
||||||
<Ki>-0.0001</Ki>
|
<Ki>-0.0001</Ki>
|
||||||
|
|
@ -135,9 +106,7 @@
|
||||||
<property>/it-autoflight/internal/bank-limit</property>
|
<property>/it-autoflight/internal/bank-limit</property>
|
||||||
<scale>-1</scale>
|
<scale>-1</scale>
|
||||||
</min>
|
</min>
|
||||||
<max>
|
<max>/it-autoflight/internal/bank-limit</max>
|
||||||
<property>/it-autoflight/internal/bank-limit</property>
|
|
||||||
</max>
|
|
||||||
</config>
|
</config>
|
||||||
</pi-simple-controller>
|
</pi-simple-controller>
|
||||||
|
|
||||||
|
|
@ -174,48 +143,14 @@
|
||||||
<property>/it-autoflight/internal/bank-limit</property>
|
<property>/it-autoflight/internal/bank-limit</property>
|
||||||
<scale>-1</scale>
|
<scale>-1</scale>
|
||||||
</min>
|
</min>
|
||||||
<max>
|
<max>/it-autoflight/internal/bank-limit</max>
|
||||||
<property>/it-autoflight/internal/bank-limit</property>
|
|
||||||
</max>
|
|
||||||
</filter>
|
</filter>
|
||||||
|
|
||||||
<filter>
|
<filter>
|
||||||
<name>IT-CONTROLLER: TARGET ROLL CMD</name>
|
<name>IT-CONTROLLER: TARGET ROLL CMD</name>
|
||||||
<debug>false</debug>
|
<debug>false</debug>
|
||||||
<feedback-if-disabled>true</feedback-if-disabled>
|
|
||||||
<initialize-to>output</initialize-to>
|
|
||||||
<input>
|
|
||||||
<property>/it-autoflight/internal/target-roll-deg</property>
|
|
||||||
</input>
|
|
||||||
<output>/it-autoflight/internal/target-roll</output>
|
|
||||||
<type>noise-spike</type>
|
<type>noise-spike</type>
|
||||||
<max-rate-of-change>6</max-rate-of-change>
|
|
||||||
</filter>
|
|
||||||
|
|
||||||
<filter>
|
|
||||||
<name>System Command: Roll Rate</name>
|
|
||||||
<debug>false</debug>
|
|
||||||
<type>gain</type>
|
|
||||||
<gain>-0.1</gain>
|
|
||||||
<input>
|
<input>
|
||||||
<property>/orientation/roll-deg</property>
|
|
||||||
</input>
|
|
||||||
<reference>
|
|
||||||
<condition>
|
|
||||||
<and>
|
|
||||||
<not-equals>
|
|
||||||
<property>/it-autoflight/output/lat</property>
|
|
||||||
<value>4</value>
|
|
||||||
</not-equals>
|
|
||||||
<not-equals>
|
|
||||||
<property>/it-autoflight/output/lat</property>
|
|
||||||
<value>5</value>
|
|
||||||
</not-equals>
|
|
||||||
</and>
|
|
||||||
</condition>
|
|
||||||
<property>/it-autoflight/internal/target-roll</property>
|
|
||||||
</reference>
|
|
||||||
<reference>
|
|
||||||
<condition>
|
<condition>
|
||||||
<or>
|
<or>
|
||||||
<equals>
|
<equals>
|
||||||
|
|
@ -229,10 +164,58 @@
|
||||||
</or>
|
</or>
|
||||||
</condition>
|
</condition>
|
||||||
<value>0</value>
|
<value>0</value>
|
||||||
</reference>
|
</input>
|
||||||
<output>
|
<input>/it-autoflight/internal/target-roll-deg</input>
|
||||||
<property>/fdm/jsbsim/fbw/fmgc/roll-cmd</property> <!-- Inputs to the FBW Roll Rate -->
|
<output>/it-autoflight/internal/target-roll</output>
|
||||||
</output>
|
<max-rate-of-change>
|
||||||
|
<condition>
|
||||||
|
<and>
|
||||||
|
<not-equals>
|
||||||
|
<property>/it-autoflight/output/ap1</property>
|
||||||
|
<value>1</value>
|
||||||
|
</not-equals>
|
||||||
|
<not-equals>
|
||||||
|
<property>/it-autoflight/output/ap2</property>
|
||||||
|
<value>1</value>
|
||||||
|
</not-equals>
|
||||||
|
<not-equals>
|
||||||
|
<property>/it-autoflight/output/fd1</property>
|
||||||
|
<value>1</value>
|
||||||
|
</not-equals>
|
||||||
|
<not-equals>
|
||||||
|
<property>/it-autoflight/output/fd2</property>
|
||||||
|
<value>1</value>
|
||||||
|
</not-equals>
|
||||||
|
</and>
|
||||||
|
</condition>
|
||||||
|
<value>50</value>
|
||||||
|
</max-rate-of-change>
|
||||||
|
<max-rate-of-change>
|
||||||
|
<condition>
|
||||||
|
<and>
|
||||||
|
<not-equals>
|
||||||
|
<property>/it-autoflight/output/ap1</property>
|
||||||
|
<value>1</value>
|
||||||
|
</not-equals>
|
||||||
|
<not-equals>
|
||||||
|
<property>/it-autoflight/output/ap2</property>
|
||||||
|
<value>1</value>
|
||||||
|
</not-equals>
|
||||||
|
</and>
|
||||||
|
</condition>
|
||||||
|
<value>15</value>
|
||||||
|
</max-rate-of-change>
|
||||||
|
<max-rate-of-change>8</max-rate-of-change>
|
||||||
|
</filter>
|
||||||
|
|
||||||
|
<filter>
|
||||||
|
<name>System Command: Roll Rate</name>
|
||||||
|
<debug>false</debug>
|
||||||
|
<type>gain</type>
|
||||||
|
<gain>-0.1</gain>
|
||||||
|
<input>/orientation/roll-deg</input>
|
||||||
|
<reference>/it-autoflight/internal/target-roll</reference>
|
||||||
|
<output>/fdm/jsbsim/fbw/fmgc/roll-cmd</output> <!-- Inputs to the FBW Roll -->
|
||||||
<min>-0.32</min>
|
<min>-0.32</min>
|
||||||
<max>0.32</max>
|
<max>0.32</max>
|
||||||
</filter>
|
</filter>
|
||||||
|
|
@ -252,12 +235,8 @@
|
||||||
</equals>
|
</equals>
|
||||||
</condition>
|
</condition>
|
||||||
</enable>
|
</enable>
|
||||||
<input>
|
<input>/it-autoflight/internal/nav-heading-error-deg</input>
|
||||||
<property>/it-autoflight/internal/nav-heading-error-deg</property>
|
<reference>0</reference>
|
||||||
</input>
|
|
||||||
<reference>
|
|
||||||
<value>0</value>
|
|
||||||
</reference>
|
|
||||||
<output>/it-autoflight/internal/rudder-cmd</output>
|
<output>/it-autoflight/internal/rudder-cmd</output>
|
||||||
<config>
|
<config>
|
||||||
<Kp>
|
<Kp>
|
||||||
|
|
@ -299,6 +278,7 @@
|
||||||
<filter>
|
<filter>
|
||||||
<name>IT-CONTROLLER: RUDDER CMD</name>
|
<name>IT-CONTROLLER: RUDDER CMD</name>
|
||||||
<debug>false</debug>
|
<debug>false</debug>
|
||||||
|
<type>noise-spike</type>
|
||||||
<feedback-if-disabled>true</feedback-if-disabled>
|
<feedback-if-disabled>true</feedback-if-disabled>
|
||||||
<initialize-to>output</initialize-to>
|
<initialize-to>output</initialize-to>
|
||||||
<input>
|
<input>
|
||||||
|
|
@ -319,8 +299,7 @@
|
||||||
</condition>
|
</condition>
|
||||||
<property>/it-autoflight/internal/rudder-cmd</property>
|
<property>/it-autoflight/internal/rudder-cmd</property>
|
||||||
</input>
|
</input>
|
||||||
<output>/fdm/jsbsim/fbw/fmgc/yaw-cmd</output>
|
<output>/fdm/jsbsim/fbw/fmgc/yaw-cmd</output> <!-- Inputs to the FBW Yaw -->
|
||||||
<type>noise-spike</type>
|
|
||||||
<max-rate-of-change>0.6</max-rate-of-change>
|
<max-rate-of-change>0.6</max-rate-of-change>
|
||||||
</filter>
|
</filter>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,43 +8,16 @@
|
||||||
|
|
||||||
<PropertyList>
|
<PropertyList>
|
||||||
|
|
||||||
<!-- =============================================================== -->
|
<!-- Thrust Axis -->
|
||||||
<!-- Thrust Modes -->
|
|
||||||
<!-- =============================================================== -->
|
|
||||||
|
|
||||||
<filter>
|
<filter>
|
||||||
<name>KTS INPUT FILTER</name>
|
<name>KTS INPUT FILTER</name>
|
||||||
<debug>false</debug>
|
<debug>false</debug>
|
||||||
|
<type>noise-spike</type>
|
||||||
<feedback-if-disabled>true</feedback-if-disabled>
|
<feedback-if-disabled>true</feedback-if-disabled>
|
||||||
<initialize-to>output</initialize-to>
|
<initialize-to>output</initialize-to>
|
||||||
<input>
|
<input>/it-autoflight/input/spd-kts</input>
|
||||||
<property>/it-autoflight/input/spd-kts</property>
|
|
||||||
</input>
|
|
||||||
<output>/it-autoflight/internal/kts</output>
|
<output>/it-autoflight/internal/kts</output>
|
||||||
<type>noise-spike</type>
|
|
||||||
<max-rate-of-change>
|
|
||||||
<condition>
|
|
||||||
<or>
|
|
||||||
<not-equals>
|
|
||||||
<property>/it-autoflight/output/thr-mode</property>
|
|
||||||
<value>0</value>
|
|
||||||
</not-equals>
|
|
||||||
<equals>
|
|
||||||
<property>/it-autoflight/output/athr</property>
|
|
||||||
<value>0</value>
|
|
||||||
</equals>
|
|
||||||
<equals>
|
|
||||||
<property>/gear/gear[1]/wow</property>
|
|
||||||
<value>1</value>
|
|
||||||
</equals>
|
|
||||||
<equals>
|
|
||||||
<property>/gear/gear[2]/wow</property>
|
|
||||||
<value>1</value>
|
|
||||||
</equals>
|
|
||||||
</or>
|
|
||||||
</condition>
|
|
||||||
<value>200</value>
|
|
||||||
</max-rate-of-change>
|
|
||||||
<max-rate-of-change>
|
<max-rate-of-change>
|
||||||
<condition>
|
<condition>
|
||||||
<and>
|
<and>
|
||||||
|
|
@ -56,6 +29,10 @@
|
||||||
<property>/it-autoflight/output/athr</property>
|
<property>/it-autoflight/output/athr</property>
|
||||||
<value>1</value>
|
<value>1</value>
|
||||||
</equals>
|
</equals>
|
||||||
|
<equals>
|
||||||
|
<property>/it-autoflight/input/kts-mach</property>
|
||||||
|
<value>0</value>
|
||||||
|
</equals>
|
||||||
<equals>
|
<equals>
|
||||||
<property>/gear/gear[1]/wow</property>
|
<property>/gear/gear[1]/wow</property>
|
||||||
<value>0</value>
|
<value>0</value>
|
||||||
|
|
@ -68,41 +45,17 @@
|
||||||
</condition>
|
</condition>
|
||||||
<value>10</value>
|
<value>10</value>
|
||||||
</max-rate-of-change>
|
</max-rate-of-change>
|
||||||
|
<max-rate-of-change>200</max-rate-of-change>
|
||||||
</filter>
|
</filter>
|
||||||
|
|
||||||
<filter>
|
<filter>
|
||||||
<name>MACH INPUT FILTER</name>
|
<name>MACH INPUT FILTER</name>
|
||||||
<debug>false</debug>
|
<debug>false</debug>
|
||||||
|
<type>noise-spike</type>
|
||||||
<feedback-if-disabled>true</feedback-if-disabled>
|
<feedback-if-disabled>true</feedback-if-disabled>
|
||||||
<initialize-to>output</initialize-to>
|
<initialize-to>output</initialize-to>
|
||||||
<input>
|
<input>/it-autoflight/input/spd-mach</input>
|
||||||
<property>/it-autoflight/input/spd-mach</property>
|
|
||||||
</input>
|
|
||||||
<output>/it-autoflight/internal/mach</output>
|
<output>/it-autoflight/internal/mach</output>
|
||||||
<type>noise-spike</type>
|
|
||||||
<max-rate-of-change>
|
|
||||||
<condition>
|
|
||||||
<or>
|
|
||||||
<not-equals>
|
|
||||||
<property>/it-autoflight/output/thr-mode</property>
|
|
||||||
<value>0</value>
|
|
||||||
</not-equals>
|
|
||||||
<equals>
|
|
||||||
<property>/it-autoflight/output/athr</property>
|
|
||||||
<value>0</value>
|
|
||||||
</equals>
|
|
||||||
<equals>
|
|
||||||
<property>/gear/gear[1]/wow</property>
|
|
||||||
<value>1</value>
|
|
||||||
</equals>
|
|
||||||
<equals>
|
|
||||||
<property>/gear/gear[2]/wow</property>
|
|
||||||
<value>1</value>
|
|
||||||
</equals>
|
|
||||||
</or>
|
|
||||||
</condition>
|
|
||||||
<value>2</value>
|
|
||||||
</max-rate-of-change>
|
|
||||||
<max-rate-of-change>
|
<max-rate-of-change>
|
||||||
<condition>
|
<condition>
|
||||||
<and>
|
<and>
|
||||||
|
|
@ -114,6 +67,10 @@
|
||||||
<property>/it-autoflight/output/athr</property>
|
<property>/it-autoflight/output/athr</property>
|
||||||
<value>1</value>
|
<value>1</value>
|
||||||
</equals>
|
</equals>
|
||||||
|
<equals>
|
||||||
|
<property>/it-autoflight/input/kts-mach</property>
|
||||||
|
<value>1</value>
|
||||||
|
</equals>
|
||||||
<equals>
|
<equals>
|
||||||
<property>/gear/gear[1]/wow</property>
|
<property>/gear/gear[1]/wow</property>
|
||||||
<value>0</value>
|
<value>0</value>
|
||||||
|
|
@ -126,6 +83,7 @@
|
||||||
</condition>
|
</condition>
|
||||||
<value>0.1</value>
|
<value>0.1</value>
|
||||||
</max-rate-of-change>
|
</max-rate-of-change>
|
||||||
|
<max-rate-of-change>2</max-rate-of-change>
|
||||||
</filter>
|
</filter>
|
||||||
|
|
||||||
<filter>
|
<filter>
|
||||||
|
|
@ -250,28 +208,15 @@
|
||||||
</and>
|
</and>
|
||||||
</condition>
|
</condition>
|
||||||
</enable>
|
</enable>
|
||||||
<input>
|
<input>/instrumentation/airspeed-indicator/indicated-speed-kt</input>
|
||||||
<property>/instrumentation/airspeed-indicator/indicated-speed-kt</property>
|
<reference>/it-autoflight/internal/kts</reference>
|
||||||
</input>
|
<output>/controls/engines/throttle-cmd-pid</output>
|
||||||
<reference>
|
|
||||||
<property>/it-autoflight/internal/kts</property>
|
|
||||||
</reference>
|
|
||||||
<output>
|
|
||||||
<property>/controls/engines/throttle-cmd-pid</property>
|
|
||||||
</output>
|
|
||||||
<config>
|
<config>
|
||||||
<Kp>0.055</Kp>
|
<Kp>0.055</Kp>
|
||||||
<beta>1.0</beta>
|
|
||||||
<alpha>0.1</alpha>
|
|
||||||
<gamma>0.0</gamma>
|
|
||||||
<Ti>9.0</Ti>
|
<Ti>9.0</Ti>
|
||||||
<Td>0.00001</Td>
|
<Td>0.00001</Td>
|
||||||
<u_min>
|
<u_min>/controls/engines/idle-limit</u_min>
|
||||||
<property>/controls/engines/idle-limit</property>
|
<u_max>/controls/engines/throttle-pid-max</u_max>
|
||||||
</u_min>
|
|
||||||
<u_max>
|
|
||||||
<property>/controls/engines/throttle-pid-max</property>
|
|
||||||
</u_max>
|
|
||||||
</config>
|
</config>
|
||||||
</pid-controller>
|
</pid-controller>
|
||||||
|
|
||||||
|
|
@ -390,22 +335,13 @@
|
||||||
<property>/it-autoflight/internal/mach</property>
|
<property>/it-autoflight/internal/mach</property>
|
||||||
<scale>1000.0</scale>
|
<scale>1000.0</scale>
|
||||||
</reference>
|
</reference>
|
||||||
<output>
|
<output>/controls/engines/throttle-cmd-pid</output>
|
||||||
<property>/controls/engines/throttle-cmd-pid</property>
|
|
||||||
</output>
|
|
||||||
<config>
|
<config>
|
||||||
<Kp>0.055</Kp>
|
<Kp>0.055</Kp>
|
||||||
<beta>1.0</beta>
|
|
||||||
<alpha>0.1</alpha>
|
|
||||||
<gamma>0.0</gamma>
|
|
||||||
<Ti>9.0</Ti>
|
<Ti>9.0</Ti>
|
||||||
<Td>0.00001</Td>
|
<Td>0.00001</Td>
|
||||||
<u_min>
|
<u_min>/controls/engines/idle-limit</u_min>
|
||||||
<property>/controls/engines/idle-limit</property>
|
<u_max>/controls/engines/throttle-pid-max</u_max>
|
||||||
</u_min>
|
|
||||||
<u_max>
|
|
||||||
<property>/controls/engines/throttle-pid-max</property>
|
|
||||||
</u_max>
|
|
||||||
</config>
|
</config>
|
||||||
</pid-controller>
|
</pid-controller>
|
||||||
|
|
||||||
|
|
@ -512,12 +448,8 @@
|
||||||
</and>
|
</and>
|
||||||
</condition>
|
</condition>
|
||||||
</enable>
|
</enable>
|
||||||
<input>
|
<input>0.0</input>
|
||||||
<value>0.0</value>
|
<output>/controls/engines/throttle-cmd-pid</output>
|
||||||
</input>
|
|
||||||
<output>
|
|
||||||
<property>/controls/engines/throttle-cmd-pid</property>
|
|
||||||
</output>
|
|
||||||
</filter>
|
</filter>
|
||||||
|
|
||||||
<filter>
|
<filter>
|
||||||
|
|
@ -623,12 +555,8 @@
|
||||||
</and>
|
</and>
|
||||||
</condition>
|
</condition>
|
||||||
</enable>
|
</enable>
|
||||||
<input>
|
<input>1.0</input>
|
||||||
<value>1.0</value>
|
<output>/controls/engines/throttle-cmd-pid</output>
|
||||||
</input>
|
|
||||||
<output>
|
|
||||||
<property>/controls/engines/throttle-cmd-pid</property>
|
|
||||||
</output>
|
|
||||||
</filter>
|
</filter>
|
||||||
|
|
||||||
<filter>
|
<filter>
|
||||||
|
|
@ -725,12 +653,10 @@
|
||||||
</not-equals>
|
</not-equals>
|
||||||
</and>
|
</and>
|
||||||
</condition>
|
</condition>
|
||||||
<value>1</value>
|
<value>1.0</value>
|
||||||
</input>
|
</input>
|
||||||
<input>0</input>
|
<input>0.0</input>
|
||||||
<output>
|
<output>/controls/engines/throttle-cmd-pid</output>
|
||||||
<property>/controls/engines/throttle-cmd-pid</property>
|
|
||||||
</output>
|
|
||||||
</filter>
|
</filter>
|
||||||
|
|
||||||
</PropertyList>
|
</PropertyList>
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
4678
|
4679
|
||||||
Reference in a new issue