Various code cleanup, thrust limits now change to TOGA, MCT, and CLB, yellow limits added to EAD

This commit is contained in:
Joshua Davidson 2017-04-25 14:41:13 -04:00
parent d6018aeb7c
commit 27e6409824
13 changed files with 333 additions and 33610 deletions

View file

@ -75,7 +75,7 @@
<nasal> <nasal>
<A320> <A320>
<file>Aircraft/A320Family/Nasal/systems.nas</file> <file>Aircraft/A320Family/Nasal/various.nas</file>
<file>Aircraft/A320Family/Nasal/a319livery.nas</file> <file>Aircraft/A320Family/Nasal/a319livery.nas</file>
<file>Aircraft/A320Family/Models/Instruments/ND/ND.nas</file> <file>Aircraft/A320Family/Models/Instruments/ND/ND.nas</file>
<file>Aircraft/A320Family/Nasal/gpws.nas</file> <file>Aircraft/A320Family/Nasal/gpws.nas</file>

View file

@ -68,7 +68,7 @@
<nasal> <nasal>
<A320> <A320>
<file>Aircraft/A320Family/Nasal/systems.nas</file> <file>Aircraft/A320Family/Nasal/various.nas</file>
<file>Aircraft/A320Family/Nasal/a320livery.nas</file> <file>Aircraft/A320Family/Nasal/a320livery.nas</file>
<file>Aircraft/A320Family/Models/Instruments/ND/ND.nas</file> <file>Aircraft/A320Family/Models/Instruments/ND/ND.nas</file>
<file>Aircraft/A320Family/Nasal/gpws.nas</file> <file>Aircraft/A320Family/Nasal/gpws.nas</file>

View file

@ -68,7 +68,7 @@
<nasal> <nasal>
<A320> <A320>
<file>Aircraft/A320Family/Nasal/systems.nas</file> <file>Aircraft/A320Family/Nasal/various.nas</file>
<file>Aircraft/A320Family/Nasal/a321livery.nas</file> <file>Aircraft/A320Family/Nasal/a321livery.nas</file>
<file>Aircraft/A320Family/Models/Instruments/ND/ND.nas</file> <file>Aircraft/A320Family/Models/Instruments/ND/ND.nas</file>
<file>Aircraft/A320Family/Nasal/gpws.nas</file> <file>Aircraft/A320Family/Nasal/gpws.nas</file>

View file

@ -74,7 +74,7 @@
<nasal> <nasal>
<A320> <A320>
<file>Aircraft/A320Family/Nasal/systems.nas</file> <file>Aircraft/A320Family/Nasal/various.nas</file>
<file>Aircraft/A320Family/Nasal/acjlivery.nas</file> <file>Aircraft/A320Family/Nasal/acjlivery.nas</file>
<file>Aircraft/A320Family/Models/Instruments/ND/ND.nas</file> <file>Aircraft/A320Family/Models/Instruments/ND/ND.nas</file>
<file>Aircraft/A320Family/Nasal/gpws.nas</file> <file>Aircraft/A320Family/Nasal/gpws.nas</file>

File diff suppressed because it is too large Load diff

View file

@ -11,11 +11,11 @@
<condition> <condition>
<and> <and>
<not-equals> <not-equals>
<property>controls/engines/engine-start-switch</property> <property>/controls/engines/engine-start-switch</property>
<value>2</value> <value>2</value>
</not-equals> </not-equals>
<less-than> <less-than>
<property>engines/engine[0]/n2</property> <property>/engines/engine[0]/n2</property>
<value>5</value> <value>5</value>
</less-than> </less-than>
</and> </and>
@ -29,11 +29,11 @@
<condition> <condition>
<and> <and>
<not-equals> <not-equals>
<property>controls/engines/engine-start-switch</property> <property>/controls/engines/engine-start-switch</property>
<value>2</value> <value>2</value>
</not-equals> </not-equals>
<less-than> <less-than>
<property>engines/engine[1]/n2</property> <property>/engines/engine[1]/n2</property>
<value>5</value> <value>5</value>
</less-than> </less-than>
</and> </and>
@ -46,7 +46,7 @@
<object-name>XX3</object-name> <object-name>XX3</object-name>
<condition> <condition>
<less-than> <less-than>
<property>engines/engine[0]/n1</property> <property>/engines/engine[0]/n1</property>
<value>20</value> <value>20</value>
</less-than> </less-than>
</condition> </condition>
@ -58,7 +58,7 @@
<object-name>XX4</object-name> <object-name>XX4</object-name>
<condition> <condition>
<less-than> <less-than>
<property>engines/engine[1]/n1</property> <property>/engines/engine[1]/n1</property>
<value>20</value> <value>20</value>
</less-than> </less-than>
</condition> </condition>
@ -70,8 +70,8 @@
<object-name>n11</object-name> <object-name>n11</object-name>
<condition> <condition>
<greater-than-equals> <greater-than-equals>
<property>engines/engine[0]/n1</property> <property>/engines/engine[0]/n1</property>
<value>20</value> <value>15</value>
</greater-than-equals> </greater-than-equals>
</condition> </condition>
</animation> </animation>
@ -82,8 +82,8 @@
<object-name>n12</object-name> <object-name>n12</object-name>
<condition> <condition>
<greater-than-equals> <greater-than-equals>
<property>engines/engine[1]/n1</property> <property>/engines/engine[1]/n1</property>
<value>20</value> <value>15</value>
</greater-than-equals> </greater-than-equals>
</condition> </condition>
</animation> </animation>
@ -93,17 +93,18 @@
<object-name>osgtext-green1</object-name> <object-name>osgtext-green1</object-name>
<object-name>epr1</object-name> <object-name>epr1</object-name>
<object-name>egt1</object-name> <object-name>egt1</object-name>
<object-name>eprlimy1</object-name>
<object-name>thrpos1</object-name> <object-name>thrpos1</object-name>
<object-name>rev1.g</object-name> <object-name>rev1.g</object-name>
<object-name>rev1.y</object-name> <object-name>rev1.y</object-name>
<condition> <condition>
<or> <or>
<equals> <equals>
<property>controls/engines/engine-start-switch</property> <property>/controls/engines/engine-start-switch</property>
<value>2</value> <value>2</value>
</equals> </equals>
<greater-than-equals> <greater-than-equals>
<property>engines/engine[0]/n2</property> <property>/engines/engine[0]/n2</property>
<value>5</value> <value>5</value>
</greater-than-equals> </greater-than-equals>
</or> </or>
@ -115,17 +116,18 @@
<object-name>osgtext-green2</object-name> <object-name>osgtext-green2</object-name>
<object-name>epr2</object-name> <object-name>epr2</object-name>
<object-name>egt2</object-name> <object-name>egt2</object-name>
<object-name>eprlimy2</object-name>
<object-name>thrpos2</object-name> <object-name>thrpos2</object-name>
<object-name>rev2.g</object-name> <object-name>rev2.g</object-name>
<object-name>rev2.y</object-name> <object-name>rev2.y</object-name>
<condition> <condition>
<or> <or>
<equals> <equals>
<property>controls/engines/engine-start-switch</property> <property>/controls/engines/engine-start-switch</property>
<value>2</value> <value>2</value>
</equals> </equals>
<greater-than-equals> <greater-than-equals>
<property>engines/engine[1]/n2</property> <property>/engines/engine[1]/n2</property>
<value>5</value> <value>5</value>
</greater-than-equals> </greater-than-equals>
</or> </or>
@ -137,7 +139,7 @@
<object-name>thrpos1</object-name> <object-name>thrpos1</object-name>
<condition> <condition>
<less-than> <less-than>
<property>engines/engine[0]/reverser-pos-norm</property> <property>/engines/engine[0]/reverser-pos-norm</property>
<value>0.01</value> <value>0.01</value>
</less-than> </less-than>
</condition> </condition>
@ -148,7 +150,7 @@
<object-name>thrpos2</object-name> <object-name>thrpos2</object-name>
<condition> <condition>
<less-than> <less-than>
<property>engines/engine[1]/reverser-pos-norm</property> <property>/engines/engine[1]/reverser-pos-norm</property>
<value>0.01</value> <value>0.01</value>
</less-than> </less-than>
</condition> </condition>
@ -160,11 +162,11 @@
<condition> <condition>
<and> <and>
<greater-than> <greater-than>
<property>engines/engine[0]/reverser-pos-norm</property> <property>/engines/engine[0]/reverser-pos-norm</property>
<value>0.01</value> <value>0.01</value>
</greater-than> </greater-than>
<less-than> <less-than>
<property>engines/engine[0]/reverser-pos-norm</property> <property>/engines/engine[0]/reverser-pos-norm</property>
<value>0.9500000001</value> <value>0.9500000001</value>
</less-than> </less-than>
</and> </and>
@ -177,11 +179,11 @@
<condition> <condition>
<and> <and>
<greater-than> <greater-than>
<property>engines/engine[1]/reverser-pos-norm</property> <property>/engines/engine[1]/reverser-pos-norm</property>
<value>0.01</value> <value>0.01</value>
</greater-than> </greater-than>
<less-than> <less-than>
<property>engines/engine[1]/reverser-pos-norm</property> <property>/engines/engine[1]/reverser-pos-norm</property>
<value>0.9500000001</value> <value>0.9500000001</value>
</less-than> </less-than>
</and> </and>
@ -193,7 +195,7 @@
<object-name>rev1.g</object-name> <object-name>rev1.g</object-name>
<condition> <condition>
<greater-than> <greater-than>
<property>engines/engine[0]/reverser-pos-norm</property> <property>/engines/engine[0]/reverser-pos-norm</property>
<value>0.95</value> <value>0.95</value>
</greater-than> </greater-than>
</condition> </condition>
@ -204,7 +206,7 @@
<object-name>rev2.g</object-name> <object-name>rev2.g</object-name>
<condition> <condition>
<greater-than> <greater-than>
<property>engines/engine[1]/reverser-pos-norm</property> <property>/engines/engine[1]/reverser-pos-norm</property>
<value>0.95</value> <value>0.95</value>
</greater-than> </greater-than>
</condition> </condition>
@ -335,7 +337,7 @@
<axis-alignment>yz-plane</axis-alignment> <axis-alignment>yz-plane</axis-alignment>
<type type="string">number-value</type> <type type="string">number-value</type>
<format type="string">%1.3f</format> <format type="string">%1.3f</format>
<property>engines/engine/epr-actual</property> <property>/engines/engine/epr-actual</property>
<truncate type="bool">false</truncate> <truncate type="bool">false</truncate>
<font type="string">helvetica_bold.txf</font> <font type="string">helvetica_bold.txf</font>
<draw-text type="bool">true</draw-text> <draw-text type="bool">true</draw-text>
@ -359,7 +361,7 @@
<axis-alignment>yz-plane</axis-alignment> <axis-alignment>yz-plane</axis-alignment>
<type type="string">number-value</type> <type type="string">number-value</type>
<format type="string">%1.3f</format> <format type="string">%1.3f</format>
<property>engines/engine[1]/epr-actual</property> <property>/engines/engine[1]/epr-actual</property>
<truncate type="bool">false</truncate> <truncate type="bool">false</truncate>
<font type="string">helvetica_bold.txf</font> <font type="string">helvetica_bold.txf</font>
<draw-text type="bool">true</draw-text> <draw-text type="bool">true</draw-text>
@ -577,7 +579,7 @@
<axis-alignment>yz-plane</axis-alignment> <axis-alignment>yz-plane</axis-alignment>
<type type="string">number-value</type> <type type="string">number-value</type>
<format type="string">%4.0f</format> <format type="string">%4.0f</format>
<property>engines/engine/egt-actual</property> <property>/engines/engine/egt-actual</property>
<truncate type="bool">false</truncate> <truncate type="bool">false</truncate>
<font type="string">helvetica_bold.txf</font> <font type="string">helvetica_bold.txf</font>
<draw-text type="bool">true</draw-text> <draw-text type="bool">true</draw-text>
@ -601,7 +603,7 @@
<axis-alignment>yz-plane</axis-alignment> <axis-alignment>yz-plane</axis-alignment>
<type type="string">number-value</type> <type type="string">number-value</type>
<format type="string">%4.0f</format> <format type="string">%4.0f</format>
<property>engines/engine[1]/egt-actual</property> <property>/engines/engine[1]/egt-actual</property>
<truncate type="bool">false</truncate> <truncate type="bool">false</truncate>
<font type="string">helvetica_bold.txf</font> <font type="string">helvetica_bold.txf</font>
<draw-text type="bool">true</draw-text> <draw-text type="bool">true</draw-text>
@ -675,7 +677,7 @@
<axis-alignment>yz-plane</axis-alignment> <axis-alignment>yz-plane</axis-alignment>
<type type="string">number-value</type> <type type="string">number-value</type>
<format type="string">%3.1f</format> <format type="string">%3.1f</format>
<property>engines/engine/n1</property> <property>/engines/engine/n1</property>
<truncate type="bool">false</truncate> <truncate type="bool">false</truncate>
<font type="string">helvetica_bold.txf</font> <font type="string">helvetica_bold.txf</font>
<draw-text type="bool">true</draw-text> <draw-text type="bool">true</draw-text>
@ -699,7 +701,7 @@
<axis-alignment>yz-plane</axis-alignment> <axis-alignment>yz-plane</axis-alignment>
<type type="string">number-value</type> <type type="string">number-value</type>
<format type="string">%3.1f</format> <format type="string">%3.1f</format>
<property>engines/engine[1]/n1</property> <property>/engines/engine[1]/n1</property>
<truncate type="bool">false</truncate> <truncate type="bool">false</truncate>
<font type="string">helvetica_bold.txf</font> <font type="string">helvetica_bold.txf</font>
<draw-text type="bool">true</draw-text> <draw-text type="bool">true</draw-text>
@ -773,7 +775,7 @@
<axis-alignment>yz-plane</axis-alignment> <axis-alignment>yz-plane</axis-alignment>
<type type="string">number-value</type> <type type="string">number-value</type>
<format type="string">%3.1f</format> <format type="string">%3.1f</format>
<property>engines/engine/n2</property> <property>/engines/engine/n2</property>
<truncate type="bool">false</truncate> <truncate type="bool">false</truncate>
<font type="string">helvetica_bold.txf</font> <font type="string">helvetica_bold.txf</font>
<draw-text type="bool">true</draw-text> <draw-text type="bool">true</draw-text>
@ -797,7 +799,7 @@
<axis-alignment>yz-plane</axis-alignment> <axis-alignment>yz-plane</axis-alignment>
<type type="string">number-value</type> <type type="string">number-value</type>
<format type="string">%3.1f</format> <format type="string">%3.1f</format>
<property>engines/engine[1]/n2</property> <property>/engines/engine[1]/n2</property>
<truncate type="bool">false</truncate> <truncate type="bool">false</truncate>
<font type="string">helvetica_bold.txf</font> <font type="string">helvetica_bold.txf</font>
<draw-text type="bool">true</draw-text> <draw-text type="bool">true</draw-text>
@ -871,7 +873,7 @@
<axis-alignment>yz-plane</axis-alignment> <axis-alignment>yz-plane</axis-alignment>
<type type="string">text-value</type> <type type="string">text-value</type>
<format type="string">%s</format> <format type="string">%s</format>
<property>controls/engines/thrust-limit</property> <property>/controls/engines/thrust-limit</property>
<truncate type="bool">false</truncate> <truncate type="bool">false</truncate>
<font type="string">helvetica_bold.txf</font> <font type="string">helvetica_bold.txf</font>
<draw-text type="bool">true</draw-text> <draw-text type="bool">true</draw-text>
@ -895,7 +897,7 @@
<axis-alignment>yz-plane</axis-alignment> <axis-alignment>yz-plane</axis-alignment>
<type type="string">number-value</type> <type type="string">number-value</type>
<format type="string">%1.3f</format> <format type="string">%1.3f</format>
<property>controls/engines/epr-limit</property> <property>/controls/engines/epr-limit</property>
<truncate type="bool">false</truncate> <truncate type="bool">false</truncate>
<font type="string">helvetica_bold.txf</font> <font type="string">helvetica_bold.txf</font>
<draw-text type="bool">true</draw-text> <draw-text type="bool">true</draw-text>
@ -921,7 +923,7 @@
<axis-alignment>yz-plane</axis-alignment> <axis-alignment>yz-plane</axis-alignment>
<type type="string">number-value</type> <type type="string">number-value</type>
<format type="string">%4.0f</format> <format type="string">%4.0f</format>
<property>engines/engine/fuel-flow_actual</property> <property>/engines/engine/fuel-flow_actual</property>
<truncate type="bool">false</truncate> <truncate type="bool">false</truncate>
<font type="string">helvetica_bold.txf</font> <font type="string">helvetica_bold.txf</font>
<draw-text type="bool">true</draw-text> <draw-text type="bool">true</draw-text>
@ -945,7 +947,7 @@
<axis-alignment>yz-plane</axis-alignment> <axis-alignment>yz-plane</axis-alignment>
<type type="string">number-value</type> <type type="string">number-value</type>
<format type="string">%4.0f</format> <format type="string">%4.0f</format>
<property>engines/engine[1]/fuel-flow_actual</property> <property>/engines/engine[1]/fuel-flow_actual</property>
<truncate type="bool">false</truncate> <truncate type="bool">false</truncate>
<font type="string">helvetica_bold.txf</font> <font type="string">helvetica_bold.txf</font>
<draw-text type="bool">true</draw-text> <draw-text type="bool">true</draw-text>
@ -1039,7 +1041,7 @@
<animation> <animation>
<type>rotate</type> <type>rotate</type>
<object-name>epr1</object-name> <object-name>epr1</object-name>
<property>engines/engine/epr-actual</property> <property>/engines/engine/epr-actual</property>
<interpolation> <interpolation>
<entry><ind>0.8</ind><dep> 0</dep></entry> <entry><ind>0.8</ind><dep> 0</dep></entry>
<entry><ind>1.0</ind><dep> 05</dep></entry> <entry><ind>1.0</ind><dep> 05</dep></entry>
@ -1063,7 +1065,55 @@
<animation> <animation>
<type>rotate</type> <type>rotate</type>
<object-name>epr2</object-name> <object-name>epr2</object-name>
<property>engines/engine[1]/epr-actual</property> <property>/engines/engine[1]/epr-actual</property>
<interpolation>
<entry><ind>0.8</ind><dep> 0</dep></entry>
<entry><ind>1.0</ind><dep> 05</dep></entry>
<entry><ind>1.1</ind><dep> 33</dep></entry>
<entry><ind>1.2</ind><dep> 64</dep></entry>
<entry><ind>1.4</ind><dep>117</dep></entry>
<entry><ind>1.6</ind><dep>165</dep></entry>
</interpolation>
<center>
<x-m>0</x-m>
<y-m>-0.0042</y-m>
<z-m>0.0588</z-m>
</center>
<axis>
<x>-1</x>
<y>0</y>
<z>0</z>
</axis>
</animation>
<animation>
<type>rotate</type>
<object-name>eprlimy1</object-name>
<property>/controls/engines/epr-limit</property>
<interpolation>
<entry><ind>0.8</ind><dep> 0</dep></entry>
<entry><ind>1.0</ind><dep> 05</dep></entry>
<entry><ind>1.1</ind><dep> 33</dep></entry>
<entry><ind>1.2</ind><dep> 64</dep></entry>
<entry><ind>1.4</ind><dep>117</dep></entry>
<entry><ind>1.6</ind><dep>165</dep></entry>
</interpolation>
<center>
<x-m>0</x-m>
<y-m>-0.0598</y-m>
<z-m>0.0588</z-m>
</center>
<axis>
<x>-1</x>
<y>0</y>
<z>0</z>
</axis>
</animation>
<animation>
<type>rotate</type>
<object-name>eprlimy2</object-name>
<property>/controls/engines/epr-limit</property>
<interpolation> <interpolation>
<entry><ind>0.8</ind><dep> 0</dep></entry> <entry><ind>0.8</ind><dep> 0</dep></entry>
<entry><ind>1.0</ind><dep> 05</dep></entry> <entry><ind>1.0</ind><dep> 05</dep></entry>
@ -1087,7 +1137,7 @@
<animation> <animation>
<type>rotate</type> <type>rotate</type>
<object-name>thrpos1</object-name> <object-name>thrpos1</object-name>
<property>controls/engines/engine[0]/throttle</property> <property>/controls/engines/engine[0]/throttle</property>
<interpolation> <interpolation>
<entry><ind>0.00000</ind><dep>05</dep></entry> <entry><ind>0.00000</ind><dep>05</dep></entry>
<entry><ind>0.19560</ind><dep>33</dep></entry> <entry><ind>0.19560</ind><dep>33</dep></entry>
@ -1119,7 +1169,7 @@
<animation> <animation>
<type>rotate</type> <type>rotate</type>
<object-name>thrpos2</object-name> <object-name>thrpos2</object-name>
<property>controls/engines/engine[1]/throttle</property> <property>/controls/engines/engine[1]/throttle</property>
<interpolation> <interpolation>
<entry><ind>0.00000</ind><dep>05</dep></entry> <entry><ind>0.00000</ind><dep>05</dep></entry>
<entry><ind>0.19560</ind><dep>33</dep></entry> <entry><ind>0.19560</ind><dep>33</dep></entry>
@ -1153,7 +1203,7 @@
<animation> <animation>
<type>rotate</type> <type>rotate</type>
<object-name>egt1</object-name> <object-name>egt1</object-name>
<property>engines/engine/egt-actual</property> <property>/engines/engine/egt-actual</property>
<interpolation> <interpolation>
<entry><ind> 0</ind><dep> 0</dep></entry> <entry><ind> 0</ind><dep> 0</dep></entry>
<entry><ind>400</ind><dep> 78</dep></entry> <entry><ind>400</ind><dep> 78</dep></entry>
@ -1174,7 +1224,7 @@
<animation> <animation>
<type>rotate</type> <type>rotate</type>
<object-name>egt2</object-name> <object-name>egt2</object-name>
<property>engines/engine[1]/egt-actual</property> <property>/engines/engine[1]/egt-actual</property>
<interpolation> <interpolation>
<entry><ind> 0</ind><dep> 0</dep></entry> <entry><ind> 0</ind><dep> 0</dep></entry>
<entry><ind>400</ind><dep> 78</dep></entry> <entry><ind>400</ind><dep> 78</dep></entry>
@ -1197,9 +1247,9 @@
<animation> <animation>
<type>rotate</type> <type>rotate</type>
<object-name>n11</object-name> <object-name>n11</object-name>
<property>engines/engine/n1</property> <property>/engines/engine/n1</property>
<interpolation> <interpolation>
<entry><ind> 20</ind><dep> 0</dep></entry> <entry><ind> 23</ind><dep> 0</dep></entry>
<entry><ind> 40</ind><dep> 47</dep></entry> <entry><ind> 40</ind><dep> 47</dep></entry>
<entry><ind>100</ind><dep>159</dep></entry> <entry><ind>100</ind><dep>159</dep></entry>
<entry><ind>110</ind><dep>170</dep></entry> <entry><ind>110</ind><dep>170</dep></entry>
@ -1219,9 +1269,9 @@
<animation> <animation>
<type>rotate</type> <type>rotate</type>
<object-name>n12</object-name> <object-name>n12</object-name>
<property>engines/engine[1]/n1</property> <property>/engines/engine[1]/n1</property>
<interpolation> <interpolation>
<entry><ind> 20</ind><dep> 0</dep></entry> <entry><ind> 23</ind><dep> 0</dep></entry>
<entry><ind> 40</ind><dep> 47</dep></entry> <entry><ind> 40</ind><dep> 47</dep></entry>
<entry><ind>100</ind><dep>159</dep></entry> <entry><ind>100</ind><dep>159</dep></entry>
<entry><ind>110</ind><dep>170</dep></entry> <entry><ind>110</ind><dep>170</dep></entry>

View file

@ -2,8 +2,47 @@ AC3Db
MATERIAL "ac3dmat1" rgb 1 1 1 amb 0.2 0.2 0.2 emis 1 1 1 spec 0 0 0 shi 128 trans 0 MATERIAL "ac3dmat1" rgb 1 1 1 amb 0.2 0.2 0.2 emis 1 1 1 spec 0 0 0 shi 128 trans 0
MATERIAL "DefaultWhite.001" rgb 0 0 0 amb 0 0 0 emis 0 0 0 spec 0 0 0 shi 64 trans 0 MATERIAL "DefaultWhite.001" rgb 0 0 0 amb 0 0 0 emis 0 0 0 spec 0 0 0 shi 64 trans 0
MATERIAL "ac3dmat9" rgb 0 0.356863 0.717647 amb 0 0 0 emis 0 0.356863 0.717647 spec 0 0 0 shi 0 trans 0 MATERIAL "ac3dmat9" rgb 0 0.356863 0.717647 amb 0 0 0 emis 0 0.356863 0.717647 spec 0 0 0 shi 0 trans 0
MATERIAL "Material.001" rgb 0.8 0.5614 0 amb 1 1 1 emis 0.8 0.8 0.8 spec 0.5 0.5 0.5 shi 50 trans 0
OBJECT world OBJECT world
kids 17 kids 19
OBJECT poly
name "eprlimy2"
loc 0.000766698 0.0582223 0.0197803
texture "yellow.png"
crease 30.000002
numvert 4
0 -0.0045049 -0.00116534
0 -0.00369225 -0.00086353
0 -0.00417997 -0.00206228
0 -0.00336739 -0.00176032
numsurf 1
SURF 0x20
mat 3
refs 4
3 0 0
1 0 0
0 0 0
2 0 0
kids 0
OBJECT poly
name "eprlimy1"
loc 0.000766698 0.0582223 0.0753988
texture "yellow.png"
crease 30.000002
numvert 4
0 -0.00336739 -0.00176032
0 -0.00417997 -0.00206228
0 -0.00369225 -0.00086353
0 -0.0045049 -0.00116534
numsurf 1
SURF 0x20
mat 3
refs 4
0 0 0
2 0 0
3 0 0
1 0 0
kids 0
OBJECT poly OBJECT poly
name "flapc" name "flapc"
loc 0.000794735 0.00884851 -0.0438111 loc 0.000794735 0.00884851 -0.0438111

Binary file not shown.

After

Width:  |  Height:  |  Size: 139 B

View file

@ -65,7 +65,6 @@ setlistener("/sim/signals/fdm-initialized", func {
setprop("/it-fbw/law", 2); setprop("/it-fbw/law", 2);
update_roll.start(); update_roll.start();
update_pitch.start(); update_pitch.start();
print("AIRBUS FBW ... Done!");
}); });
setlistener("/systems/electrical/bus/ac-ess", func { setlistener("/systems/electrical/bus/ac-ess", func {

View file

@ -1,168 +0,0 @@
# AIRBUS A320 SYSTEMS FILE
##########################
## LIGHTS
#########
# create all lights
var beacon_switch = props.globals.getNode("controls/switches/beacon", 2);
var beacon = aircraft.light.new("sim/model/lights/beacon", [0.015, 3], "controls/lighting/beacon");
var strobe_switch = props.globals.getNode("controls/switches/strobe", 2);
var strobe = aircraft.light.new("sim/model/lights/strobe", [0.025, 1.5], "controls/lighting/strobe");
# logo lights listener
setlistener("controls/lighting/nav-lights-switch", func
{
var nav_lights = props.globals.getNode("sim/model/lights/nav-lights");
var logo_lights = props.globals.getNode("sim/model/lights/logo-lights");
var setting = getprop("controls/lighting/nav-lights-switch");
if (setting == 1)
{
nav_lights.setBoolValue(1);
logo_lights.setBoolValue(0);
}
elsif (setting == 2)
{
nav_lights.setBoolValue(1);
logo_lights.setBoolValue(1);
}
else
{
nav_lights.setBoolValue(0);
logo_lights.setBoolValue(0);
}
});
setlistener("controls/lighting/landing-lights[1]", func
{
var landl = getprop("controls/lighting/landing-lights[1]");
if (landl == 1) {
setprop("sim/rendering/als-secondary-lights/alt-landing-light",1);
} else {
setprop("sim/rendering/als-secondary-lights/alt-landing-light",0);
}
});
setlistener("controls/lighting/landing-lights[2]", func
{
var landr = getprop("controls/lighting/landing-lights[2]");
if (landr == 1) {
setprop("sim/rendering/als-secondary-lights/use-alt-landing-light",1);
} else {
setprop("sim/rendering/als-secondary-lights/use-alt-landing-light",0);
}
});
## TIRE SMOKE/RAIN
##################
var tiresmoke_system = aircraft.tyresmoke_system.new(0, 1, 2);
aircraft.rain.init();
## SOUNDS
#########
# seatbelt/no smoking/detent sign triggers
setlistener("/controls/switches/seatbelt-sign", func
{
props.globals.getNode("/sim/sounde/seatbelt-sign").setBoolValue(1);
settimer(func
{
props.globals.getNode("/sim/sounde/seatbelt-sign").setBoolValue(0);
}, 2);
});
setlistener("/controls/switches/no-smoking-sign", func
{
props.globals.getNode("/sim/sounde/no-smoking-sign").setBoolValue(1);
settimer(func
{
props.globals.getNode("/sim/sounde/no-smoking-sign").setBoolValue(0);
}, 2);
});
## GEAR
#######
# prevent retraction of the landing gear when any of the wheels are compressed
setlistener("controls/gear/gear-down", func
{
var down = props.globals.getNode("controls/gear/gear-down").getBoolValue();
if (!down and (getprop("gear/gear[0]/wow") or getprop("gear/gear[1]/wow") or getprop("gear/gear[2]/wow")))
{
props.globals.getNode("controls/gear/gear-down").setBoolValue(1);
}
});
## DOORS
########
# create all doors
# front doors
var doorl1 = aircraft.door.new("sim/model/door-positions/doorl1", 2);
var doorr1 = aircraft.door.new("sim/model/door-positions/doorr1", 2);
# middle doors (A321 only)
var doorl2 = aircraft.door.new("sim/model/door-positions/doorl2", 2);
var doorr2 = aircraft.door.new("sim/model/door-positions/doorr2", 2);
var doorl3 = aircraft.door.new("sim/model/door-positions/doorl3", 2);
var doorr3 = aircraft.door.new("sim/model/door-positions/doorr3", 2);
# rear doors
var doorl4 = aircraft.door.new("sim/model/door-positions/doorl4", 2);
var doorr4 = aircraft.door.new("sim/model/door-positions/doorr4", 2);
# cargo holds
var cargobulk = aircraft.door.new("sim/model/door-positions/cargobulk", 2.5);
var cargoaft = aircraft.door.new("sim/model/door-positions/cargoaft", 2.5);
var cargofwd = aircraft.door.new("sim/model/door-positions/cargofwd", 2.5);
# seat armrests in the flight deck
var armrests = aircraft.door.new("sim/model/door-positions/armrests", 2);
# door opener/closer
var triggerDoor = func(door, doorName, doorDesc)
{
if (getprop("sim/model/door-positions/" ~ doorName ~ "/position-norm") > 0)
{
gui.popupTip("Closing " ~ doorDesc ~ " door");
door.toggle();
}
else
{
if (getprop("velocities/groundspeed-kt") > 5)
{
gui.popupTip("You cannot open the doors while the aircraft is moving");
}
else
{
gui.popupTip("Opening " ~ doorDesc ~ " door");
door.toggle();
}
}
};
setlistener("/sim/signals/fdm-initialized", func {
systems.elec_init();
systems.adirs_init();
systems.pneumatics_init();
itaf.ap_init();
var autopilot = gui.Dialog.new("sim/gui/dialogs/autopilot/dialog", "Aircraft/A320Family/Systems/autopilot-dlg.xml");
setprop("/it-autoflight/input/fd1", 1);
setprop("/it-autoflight/input/fd2", 1);
});
var aglgears = func {
var agl = getprop("/position/altitude-agl-ft") or 0;
var aglft = agl - 11.102; # is the position from the Airbus A320 above ground
var aglm = aglft * 0.3048;
setprop("/position/gear-agl-ft", aglft);
setprop("/position/gear-agl-m", aglm);
settimer(aglgears, 0.01);
}
aglgears();

View file

@ -5,14 +5,13 @@
setlistener("/sim/signals/fdm-initialized", func { setlistener("/sim/signals/fdm-initialized", func {
setprop("/controls/engines/thrust-limit", "TOGA"); setprop("/controls/engines/thrust-limit", "TOGA");
setprop("/controls/engines/epr-limit", 1.301); setprop("/controls/engines/epr-limit", 1.308);
setprop("/controls/engines/n1-limit", 97.8); setprop("/controls/engines/n1-limit", 101.9);
setprop("/systems/thrust/state1", "IDLE"); setprop("/systems/thrust/state1", "IDLE");
setprop("/systems/thrust/state2", "IDLE"); setprop("/systems/thrust/state2", "IDLE");
setprop("/systems/thrust/lvrclb", "0"); setprop("/systems/thrust/lvrclb", "0");
setprop("/systems/thrust/clbreduc-ft", "1500"); setprop("/systems/thrust/clbreduc-ft", "1500");
lvrclbt.start(); thrustt.start();
print("FADEC ... Done!")
}); });
setlistener("/controls/engines/engine[0]/throttle-pos", func { setlistener("/controls/engines/engine[0]/throttle-pos", func {
@ -74,7 +73,41 @@ var atoff_request = func {
} }
} }
var lvrclb = func { setlistener("/systems/thrust/state1", func {
thrust_lim();
});
setlistener("/systems/thrust/state2", func {
thrust_lim();
});
var thrust_lim = func {
var state1 = getprop("/systems/thrust/state1");
var state2 = getprop("/systems/thrust/state2");
var thr1 = getprop("/controls/engines/engine[0]/throttle-pos");
var thr2 = getprop("/controls/engines/engine[0]/throttle-pos");
if (getprop("/gear/gear[1]/wow") == 0 and getprop("/gear/gear[2]/wow") == 0) {
if (state1 == "TOGA" or state2 == "TOGA" or (state1 == "MAN THR" and thr1 >= 0.83) or (state2 == "MAN THR" and thr2 >= 0.83)) {
setprop("/controls/engines/thrust-limit", "TOGA");
setprop("/controls/engines/epr-limit", 1.308);
setprop("/controls/engines/n1-limit", 101.8);
} else if (state1 == "MCT" or state2 == "MCT" or (state1 == "MAN THR" and thr1 < 0.83) or (state2 == "MAN THR" and thr2 < 0.83)) {
setprop("/controls/engines/thrust-limit", "MCT");
setprop("/controls/engines/epr-limit", 1.293);
setprop("/controls/engines/n1-limit", 97.7);
} else if (state1 == "CL" or state2 == "CL" or state1 == "MAN" or state2 == "MAN" or state1 == "IDLE" or state2 == "IDLE") {
setprop("/controls/engines/thrust-limit", "CLB");
setprop("/controls/engines/epr-limit", 1.271);
setprop("/controls/engines/n1-limit", 91.9);
}
} else {
setprop("/controls/engines/thrust-limit", "TOGA");
setprop("/controls/engines/epr-limit", 1.308);
setprop("/controls/engines/n1-limit", 101.9);
}
}
var thrust_loop = func {
var state1 = getprop("/systems/thrust/state1"); var state1 = getprop("/systems/thrust/state1");
var state2 = getprop("/systems/thrust/state2"); var state2 = getprop("/systems/thrust/state2");
if ((state1 == "CL") and (state2 == "CL")) { if ((state1 == "CL") and (state2 == "CL")) {
@ -85,7 +118,7 @@ var lvrclb = func {
if (getprop("/systems/thrust/state1") == "MAN" or getprop("/systems/thrust/state2") == "MAN") { if (getprop("/systems/thrust/state1") == "MAN" or getprop("/systems/thrust/state2") == "MAN") {
setprop("/systems/thrust/lvrclb", "1"); setprop("/systems/thrust/lvrclb", "1");
} else { } else {
if (getprop("/instrumentation/altimeter/indicated-altitude-ft") >= getprop("/systems/thrust/clbreduc-ft")) { if (getprop("/position/gear-agl-ft") >= getprop("/systems/thrust/clbreduc-ft")) {
setprop("/systems/thrust/lvrclb", "1"); setprop("/systems/thrust/lvrclb", "1");
} else { } else {
setprop("/systems/thrust/lvrclb", "0"); setprop("/systems/thrust/lvrclb", "0");
@ -98,4 +131,4 @@ var lvrclb = func {
} }
# Timers # Timers
var lvrclbt = maketimer(0.5, lvrclb); var thrustt = maketimer(0.5, thrust_loop);

155
Nasal/various.nas Normal file
View file

@ -0,0 +1,155 @@
# A320 Various
# Joshua Davidson (it0uchpods)
# :)
print(" ____ ___ ___ ______ _ _ ");
print(" /\ |___ \__ \ / _ \| ____| (_) | ");
print(" / \ __) | ) | | | | |__ __ _ _ __ ___ _| |_ _ ");
print(" / /\ \ |__ < / /| | | | __/ _` | '_ ` _ \| | | | | |");
print(" / ____ \ ___) / /_| |_| | | | (_| | | | | | | | | |_| |");
print("/_/ \_\____/____|\___/|_| \__,_|_| |_| |_|_|_|\__, |");
print(" __/ |");
print(" |___/ ");
print("-----------------------------------------------------------------------");
print("(c) 2016-2017 Joshua Davidson, and The it0uchpods Development Group");
print("Report all bugs on GitHub Issues tab, or the forums. :)");
print("If you are reading this, you are awesome!");
print("-----------------------------------------------------------------------");
print(" ");
##########
# Lights #
##########
var beacon_switch = props.globals.getNode("/controls/switches/beacon", 2);
var beacon = aircraft.light.new("/sim/model/lights/beacon", [0.015, 3], "/controls/lighting/beacon");
var strobe_switch = props.globals.getNode("/controls/switches/strobe", 2);
var strobe = aircraft.light.new("/sim/model/lights/strobe", [0.025, 1.5], "/controls/lighting/strobe");
setlistener("controls/lighting/nav-lights-switch", func {
var nav_lights = props.globals.getNode("/sim/model/lights/nav-lights");
var logo_lights = props.globals.getNode("/sim/model/lights/logo-lights");
var setting = getprop("/controls/lighting/nav-lights-switch");
if (setting == 1) {
nav_lights.setBoolValue(1);
logo_lights.setBoolValue(0);
} else if (setting == 2) {
nav_lights.setBoolValue(1);
logo_lights.setBoolValue(1);
} else {
nav_lights.setBoolValue(0);
logo_lights.setBoolValue(0);
}
});
setlistener("controls/lighting/landing-lights[1]", func {
var landl = getprop("/controls/lighting/landing-lights[1]");
if (landl == 1) {
setprop("/sim/rendering/als-secondary-lights/alt-landing-light",1);
} else {
setprop("/sim/rendering/als-secondary-lights/alt-landing-light",0);
}
});
setlistener("controls/lighting/landing-lights[2]", func {
var landr = getprop("/controls/lighting/landing-lights[2]");
if (landr == 1) {
setprop("/sim/rendering/als-secondary-lights/use-alt-landing-light",1);
} else {
setprop("/sim/rendering/als-secondary-lights/use-alt-landing-light",0);
}
});
###################
# Tire Smoke/Rain #
###################
var tiresmoke_system = aircraft.tyresmoke_system.new(0, 1, 2);
aircraft.rain.init();
##########
# Sounds #
##########
setlistener("/controls/switches/seatbelt-sign", func {
props.globals.getNode("/sim/sounde/seatbelt-sign").setBoolValue(1);
settimer(func {
props.globals.getNode("/sim/sounde/seatbelt-sign").setBoolValue(0);
}, 2);
});
setlistener("/controls/switches/no-smoking-sign", func {
props.globals.getNode("/sim/sounde/no-smoking-sign").setBoolValue(1);
settimer(func {
props.globals.getNode("/sim/sounde/no-smoking-sign").setBoolValue(0);
}, 2);
});
##################
# Gear and Doors #
##################
setlistener("/controls/gear/gear-down", func {
var down = props.globals.getNode("/controls/gear/gear-down").getBoolValue();
if (!down and (getprop("/gear/gear[0]/wow") or getprop("/gear/gear[1]/wow") or getprop("/gear/gear[2]/wow"))) {
props.globals.getNode("/controls/gear/gear-down").setBoolValue(1);
}
});
# Front doors
var doorl1 = aircraft.door.new("/sim/model/door-positions/doorl1", 2);
var doorr1 = aircraft.door.new("/sim/model/door-positions/doorr1", 2);
# Middle doors (A321 only)
var doorl2 = aircraft.door.new("/sim/model/door-positions/doorl2", 2);
var doorr2 = aircraft.door.new("/sim/model/door-positions/doorr2", 2);
var doorl3 = aircraft.door.new("/sim/model/door-positions/doorl3", 2);
var doorr3 = aircraft.door.new("/sim/model/door-positions/doorr3", 2);
# Rear doors
var doorl4 = aircraft.door.new("/sim/model/door-positions/doorl4", 2);
var doorr4 = aircraft.door.new("/sim/model/door-positions/doorr4", 2);
# Cargo holds
var cargobulk = aircraft.door.new("/sim/model/door-positions/cargobulk", 2.5);
var cargoaft = aircraft.door.new("/sim/model/door-positions/cargoaft", 2.5);
var cargofwd = aircraft.door.new("/sim/model/door-positions/cargofwd", 2.5);
# Seat armrests in the flight deck (unused)
var armrests = aircraft.door.new("/sim/model/door-positions/armrests", 2);
# door opener/closer
var triggerDoor = func(door, doorName, doorDesc) {
if (getprop("/sim/model/door-positions/" ~ doorName ~ "/position-norm") > 0) {
gui.popupTip("Closing " ~ doorDesc ~ " door");
door.toggle();
} else {
if (getprop("/velocities/groundspeed-kt") > 5) {
gui.popupTip("You cannot open the doors while the aircraft is moving!!!");
} else {
gui.popupTip("Opening " ~ doorDesc ~ " door");
door.toggle();
}
}
};
setlistener("/sim/signals/fdm-initialized", func {
systems.elec_init();
systems.adirs_init();
systems.pneumatics_init();
itaf.ap_init();
var autopilot = gui.Dialog.new("sim/gui/dialogs/autopilot/dialog", "Aircraft/A320Family/Systems/autopilot-dlg.xml");
setprop("/it-autoflight/input/fd1", 1);
setprop("/it-autoflight/input/fd2", 1);
});
var aglgears = func {
var agl = getprop("/position/altitude-agl-ft") or 0;
var aglft = agl - 11.102; # is the position from the Airbus A320 above ground
var aglm = aglft * 0.3048;
setprop("/position/gear-agl-ft", aglft);
setprop("/position/gear-agl-m", aglm);
settimer(aglgears, 0.01);
}
aglgears();

View file

@ -14,4 +14,3 @@ var walk_about = func(wa_distance) {
yViewNode.setValue(new_y_position); yViewNode.setValue(new_y_position);
} }
} }