fly/IDG-A32X
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse source
This commit is contained in:
Joshua Davidson 2018-10-19 17:47:33 -04:00
commit 32f1876a02
6 changed files with 259 additions and 393 deletions

63
Systems/a320-fcs.xml
View file

@ -1737,6 +1737,24 @@
</channel> </channel>
<channel name="SFCC">
<switch name="fcs/sfcc/unit1-avail">
<default value="0"/>
<test logic="OR" value="1">
/systems/electrical/bus/dc-ess ge 25
</test>
</switch>
<switch name="fcs/sfcc/unit2-avail">
<default value="0"/>
<test logic="OR" value="1">
/systems/electrical/bus/dc2 ge 25
</test>
</switch>
</channel>
<channel name="Flaps"> <channel name="Flaps">
<pure_gain name="fcs/flap-pos-gain"> <pure_gain name="fcs/flap-pos-gain">
@ -1746,9 +1764,29 @@
<switch name="fcs/flap-pos-rate"> <switch name="fcs/flap-pos-rate">
<default value="0.0"/> <default value="0.0"/>
<test logic="OR" value="1.16666666"> <test logic="AND" value="1.16666666">
/systems/hydraulic/green-psi ge 1500 /systems/hydraulic/green-psi ge 1500
/systems/hydraulic/yellow-psi ge 1500 /systems/hydraulic/yellow-psi ge 1500
fcs/sfcc/unit1-avail eq 1
fcs/sfcc/unit2-avail eq 1
</test>
<test logic="AND" value="0.58333333">
/systems/hydraulic/green-psi ge 1500
fcs/sfcc/unit1-avail eq 1
fcs/sfcc/unit2-avail eq 0
</test>
<test logic="AND" value="0.58333333">
/systems/hydraulic/yellow-psi ge 1500
fcs/sfcc/unit1-avail eq 0
fcs/sfcc/unit2-avail eq 1
</test>
<test logic="AND" value="0.58333333">
/systems/hydraulic/green-psi ge 1500
/systems/hydraulic/yellow-psi lt 1500
</test>
<test logic="AND" value="0.58333333">
/systems/hydraulic/green-psi lt 1500
/systems/hydraulic/yellow-psi ge 1500
</test> </test>
</switch> </switch>
@ -1782,10 +1820,29 @@
<switch name="fcs/slat-pos-rate"> <switch name="fcs/slat-pos-rate">
<default value="0.0"/> <default value="0.0"/>
<test logic="OR" value="1.35"> <test logic="AND" value="1.35">
/systems/hydraulic/blue-psi ge 1500 /systems/hydraulic/blue-psi ge 1500
/systems/hydraulic/green-psi ge 1500 /systems/hydraulic/green-psi ge 1500
/systems/hydraulic/yellow-psi ge 1500 fcs/sfcc/unit1-avail eq 1
fcs/sfcc/unit2-avail eq 1
</test>
<test logic="AND" value="0.675">
/systems/hydraulic/blue-psi ge 1500
fcs/sfcc/unit1-avail eq 1
fcs/sfcc/unit2-avail eq 0
</test>
<test logic="AND" value="0.675">
/systems/hydraulic/green-psi ge 1500
fcs/sfcc/unit1-avail eq 0
fcs/sfcc/unit2-avail eq 1
</test>
<test logic="AND" value="0.675">
/systems/hydraulic/blue-psi ge 1500
/systems/hydraulic/green-psi lt 1500
</test>
<test logic="AND" value="0.675">
/systems/hydraulic/blue-psi lt 1500
/systems/hydraulic/green-psi ge 1500
</test> </test>
</switch> </switch>

220
Systems/fmgc-drivers.xml
View file

@ -9,11 +9,9 @@
<!-- IT-AUTOFLIGHT --> <!-- IT-AUTOFLIGHT -->
<PropertyList> <PropertyList>
<!-- =============================================================== --> <!-- Predictors -->
<!-- Predictors -->
<!-- =============================================================== -->
<predict-simple> <predict-simple>
<name>IAS 5 SECOND PREDICTOR</name> <name>IAS 5 SECOND PREDICTOR</name>
<debug>false</debug> <debug>false</debug>
@ -22,7 +20,7 @@
<seconds>5.0</seconds> <seconds>5.0</seconds>
<filter-gain>0.0</filter-gain> <filter-gain>0.0</filter-gain>
</predict-simple> </predict-simple>
<predict-simple> <predict-simple>
<name>IAS 10 SECOND PREDICTOR</name> <name>IAS 10 SECOND PREDICTOR</name>
<debug>false</debug> <debug>false</debug>
@ -49,7 +47,7 @@
<seconds>5.0</seconds> <seconds>5.0</seconds>
<filter-gain>0.0</filter-gain> <filter-gain>0.0</filter-gain>
</predict-simple> </predict-simple>
<predict-simple> <predict-simple>
<name>MACH 10 SECOND PREDICTOR</name> <name>MACH 10 SECOND PREDICTOR</name>
<debug>false</debug> <debug>false</debug>
@ -67,16 +65,13 @@
<seconds>15.0</seconds> <seconds>15.0</seconds>
<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>
@ -89,12 +84,11 @@
</input> </input>
<output>/it-autoflight/internal/target-fpm-c2</output> <output>/it-autoflight/internal/target-fpm-c2</output>
</filter> </filter>
<filter> <filter>
<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>
@ -111,12 +105,11 @@
</input> </input>
<output>/it-autoflight/internal/target-fpm-c</output> <output>/it-autoflight/internal/target-fpm-c</output>
</filter> </filter>
<filter> <filter>
<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>
@ -193,10 +184,11 @@
</input> </input>
<output>/FMGC/internal/target-ias-pfd</output> <output>/FMGC/internal/target-ias-pfd</output>
</filter> </filter>
<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,43 +239,33 @@
</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>
<property>/it-autoflight/output/vert</property>
<value>4</value>
</equals>
<equals>
<property>/it-autoflight/output/vert</property>
<value>7</value>
</equals>
</or>
<equals> <equals>
<property>/it-autoflight/output/vert</property> <property>/it-autoflight/input/kts-mach</property>
<value>4</value> <value>1</value>
</equals> </equals>
<equals> <equals>
<property>/gear/gear[1]/wow</property> <property>/gear/gear[1]/wow</property>
@ -319,8 +279,9 @@
</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>
<name>IAS SYNC</name> <name>IAS SYNC</name>
<type>gain</type> <type>gain</type>
@ -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>
<property>/it-autoflight/internal/vert-speed-fpm</property> <sum>
<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,8 +516,9 @@
</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>
<name>NAV ERROR DEG</name> <name>NAV ERROR DEG</name>
<debug>false</debug> <debug>false</debug>
@ -589,7 +537,7 @@
<max>180</max> <max>180</max>
</period> </period>
</filter> </filter>
<filter> <filter>
<name>INTERNAL VERTICAL SPEED COMPUTER</name> <name>INTERNAL VERTICAL SPEED COMPUTER</name>
<debug>false</debug> <debug>false</debug>
@ -830,49 +778,13 @@
</input> </input>
<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>
@ -897,7 +837,7 @@
<min>-30</min> <min>-30</min>
<max>30</max> <max>30</max>
</filter> </filter>
<filter> <filter>
<name>FD: PITCH</name> <name>FD: PITCH</name>
<debug>false</debug> <debug>false</debug>

64
Systems/fmgc-pitch.xml
View file

@ -9,10 +9,8 @@
<!-- IT-AUTOFLIGHT --> <!-- IT-AUTOFLIGHT -->
<PropertyList> <PropertyList>
<!-- =============================================================== --> <!-- Pitch Axis -->
<!-- Vertical Modes -->
<!-- =============================================================== -->
<filter> <filter>
<name>ALTITUDE CAPTURE/HOLD</name> <name>ALTITUDE CAPTURE/HOLD</name>
@ -45,17 +43,11 @@
</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>
<name>FPA HOLD</name> <name>FPA HOLD</name>
<debug>false</debug> <debug>false</debug>
@ -87,15 +79,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 +92,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 +198,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 +218,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 +483,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 +566,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>
@ -711,21 +685,15 @@
<min>-15</min> <min>-15</min>
<max>30</max> <max>30</max>
</filter> </filter>
<filter> <filter>
<name>System Command: Pitch Rate</name> <name>System Command: Pitch Rate</name>
<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>

165
Systems/fmgc-roll-yaw.xml
View file

@ -9,11 +9,9 @@
<!-- IT-AUTOFLIGHT --> <!-- IT-AUTOFLIGHT -->
<PropertyList> <PropertyList>
<!-- =============================================================== --> <!-- Roll Axis -->
<!-- Lateral Modes -->
<!-- =============================================================== -->
<pi-simple-controller> <pi-simple-controller>
<name>ROLL CONTROLLER: HDG/LNAV</name> <name>ROLL CONTROLLER: HDG/LNAV</name>
<debug>false</debug> <debug>false</debug>
@ -51,15 +49,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 +59,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 +94,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,12 +104,10 @@
<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>
<filter> <filter>
<name>ROLL DEG SYNC</name> <name>ROLL DEG SYNC</name>
<debug>false</debug> <debug>false</debug>
@ -174,48 +141,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,17 +162,63 @@
</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>
<!-- =============================================================== --> <!-- Yaw Axis -->
<!-- Yaw Control -->
<!-- =============================================================== -->
<pi-simple-controller> <pi-simple-controller>
<name>RUDDER VORLOC TRK</name> <name>RUDDER VORLOC TRK</name>
@ -252,12 +231,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 +274,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 +295,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>

138
Systems/fmgc-thrust.xml
View file

@ -7,44 +7,17 @@
--> -->
<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>

2
revision.txt
View file

@ -1 +1 @@
4678 4679