A32X: Fix not enough drag, fix some other, add new EPR calculation system

This commit is contained in:
Joshua Davidson 2017-12-29 15:27:41 -05:00
parent 6209d3cb3d
commit 1cf7afa35f
10 changed files with 109 additions and 62 deletions

View file

@ -27,12 +27,12 @@
<independentVar lookup="column">atmosphere/density-altitude</independentVar>
<tableData>
-10000 0 10000 20000 30000 40000 50000
0.0 0.0430 0.0458 0.0378 0.0684 0.0819 0.0793 0.0000
0.2 0.0500 0.0291 0.0205 0.0514 0.0727 0.0729 0.0000
0.4 0.0040 0.0047 0.0012 0.0412 0.0585 0.0671 0.0000
0.6 0.0000 0.0000 0.0000 0.0000 0.0416 0.0518 0.0000
0.8 0.0000 0.0000 0.0000 0.0000 0.0354 0.0468 0.0000
1.0 0.0000 0.0000 0.0000 0.0000 0.0000 0.0352 0.0000
0.0 0.0430 0.0458 0.0378 0.0684 0.0619 0.0693 0.0000
0.2 0.0500 0.0291 0.0205 0.0514 0.0627 0.0629 0.0000
0.4 0.0040 0.0047 0.0012 0.0412 0.0485 0.0571 0.0000
0.6 0.0000 0.0000 0.0000 0.0000 0.0316 0.0418 0.0000
0.8 0.0000 0.0000 0.0000 0.0000 0.0254 0.0368 0.0000
1.0 0.0000 0.0000 0.0000 0.0000 0.0000 0.0252 0.0000
</tableData>
</table>
</function>

View file

@ -27,12 +27,12 @@
<independentVar lookup="column">atmosphere/density-altitude</independentVar>
<tableData>
-10000 0 10000 20000 30000 40000 50000
0.0 0.0430 0.0458 0.0378 0.0684 0.0819 0.0793 0.0000
0.2 0.0500 0.0291 0.0205 0.0514 0.0727 0.0729 0.0000
0.4 0.0040 0.0047 0.0012 0.0412 0.0585 0.0671 0.0000
0.6 0.0000 0.0000 0.0000 0.0000 0.0416 0.0518 0.0000
0.8 0.0000 0.0000 0.0000 0.0000 0.0354 0.0468 0.0000
1.0 0.0000 0.0000 0.0000 0.0000 0.0000 0.0352 0.0000
0.0 0.0430 0.0458 0.0378 0.0684 0.0619 0.0693 0.0000
0.2 0.0500 0.0291 0.0205 0.0514 0.0627 0.0629 0.0000
0.4 0.0040 0.0047 0.0012 0.0412 0.0485 0.0571 0.0000
0.6 0.0000 0.0000 0.0000 0.0000 0.0316 0.0418 0.0000
0.8 0.0000 0.0000 0.0000 0.0000 0.0254 0.0368 0.0000
1.0 0.0000 0.0000 0.0000 0.0000 0.0000 0.0252 0.0000
</tableData>
</table>
</function>

View file

@ -27,12 +27,12 @@
<independentVar lookup="column">atmosphere/density-altitude</independentVar>
<tableData>
-10000 0 10000 20000 30000 40000 50000
0.0 0.0430 0.0458 0.0378 0.0684 0.0819 0.0793 0.0000
0.2 0.0500 0.0291 0.0205 0.0514 0.0727 0.0729 0.0000
0.4 0.0040 0.0047 0.0012 0.0412 0.0585 0.0671 0.0000
0.6 0.0000 0.0000 0.0000 0.0000 0.0416 0.0518 0.0000
0.8 0.0000 0.0000 0.0000 0.0000 0.0354 0.0468 0.0000
1.0 0.0000 0.0000 0.0000 0.0000 0.0000 0.0352 0.0000
0.0 0.0430 0.0458 0.0378 0.0684 0.0619 0.0693 0.0000
0.2 0.0500 0.0291 0.0205 0.0514 0.0627 0.0629 0.0000
0.4 0.0040 0.0047 0.0012 0.0412 0.0485 0.0571 0.0000
0.6 0.0000 0.0000 0.0000 0.0000 0.0316 0.0418 0.0000
0.8 0.0000 0.0000 0.0000 0.0000 0.0254 0.0368 0.0000
1.0 0.0000 0.0000 0.0000 0.0000 0.0000 0.0252 0.0000
</tableData>
</table>
</function>

View file

@ -27,12 +27,12 @@
<independentVar lookup="column">atmosphere/density-altitude</independentVar>
<tableData>
-10000 0 10000 20000 30000 40000 50000
0.0 0.0430 0.0458 0.0378 0.0684 0.0819 0.0793 0.0000
0.2 0.0500 0.0291 0.0205 0.0514 0.0727 0.0729 0.0000
0.4 0.0040 0.0047 0.0012 0.0412 0.0585 0.0671 0.0000
0.6 0.0000 0.0000 0.0000 0.0000 0.0416 0.0518 0.0000
0.8 0.0000 0.0000 0.0000 0.0000 0.0354 0.0468 0.0000
1.0 0.0000 0.0000 0.0000 0.0000 0.0000 0.0352 0.0000
0.0 0.0430 0.0458 0.0378 0.0684 0.0619 0.0693 0.0000
0.2 0.0500 0.0291 0.0205 0.0514 0.0627 0.0629 0.0000
0.4 0.0040 0.0047 0.0012 0.0412 0.0485 0.0571 0.0000
0.6 0.0000 0.0000 0.0000 0.0000 0.0316 0.0418 0.0000
0.8 0.0000 0.0000 0.0000 0.0000 0.0254 0.0368 0.0000
1.0 0.0000 0.0000 0.0000 0.0000 0.0000 0.0252 0.0000
</tableData>
</table>
</function>

View file

@ -5183,7 +5183,7 @@
<animation>
<type>translate</type>
<object-name>SpdBrk</object-name>
<property>controls/flight/speedbrake</property>
<property>controls/flight/speedbrake-lever</property>
<factor>0.052</factor>
<axis>
<x>1</x>

View file

@ -164,11 +164,11 @@
<table>
<independentVar lookup="row">aero/alpha-rad</independentVar>
<tableData>
-1.57 1.2083
-0.20 0.0231
-1.57 1.3083
-0.20 0.0331
0.00 0.0000
0.20 0.0231
1.57 1.2083
0.20 0.0331
1.57 1.3083
</tableData>
</table>
</product>
@ -180,7 +180,7 @@
<property>aero/qbar-psf</property>
<property>metrics/Sw-sqft</property>
<property>aero/cl-squared</property>
<value>0.0374</value>
<value>0.0384</value>
</product>
</function>
@ -193,7 +193,8 @@
<independentVar lookup="row">velocities/mach</independentVar>
<tableData>
0.00 0.000
0.79 0.000
0.20 0.000
0.79 0.002
1.10 0.023
1.80 0.015
</tableData>

View file

@ -16,7 +16,7 @@
<type>gain</type>
<gain>1.0</gain>
<update-interval-secs type="double">0.05</update-interval-secs>
<input>
<input>
<expression>
<table>
<property>/environment/temperature-degc</property>
@ -34,7 +34,7 @@
<type>gain</type>
<gain>1.0</gain>
<update-interval-secs type="double">0.05</update-interval-secs>
<input>
<input>
<expression>
<table>
<property>/FMGC/internal/flex</property>
@ -76,7 +76,7 @@
</condition>
<expression>
<table>
<property>/position/altitude-ft</property>
<property>/fdm/jsbsim/atmosphere/density-altitude</property>
<entry><ind> 0</ind><dep>0.035</dep></entry>
<entry><ind>42000</ind><dep>0.285</dep></entry>
</table>
@ -91,7 +91,7 @@
<type>gain</type>
<gain>1.0</gain>
<update-interval-secs type="double">0.05</update-interval-secs>
<input>
<input>
<expression>
<table>
<property>/controls/engines/engine[0]/throttle-pos</property>
@ -113,7 +113,7 @@
<type>gain</type>
<gain>1.0</gain>
<update-interval-secs type="double">0.05</update-interval-secs>
<input>
<input>
<expression>
<table>
<property>/controls/engines/engine[1]/throttle-pos</property>
@ -135,7 +135,7 @@
<type>gain</type>
<gain>1.0</gain>
<update-interval-secs type="double">0.05</update-interval-secs>
<input>
<input>
<expression>
<product>
<table>
@ -160,7 +160,7 @@
<type>gain</type>
<gain>1.0</gain>
<update-interval-secs type="double">0.05</update-interval-secs>
<input>
<input>
<expression>
<product>
<table>

View file

@ -16,7 +16,7 @@
<type>gain</type>
<gain>1.0</gain>
<update-interval-secs type="double">0.05</update-interval-secs>
<input>
<input>
<expression>
<table>
<property>/environment/temperature-degc</property>
@ -34,7 +34,7 @@
<type>gain</type>
<gain>1.0</gain>
<update-interval-secs type="double">0.05</update-interval-secs>
<input>
<input>
<expression>
<table>
<property>/FMGC/internal/flex</property>
@ -76,7 +76,7 @@
</condition>
<expression>
<table>
<property>/position/altitude-ft</property>
<property>/fdm/jsbsim/atmosphere/density-altitude</property>
<entry><ind> 0</ind><dep>0.035</dep></entry>
<entry><ind>42000</ind><dep>0.285</dep></entry>
</table>
@ -91,7 +91,7 @@
<type>gain</type>
<gain>1.0</gain>
<update-interval-secs type="double">0.05</update-interval-secs>
<input>
<input>
<expression>
<table>
<property>/controls/engines/engine[0]/throttle-pos</property>
@ -113,7 +113,7 @@
<type>gain</type>
<gain>1.0</gain>
<update-interval-secs type="double">0.05</update-interval-secs>
<input>
<input>
<expression>
<table>
<property>/controls/engines/engine[1]/throttle-pos</property>
@ -135,7 +135,7 @@
<type>gain</type>
<gain>1.0</gain>
<update-interval-secs type="double">0.05</update-interval-secs>
<input>
<input>
<expression>
<product>
<table>
@ -160,7 +160,7 @@
<type>gain</type>
<gain>1.0</gain>
<update-interval-secs type="double">0.05</update-interval-secs>
<input>
<input>
<expression>
<product>
<table>
@ -184,12 +184,12 @@
<name>EPR Scale</name>
<type>gain</type>
<gain>1.0</gain>
<input>
<input>
<expression>
<table>
<property>/position/altitude-ft</property>
<property>/fdm/jsbsim/atmosphere/density-altitude</property>
<entry><ind> 0</ind><dep>0.576</dep></entry>
<entry><ind>42000</ind><dep>1.076</dep></entry>
<entry><ind>42000</ind><dep>0.876</dep></entry>
</table>
</expression>
</input>
@ -197,19 +197,61 @@
</filter>
<filter>
<name>EPR Scale 2</name>
<name>Alpha Normalizer</name>
<type>gain</type>
<gain>1.0</gain>
<input>
<input>
<condition>
<equals>
<property>/gear/gear[0]/wow</property>
<value>0</value>
</equals>
</condition>
<property>/fdm/jsbsim/aero/alpha-deg</property>
</input>
<input>0</input>
<output>/fdm/jsbsim/aero/alpha-deg-norm</output>
</filter>
<filter>
<name>EPR Scale 2 Sum/Difference</name>
<type>gain</type>
<gain>1.0</gain>
<input>
<expression>
<table>
<property>/position/altitude-ft</property>
<entry><ind> 0</ind><dep>0.988</dep></entry>
<entry><ind>42000</ind><dep>0.708</dep></entry>
</table>
<difference>
<table>
<property>/fdm/jsbsim/atmosphere/density-altitude</property>
<entry><ind> 0</ind><dep>0.988</dep></entry>
<entry><ind>43000</ind><dep>0.858</dep></entry>
</table>
<table>
<property>/fdm/jsbsim/velocities/mach</property>
<entry><ind>0.00</ind><dep>0.000</dep></entry>
<entry><ind>0.09</ind><dep>0.000</dep></entry>
<entry><ind>0.15</ind><dep>0.016</dep></entry>
<entry><ind>0.22</ind><dep>0.022</dep></entry>
<entry><ind>1.00</ind><dep>0.010</dep></entry>
</table>
<table>
<property>/fdm/jsbsim/aero/alpha-deg-norm</property>
<entry><ind> 0.0</ind><dep> 0.00</dep></entry>
<entry><ind> 2.0</ind><dep> 0.00</dep></entry>
<entry><ind> 17.0</ind><dep> 0.06</dep></entry>
</table>
</difference>
</expression>
</input>
<output>/engines/epr-scale-b-cmd</output>
</filter>
<filter>
<name>EPR Scale 2 Sum/Difference Exponential</name>
<type>exponential</type>
<gain>1.0</gain>
<input>/engines/epr-scale-b-cmd</input>
<output>/engines/epr-scale-b</output>
<filter-time>0.32</filter-time>
</filter>
<!-- -->
@ -218,7 +260,7 @@
<name>EPR N1 Input Engine 1</name>
<type>gain</type>
<gain>1.0</gain>
<input>
<input>
<expression>
<product>
<property>/engines/engine[0]/n1-actual</property>
@ -237,7 +279,7 @@
<name>EPR N1 Input Engine 2</name>
<type>gain</type>
<gain>1.0</gain>
<input>
<input>
<expression>
<product>
<property>/engines/engine[1]/n1-actual</property>
@ -256,7 +298,7 @@
<name>EPR THR Input Engine 1</name>
<type>gain</type>
<gain>1.0</gain>
<input>
<input>
<expression>
<product>
<table>
@ -283,7 +325,7 @@
<name>EPR THR Input Engine 2</name>
<type>gain</type>
<gain>1.0</gain>
<input>
<input>
<expression>
<product>
<table>
@ -310,7 +352,7 @@
<name>EPR THR Input Flex</name>
<type>gain</type>
<gain>1.0</gain>
<input>
<input>
<expression>
<product>
<table>

View file

@ -165,6 +165,8 @@
</expression>
</input>
<output>/FMGC/internal/mng-alt-spd</output>
<min>250</min>
<max>345</max>
</filter>
<filter>
@ -178,7 +180,7 @@
<table>
<property>/instrumentation/altimeter/indicated-altitude-ft</property>
<entry><ind>20000</ind><dep>0.625</dep></entry>
<entry><ind>42000</ind><dep>0.825</dep></entry>
<entry><ind>42000</ind><dep>0.805</dep></entry>
</table>
<table>
<property>/FMGC/internal/cost-index</property>
@ -189,6 +191,8 @@
</expression>
</input>
<output>/FMGC/internal/mng-alt-mach</output>
<min>0.500</min>
<max>0.815</max>
</filter>
<filter>

View file

@ -1 +1 @@
4200
4201