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

Merge https://github.com/FGMEMBERS/A320Family

Browse source
This commit is contained in:
omega13a 2017-07-03 16:55:33 -07:00
commit 6b930d2ed6
21 changed files with 840 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
A320-main.xml
View file

@ -522,6 +522,7 @@
<no-smoking-sign type="bool">1</no-smoking-sign> <no-smoking-sign type="bool">1</no-smoking-sign>
<seatbelt-sign type="bool">0</seatbelt-sign> <seatbelt-sign type="bool">0</seatbelt-sign>
<annun-test>0</annun-test> <annun-test>0</annun-test>
<windowprobeheat type="double">0.5</windowprobeheat>
</switches> </switches>
</controls> </controls>

1
AircraftConfig/acconfig.nas
View file

@ -99,6 +99,7 @@ var systemsReset = func {
systems.pneu_init(); systems.pneu_init();
systems.hyd_init(); systems.hyd_init();
systems.fuel_init(); systems.fuel_init();
systems.eng_init();
fmgc.FMGCinit(); fmgc.FMGCinit();
mcdu1.MCDU_reset(); mcdu1.MCDU_reset();
mcdu2.MCDU_reset(); mcdu2.MCDU_reset();

219
Models/Instruments/OHpanel/OHpanel.xml
View file

@ -79,8 +79,10 @@
<object-name>Eng2AntiIceBtn2O</object-name> <object-name>Eng2AntiIceBtn2O</object-name>
<object-name>Eng1BleedBtn1F</object-name> <object-name>Eng1BleedBtn1F</object-name>
<object-name>Eng1BleedBtn2O</object-name> <object-name>Eng1BleedBtn2O</object-name>
<object-name>Eng1ManStartBtn2O</object-name>
<object-name>Eng2BleedBtn1F</object-name> <object-name>Eng2BleedBtn1F</object-name>
<object-name>Eng2BleedBtn2O</object-name> <object-name>Eng2BleedBtn2O</object-name>
<object-name>Eng2ManStartBtn2O</object-name>
<object-name>FuelModeBtn1F</object-name> <object-name>FuelModeBtn1F</object-name>
<object-name>FuelModeBtn2O</object-name> <object-name>FuelModeBtn2O</object-name>
<object-name>FuelXfeedBtn1A</object-name> <object-name>FuelXfeedBtn1A</object-name>
@ -3955,7 +3957,7 @@
</or> </or>
</condition> </condition>
<command>property-toggle</command> <command>property-toggle</command>
<property>/controls/deice/wing</property> <property>/controls/switches/wing</property>
</binding> </binding>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
@ -3968,10 +3970,16 @@
<type>select</type> <type>select</type>
<object-name>WingAntiIceBtn1F</object-name> <object-name>WingAntiIceBtn1F</object-name>
<condition> <condition>
<or>
<equals>
<property>/controls/switches/wingfault</property>
<value>1</value>
</equals>
<equals> <equals>
<property>/controls/switches/annun-test</property> <property>/controls/switches/annun-test</property>
<value>1</value> <value>1</value>
</equals> </equals>
</or>
</condition> </condition>
</animation> </animation>
@ -3981,7 +3989,7 @@
<condition> <condition>
<or> <or>
<equals> <equals>
<property>/controls/deice/wing</property> <property>/controls/switches/wing</property>
<value>1</value> <value>1</value>
</equals> </equals>
<equals> <equals>
@ -4323,6 +4331,213 @@
</condition> </condition>
</animation> </animation>
<!-- Manual Start -->
<animation>
<type>pick</type>
<object-name>Eng1ManStartBtn1</object-name>
<object-name>Eng1ManStartBtn2</object-name>
<object-name>Eng1ManStartBtn2O</object-name>
<action>
<button>0</button>
<repeatable>false</repeatable>
<binding>
<condition>
<and>
<equals>
<property>/controls/OH/protectors/eng1-manstart</property>
<value>1</value>
</equals>
<or>
<greater-than-equals>
<property>/systems/electrical/bus/dc1</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>/systems/electrical/bus/dc2</property>
<value>25</value>
</greater-than-equals>
</or>
</and>
</condition>
<command>property-toggle</command>
<property>/controls/engines/engine[0]/man-start</property>
</binding>
<binding>
<condition>
<equals>
<property>/controls/OH/protectors/eng1-manstart</property>
<value>1</value>
</equals>
</condition>
<command>nasal</command>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
<animation>
<type>pick</type>
<object-name>Eng1ManStartBtn1</object-name>
<object-name>Eng1ManStartBtn2</object-name>
<object-name>Eng1ManStartBtn2O</object-name>
<object-name>Eng1ManStartProt</object-name>
<action>
<button>1</button>
<repeatable>false</repeatable>
<binding>
<command>property-assign</command>
<property>/controls/OH/protectors/eng1-manstart</property>
<value>1</value>
</binding>
<mod-up>
<binding>
<command>property-assign</command>
<property>/controls/OH/protectors/eng1-manstart</property>
<value>0</value>
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/oh-cover", 1);</script>
</binding>
</mod-up>
</action>
</animation>
<animation>
<type>rotate</type>
<object-name>Eng1ManStartProt</object-name>
<property>/controls/OH/protectors/eng1-manstart</property>
<factor>-145</factor>
<axis>
<x1-m>-0.00641</x1-m>
<y1-m>0.18647</y1-m>
<z1-m>-0.20418</z1-m>
<x2-m>-0.00353</x2-m>
<y2-m>0.20925</y2-m>
<z2-m>-0.20418</z2-m>
</axis>
</animation>
<animation>
<type>select</type>
<object-name>Eng1ManStartBtn2O</object-name>
<condition>
<or>
<equals>
<property>/controls/engines/engine[0]/man-start</property>
<value>1</value>
</equals>
<equals>
<property>/controls/switches/annun-test</property>
<value>1</value>
</equals>
</or>
</condition>
</animation>
<animation>
<type>pick</type>
<object-name>Eng2ManStartBtn1</object-name>
<object-name>Eng2ManStartBtn2</object-name>
<object-name>Eng2ManStartBtn2O</object-name>
<action>
<button>0</button>
<repeatable>false</repeatable>
<binding>
<condition>
<and>
<equals>
<property>/controls/OH/protectors/eng2-manstart</property>
<value>1</value>
</equals>
<or>
<greater-than-equals>
<property>/systems/electrical/bus/dc1</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>/systems/electrical/bus/dc2</property>
<value>25</value>
</greater-than-equals>
</or>
</and>
</condition>
<command>property-toggle</command>
<property>/controls/engines/engine[1]/man-start</property>
</binding>
<binding>
<condition>
<equals>
<property>/controls/OH/protectors/eng2-manstart</property>
<value>1</value>
</equals>
</condition>
<command>nasal</command>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
<animation>
<type>pick</type>
<object-name>Eng2ManStartBtn1</object-name>
<object-name>Eng2ManStartBtn2</object-name>
<object-name>Eng2ManStartBtn2O</object-name>
<object-name>Eng2ManStartProt</object-name>
<action>
<button>1</button>
<repeatable>false</repeatable>
<binding>
<command>property-assign</command>
<property>/controls/OH/protectors/eng2-manstart</property>
<value>1</value>
</binding>
<mod-up>
<binding>
<command>property-assign</command>
<property>/controls/OH/protectors/eng2-manstart</property>
<value>0</value>
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/oh-cover", 1);</script>
</binding>
</mod-up>
</action>
</animation>
<animation>
<type>rotate</type>
<object-name>Eng2ManStartProt</object-name>
<property>/controls/OH/protectors/eng2-manstart</property>
<factor>-145</factor>
<axis>
<x1-m>-0.00226</x1-m>
<y1-m>0.21793</y1-m>
<z1-m>-0.20418</z1-m>
<x2-m>0.00062</x2-m>
<y2-m>0.24071</y2-m>
<z2-m>-0.20418</z2-m>
</axis>
</animation>
<animation>
<type>select</type>
<object-name>Eng2ManStartBtn2O</object-name>
<condition>
<or>
<equals>
<property>/controls/engines/engine[1]/man-start</property>
<value>1</value>
</equals>
<equals>
<property>/controls/switches/annun-test</property>
<value>1</value>
</equals>
</or>
</condition>
</animation>
<!-- Interior lights --> <!-- Interior lights -->
<animation> <animation>
<name>Overhead panel light pick</name> <name>Overhead panel light pick</name>

8
Models/Instruments/OHpanel/OHpanelEPR.xml
View file

@ -114,11 +114,11 @@
<condition> <condition>
<or> <or>
<equals> <equals>
<property>/controls/adirs/adr[2]/off</property> <property>/controls/fadec/n1mode1</property>
<value>1</value> <value>1</value>
</equals> </equals>
<equals> <equals>
<property>/controls/fadec/n1mode1</property> <property>/controls/switches/annun-test</property>
<value>1</value> <value>1</value>
</equals> </equals>
</or> </or>
@ -215,11 +215,11 @@
<condition> <condition>
<or> <or>
<equals> <equals>
<property>/controls/adirs/adr[2]/off</property> <property>/controls/fadec/n1mode2</property>
<value>1</value> <value>1</value>
</equals> </equals>
<equals> <equals>
<property>/controls/fadec/n1mode2</property> <property>/controls/switches/annun-test</property>
<value>1</value> <value>1</value>
</equals> </equals>
</or> </or>

BIN
Models/Instruments/OHpanel/res/markings.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 167 KiB

After

Width:  |  Height:  |  Size: 168 KiB

94
Models/Instruments/OHpanel/res/ohpanel.ac
View file

@ -9,7 +9,99 @@ MATERIAL "Switch" rgb 0.678431 0.678431 0.678431 amb 0.678431 0.678431 0.678431
MATERIAL "ac3dmat1" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 1 1 1 shi 128 trans 0 MATERIAL "ac3dmat1" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 1 1 1 shi 128 trans 0
MATERIAL "DefaultWhite.002" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.0015 0.0015 0.0015 shi 50 trans 0 MATERIAL "DefaultWhite.002" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.0015 0.0015 0.0015 shi 50 trans 0
OBJECT world OBJECT world
kids 285 kids 287
OBJECT poly
name "Eng1ManStartBtn2O"
loc 0.000119683 -5.00064e-005 -4.99785e-005
data 8
Cube.027
texture "buttons2.png"
crease 30.000000
numvert 8
-0.001687 -0.2257 -0.207197
-0.004168 -0.2257 -0.187351
-0.007144 -0.2257 -0.187723
-0.004664 -0.2257 -0.207569
-0.001687 -0.2157 -0.207197
-0.004168 -0.2157 -0.187351
-0.007144 -0.2157 -0.187723
-0.004664 -0.2157 -0.207569
numsurf 4
SURF 0x0
mat 4
refs 4
0 0.5 0.5
1 0 0.5
2 0 0.5
3 0.5 0.5
SURF 0x0
mat 4
refs 4
0 0.5 0.5
4 0.5 0.75
5 9.31321e-008 0.75
1 0 0.5
SURF 0x0
mat 4
refs 4
1 0 0.5
5 9.31321e-008 0.75
6 9.31321e-008 0.75
2 0 0.5
SURF 0x0
mat 4
refs 4
4 0.5 0.75
0 0.5 0.5
3 0.5 0.5
7 0.5 0.75
kids 0
OBJECT poly
name "Eng2ManStartBtn2O"
loc 0.000119683 -5.00064e-005 -4.99785e-005
data 8
Cube.090
texture "buttons2.png"
crease 30.000000
numvert 8
0.002245 -0.2257 -0.238652
-0.000235999 -0.2257 -0.218806
-0.003213 -0.2257 -0.219178
-0.000731999 -0.2257 -0.239024
0.002245 -0.2157 -0.238652
-0.000235999 -0.2157 -0.218806
-0.003213 -0.2157 -0.219178
-0.000731999 -0.2157 -0.239024
numsurf 4
SURF 0x0
mat 4
refs 4
0 0.5 0.5
1 0 0.5
2 0 0.5
3 0.5 0.5
SURF 0x0
mat 4
refs 4
0 0.5 0.5
4 0.5 0.75
5 9.31321e-008 0.75
1 0 0.5
SURF 0x0
mat 4
refs 4
1 0 0.5
5 9.31321e-008 0.75
6 9.31321e-008 0.75
2 0 0.5
SURF 0x0
mat 4
refs 4
4 0.5 0.75
0 0.5 0.5
3 0.5 0.5
7 0.5 0.75
kids 0
OBJECT poly OBJECT poly
name "Eng1ManStartProt" name "Eng1ManStartProt"
loc 7.05261 -5.75766 0.649317 loc 7.05261 -5.75766 0.649317

148
Models/Instruments/PFD/PFD1.xml
View file

@ -1218,7 +1218,7 @@
<offsets> <offsets>
<x-m>0.00091828</x-m> <x-m>0.00091828</x-m>
<y-m>0.0326226</y-m> <y-m>0.0326226</y-m>
<z-m>0.0591781</z-m> <z-m>0.0584781</z-m>
</offsets> </offsets>
<alignment>center-center</alignment> <alignment>center-center</alignment>
<axis-alignment>yz-plane</axis-alignment> <axis-alignment>yz-plane</axis-alignment>
@ -1242,7 +1242,7 @@
<offsets> <offsets>
<x-m>0.00091828</x-m> <x-m>0.00091828</x-m>
<y-m>0.0436226</y-m> <y-m>0.0436226</y-m>
<z-m>0.0591781</z-m> <z-m>0.0584781</z-m>
</offsets> </offsets>
<alignment>center-center</alignment> <alignment>center-center</alignment>
<axis-alignment>yz-plane</axis-alignment> <axis-alignment>yz-plane</axis-alignment>
@ -2050,7 +2050,7 @@
<offsets> <offsets>
<x-m>0.00091828</x-m> <x-m>0.00091828</x-m>
<y-m>0.0656226</y-m> <y-m>0.0656226</y-m>
<z-m>0.0734781</z-m> <z-m>0.0727781</z-m>
</offsets> </offsets>
<alignment>center-center</alignment> <alignment>center-center</alignment>
<axis-alignment>yz-plane</axis-alignment> <axis-alignment>yz-plane</axis-alignment>
@ -2074,7 +2074,7 @@
<offsets> <offsets>
<x-m>0.00091828</x-m> <x-m>0.00091828</x-m>
<y-m>0.0656226</y-m> <y-m>0.0656226</y-m>
<z-m>0.0662781</z-m> <z-m>0.0655781</z-m>
</offsets> </offsets>
<alignment>center-center</alignment> <alignment>center-center</alignment>
<axis-alignment>yz-plane</axis-alignment> <axis-alignment>yz-plane</axis-alignment>
@ -2098,7 +2098,7 @@
<offsets> <offsets>
<x-m>0.00091828</x-m> <x-m>0.00091828</x-m>
<y-m>0.0656226</y-m> <y-m>0.0656226</y-m>
<z-m>0.0591781</z-m> <z-m>0.0584781</z-m>
</offsets> </offsets>
<alignment>center-center</alignment> <alignment>center-center</alignment>
<axis-alignment>yz-plane</axis-alignment> <axis-alignment>yz-plane</axis-alignment>
@ -2122,7 +2122,7 @@
<offsets> <offsets>
<x-m>0.00091828</x-m> <x-m>0.00091828</x-m>
<y-m>0.0656226</y-m> <y-m>0.0656226</y-m>
<z-m>0.0591781</z-m> <z-m>0.0584781</z-m>
</offsets> </offsets>
<alignment>center-center</alignment> <alignment>center-center</alignment>
<axis-alignment>yz-plane</axis-alignment> <axis-alignment>yz-plane</axis-alignment>
@ -3208,6 +3208,115 @@
</condition> </condition>
</animation> </animation>
<animation>
<type>select</type>
<object-name>banklim</object-name>
<condition>
<equals>
<property>/it-fbw/law</property>
<value>0</value>
</equals>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>banklimXX</object-name>
<condition>
<not-equals>
<property>/it-fbw/law</property>
<value>0</value>
</not-equals>
</condition>
</animation>
<text>
<name>usemanpitchtrim</name>
<offsets>
<x-m>0.00091828</x-m>
<y-m>-0.00521</y-m>
<z-m>0.0570781</z-m>
</offsets>
<alignment>center-center</alignment>
<axis-alignment>yz-plane</axis-alignment>
<type type="string">text-value</type>
<format type="string">USE MAN PITCH TRIM</format>
<truncate type="bool">false</truncate>
<font type="string">helvetica_medium.txf</font>
<property>autopilot/serviceable</property>
<draw-text type="bool">true</draw-text>
<draw-alignment type="bool">false</draw-alignment>
<draw-boundingbox type="bool">false</draw-boundingbox>
<character-size>0.0051</character-size>
<font-resolution>
<width type="int">32</width>
<height type="int">32</height>
</font-resolution>
</text>
<animation>
<type>select</type>
<object-name>usemanpitchtrim</object-name>
<condition>
<equals>
<property>/it-fbw/law</property>
<value>2</value>
</equals>
</condition>
</animation>
<text>
<name>manpitchtrimonly</name>
<offsets>
<x-m>0.00091828</x-m>
<y-m>-0.00521</y-m>
<z-m>0.0570781</z-m>
</offsets>
<alignment>center-center</alignment>
<axis-alignment>yz-plane</axis-alignment>
<type type="string">text-value</type>
<format type="string">MAN PITCH TRIM ONLY</format>
<truncate type="bool">false</truncate>
<font type="string">helvetica_medium.txf</font>
<property>autopilot/serviceable</property>
<draw-text type="bool">true</draw-text>
<draw-alignment type="bool">false</draw-alignment>
<draw-boundingbox type="bool">false</draw-boundingbox>
<character-size>0.0051</character-size>
<font-resolution>
<width type="int">32</width>
<height type="int">32</height>
</font-resolution>
</text>
<animation>
<type>select</type>
<object-name>manpitchtrimonly</object-name>
<condition>
<equals>
<property>/it-fbw/law</property>
<value>3</value>
</equals>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>fbwmask</object-name>
<condition>
<or>
<equals>
<property>/it-fbw/law</property>
<value>2</value>
</equals>
<equals>
<property>/it-fbw/law</property>
<value>3</value>
</equals>
</or>
</condition>
</animation>
<!-- Colors --> <!-- Colors -->
<!-- White --> <!-- White -->
<animation> <animation>
@ -3428,6 +3537,7 @@
<type>material</type> <type>material</type>
<object-name>athr-afloor-fma</object-name> <object-name>athr-afloor-fma</object-name>
<object-name>athr-togalk-fma</object-name> <object-name>athr-togalk-fma</object-name>
<object-name>usemanpitchtrim</object-name>
<diffuse> <diffuse>
<red>1</red> <red>1</red>
<green>0.45</green> <green>0.45</green>
@ -3507,4 +3617,30 @@
</emission> </emission>
</animation> </animation>
<!-- Red -->
<animation>
<type>material</type>
<object-name>manpitchtrimonly</object-name>
<diffuse>
<red>1</red>
<green>0</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</green>
<blue>0</blue>
</emission>
</animation>
</PropertyList> </PropertyList>

148
Models/Instruments/PFD/PFD2.xml
View file

@ -1218,7 +1218,7 @@
<offsets> <offsets>
<x-m>0.00091828</x-m> <x-m>0.00091828</x-m>
<y-m>0.0326226</y-m> <y-m>0.0326226</y-m>
<z-m>0.0591781</z-m> <z-m>0.0584781</z-m>
</offsets> </offsets>
<alignment>center-center</alignment> <alignment>center-center</alignment>
<axis-alignment>yz-plane</axis-alignment> <axis-alignment>yz-plane</axis-alignment>
@ -1242,7 +1242,7 @@
<offsets> <offsets>
<x-m>0.00091828</x-m> <x-m>0.00091828</x-m>
<y-m>0.0436226</y-m> <y-m>0.0436226</y-m>
<z-m>0.0591781</z-m> <z-m>0.0584781</z-m>
</offsets> </offsets>
<alignment>center-center</alignment> <alignment>center-center</alignment>
<axis-alignment>yz-plane</axis-alignment> <axis-alignment>yz-plane</axis-alignment>
@ -2050,7 +2050,7 @@
<offsets> <offsets>
<x-m>0.00091828</x-m> <x-m>0.00091828</x-m>
<y-m>0.0656226</y-m> <y-m>0.0656226</y-m>
<z-m>0.0734781</z-m> <z-m>0.0727781</z-m>
</offsets> </offsets>
<alignment>center-center</alignment> <alignment>center-center</alignment>
<axis-alignment>yz-plane</axis-alignment> <axis-alignment>yz-plane</axis-alignment>
@ -2074,7 +2074,7 @@
<offsets> <offsets>
<x-m>0.00091828</x-m> <x-m>0.00091828</x-m>
<y-m>0.0656226</y-m> <y-m>0.0656226</y-m>
<z-m>0.0662781</z-m> <z-m>0.0655781</z-m>
</offsets> </offsets>
<alignment>center-center</alignment> <alignment>center-center</alignment>
<axis-alignment>yz-plane</axis-alignment> <axis-alignment>yz-plane</axis-alignment>
@ -2098,7 +2098,7 @@
<offsets> <offsets>
<x-m>0.00091828</x-m> <x-m>0.00091828</x-m>
<y-m>0.0656226</y-m> <y-m>0.0656226</y-m>
<z-m>0.0591781</z-m> <z-m>0.0584781</z-m>
</offsets> </offsets>
<alignment>center-center</alignment> <alignment>center-center</alignment>
<axis-alignment>yz-plane</axis-alignment> <axis-alignment>yz-plane</axis-alignment>
@ -2122,7 +2122,7 @@
<offsets> <offsets>
<x-m>0.00091828</x-m> <x-m>0.00091828</x-m>
<y-m>0.0656226</y-m> <y-m>0.0656226</y-m>
<z-m>0.0591781</z-m> <z-m>0.0584781</z-m>
</offsets> </offsets>
<alignment>center-center</alignment> <alignment>center-center</alignment>
<axis-alignment>yz-plane</axis-alignment> <axis-alignment>yz-plane</axis-alignment>
@ -3208,6 +3208,115 @@
</condition> </condition>
</animation> </animation>
<animation>
<type>select</type>
<object-name>banklim</object-name>
<condition>
<equals>
<property>/it-fbw/law</property>
<value>0</value>
</equals>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>banklimXX</object-name>
<condition>
<not-equals>
<property>/it-fbw/law</property>
<value>0</value>
</not-equals>
</condition>
</animation>
<text>
<name>usemanpitchtrim</name>
<offsets>
<x-m>0.00091828</x-m>
<y-m>-0.00521</y-m>
<z-m>0.0570781</z-m>
</offsets>
<alignment>center-center</alignment>
<axis-alignment>yz-plane</axis-alignment>
<type type="string">text-value</type>
<format type="string">USE MAN PITCH TRIM</format>
<truncate type="bool">false</truncate>
<font type="string">helvetica_medium.txf</font>
<property>autopilot/serviceable</property>
<draw-text type="bool">true</draw-text>
<draw-alignment type="bool">false</draw-alignment>
<draw-boundingbox type="bool">false</draw-boundingbox>
<character-size>0.0051</character-size>
<font-resolution>
<width type="int">32</width>
<height type="int">32</height>
</font-resolution>
</text>
<animation>
<type>select</type>
<object-name>usemanpitchtrim</object-name>
<condition>
<equals>
<property>/it-fbw/law</property>
<value>2</value>
</equals>
</condition>
</animation>
<text>
<name>manpitchtrimonly</name>
<offsets>
<x-m>0.00091828</x-m>
<y-m>-0.00521</y-m>
<z-m>0.0570781</z-m>
</offsets>
<alignment>center-center</alignment>
<axis-alignment>yz-plane</axis-alignment>
<type type="string">text-value</type>
<format type="string">MAN PITCH TRIM ONLY</format>
<truncate type="bool">false</truncate>
<font type="string">helvetica_medium.txf</font>
<property>autopilot/serviceable</property>
<draw-text type="bool">true</draw-text>
<draw-alignment type="bool">false</draw-alignment>
<draw-boundingbox type="bool">false</draw-boundingbox>
<character-size>0.0051</character-size>
<font-resolution>
<width type="int">32</width>
<height type="int">32</height>
</font-resolution>
</text>
<animation>
<type>select</type>
<object-name>manpitchtrimonly</object-name>
<condition>
<equals>
<property>/it-fbw/law</property>
<value>3</value>
</equals>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>fbwmask</object-name>
<condition>
<or>
<equals>
<property>/it-fbw/law</property>
<value>2</value>
</equals>
<equals>
<property>/it-fbw/law</property>
<value>3</value>
</equals>
</or>
</condition>
</animation>
<!-- Colors --> <!-- Colors -->
<!-- White --> <!-- White -->
<animation> <animation>
@ -3428,6 +3537,7 @@
<type>material</type> <type>material</type>
<object-name>athr-afloor-fma</object-name> <object-name>athr-afloor-fma</object-name>
<object-name>athr-togalk-fma</object-name> <object-name>athr-togalk-fma</object-name>
<object-name>usemanpitchtrim</object-name>
<diffuse> <diffuse>
<red>1</red> <red>1</red>
<green>0.45</green> <green>0.45</green>
@ -3507,4 +3617,30 @@
</emission> </emission>
</animation> </animation>
<!-- Red -->
<animation>
<type>material</type>
<object-name>manpitchtrimonly</object-name>
<diffuse>
<red>1</red>
<green>0</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</green>
<blue>0</blue>
</emission>
</animation>
</PropertyList> </PropertyList>

BIN
Models/Instruments/PFD/res/banklim.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
Models/Instruments/PFD/res/banklimXX.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
Models/Instruments/PFD/res/fastslow.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

BIN
Models/Instruments/PFD/res/mask.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 12 KiB

102
Models/Instruments/PFD/res/pfd-3d.ac
View file

@ -3,7 +3,101 @@ MATERIAL "ac3dmat1" rgb 1 1 1 amb 0 0 0 emis 0.658824 0.670588 0.67451 spec 0
MATERIAL "white" rgb 1 1 1 amb 1 1 1 emis 0.798 0.798 0.798 spec 0 0 0 shi 0 trans 0 MATERIAL "white" rgb 1 1 1 amb 1 1 1 emis 0.798 0.798 0.798 spec 0 0 0 shi 0 trans 0
MATERIAL "ac3dmat0" rgb 0 0 0 amb 0 0 0 emis 0 0 0 spec 0 0 0 shi 0 trans 0 MATERIAL "ac3dmat0" rgb 0 0 0 amb 0 0 0 emis 0 0 0 spec 0 0 0 shi 0 trans 0
OBJECT world OBJECT world
kids 48 kids 53
OBJECT poly
name "fbwmask"
loc 0.000382955 0.0573058 0.00520964
crease 45.000000
numvert 4
0 0.00259959 -0.00100451
0 0.00259959 0.00100451
0 -0.00336058 0.00100451
0 -0.00336058 -0.00100451
numsurf 1
SURF 0x30
mat 2
refs 4
0 1 1
1 0 1
2 0 0
3 1 0
kids 0
OBJECT poly
name "banklimXX"
loc 0.00099002 0.012811 -0.0336226
texture "banklimXX.png"
crease 45.000000
numvert 4
0 -0.00101332 -0.0018114
0 -0.00101332 0.00106828
0 0.0018626 0.00106829
0 0.00186259 -0.0018114
numsurf 1
SURF 0x30
mat 0
refs 4
0 1 1
1 0 1
2 0 0
3 1 0
kids 0
OBJECT poly
name "banklimXX"
loc 0.00099002 0.012811 0.0443929
texture "banklimXX.png"
crease 45.000000
numvert 4
0 0.00186259 -0.00181141
0 0.00186259 0.00106828
0 -0.00101332 0.00106828
0 -0.00101332 -0.00181141
numsurf 1
SURF 0x30
mat 0
refs 4
3 1 1
2 0 1
1 0 0
0 1 0
kids 0
OBJECT poly
name "banklim"
loc 0.00099002 0.0133653 -0.0334266
texture "banklim.png"
crease 45.000000
numvert 4
0 -0.000722769 -0.00255431
0 0.00171136 -0.00152109
0 0.000463212 0.00141935
0 -0.00197092 0.00038613
numsurf 1
SURF 0x30
mat 0
refs 4
3 1 1
2 0 1
1 0 0
0 1 0
kids 0
OBJECT poly
name "banklim"
loc 0.00099002 0.0127372 0.0437205
texture "banklim.png"
crease 45.000000
numvert 4
0 0.00109136 -0.00168599
0 -0.00134277 -0.000652768
0 -9.46289e-005 0.00228769
0 0.00233951 0.00125446
numsurf 1
SURF 0x30
mat 0
refs 4
0 1 1
1 0 1
2 0 0
3 1 0
kids 0
OBJECT poly OBJECT poly
name "fpd" name "fpd"
loc 0.00031928 0.00206621 -0.013179 loc 0.00031928 0.00206621 -0.013179
@ -117,7 +211,7 @@ refs 4
kids 0 kids 0
OBJECT poly OBJECT poly
name "ap-mode-box" name "ap-mode-box"
loc 0.000380651 0.0723146 -0.0618702 loc 0.000380651 0.0716448 -0.0618702
data 6 data 6
Circle Circle
texture "box.png" texture "box.png"
@ -171,7 +265,7 @@ refs 4
kids 0 kids 0
OBJECT poly OBJECT poly
name "fd-mode-box" name "fd-mode-box"
loc 0.000380651 0.0652178 -0.0618702 loc 0.000380651 0.064548 -0.0618702
data 6 data 6
Circle Circle
texture "box.png" texture "box.png"
@ -225,7 +319,7 @@ refs 4
kids 0 kids 0
OBJECT poly OBJECT poly
name "athr-mode-box" name "athr-mode-box"
loc 0.000380651 0.0581517 -0.0618702 loc 0.000380651 0.0574819 -0.0618702
data 6 data 6
Circle Circle
texture "box.png" texture "box.png"

BIN
Models/Instruments/PFD/res/spd-tape.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 33 KiB

2
Nasal/FMGC-b.nas
View file

@ -717,7 +717,7 @@ var make_loc_active = func {
var apparmcheck = func { var apparmcheck = func {
var signal = getprop("/instrumentation/nav[0]/gs-needle-deflection-norm"); var signal = getprop("/instrumentation/nav[0]/gs-needle-deflection-norm");
if ((signal <= -0.000000001) and (getprop("/FMGC/internal/loc-source") == "NAV0") and (getprop("/it-autoflight/output/lat") == 2)) { if (((signal < 0 and signal >= 0.45) or (signal > 0 and signal <= 0.30)) and (getprop("/FMGC/internal/loc-source") == "NAV0") and (getprop("/it-autoflight/output/lat") == 2)) {
make_appr_active(); make_appr_active();
} else { } else {
return 0; return 0;

3
Nasal/FMGC.nas
View file

@ -114,8 +114,9 @@ var phasecheck = maketimer(0.2, func {
var reduc_agl_ft = getprop("/it-autoflight/settings/reduc-agl-ft"); var reduc_agl_ft = getprop("/it-autoflight/settings/reduc-agl-ft");
var locarm = getprop("/it-autopilot/output/loc-armed"); var locarm = getprop("/it-autopilot/output/loc-armed");
var apprarm = getprop("/it-autopilot/output/appr-armed"); var apprarm = getprop("/it-autopilot/output/appr-armed");
var gear0 = getprop("/gear/gear[0]/wow");
if ((((n1_left >= 85) and (n1_right >= 85)) or (gs > 90 )) and (mode == "SRS")) { if ((((n1_left >= 85) and (n1_right >= 85)) or (gs > 90 )) and (mode == "SRS") and gear0 == 1 and phase == 0) {
setprop("/FMGC/status/phase", "1"); setprop("/FMGC/status/phase", "1");
setprop("/systems/pressurization/mode", "TO"); setprop("/systems/pressurization/mode", "TO");
} }

38
Nasal/PFD_FMA.nas
View file

@ -99,8 +99,9 @@ setlistener("/it-autoflight/mode/lat", func {
setprop("/modes/pfd/fma/roll-mode", "NAV"); setprop("/modes/pfd/fma/roll-mode", "NAV");
} }
} else if (lat == "LOC") { } else if (lat == "LOC") {
if (newlat != "LOC") { if (newlat != "LOC*" and newlat != "LOC") {
setprop("/modes/pfd/fma/roll-mode", "LOC"); setprop("/modes/pfd/fma/roll-mode", "LOC*");
locupdate.start();
} }
} else if (lat == "ALGN") { } else if (lat == "ALGN") {
if (newlat != "LAND") { if (newlat != "LAND") {
@ -113,6 +114,20 @@ setlistener("/it-autoflight/mode/lat", func {
} }
}); });
var locupdate = maketimer(0.5, func {
var lat = getprop("/it-autoflight/mode/lat");
var newlat = getprop("/modes/pfd/fma/roll-mode");
var nav_defl = getprop("/it-autoflight/internal/nav-heading-error-deg");
if (lat == "LOC") {
if (nav_defl > -1 and nav_defl < 1) {
locupdate.stop();
if (newlat != "LOC") {
setprop("/modes/pfd/fma/roll-mode", "LOC");
}
}
}
});
# Master Vertical # Master Vertical
setlistener("/it-autoflight/mode/vert", func { setlistener("/it-autoflight/mode/vert", func {
var vert = getprop("/it-autoflight/mode/vert"); var vert = getprop("/it-autoflight/mode/vert");
@ -142,8 +157,9 @@ setlistener("/it-autoflight/mode/vert", func {
setprop("/modes/pfd/fma/pitch-mode2-armed", "ALT"); setprop("/modes/pfd/fma/pitch-mode2-armed", "ALT");
} }
} else if (vert == "G/S") { } else if (vert == "G/S") {
if (newvert != "G/S") { if (newvert != "G/S*" and newvert != "G/S") {
setprop("/modes/pfd/fma/pitch-mode", "G/S"); setprop("/modes/pfd/fma/pitch-mode", "G/S*");
gsupdate.start();
} }
if (newvertarm != " ") { if (newvertarm != " ") {
setprop("/modes/pfd/fma/pitch-mode2-armed", " "); setprop("/modes/pfd/fma/pitch-mode2-armed", " ");
@ -223,6 +239,20 @@ setlistener("/it-autoflight/mode/vert", func {
altvert(); altvert();
}); });
var gsupdate = maketimer(0.5, func {
var vert = getprop("/it-autoflight/mode/vert");
var newvert = getprop("/modes/pfd/fma/pitch-mode");
var gs_defl = getprop("/instrumentation/nav[0]/gs-needle-deflection-norm");
if (vert == "G/S") {
if (gs_defl > -0.06 and gs_defl < 0.06) {
gsupdate.stop();
if (newvert != "G/S") {
setprop("/modes/pfd/fma/pitch-mode", "G/S");
}
}
}
});
var altvert = func { var altvert = func {
var FMGCalt = getprop("/FMGC/internal/cruise-ft"); var FMGCalt = getprop("/FMGC/internal/cruise-ft");
var MCPalt = getprop("/it-autoflight/internal/alt"); var MCPalt = getprop("/it-autoflight/internal/alt");

49
Nasal/engines.nas
View file

@ -32,6 +32,11 @@ setprop("/systems/apu/egt", 42);
setprop("/controls/engines/engine[0]/reverser", 0); setprop("/controls/engines/engine[0]/reverser", 0);
setprop("/controls/engines/engine[1]/reverser", 0); setprop("/controls/engines/engine[1]/reverser", 0);
var eng_init = func {
setprop("/controls/engines/engine[0]/man-start", 0);
setprop("/controls/engines/engine[1]/man-start", 0);
}
############################## ##############################
# Trigger Startups and Stops # # Trigger Startups and Stops #
############################## ##############################
@ -45,6 +50,7 @@ setlistener("/controls/engines/engine[0]/cutoff-switch", func {
eng_one_man_startt.start(); eng_one_man_startt.start();
} }
} else if (getprop("/controls/engines/engine[0]/cutoff-switch") == 1) { } else if (getprop("/controls/engines/engine[0]/cutoff-switch") == 1) {
setprop("/controls/engines/engine[0]/man-start", 0);
setprop("/systems/pneumatic/eng1-starter", 0); setprop("/systems/pneumatic/eng1-starter", 0);
setprop("/controls/engines/engine[0]/starter", 0); setprop("/controls/engines/engine[0]/starter", 0);
setprop("/controls/engines/engine[0]/cutoff", 1); setprop("/controls/engines/engine[0]/cutoff", 1);
@ -54,6 +60,26 @@ setlistener("/controls/engines/engine[0]/cutoff-switch", func {
} }
}); });
setlistener("/controls/engines/engine[0]/man-start", func {
start_one_mancheck();
});
var start_one_mancheck = func {
if (getprop("/controls/engines/engine[0]/man-start") == 1) {
if ((getprop("/controls/engines/engine-start-switch") == 2) and (getprop("/systems/pneumatic/total-psi") >= 28) and (getprop("/controls/engines/engine[0]/cutoff-switch") == 1)) {
setprop("/systems/pneumatic/eng1-starter", 1);
setprop("/engines/engine[0]/state", 1);
setprop("/controls/engines/engine[0]/starter", 1);
}
} else {
if (getprop("/engines/engine[0]/state") == 1 or getprop("/engines/engine[0]/state") == 2) {
setprop("/systems/pneumatic/eng1-starter", 0);
setprop("/engines/engine[0]/state", 0);
setprop("/controls/engines/engine[0]/starter", 0);
}
}
}
var start_one_check = func { var start_one_check = func {
settimer(start_one_check_b, 0.3); settimer(start_one_check_b, 0.3);
} }
@ -73,6 +99,7 @@ setlistener("/controls/engines/engine[1]/cutoff-switch", func {
eng_two_man_startt.start(); eng_two_man_startt.start();
} }
} else if (getprop("/controls/engines/engine[1]/cutoff-switch") == 1) { } else if (getprop("/controls/engines/engine[1]/cutoff-switch") == 1) {
setprop("/controls/engines/engine[1]/man-start", 0);
setprop("/systems/pneumatic/eng2-starter", 0); setprop("/systems/pneumatic/eng2-starter", 0);
setprop("/controls/engines/engine[1]/starter", 0); setprop("/controls/engines/engine[1]/starter", 0);
setprop("/controls/engines/engine[1]/cutoff", 1); setprop("/controls/engines/engine[1]/cutoff", 1);
@ -81,6 +108,26 @@ setlistener("/controls/engines/engine[1]/cutoff-switch", func {
} }
}); });
setlistener("/controls/engines/engine[1]/man-start", func {
start_two_mancheck();
});
var start_two_mancheck = func {
if (getprop("/controls/engines/engine[1]/man-start") == 1) {
if ((getprop("/controls/engines/engine-start-switch") == 2) and (getprop("/systems/pneumatic/total-psi") >= 28) and (getprop("/controls/engines/engine[1]/cutoff-switch") == 1)) {
setprop("/systems/pneumatic/eng2-starter", 1);
setprop("/engines/engine[1]/state", 1);
setprop("/controls/engines/engine[1]/starter", 1);
}
} else {
if (getprop("/engines/engine[1]/state") == 1 or getprop("/engines/engine[1]/state") == 2) {
setprop("/systems/pneumatic/eng2-starter", 0);
setprop("/engines/engine[1]/state", 0);
setprop("/controls/engines/engine[1]/starter", 0);
}
}
}
var start_two_check = func { var start_two_check = func {
settimer(start_two_check_b, 0.3); settimer(start_two_check_b, 0.3);
} }
@ -215,9 +262,11 @@ var apu_stop = func {
setlistener("/controls/engines/engine-start-switch", func { setlistener("/controls/engines/engine-start-switch", func {
if (getprop("/engines/engine[0]/state") == 0) { if (getprop("/engines/engine[0]/state") == 0) {
start_one_check(); start_one_check();
start_one_mancheck();
} }
if (getprop("/engines/engine[1]/state") == 0) { if (getprop("/engines/engine[1]/state") == 0) {
start_two_check(); start_two_check();
start_two_mancheck();
} }
if ((getprop("/controls/engines/engine-start-switch") == 0) or (getprop("/controls/engines/engine-start-switch") == 1)) { if ((getprop("/controls/engines/engine-start-switch") == 0) or (getprop("/controls/engines/engine-start-switch") == 1)) {
if (getprop("/engines/engine[0]/state") == 1 or getprop("/engines/engine[0]/state") == 2) { if (getprop("/engines/engine[0]/state") == 1 or getprop("/engines/engine[0]/state") == 2) {

2
Nasal/fadec-common.nas
View file

@ -225,7 +225,7 @@ var thrust_loop = 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("/position/gear-agl-ft") >= getprop("/systems/thrust/clbreduc-ft")) { if (getprop("/instrumentation/altimeter/indicated-altitude-ft") >= getprop("/systems/thrust/clbreduc-ft") and getprop("/gear/gear[1]/wow") == 0 and getprop("/gear/gear[2]/wow") == 0) {
setprop("/systems/thrust/lvrclb", "1"); setprop("/systems/thrust/lvrclb", "1");
} else { } else {
setprop("/systems/thrust/lvrclb", "0"); setprop("/systems/thrust/lvrclb", "0");

48
Nasal/icing.nas
View file

@ -11,6 +11,8 @@ var icingInit = func {
setprop("/systems/icing/icingcond", 0); setprop("/systems/icing/icingcond", 0);
setprop("/controls/switches/windowprobeheat", 0); setprop("/controls/switches/windowprobeheat", 0);
setprop("/controls/switches/windowprobeheatfault", 0); setprop("/controls/switches/windowprobeheatfault", 0);
setprop("/controls/switches/wing", 0);
setprop("/controls/switches/wingfault", 0);
setprop("/controls/deice/wing", 0); setprop("/controls/deice/wing", 0);
setprop("/controls/deice/lengine", 0); setprop("/controls/deice/lengine", 0);
setprop("/controls/deice/rengine", 0); setprop("/controls/deice/rengine", 0);
@ -34,6 +36,11 @@ var icingModel = func {
var lengine = getprop("/controls/deice/lengine"); var lengine = getprop("/controls/deice/lengine");
var rengine = getprop("/controls/deice/rengine"); var rengine = getprop("/controls/deice/rengine");
var windowprobe = getprop("/controls/deice/windowprobeheat"); var windowprobe = getprop("/controls/deice/windowprobeheat");
var wingBtn = getprop("/controls/switches/wing");
var wingAnti = getprop("/controls/deice/wing");
var PSI = getprop("/systems/pneumatic/total-psi");
var wowl = getprop("/gear/gear[1]/wow");
var wowr = getprop("/gear/gear[2]/wow");
if (severity == "0") { if (severity == "0") {
setprop("/systems/icing/factor", -0.00000166); setprop("/systems/icing/factor", -0.00000166);
@ -140,6 +147,40 @@ var icingModel = func {
setprop("/systems/icing/icingcond", 0); setprop("/systems/icing/icingcond", 0);
} }
# Switching on the wing anti-ice
setlistener("/controls/switches/wing", func {
var wingBtn = getprop("/controls/switches/wing");
var wingAnti = getprop("/controls/deice/wing");
var PSI = getprop("/systems/pneumatic/total-psi");
var wowl = getprop("/gear/gear[1]/wow");
var wowr = getprop("/gear/gear[2]/wow");
if (wowl or wowr and wingBtn and PSI >= 10) {
setprop("/controls/switches/wingfault", 1);
settimer(func() {
setprop("/controls/switches/wingfault", 0);
setprop("/controls/deice/wing", 1);
}, 0.5);
settimer(func() {
setprop("/controls/switches/wingfault", 1);
setprop("/controls/switches/wing", 0);
setprop("/controls/deice/wing", 0);
setprop("/controls/switches/wingfault", 0);
}, 30.5);
} else if (wingBtn and PSI >= 10 and !wowl and !wowr) {
setprop("/controls/switches/wingfault", 1);
settimer(func() {
setprop("/controls/switches/wingfault", 0);
setprop("/controls/deice/wing", 1);
}, 0.5);
} else if (!wingBtn and PSI >= 10 and !wowl and !wowr) {
setprop("/controls/switches/wingfault", 1);
settimer(func() {
setprop("/controls/switches/wingfault", 0);
setprop("/controls/deice/wing", 0);
}, 0.5);
}
});
setlistener("/controls/switches/windowprobeheat", func { setlistener("/controls/switches/windowprobeheat", func {
var windowprb = getprop("/controls/switches/windowprobeheat"); var windowprb = getprop("/controls/switches/windowprobeheat");
var fault = getprop("/controls/switches/windowprobeheatfault"); var fault = getprop("/controls/switches/windowprobeheatfault");
@ -162,6 +203,13 @@ var icingModel = func {
setprop("/controls/deice/windowprobeheat", 0); setprop("/controls/deice/windowprobeheat", 0);
} }
}); });
# If we have low pressure we have a fault
if (PSI < 10) {
setprop("/controls/switches/wingfault", 1);
} else {
setprop("/controls/switches/wingfault", 0);
}
} }
################### ###################

1
Nasal/libraries.nas
View file

@ -186,6 +186,7 @@ setlistener("/sim/signals/fdm-initialized", func {
systems.pneu_init(); systems.pneu_init();
systems.hyd_init(); systems.hyd_init();
systems.fuel_init(); systems.fuel_init();
systems.eng_init();
fmgc.APinit(); fmgc.APinit();
librariesLoop.start(); librariesLoop.start();
fmgc.FMGCinit(); fmgc.FMGCinit();