Merge branch 'master' of https://www.github.com/it0uchpods/A320Family
Conflicts: A320-main.xml
This commit is contained in:
commit
02d6a94c34
8 changed files with 188 additions and 34 deletions
|
@ -346,7 +346,6 @@
|
||||||
<roll-scale>1.6</roll-scale>
|
<roll-scale>1.6</roll-scale>
|
||||||
<vorloc>-2.8</vorloc>
|
<vorloc>-2.8</vorloc>
|
||||||
<vs>0.01</vs>
|
<vs>0.01</vs>
|
||||||
<fpa>0.30</fpa>
|
|
||||||
</cmd>
|
</cmd>
|
||||||
<autoland>
|
<autoland>
|
||||||
<kp-pitch>0.035</kp-pitch>
|
<kp-pitch>0.035</kp-pitch>
|
||||||
|
|
|
@ -1738,6 +1738,12 @@
|
||||||
<object-name>vs-sel</object-name>
|
<object-name>vs-sel</object-name>
|
||||||
<property>/it-autoflight/input/vs</property>
|
<property>/it-autoflight/input/vs</property>
|
||||||
<factor>11.25</factor>
|
<factor>11.25</factor>
|
||||||
|
<condition>
|
||||||
|
<equals>
|
||||||
|
<property>/it-autoflight/output/vert</property>
|
||||||
|
<value>1</value>
|
||||||
|
</equals>
|
||||||
|
</condition>
|
||||||
<axis>
|
<axis>
|
||||||
<x1-m>-0.4608</x1-m>
|
<x1-m>-0.4608</x1-m>
|
||||||
<y1-m>0.0924</y1-m>
|
<y1-m>0.0924</y1-m>
|
||||||
|
|
|
@ -660,7 +660,7 @@
|
||||||
<type>textranslate</type>
|
<type>textranslate</type>
|
||||||
<object-name>alt-tape-2</object-name>
|
<object-name>alt-tape-2</object-name>
|
||||||
<property>instrumentation/altimeter/indicated-altitude-ft</property>
|
<property>instrumentation/altimeter/indicated-altitude-ft</property>
|
||||||
<factor>0.009765625</factor>
|
<factor>0.009999725</factor>
|
||||||
<axis>
|
<axis>
|
||||||
<y>1</y>
|
<y>1</y>
|
||||||
</axis>
|
</axis>
|
||||||
|
|
|
@ -660,7 +660,7 @@
|
||||||
<type>textranslate</type>
|
<type>textranslate</type>
|
||||||
<object-name>alt-tape-2</object-name>
|
<object-name>alt-tape-2</object-name>
|
||||||
<property>instrumentation/altimeter/indicated-altitude-ft</property>
|
<property>instrumentation/altimeter/indicated-altitude-ft</property>
|
||||||
<factor>0.009765625</factor>
|
<factor>0.009999725</factor>
|
||||||
<axis>
|
<axis>
|
||||||
<y>1</y>
|
<y>1</y>
|
||||||
</axis>
|
</axis>
|
||||||
|
|
BIN
Models/Instruments/PFD/res/fastslow.png
Normal file
BIN
Models/Instruments/PFD/res/fastslow.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 16 KiB |
Binary file not shown.
Before Width: | Height: | Size: 447 KiB After Width: | Height: | Size: 446 KiB |
|
@ -416,6 +416,29 @@
|
||||||
<gain>1.0</gain>
|
<gain>1.0</gain>
|
||||||
</filter>
|
</filter>
|
||||||
|
|
||||||
|
<filter>
|
||||||
|
<name>VERT SPEED SYNC</name>
|
||||||
|
<debug>false</debug>
|
||||||
|
<type>gain</type>
|
||||||
|
<gain>1.0</gain>
|
||||||
|
<enable>
|
||||||
|
<condition>
|
||||||
|
<not-equals>
|
||||||
|
<property>/it-autoflight/output/vert</property>
|
||||||
|
<value>1</value>
|
||||||
|
</not-equals>
|
||||||
|
</condition>
|
||||||
|
</enable>
|
||||||
|
<input>
|
||||||
|
<expression>
|
||||||
|
<floor>
|
||||||
|
<property>/it-autoflight/internal/vert-speed-fpm</property>
|
||||||
|
</floor>
|
||||||
|
</expression>
|
||||||
|
</input>
|
||||||
|
<output>/it-autoflight/input/vs</output>
|
||||||
|
</filter>
|
||||||
|
|
||||||
<filter>
|
<filter>
|
||||||
<name>VERT SPEED FILTER</name>
|
<name>VERT SPEED FILTER</name>
|
||||||
<debug>false</debug>
|
<debug>false</debug>
|
||||||
|
@ -487,7 +510,7 @@
|
||||||
</filter>
|
</filter>
|
||||||
|
|
||||||
<filter>
|
<filter>
|
||||||
<name>INTERNAL VERTICAL SPEED COMPUTER</name>
|
<name>INTERNAL VERTICAL SPEED COMPUTER SYNC 4</name>
|
||||||
<debug>false</debug>
|
<debug>false</debug>
|
||||||
<type>gain</type>
|
<type>gain</type>
|
||||||
<enable>
|
<enable>
|
||||||
|
@ -509,6 +532,23 @@
|
||||||
<gain>55.5</gain>
|
<gain>55.5</gain>
|
||||||
</filter>
|
</filter>
|
||||||
|
|
||||||
|
<filter>
|
||||||
|
<name>INTERNAL VERTICAL SPEED COMPUTER SYNC 5</name>
|
||||||
|
<debug>false</debug>
|
||||||
|
<type>gain</type>
|
||||||
|
<enable>
|
||||||
|
<condition>
|
||||||
|
<not-equals>
|
||||||
|
<property>/it-autoflight/output/vert</property>
|
||||||
|
<value>5</value>
|
||||||
|
</not-equals>
|
||||||
|
</condition>
|
||||||
|
</enable>
|
||||||
|
<input>/velocities/vertical-speed-fps</input>
|
||||||
|
<output>/it-autoflight/internal/target-fpm-d</output>
|
||||||
|
<gain>55.5</gain>
|
||||||
|
</filter>
|
||||||
|
|
||||||
<filter>
|
<filter>
|
||||||
<name>NAV1 G/S FPM Calc</name>
|
<name>NAV1 G/S FPM Calc</name>
|
||||||
<debug>false</debug>
|
<debug>false</debug>
|
||||||
|
@ -607,19 +647,26 @@
|
||||||
<filter>
|
<filter>
|
||||||
<name>FD: PITCH</name>
|
<name>FD: PITCH</name>
|
||||||
<debug>false</debug>
|
<debug>false</debug>
|
||||||
<type>gain</type>
|
<type>noise-spike</type>
|
||||||
<gain>1.0</gain>
|
|
||||||
<input>
|
<input>
|
||||||
<expression>
|
<expression>
|
||||||
<dif>
|
<product>
|
||||||
<property>/it-autoflight/internal/target-pitch-deg</property>
|
<dif>
|
||||||
<property>/orientation/pitch-deg</property>
|
<property>/it-autoflight/internal/target-common-fpm</property>
|
||||||
</dif>
|
<property>/it-autoflight/internal/vert-speed-fpm</property>
|
||||||
|
</dif>
|
||||||
|
<table>
|
||||||
|
<property>/instrumentation/airspeed-indicator/indicated-mach</property>
|
||||||
|
<entry><ind>0.20</ind><dep>0.004</dep></entry>
|
||||||
|
<entry><ind>0.95</ind><dep>0.002</dep></entry>
|
||||||
|
</table>
|
||||||
|
</product>
|
||||||
</expression>
|
</expression>
|
||||||
</input>
|
</input>
|
||||||
<output>/it-autoflight/fd/pitch-bar</output>
|
<output>/it-autoflight/fd/pitch-bar</output>
|
||||||
<min>-15</min>
|
<min>-15</min>
|
||||||
<max>30</max>
|
<max>30</max>
|
||||||
|
<max-rate-of-change>10</max-rate-of-change>
|
||||||
</filter>
|
</filter>
|
||||||
|
|
||||||
</PropertyList>
|
</PropertyList>
|
||||||
|
|
|
@ -83,7 +83,7 @@
|
||||||
<property>/it-autoflight/input/fpa</property>
|
<property>/it-autoflight/input/fpa</property>
|
||||||
</reference>
|
</reference>
|
||||||
<output>
|
<output>
|
||||||
<property>/it-autoflight/internal/target-pitch-deg</property>
|
<property>/it-autoflight/internal/target-fpm-d</property>
|
||||||
</output>
|
</output>
|
||||||
<config>
|
<config>
|
||||||
<Kp>
|
<Kp>
|
||||||
|
@ -94,12 +94,8 @@
|
||||||
<gamma>0.0</gamma>
|
<gamma>0.0</gamma>
|
||||||
<Ti>1.0</Ti>
|
<Ti>1.0</Ti>
|
||||||
<Td>0.00001</Td>
|
<Td>0.00001</Td>
|
||||||
<u_min>
|
<u_min>-6000</u_min>
|
||||||
<value>-10</value>
|
<u_max>8000</u_max>
|
||||||
</u_min>
|
|
||||||
<u_max>
|
|
||||||
<value>30</value>
|
|
||||||
</u_max>
|
|
||||||
</config>
|
</config>
|
||||||
</pid-controller>
|
</pid-controller>
|
||||||
|
|
||||||
|
@ -264,9 +260,117 @@
|
||||||
</condition>
|
</condition>
|
||||||
<value>-150</value>
|
<value>-150</value>
|
||||||
</u_max>
|
</u_max>
|
||||||
|
<u_min>
|
||||||
|
<condition>
|
||||||
|
<equals>
|
||||||
|
<property>/it-autoflight/output/thr-mode</property>
|
||||||
|
<value>0</value>
|
||||||
|
</equals>
|
||||||
|
</condition>
|
||||||
|
<value>-6000</value>
|
||||||
|
</u_min>
|
||||||
|
<u_max>
|
||||||
|
<condition>
|
||||||
|
<equals>
|
||||||
|
<property>/it-autoflight/output/thr-mode</property>
|
||||||
|
<value>0</value>
|
||||||
|
</equals>
|
||||||
|
</condition>
|
||||||
|
<value>10000</value>
|
||||||
|
</u_max>
|
||||||
</config>
|
</config>
|
||||||
</pid-controller>
|
</pid-controller>
|
||||||
|
|
||||||
|
<filter>
|
||||||
|
<name>TARGET FPM</name>
|
||||||
|
<debug>false</debug>
|
||||||
|
<type>gain</type>
|
||||||
|
<gain>1</gain>
|
||||||
|
<input>
|
||||||
|
<condition>
|
||||||
|
<or>
|
||||||
|
<equals>
|
||||||
|
<property>/it-autoflight/output/vert</property>
|
||||||
|
<value>0</value>
|
||||||
|
</equals>
|
||||||
|
<and>
|
||||||
|
<equals>
|
||||||
|
<property>/it-autoflight/output/vert</property>
|
||||||
|
<value>8</value>
|
||||||
|
</equals>
|
||||||
|
<equals>
|
||||||
|
<property>/it-autoflight/output/vert-mng</property>
|
||||||
|
<value>0</value>
|
||||||
|
</equals>
|
||||||
|
</and>
|
||||||
|
</or>
|
||||||
|
</condition>
|
||||||
|
<property>/it-autoflight/internal/target-fpm</property>
|
||||||
|
</input>
|
||||||
|
<input>
|
||||||
|
<condition>
|
||||||
|
<equals>
|
||||||
|
<property>/it-autoflight/output/vert</property>
|
||||||
|
<value>1</value>
|
||||||
|
</equals>
|
||||||
|
</condition>
|
||||||
|
<property>/it-autoflight/internal/vs</property>
|
||||||
|
</input>
|
||||||
|
<input>
|
||||||
|
<condition>
|
||||||
|
<or>
|
||||||
|
<equals>
|
||||||
|
<property>/it-autoflight/output/vert</property>
|
||||||
|
<value>4</value>
|
||||||
|
</equals>
|
||||||
|
<equals>
|
||||||
|
<property>/it-autoflight/output/vert</property>
|
||||||
|
<value>7</value>
|
||||||
|
</equals>
|
||||||
|
<and>
|
||||||
|
<equals>
|
||||||
|
<property>/it-autoflight/output/vert</property>
|
||||||
|
<value>8</value>
|
||||||
|
</equals>
|
||||||
|
<equals>
|
||||||
|
<property>/it-autoflight/output/vert-mng</property>
|
||||||
|
<value>4</value>
|
||||||
|
</equals>
|
||||||
|
</and>
|
||||||
|
</or>
|
||||||
|
</condition>
|
||||||
|
<property>/it-autoflight/internal/target-fpm-b</property>
|
||||||
|
</input>
|
||||||
|
<input>
|
||||||
|
<condition>
|
||||||
|
<equals>
|
||||||
|
<property>/it-autoflight/output/vert</property>
|
||||||
|
<value>6</value>
|
||||||
|
</equals>
|
||||||
|
</condition>
|
||||||
|
<property>/it-autoflight/internal/target-fpm-c</property>
|
||||||
|
</input>
|
||||||
|
<input>
|
||||||
|
<condition>
|
||||||
|
<equals>
|
||||||
|
<property>/it-autoflight/output/vert</property>
|
||||||
|
<value>5</value>
|
||||||
|
</equals>
|
||||||
|
</condition>
|
||||||
|
<property>/it-autoflight/internal/target-fpm-d</property>
|
||||||
|
</input>
|
||||||
|
<input>
|
||||||
|
<condition>
|
||||||
|
<equals>
|
||||||
|
<property>/it-autoflight/output/vert</property>
|
||||||
|
<value>2</value>
|
||||||
|
</equals>
|
||||||
|
</condition>
|
||||||
|
<property>/it-autoflight/internal/nav1-rate-of-climb-fpm</property>
|
||||||
|
</input>
|
||||||
|
<output>/it-autoflight/internal/target-common-fpm</output>
|
||||||
|
</filter>
|
||||||
|
|
||||||
<pid-controller>
|
<pid-controller>
|
||||||
<name>FPM HOLD</name>
|
<name>FPM HOLD</name>
|
||||||
<debug>false</debug>
|
<debug>false</debug>
|
||||||
|
@ -290,6 +394,10 @@
|
||||||
<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>5</value>
|
||||||
|
</equals>
|
||||||
<equals>
|
<equals>
|
||||||
<property>/it-autoflight/output/vert</property>
|
<property>/it-autoflight/output/vert</property>
|
||||||
<value>6</value>
|
<value>6</value>
|
||||||
|
@ -312,14 +420,6 @@
|
||||||
<property>/it-autoflight/output/ap2</property>
|
<property>/it-autoflight/output/ap2</property>
|
||||||
<value>1</value>
|
<value>1</value>
|
||||||
</equals>
|
</equals>
|
||||||
<equals>
|
|
||||||
<property>/it-autoflight/output/fd1</property>
|
|
||||||
<value>1</value>
|
|
||||||
</equals>
|
|
||||||
<equals>
|
|
||||||
<property>/it-autoflight/output/fd2</property>
|
|
||||||
<value>1</value>
|
|
||||||
</equals>
|
|
||||||
</or>
|
</or>
|
||||||
</and>
|
</and>
|
||||||
</condition>
|
</condition>
|
||||||
|
@ -396,6 +496,16 @@
|
||||||
<property>/it-autoflight/internal/target-fpm-c</property>
|
<property>/it-autoflight/internal/target-fpm-c</property>
|
||||||
<scale>0.16667</scale>
|
<scale>0.16667</scale>
|
||||||
</reference>
|
</reference>
|
||||||
|
<reference>
|
||||||
|
<condition>
|
||||||
|
<equals>
|
||||||
|
<property>/it-autoflight/output/vert</property>
|
||||||
|
<value>5</value>
|
||||||
|
</equals>
|
||||||
|
</condition>
|
||||||
|
<property>/it-autoflight/internal/target-fpm-d</property>
|
||||||
|
<scale>0.16667</scale>
|
||||||
|
</reference>
|
||||||
<reference>
|
<reference>
|
||||||
<condition>
|
<condition>
|
||||||
<equals>
|
<equals>
|
||||||
|
@ -428,7 +538,7 @@
|
||||||
</condition>
|
</condition>
|
||||||
<property>/it-autoflight/config/autoland/kp-pitch</property>
|
<property>/it-autoflight/config/autoland/kp-pitch</property>
|
||||||
</Kp>
|
</Kp>
|
||||||
<Ti>7.0</Ti>
|
<Ti>3.0</Ti>
|
||||||
<Td>0.0001</Td>
|
<Td>0.0001</Td>
|
||||||
<u_min>
|
<u_min>
|
||||||
<condition>
|
<condition>
|
||||||
|
@ -497,14 +607,6 @@
|
||||||
<property>/it-autoflight/output/ap2</property>
|
<property>/it-autoflight/output/ap2</property>
|
||||||
<value>1</value>
|
<value>1</value>
|
||||||
</not-equals>
|
</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>
|
</and>
|
||||||
</condition>
|
</condition>
|
||||||
</enable>
|
</enable>
|
||||||
|
|
Reference in a new issue