Improve FADEC, improve EPR Calculation, make MAN THR box Amber

This commit is contained in:
Joshua Davidson 2017-05-31 18:56:52 -04:00
parent d09f27cbec
commit 78d4b67e79
6 changed files with 223 additions and 15 deletions

View file

@ -1854,9 +1854,71 @@
</font-resolution>
</text>
<text>
<name>athr-box-b-fma</name>
<offsets>
<x-m>0.00091828</x-m>
<y-m>-0.0546226</y-m>
<z-m>0.0670781</z-m>
</offsets>
<alignment>center-center</alignment>
<axis-alignment>yz-plane</axis-alignment>
<type type="string">text-value</type>
<format type="string">%s</format>
<truncate type="bool">false</truncate>
<font type="string">helvetica_medium.txf</font>
<property>/modes/pfd/fma/athr-box</property>
<draw-text type="bool">false</draw-text>
<draw-alignment type="bool">false</draw-alignment>
<draw-boundingbox type="bool">true</draw-boundingbox>
<character-size>0.020</character-size>
<font-resolution>
<width type="int">36</width>
<height type="int">36</height>
</font-resolution>
</text>
<animation>
<type>select</type>
<object-name>athr-man-fma</object-name>
<condition>
<and>
<equals>
<property>/it-autoflight/output/athr</property>
<value>1</value>
</equals>
<or>
<equals>
<property>/systems/thrust/state1</property>
<value>TOGA</value>
</equals>
<equals>
<property>/systems/thrust/state2</property>
<value>TOGA</value>
</equals>
<equals>
<property>/systems/thrust/state1</property>
<value>MCT</value>
</equals>
<equals>
<property>/systems/thrust/state2</property>
<value>MCT</value>
</equals>
<equals>
<property>/systems/thrust/state1</property>
<value>MAN THR</value>
</equals>
<equals>
<property>/systems/thrust/state2</property>
<value>MAN THR</value>
</equals>
</or>
</and>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>athr-box-fma</object-name>
<condition>
<and>
@ -1881,6 +1943,21 @@
<property>/systems/thrust/state2</property>
<value>MCT</value>
</equals>
</or>
</and>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>athr-box-b-fma</object-name>
<condition>
<and>
<equals>
<property>/it-autoflight/output/athr</property>
<value>1</value>
</equals>
<or>
<equals>
<property>/systems/thrust/state1</property>
<value>MAN THR</value>
@ -2590,4 +2667,29 @@
</emission>
</animation>
<animation>
<type>material</type>
<object-name>athr-box-b-fma</object-name>
<diffuse>
<red>1</red>
<green>0.4</green>
<blue>0</blue>
</diffuse>
<ambient>
<red>0</red>
<green>0</green>
<blue>0</blue>
</ambient>
<specular>
<red>0</red>
<green>0</green>
<blue>0</blue>
</specular>
<emission>
<red>1</red>
<green>0.4</green>
<blue>0</blue>
</emission>
</animation>
</PropertyList>

View file

@ -1854,9 +1854,71 @@
</font-resolution>
</text>
<text>
<name>athr-box-b-fma</name>
<offsets>
<x-m>0.00091828</x-m>
<y-m>-0.0546226</y-m>
<z-m>0.0670781</z-m>
</offsets>
<alignment>center-center</alignment>
<axis-alignment>yz-plane</axis-alignment>
<type type="string">text-value</type>
<format type="string">%s</format>
<truncate type="bool">false</truncate>
<font type="string">helvetica_medium.txf</font>
<property>/modes/pfd/fma/athr-box</property>
<draw-text type="bool">false</draw-text>
<draw-alignment type="bool">false</draw-alignment>
<draw-boundingbox type="bool">true</draw-boundingbox>
<character-size>0.020</character-size>
<font-resolution>
<width type="int">36</width>
<height type="int">36</height>
</font-resolution>
</text>
<animation>
<type>select</type>
<object-name>athr-man-fma</object-name>
<condition>
<and>
<equals>
<property>/it-autoflight/output/athr</property>
<value>1</value>
</equals>
<or>
<equals>
<property>/systems/thrust/state1</property>
<value>TOGA</value>
</equals>
<equals>
<property>/systems/thrust/state2</property>
<value>TOGA</value>
</equals>
<equals>
<property>/systems/thrust/state1</property>
<value>MCT</value>
</equals>
<equals>
<property>/systems/thrust/state2</property>
<value>MCT</value>
</equals>
<equals>
<property>/systems/thrust/state1</property>
<value>MAN THR</value>
</equals>
<equals>
<property>/systems/thrust/state2</property>
<value>MAN THR</value>
</equals>
</or>
</and>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>athr-box-fma</object-name>
<condition>
<and>
@ -1881,6 +1943,21 @@
<property>/systems/thrust/state2</property>
<value>MCT</value>
</equals>
</or>
</and>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>athr-box-b-fma</object-name>
<condition>
<and>
<equals>
<property>/it-autoflight/output/athr</property>
<value>1</value>
</equals>
<or>
<equals>
<property>/systems/thrust/state1</property>
<value>MAN THR</value>
@ -2590,4 +2667,29 @@
</emission>
</animation>
<animation>
<type>material</type>
<object-name>athr-box-b-fma</object-name>
<diffuse>
<red>1</red>
<green>0.4</green>
<blue>0</blue>
</diffuse>
<ambient>
<red>0</red>
<green>0</green>
<blue>0</blue>
</ambient>
<specular>
<red>0</red>
<green>0</green>
<blue>0</blue>
</specular>
<emission>
<red>1</red>
<green>0.4</green>
<blue>0</blue>
</emission>
</animation>
</PropertyList>

View file

@ -13,10 +13,10 @@ var n1_spin = 5.1;
var n2_spin = 22.8;
var n1_start = 23.3;
var n2_start = 63.6;
var egt_start = 623;
var egt_start = 507;
var n1_max = 105.8;
var n2_max = 102.1;
var egt_max = 860;
var egt_max = 712;
var n1_wm = 0;
var n2_wm = 0;
var apu_max = 99.8;

View file

@ -45,7 +45,7 @@
<entry><ind>0</ind><dep>0</dep></entry>
<entry><ind>6</ind><dep>0</dep></entry>
<entry><ind>23.4</ind><dep>323</dep></entry>
<entry><ind>110</ind><dep>760</dep></entry>
<entry><ind>110</ind><dep>690</dep></entry>
</table>
</expression>
</input>
@ -62,7 +62,7 @@
<entry><ind>0</ind><dep>0</dep></entry>
<entry><ind>6</ind><dep>0</dep></entry>
<entry><ind>23.4</ind><dep>323</dep></entry>
<entry><ind>110</ind><dep>680</dep></entry>
<entry><ind>110</ind><dep>620</dep></entry>
</table>
</expression>
</input>
@ -95,7 +95,7 @@
<entry><ind>0</ind><dep>0</dep></entry>
<entry><ind>6</ind><dep>0</dep></entry>
<entry><ind>23.4</ind><dep>323</dep></entry>
<entry><ind>110</ind><dep>760</dep></entry>
<entry><ind>110</ind><dep>690</dep></entry>
</table>
</expression>
</input>
@ -112,7 +112,7 @@
<entry><ind>0</ind><dep>0</dep></entry>
<entry><ind>6</ind><dep>0</dep></entry>
<entry><ind>23.4</ind><dep>323</dep></entry>
<entry><ind>110</ind><dep>680</dep></entry>
<entry><ind>110</ind><dep>620</dep></entry>
</table>
</expression>
</input>

View file

@ -10,8 +10,9 @@
<input>
<expression>
<table>
<property>/controls/engines/engine[0]/throttle-pos</property>
<property>/controls/engines/engine[0]/throttle-pos</property>
<entry><ind>0.00</ind><dep>0.00</dep></entry>
<entry><ind>0.01</ind><dep>0.00</dep></entry>
<entry><ind>0.60</ind><dep>0.83</dep></entry>
<entry><ind>0.65</ind><dep>0.83</dep></entry>
<entry><ind>0.78</ind><dep>0.90</dep></entry>
@ -31,8 +32,9 @@
<input>
<expression>
<table>
<property>/controls/engines/engine[1]/throttle-pos</property>
<property>/controls/engines/engine[1]/throttle-pos</property>
<entry><ind>0.00</ind><dep>0.00</dep></entry>
<entry><ind>0.01</ind><dep>0.00</dep></entry>
<entry><ind>0.60</ind><dep>0.83</dep></entry>
<entry><ind>0.65</ind><dep>0.83</dep></entry>
<entry><ind>0.78</ind><dep>0.90</dep></entry>

View file

@ -10,8 +10,9 @@
<input>
<expression>
<table>
<property>/controls/engines/engine[0]/throttle-pos</property>
<property>/controls/engines/engine[0]/throttle-pos</property>
<entry><ind>0.00</ind><dep>0.00</dep></entry>
<entry><ind>0.01</ind><dep>0.00</dep></entry>
<entry><ind>0.60</ind><dep>0.83</dep></entry>
<entry><ind>0.65</ind><dep>0.83</dep></entry>
<entry><ind>0.78</ind><dep>0.90</dep></entry>
@ -31,8 +32,9 @@
<input>
<expression>
<table>
<property>/controls/engines/engine[1]/throttle-pos</property>
<property>/controls/engines/engine[1]/throttle-pos</property>
<entry><ind>0.00</ind><dep>0.00</dep></entry>
<entry><ind>0.01</ind><dep>0.00</dep></entry>
<entry><ind>0.60</ind><dep>0.83</dep></entry>
<entry><ind>0.65</ind><dep>0.83</dep></entry>
<entry><ind>0.78</ind><dep>0.90</dep></entry>
@ -53,8 +55,8 @@
<expression>
<table>
<property>/position/altitude-ft</property>
<entry><ind> 0</ind><dep>0.344</dep></entry>
<entry><ind>42000</ind><dep>0.644</dep></entry>
<entry><ind> 0</ind><dep>0.441</dep></entry>
<entry><ind>42000</ind><dep>0.671</dep></entry>
</table>
</expression>
</input>
@ -70,9 +72,9 @@
<expression>
<table>
<property>/position/altitude-ft</property>
<entry><ind> 0</ind><dep>0.993</dep></entry>
<entry><ind>12000</ind><dep>0.979</dep></entry>
<entry><ind>41000</ind><dep>0.968</dep></entry>
<entry><ind> 0</ind><dep>0.992</dep></entry>
<entry><ind>13000</ind><dep>0.979</dep></entry>
<entry><ind>42000</ind><dep>0.969</dep></entry>
</table>
</expression>
</input>