diff --git a/A320-main.xml b/A320-main.xml
index a6a5baf8..28ff400f 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -320,13 +320,13 @@
</autoland>
</config>
<settings>
- <default-bank-limit>30</default-bank-limit> <!-- Set the Default Bank Limit -->
+ <default-bank-limit>25</default-bank-limit> <!-- Set the Default Bank Limit -->
<enable-cws>0</enable-cws> <!-- Enable/Disable CWS -->
<land-enable>1</land-enable> <!-- Enable/Disable Autoland -->
<land-flap>0.645</land-flap> <!-- Minimum Flap used for Landing -->
<retard-ft>40</retard-ft> <!-- Enable Thrust Retard -->
<retard-enable>0</retard-enable> <!-- AGL to Thrust Retard -->
- <togaspd>162</togaspd> <!-- V2 + 10kts -->
+ <togaspd>157</togaspd> <!-- V2 + 10kts -->
<lat-agl-ft>30</lat-agl-ft> <!-- Set to 999999 if you do not want T/O to change automatically to HDG, or LNAV -->
<reduc-agl-ft>3000</reduc-agl-ft> <!-- Set to 999999 if you do not want TOGA to change automatically to FLCH -->
<autoland-without-ap>1</autoland-without-ap> <!-- Engage LAND and FLARE Modes even if the AP is off -->
diff --git a/Models/Instruments/PFD/PFD1.xml b/Models/Instruments/PFD/PFD1.xml
index a46a580f..616c9b5b 100644
--- a/Models/Instruments/PFD/PFD1.xml
+++ b/Models/Instruments/PFD/PFD1.xml
@@ -86,7 +86,7 @@
<type>texmultiple</type>
<object-name>horizon</object-name>
<transform>
- <property>orientation/pitch-deg</property>
+ <property>/orientation/pitch-deg</property>
<subtype>textranslate</subtype>
<factor>0.003955078</factor>
<axis>
@@ -95,7 +95,49 @@
</axis>
</transform>
<transform>
- <property>orientation/roll-deg</property>
+ <property>/orientation/roll-deg</property>
+ <subtype>texrotate</subtype>
+ <center>
+ <x>0.50</x>
+ <y>0.50</y>
+ </center>
+ <axis>
+ <x>0</x>
+ <y>0</y>
+ <z>-1</z>
+ </axis>
+ </transform>
+ </animation>
+
+ <animation>
+ <type>texrotate</type>
+ <object-name>sky</object-name>
+ <property>/orientation/roll-deg</property>
+ <center>
+ <x>0.50</x>
+ <y>0.50</y>
+ </center>
+ <axis>
+ <x>0</x>
+ <y>0</y>
+ <z>-1</z>
+ </axis>
+ </animation>
+
+ <animation>
+ <type>texmultiple</type>
+ <object-name>ground</object-name>
+ <transform>
+ <property>/instrumentation/pfd/horizon-ground</property>
+ <subtype>textranslate</subtype>
+ <factor>0.003955078</factor>
+ <axis>
+ <x>0</x>
+ <y>1</y>
+ </axis>
+ </transform>
+ <transform>
+ <property>/orientation/roll-deg</property>
<subtype>texrotate</subtype>
<center>
<x>0.50</x>
@@ -113,11 +155,14 @@
<type>rotate</type>
<object-name>bank</object-name>
<object-name>slipskid</object-name>
+ <object-name>radio-alt</object-name>
+ <object-name>radio-alt-land</object-name>
<property>orientation/roll-deg</property>
+ <factor>1.05</factor>
<center>
<x-m>0</x-m>
- <y-m>-0.0049</y-m>
- <z-m>0.0005</z-m>
+ <y-m>-0.0051</y-m>
+ <z-m>0.00091</z-m>
</center>
<axis>
<x>1</x>
@@ -453,8 +498,8 @@
<name>radio-alt</name>
<offsets>
<x-m>0.0010</x-m>
- <y-m>-0.0051</y-m>
- <z-m>-0.0342</z-m>
+ <y-m>-0.006</y-m>
+ <z-m>-0.0362</z-m>
</offsets>
<alignment>center-center</alignment>
<axis-alignment>yz-plane</axis-alignment>
@@ -477,8 +522,8 @@
<name>radio-alt-land</name>
<offsets>
<x-m>0.0010</x-m>
- <y-m>-0.0051</y-m>
- <z-m>-0.0342</z-m>
+ <y-m>-0.006</y-m>
+ <z-m>-0.0362</z-m>
</offsets>
<alignment>center-center</alignment>
<axis-alignment>yz-plane</axis-alignment>
@@ -831,7 +876,7 @@
</less-than>
<greater-than>
<property>position/gear-agl-ft</property>
- <value>400</value>
+ <value>250</value>
</greater-than>
</and>
</condition>
@@ -844,7 +889,7 @@
<condition>
<less-than-equals>
<property>position/gear-agl-ft</property>
- <value>400</value>
+ <value>250</value>
</less-than-equals>
</condition>
</animation>
@@ -1209,7 +1254,7 @@
<name>pitch-mode-armed-fma</name>
<offsets>
<x-m>0.00091828</x-m>
- <y-m>-0.0210226</y-m>
+ <y-m>-0.0130226</y-m>
<z-m>0.0635781</z-m>
</offsets>
<alignment>center-center</alignment>
@@ -1229,6 +1274,30 @@
</font-resolution>
</text>
+ <text>
+ <name>pitch-mode-armed2-fma</name>
+ <offsets>
+ <x-m>0.00091828</x-m>
+ <y-m>-0.0290226</y-m>
+ <z-m>0.0635781</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/pitch-mode2-armed</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.0055</character-size>
+ <font-resolution>
+ <width type="int">32</width>
+ <height type="int">32</height>
+ </font-resolution>
+ </text>
+
<text>
<name>roll-mode-armed-fma</name>
<offsets>
@@ -1258,6 +1327,7 @@
<object-name>pitch-mode-fma</object-name>
<object-name>roll-mode-fma</object-name>
<object-name>pitch-mode-armed-fma</object-name>
+ <object-name>pitch-mode-armed2-fma</object-name>
<object-name>roll-mode-armed-fma</object-name>
<condition>
<or>
@@ -2247,6 +2317,7 @@
<object-name>qnh-indicator-hpa</object-name>
<object-name>roll-mode-armed-fma</object-name>
<object-name>pitch-mode-armed-fma</object-name>
+ <object-name>pitch-mode-armed2-fma</object-name>
<diffuse>
<red>0</red>
<green>0.886</green>
diff --git a/Models/Instruments/PFD/PFD2.xml b/Models/Instruments/PFD/PFD2.xml
index 3a0efcc5..94bcdac6 100644
--- a/Models/Instruments/PFD/PFD2.xml
+++ b/Models/Instruments/PFD/PFD2.xml
@@ -86,7 +86,7 @@
<type>texmultiple</type>
<object-name>horizon</object-name>
<transform>
- <property>orientation/pitch-deg</property>
+ <property>/orientation/pitch-deg</property>
<subtype>textranslate</subtype>
<factor>0.003955078</factor>
<axis>
@@ -95,7 +95,49 @@
</axis>
</transform>
<transform>
- <property>orientation/roll-deg</property>
+ <property>/orientation/roll-deg</property>
+ <subtype>texrotate</subtype>
+ <center>
+ <x>0.50</x>
+ <y>0.50</y>
+ </center>
+ <axis>
+ <x>0</x>
+ <y>0</y>
+ <z>-1</z>
+ </axis>
+ </transform>
+ </animation>
+
+ <animation>
+ <type>texrotate</type>
+ <object-name>sky</object-name>
+ <property>/orientation/roll-deg</property>
+ <center>
+ <x>0.50</x>
+ <y>0.50</y>
+ </center>
+ <axis>
+ <x>0</x>
+ <y>0</y>
+ <z>-1</z>
+ </axis>
+ </animation>
+
+ <animation>
+ <type>texmultiple</type>
+ <object-name>ground</object-name>
+ <transform>
+ <property>/instrumentation/pfd/horizon-ground</property>
+ <subtype>textranslate</subtype>
+ <factor>0.003955078</factor>
+ <axis>
+ <x>0</x>
+ <y>1</y>
+ </axis>
+ </transform>
+ <transform>
+ <property>/orientation/roll-deg</property>
<subtype>texrotate</subtype>
<center>
<x>0.50</x>
@@ -113,11 +155,14 @@
<type>rotate</type>
<object-name>bank</object-name>
<object-name>slipskid</object-name>
+ <object-name>radio-alt</object-name>
+ <object-name>radio-alt-land</object-name>
<property>orientation/roll-deg</property>
+ <factor>1.05</factor>
<center>
<x-m>0</x-m>
- <y-m>-0.0049</y-m>
- <z-m>0.0005</z-m>
+ <y-m>-0.0051</y-m>
+ <z-m>0.00091</z-m>
</center>
<axis>
<x>1</x>
@@ -453,8 +498,8 @@
<name>radio-alt</name>
<offsets>
<x-m>0.0010</x-m>
- <y-m>-0.0051</y-m>
- <z-m>-0.0342</z-m>
+ <y-m>-0.006</y-m>
+ <z-m>-0.0362</z-m>
</offsets>
<alignment>center-center</alignment>
<axis-alignment>yz-plane</axis-alignment>
@@ -477,8 +522,8 @@
<name>radio-alt-land</name>
<offsets>
<x-m>0.0010</x-m>
- <y-m>-0.0051</y-m>
- <z-m>-0.0342</z-m>
+ <y-m>-0.006</y-m>
+ <z-m>-0.0362</z-m>
</offsets>
<alignment>center-center</alignment>
<axis-alignment>yz-plane</axis-alignment>
@@ -831,7 +876,7 @@
</less-than>
<greater-than>
<property>position/gear-agl-ft</property>
- <value>400</value>
+ <value>250</value>
</greater-than>
</and>
</condition>
@@ -844,7 +889,7 @@
<condition>
<less-than-equals>
<property>position/gear-agl-ft</property>
- <value>400</value>
+ <value>250</value>
</less-than-equals>
</condition>
</animation>
@@ -1209,7 +1254,7 @@
<name>pitch-mode-armed-fma</name>
<offsets>
<x-m>0.00091828</x-m>
- <y-m>-0.0210226</y-m>
+ <y-m>-0.0130226</y-m>
<z-m>0.0635781</z-m>
</offsets>
<alignment>center-center</alignment>
@@ -1229,6 +1274,30 @@
</font-resolution>
</text>
+ <text>
+ <name>pitch-mode-armed2-fma</name>
+ <offsets>
+ <x-m>0.00091828</x-m>
+ <y-m>-0.0290226</y-m>
+ <z-m>0.0635781</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/pitch-mode2-armed</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.0055</character-size>
+ <font-resolution>
+ <width type="int">32</width>
+ <height type="int">32</height>
+ </font-resolution>
+ </text>
+
<text>
<name>roll-mode-armed-fma</name>
<offsets>
@@ -1258,6 +1327,7 @@
<object-name>pitch-mode-fma</object-name>
<object-name>roll-mode-fma</object-name>
<object-name>pitch-mode-armed-fma</object-name>
+ <object-name>pitch-mode-armed2-fma</object-name>
<object-name>roll-mode-armed-fma</object-name>
<condition>
<or>
@@ -2247,6 +2317,7 @@
<object-name>qnh-indicator-hpa</object-name>
<object-name>roll-mode-armed-fma</object-name>
<object-name>pitch-mode-armed-fma</object-name>
+ <object-name>pitch-mode-armed2-fma</object-name>
<diffuse>
<red>0</red>
<green>0.886</green>
diff --git a/Models/Instruments/PFD/res/ground.png b/Models/Instruments/PFD/res/ground.png
new file mode 100644
index 00000000..e6cc410a
Binary files /dev/null and b/Models/Instruments/PFD/res/ground.png differ
diff --git a/Models/Instruments/PFD/res/horizon.png b/Models/Instruments/PFD/res/horizon.png
index b3e968b3..3f568ac9 100644
Binary files a/Models/Instruments/PFD/res/horizon.png and b/Models/Instruments/PFD/res/horizon.png differ
diff --git a/Models/Instruments/PFD/res/mask.png b/Models/Instruments/PFD/res/mask.png
index 23b22eb6..8b56b2f2 100644
Binary files a/Models/Instruments/PFD/res/mask.png and b/Models/Instruments/PFD/res/mask.png differ
diff --git a/Models/Instruments/PFD/res/pfd-3d.3ds b/Models/Instruments/PFD/res/pfd-3d.3ds
deleted file mode 100644
index 9dd87cea..00000000
Binary files a/Models/Instruments/PFD/res/pfd-3d.3ds and /dev/null differ
diff --git a/Models/Instruments/PFD/res/pfd-3d.ac b/Models/Instruments/PFD/res/pfd-3d.ac
index 0e2ba120..9542061a 100644
--- a/Models/Instruments/PFD/res/pfd-3d.ac
+++ b/Models/Instruments/PFD/res/pfd-3d.ac
@@ -1,10 +1,48 @@
AC3Db
MATERIAL "ac3dmat1" rgb 1 1 1 amb 0 0 0 emis 0.658824 0.670588 0.67451 spec 0 0 0 shi 128 trans 0
OBJECT world
-kids 32
+kids 34
+OBJECT poly
+name "ground"
+loc -0.000632844 0.000620101 0.00496066
+texture "ground.png"
+crease 45.000000
+numvert 4
+0 0.0443777 -0.0369368
+0 0.0443777 0.0369368
+0 -0.0443777 0.0369368
+0 -0.0443777 -0.0369368
+numsurf 1
+SURF 0x30
+mat 0
+refs 4
+0 0.5875 0.5875
+1 0.4125 0.5875
+2 0.4125 0.4125
+3 0.5875 0.4125
+kids 0
+OBJECT poly
+name "sky"
+loc -0.000632844 0.000620101 0.00496066
+texture "sky.png"
+crease 45.000000
+numvert 4
+0 -0.0443777 -0.0369368
+0 -0.0443777 0.0369368
+0 0.0443777 0.0369368
+0 0.0443777 -0.0369368
+numsurf 1
+SURF 0x30
+mat 0
+refs 4
+3 0.5875 0.5875
+2 0.4125 0.5875
+1 0.4125 0.4125
+0 0.5875 0.4125
+kids 0
OBJECT poly
name "rudder_bar"
-loc 0.00132974 -0.00872025 0.00491576
+loc 0.00132974 -0.00872025 0.00509377
texture "rudder-bar.png"
crease 45.000000
numvert 4
@@ -80,7 +118,7 @@ refs 4
kids 0
OBJECT poly
name "hdg-tape"
-loc -0.00063943 -0.0623471 0.00488526
+loc 0.000141949 -0.0623471 0.00488526
texture "hdg-tape.png"
crease 45.000000
numvert 4
@@ -103,8 +141,8 @@ loc 0.00063943 -0.0623471 0.00488526
texture "trk-ind.png"
crease 45.000000
numvert 4
-0 -0.00631734 -0.0361253
-0 -0.00631734 0.0361253
+0 -0.00631735 -0.0361253
+0 -0.00631735 0.0361253
0 0.00631731 0.0361253
0 0.00631731 -0.0361253
numsurf 1
@@ -231,53 +269,15 @@ refs 4
3 0 -0.00461811
kids 0
OBJECT poly
-name "fd_pitch"
-loc 0.00132974 0.000487308 0.00486699
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 0.000747245 -0.01934
-0 0.000747245 0.01934
-0 -0.000747245 0.01934
-0 -0.000747245 -0.01934
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.510324 0.464321
-1 0.762653 0.464321
-2 0.762653 0.461267
-3 0.510324 0.461267
-kids 0
-OBJECT poly
-name "centerbar"
-loc 0.001346 -0.0015161 0.00461461
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 -0.00534438 -0.0329828
-0 -0.00534438 0.0335832
-0 0.00534438 0.0335832
-0 0.00534438 -0.0329828
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.403727 0.933591
-2 0.909275 0.933591
-1 0.909275 0.783893
-0 0.403727 0.783893
-kids 0
-OBJECT poly
name "sidestick-pos"
-loc 0.00133541 0.000550993 0.00362843
+loc 0.00133541 0.000618536 0.00377834
texture "autoland.png"
crease 45.000000
numvert 4
-0 0.0056307 -0.00368095
-0 -0.0056307 -0.00368095
-0 -0.0056307 0.00676597
-0 0.0056307 0.00676597
+0 0.00607052 -0.00396847
+0 -0.00607052 -0.00396847
+0 -0.00607052 0.00729446
+0 0.00607052 0.00729446
numsurf 1
SURF 0x30
mat 0
@@ -539,7 +539,7 @@ refs 4
kids 0
OBJECT poly
name "rect"
-loc 0.0643506 4.65661e-010 2.32831e-010
+loc 0.0643506 0 0
texture "mask.png"
crease 45.000000
numvert 4
@@ -576,25 +576,6 @@ refs 4
0 0 -0.00461811
kids 0
OBJECT poly
-name "fd_roll"
-loc 0.00132974 0.000720247 0.00489718
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 0.0195466 -0.000817249
-0 -0.0195466 -0.000817249
-0 -0.0195466 0.000817249
-0 0.0195466 0.000817249
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.510324 0.464321
-2 0.762653 0.464321
-1 0.762653 0.461267
-0 0.510324 0.461267
-kids 0
-OBJECT poly
name "bank"
loc 0.00147448 0.0381779 0.00511426
texture "symbols.png"
@@ -632,3 +613,60 @@ refs 4
0 0.348876 0.295057
3 0.348876 0.413639
kids 0
+OBJECT poly
+name "centerbar"
+loc 0.001346 -0.00175913 0.00477472
+texture "symbols.png"
+crease 45.000000
+numvert 4
+0 -0.00611249 -0.0377232
+0 -0.00611249 0.0384099
+0 0.0061125 0.0384099
+0 0.0061125 -0.0377232
+numsurf 1
+SURF 0x30
+mat 0
+refs 4
+3 0.403727 0.933591
+2 0.909275 0.933591
+1 0.909275 0.783893
+0 0.403727 0.783893
+kids 0
+OBJECT poly
+name "fd_pitch"
+loc 0.00132974 0.000646424 0.005045
+texture "symbols.png"
+crease 45.000000
+numvert 4
+0 0.00074983 -0.0194069
+0 0.00074983 0.0194069
+0 -0.00074983 0.0194069
+0 -0.00074983 -0.0194069
+numsurf 1
+SURF 0x30
+mat 0
+refs 4
+0 0.510324 0.464321
+1 0.762653 0.464321
+2 0.762653 0.461267
+3 0.510324 0.461267
+kids 0
+OBJECT poly
+name "fd_roll"
+loc 0.00132974 0.000880169 0.00507529
+texture "symbols.png"
+crease 45.000000
+numvert 4
+0 0.0196142 -0.000820077
+0 -0.0196142 -0.000820077
+0 -0.0196142 0.000820077
+0 0.0196142 0.000820077
+numsurf 1
+SURF 0x30
+mat 0
+refs 4
+3 0.510324 0.464321
+2 0.762653 0.464321
+1 0.762653 0.461267
+0 0.510324 0.461267
+kids 0
diff --git a/Models/Instruments/PFD/res/pfd-3d.ac.bak b/Models/Instruments/PFD/res/pfd-3d.ac.bak
index 036b616d..16d27512 100644
--- a/Models/Instruments/PFD/res/pfd-3d.ac.bak
+++ b/Models/Instruments/PFD/res/pfd-3d.ac.bak
@@ -1,11 +1,48 @@
AC3Db
-MATERIAL "ac3dmat1" rgb 1 1 1 amb 0.2 0.2 0.2 emis 0 0 0 spec 0.2 0.2 0.2 shi 128 trans 0
MATERIAL "ac3dmat1" rgb 1 1 1 amb 0 0 0 emis 0.658824 0.670588 0.67451 spec 0 0 0 shi 128 trans 0
OBJECT world
-kids 33
+kids 34
+OBJECT poly
+name "ground"
+loc -0.000632844 0.000620101 0.00496066
+texture "ground.png"
+crease 45.000000
+numvert 4
+0 0.0443777 -0.0369368
+0 0.0443777 0.0369368
+0 -0.0443777 0.0369368
+0 -0.0443777 -0.0369368
+numsurf 1
+SURF 0x30
+mat 0
+refs 4
+0 0.5875 0.5875
+1 0.4125 0.5875
+2 0.4125 0.4125
+3 0.5875 0.4125
+kids 0
+OBJECT poly
+name "sky"
+loc -0.000632844 0.000620101 0.00496066
+texture "sky.png"
+crease 45.000000
+numvert 4
+0 -0.0443777 -0.0369368
+0 -0.0443777 0.0369368
+0 0.0443777 0.0369368
+0 0.0443777 -0.0369368
+numsurf 1
+SURF 0x30
+mat 0
+refs 4
+3 0.5875 0.5875
+2 0.4125 0.5875
+1 0.4125 0.4125
+0 0.5875 0.4125
+kids 0
OBJECT poly
name "rudder_bar"
-loc 0.00132974 -0.00872025 0.00491576
+loc 0.00132974 -0.00872025 0.00509377
texture "rudder-bar.png"
crease 45.000000
numvert 4
@@ -15,7 +52,7 @@ numvert 4
0 0.0105466 -0.00420203
numsurf 1
SURF 0x30
-mat 1
+mat 0
refs 4
3 1 1
2 0 1
@@ -34,7 +71,7 @@ numvert 4
0 0.0428304 -0.00623311
numsurf 1
SURF 0x30
-mat 1
+mat 0
refs 4
3 0.990386 0.217208
2 0.022378 0.217208
@@ -53,7 +90,7 @@ numvert 4
0 -0.0424935 -0.00258292
numsurf 1
SURF 0x30
-mat 1
+mat 0
refs 4
0 0.998074 0.321737
1 0.800781 0.321737
@@ -72,7 +109,7 @@ numvert 4
0 -0.0443777 -0.0369368
numsurf 1
SURF 0x30
-mat 1
+mat 0
refs 4
0 0.5875 0.5875
1 0.4125 0.5875
@@ -81,7 +118,7 @@ refs 4
kids 0
OBJECT poly
name "hdg-tape"
-loc -0.00063943 -0.0623471 0.00488526
+loc 0.000141949 -0.0623471 0.00488526
texture "hdg-tape.png"
crease 45.000000
numvert 4
@@ -91,7 +128,7 @@ numvert 4
0 0.00631731 -0.0361253
numsurf 1
SURF 0x30
-mat 1
+mat 0
refs 4
3 0.0605338 0.994588
2 -0.0513565 0.994588
@@ -104,13 +141,13 @@ loc 0.00063943 -0.0623471 0.00488526
texture "trk-ind.png"
crease 45.000000
numvert 4
-0 -0.00631734 -0.0361253
-0 -0.00631734 0.0361253
+0 -0.00631735 -0.0361253
+0 -0.00631735 0.0361253
0 0.00631731 0.0361253
0 0.00631731 -0.0361253
numsurf 1
SURF 0x30
-mat 1
+mat 0
refs 4
3 0.0605338 0.994588
2 -0.0513565 0.994588
@@ -129,7 +166,7 @@ numvert 4
0 0.00631731 -0.0361253
numsurf 1
SURF 0x30
-mat 1
+mat 0
refs 4
3 0.0605338 0.994588
2 -0.0513565 0.994588
@@ -148,7 +185,7 @@ numvert 4
0 0.00601731 -0.0361253
numsurf 1
SURF 0x30
-mat 1
+mat 0
refs 4
3 0.0605338 0.994588
2 -0.0513565 0.994588
@@ -167,7 +204,7 @@ numvert 4
0 -0.0428304 -0.00806341
numsurf 1
SURF 0x30
-mat 1
+mat 0
refs 4
0 0.990386 0.217208
1 0.022378 0.217208
@@ -186,7 +223,7 @@ numvert 4
0 0.0428304 -0.00990531
numsurf 1
SURF 0x30
-mat 1
+mat 0
refs 4
3 0.498074 0.321737
2 0.00829178 0.321737
@@ -205,7 +242,7 @@ numvert 4
0 0.040099 -0.00314169
numsurf 1
SURF 0x30
-mat 1
+mat 0
refs 4
3 0.660342 0.662271
2 0.638535 0.662271
@@ -224,7 +261,7 @@ numvert 4
0 -0.0210118 -0.00234548
numsurf 1
SURF 0x30
-mat 1
+mat 0
refs 4
0 0 0.496308
1 1.03601 0.496308
@@ -232,56 +269,18 @@ refs 4
3 0 -0.00461811
kids 0
OBJECT poly
-name "fd_pitch"
-loc 0.00132974 0.000487308 0.00486699
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 0.000747245 -0.01934
-0 0.000747245 0.01934
-0 -0.000747245 0.01934
-0 -0.000747245 -0.01934
-numsurf 1
-SURF 0x30
-mat 1
-refs 4
-0 0.510324 0.464321
-1 0.762653 0.464321
-2 0.762653 0.461267
-3 0.510324 0.461267
-kids 0
-OBJECT poly
-name "centerbar"
-loc 0.001346 -0.0015161 0.00461461
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 -0.00534438 -0.0329828
-0 -0.00534438 0.0335832
-0 0.00534438 0.0335832
-0 0.00534438 -0.0329828
-numsurf 1
-SURF 0x30
-mat 1
-refs 4
-3 0.403727 0.933591
-2 0.909275 0.933591
-1 0.909275 0.783893
-0 0.403727 0.783893
-kids 0
-OBJECT poly
name "sidestick-pos"
-loc 0.00133541 0.000550993 0.00362843
+loc 0.00133541 0.000618536 0.00359356
texture "autoland.png"
crease 45.000000
numvert 4
-0 0.0056307 -0.00368095
-0 -0.0056307 -0.00368095
-0 -0.0056307 0.00676597
-0 0.0056307 0.00676597
+0 0.00674502 -0.00440941
+0 -0.00674502 -0.00440941
+0 -0.00674502 0.00810496
+0 0.00674502 0.00810496
numsurf 1
SURF 0x30
-mat 1
+mat 0
refs 4
3 0.791565 0.449709
2 0.68209 0.449709
@@ -304,14 +303,14 @@ numvert 8
0 0.00402807 -0.0455873
numsurf 2
SURF 0x30
-mat 1
+mat 0
refs 4
0 0.629302 0.44775
1 0.520441 0.44775
2 0.520441 0.0183234
3 0.629302 0.0183234
SURF 0x30
-mat 1
+mat 0
refs 4
7 0.629302 0.0183234
6 0.520441 0.0183234
@@ -334,14 +333,14 @@ numvert 8
0 0.00378506 -0.0455873
numsurf 2
SURF 0x30
-mat 1
+mat 0
refs 4
3 0.629302 0.44775
2 0.520441 0.44775
1 0.520441 0.0183234
0 0.629302 0.0183234
SURF 0x30
-mat 1
+mat 0
refs 4
4 0.629302 0.0183234
5 0.520441 0.0183234
@@ -360,7 +359,7 @@ numvert 4
0 -0.0361804 0.00381498
numsurf 1
SURF 0x30
-mat 1
+mat 0
refs 4
0 0.99826 0.988171
1 0.99826 0.0824336
@@ -379,7 +378,7 @@ numvert 4
0 0.00428777 -0.0357276
numsurf 1
SURF 0x30
-mat 1
+mat 0
refs 4
3 0.501561 0.112546
2 0.964105 0.112546
@@ -398,7 +397,7 @@ numvert 4
0 0.00547617 -0.00312652
numsurf 1
SURF 0x30
-mat 1
+mat 0
refs 4
0 0.239237 0.294683
1 0.442683 0.294683
@@ -417,7 +416,7 @@ numvert 4
0 0.00312651 -0.00547615
numsurf 1
SURF 0x30
-mat 1
+mat 0
refs 4
3 0.239237 0.294683
2 0.442683 0.294683
@@ -436,7 +435,7 @@ numvert 4
-1e-005 -0.0424935 -0.00136903
numsurf 1
SURF 0x30
-mat 1
+mat 0
refs 4
0 1 0.321832
1 0 0.321832
@@ -455,7 +454,7 @@ numvert 4
0 -0.0424935 -0.00136903
numsurf 1
SURF 0x30
-mat 1
+mat 0
refs 4
0 0.598403 0.321832
1 0.501577 0.321832
@@ -474,7 +473,7 @@ numvert 4
0 0.0424935 -0.00136903
numsurf 1
SURF 0x30
-mat 1
+mat 0
refs 4
3 0.66857 0.321965
2 0.605455 0.321965
@@ -493,7 +492,7 @@ numvert 4
0 0.00598263 -0.00278856
numsurf 1
SURF 0x30
-mat 1
+mat 0
refs 4
3 0.962665 0.356135
2 0.0568116 0.356135
@@ -512,7 +511,7 @@ numvert 4
0 -0.0428304 -0.00806341
numsurf 1
SURF 0x30
-mat 1
+mat 0
refs 4
0 0.990386 0.217208
1 0.022378 0.217208
@@ -531,7 +530,7 @@ numvert 4
0 -0.0428304 -0.00806341
numsurf 1
SURF 0x30
-mat 1
+mat 0
refs 4
0 0.990386 0.217208
1 0.022378 0.217208
@@ -540,7 +539,7 @@ refs 4
kids 0
OBJECT poly
name "rect"
-loc 0.0643506 4.65661e-010 2.32831e-010
+loc 0.0643506 0 0
texture "mask.png"
crease 45.000000
numvert 4
@@ -550,7 +549,7 @@ numvert 4
-0.0639733 -0.0784821 -0.0784821
numsurf 1
SURF 0x30
-mat 1
+mat 0
refs 4
0 1 1
1 0 1
@@ -569,7 +568,7 @@ numvert 4
0 -0.0210118 0.00234548
numsurf 1
SURF 0x30
-mat 1
+mat 0
refs 4
3 0 0.496308
2 1.03601 0.496308
@@ -577,43 +576,6 @@ refs 4
0 0 -0.00461811
kids 0
OBJECT poly
-name "fd_roll"
-loc 0.00132974 0.000720247 0.00489718
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 0.0195466 -0.000817249
-0 -0.0195466 -0.000817249
-0 -0.0195466 0.000817249
-0 0.0195466 0.000817249
-numsurf 1
-SURF 0x30
-mat 1
-refs 4
-3 0.510324 0.464321
-2 0.762653 0.464321
-1 0.762653 0.461267
-0 0.510324 0.461267
-kids 0
-OBJECT poly
-name "rect"
-loc 0.0153975 0.53761 0.00507878
-crease 45.000000
-numvert 4
--0.5 -0.5 0.5
--0.5 -0.5 -0.5
-0.5 -0.5 -0.5
-0.5 -0.5 0.5
-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 "bank"
loc 0.00147448 0.0381779 0.00511426
texture "symbols.png"
@@ -625,7 +587,7 @@ numvert 4
0 0.00444023 0.00535178
numsurf 1
SURF 0x30
-mat 1
+mat 0
refs 4
0 0.348876 0.413639
2 0.348876 0.567016
@@ -644,10 +606,67 @@ numvert 4
0 -0.000568084 -0.00535177
numsurf 1
SURF 0x30
-mat 1
+mat 0
refs 4
2 0.505593 0.413639
1 0.505593 0.295057
0 0.348876 0.295057
3 0.348876 0.413639
kids 0
+OBJECT poly
+name "centerbar"
+loc 0.001346 -0.00175913 0.00477472
+texture "symbols.png"
+crease 45.000000
+numvert 4
+0 -0.00611249 -0.0377232
+0 -0.00611249 0.0384099
+0 0.0061125 0.0384099
+0 0.0061125 -0.0377232
+numsurf 1
+SURF 0x30
+mat 0
+refs 4
+3 0.403727 0.933591
+2 0.909275 0.933591
+1 0.909275 0.783893
+0 0.403727 0.783893
+kids 0
+OBJECT poly
+name "fd_pitch"
+loc 0.00132974 0.000646424 0.005045
+texture "symbols.png"
+crease 45.000000
+numvert 4
+0 0.00074983 -0.0194069
+0 0.00074983 0.0194069
+0 -0.00074983 0.0194069
+0 -0.00074983 -0.0194069
+numsurf 1
+SURF 0x30
+mat 0
+refs 4
+0 0.510324 0.464321
+1 0.762653 0.464321
+2 0.762653 0.461267
+3 0.510324 0.461267
+kids 0
+OBJECT poly
+name "fd_roll"
+loc 0.00132974 0.000880169 0.00507529
+texture "symbols.png"
+crease 45.000000
+numvert 4
+0 0.0196142 -0.000820077
+0 -0.0196142 -0.000820077
+0 -0.0196142 0.000820077
+0 0.0196142 0.000820077
+numsurf 1
+SURF 0x30
+mat 0
+refs 4
+3 0.510324 0.464321
+2 0.762653 0.464321
+1 0.762653 0.461267
+0 0.510324 0.461267
+kids 0
diff --git a/Models/Instruments/PFD/res/pfd-3d.ac.radar.bck b/Models/Instruments/PFD/res/pfd-3d.ac.radar.bck
deleted file mode 100644
index 9500a490..00000000
--- a/Models/Instruments/PFD/res/pfd-3d.ac.radar.bck
+++ /dev/null
@@ -1,767 +0,0 @@
-AC3Db
-MATERIAL "ac3dmat1" rgb 1 1 1 amb 0 0 0 emis 0.658824 0.670588 0.67451 spec 0 0 0 shi 128 trans 0
-OBJECT world
-kids 39
-OBJECT poly
-name "horizon"
-loc -0.00063943 0.000620101 0.00496066
-texture "horizon.png"
-crease 45.000000
-numvert 4
-0 0.0443777 -0.0369368
-0 0.0443777 0.0369368
-0 -0.0443777 0.0369368
-0 -0.0443777 -0.0369368
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.5875 0.5875
-1 0.4125 0.5875
-2 0.4125 0.4125
-3 0.5875 0.4125
-kids 0
-OBJECT poly
-name "hdg-tape"
-loc -0.00063943 -0.0623471 0.00488526
-texture "hdg-tape.png"
-crease 45.000000
-numvert 4
-0 -0.00631734 -0.0361253
-0 -0.00631734 0.0361253
-0 0.00631731 0.0361253
-0 0.00631731 -0.0361253
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.0605338 0.994588
-2 -0.0513565 0.994588
-1 -0.0513565 -0.0462684
-0 0.0605338 -0.0462684
-kids 0
-OBJECT poly
-name "alt-tape-1"
-loc -0.00063943 -0.000264099 -0.0474465
-texture "alt-tape.png"
-crease 45.000000
-numvert 4
-0 0.0428304 -0.00806341
-0 0.0428304 0.00806338
-0 -0.0428304 0.00806338
-0 -0.0428304 -0.00806341
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.990386 0.217208
-1 0.022378 0.217208
-2 0.0223766 0.0507198
-3 0.990386 0.0507198
-kids 0
-OBJECT poly
-name "radar-alt"
-loc 0.000360576 -0.000264099 -0.0474465
-texture "radar-alt.png"
-crease 45.000000
-numvert 4
-0 0.0428304 -0.00806341
-0 0.0428304 0.00806338
-0 -0.0428304 0.00806338
-0 -0.0428304 -0.00806341
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.990386 0.217208
-1 0.022378 0.217208
-2 0.0223766 0.0507198
-3 0.990386 0.0507198
-kids 0
-OBJECT poly
-name "spd-tape"
-loc -0.00063943 -0.000264099 0.0592757
-texture "spd-tape.png"
-crease 45.000000
-numvert 4
-0 -0.0428304 -0.00990531
-0 -0.0428304 0.00990527
-0 0.0428304 0.00990527
-0 0.0428304 -0.00990531
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.498074 0.321737
-2 0.00829178 0.321737
-1 0.00829178 0.0447528
-0 0.498074 0.0447528
-kids 0
-OBJECT poly
-name "vsi"
-loc 0.00091828 -0.000133 -0.068225
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 -0.040099 -0.00324333
-0 -0.040099 0.00324335
-0 0.040099 0.00324335
-0 0.040099 -0.00324333
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.660342 0.662271
-2 0.638535 0.662271
-1 0.638535 0.258462
-0 0.660342 0.258462
-kids 0
-OBJECT poly
-name "rect"
-loc 0.0643506 0 0
-texture "mask.png"
-crease 45.000000
-numvert 4
--0.0639733 0.0784821 -0.0784821
--0.0639733 0.0784821 0.0784821
--0.0639733 -0.0784821 0.0784821
--0.0639733 -0.0784821 -0.0784821
-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 "spdtrnd-down"
-loc 0.00133822 -0.0211824 0.0513713
-texture "spdtrend.png"
-crease 45.000000
-numvert 4
-0 0.0210118 0.00234548
-0 0.0210118 -0.00234545
-0 -0.0210118 -0.00234544
-0 -0.0210118 0.00234548
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0 0.496308
-2 1.03601 0.496308
-1 1.03601 -0.00461811
-0 0 -0.00461811
-kids 0
-OBJECT poly
-name "spdtrnd-up"
-loc 0.00133822 0.021479 0.0513726
-texture "spdtrend.png"
-crease 45.000000
-numvert 4
-0 0.0210118 -0.00234548
-0 0.0210118 0.00234544
-0 -0.0210118 0.00234544
-0 -0.0210118 -0.00234548
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0 0.496308
-1 1.03601 0.496308
-2 1.03601 -0.00461811
-3 0 -0.00461811
-kids 0
-OBJECT poly
-name "fd_roll"
-loc 0.00132974 0.000720247 0.00491576
-texture "symbols.png"
-crease 45.000000
-numvert 4
--2.32831e-10 0.0195466 -0.000202025
--2.32831e-10 -0.0195466 -0.000202022
--2.32831e-10 -0.0195466 0.000202025
--2.32831e-10 0.0195466 0.000202022
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.510324 0.464321
-2 0.762653 0.464321
-1 0.762653 0.461267
-0 0.510324 0.461267
-kids 0
-OBJECT poly
-name "fd_pitch"
-loc 0.00132974 0.000562423 0.00507358
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 0.000202024 -0.0195466
-0 0.000202024 0.0195466
-0 -0.000202024 0.0195466
-0 -0.000202024 -0.0195466
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.510324 0.464321
-1 0.762653 0.464321
-2 0.762653 0.461267
-3 0.510324 0.461267
-kids 0
-OBJECT poly
-name "ap2_"
-loc 0.00091828 0.0668611 -0.0513014
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 0.00275261 -0.00200026
-0 0.00275261 0.00200026
-0 -0.00275262 0.00200026
-0 -0.00275262 -0.00200026
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.378983 0.971827
-1 0.349521 0.971827
-2 0.349521 0.88264
-3 0.378983 0.88264
-kids 0
-OBJECT poly
-name "ap1_"
-loc 0.00091828 0.0668611 -0.0461522
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 -0.00275262 -0.00200026
-0 -0.00275262 0.00200026
-0 0.00275261 0.00200026
-0 0.00275261 -0.00200026
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.334514 0.97231
-2 0.305052 0.97231
-1 0.305052 0.883124
-0 0.334514 0.883124
-kids 0
-OBJECT poly
-name "ap"
-loc 0.00091828 0.0668611 -0.0371092
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 0.00275261 -0.00531499
-0 0.00275261 0.005315
-0 -0.00275262 0.005315
-0 -0.00275262 -0.00531499
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.297231 0.97231
-1 0.216876 0.97231
-2 0.216876 0.883124
-3 0.297231 0.883124
-kids 0
-OBJECT poly
-name "center"
-loc 0.00113854 -0.0015161 0.00491486
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 -0.00534438 -0.033283
-0 -0.00534438 0.033283
-0 0.00534438 0.033283
-0 0.00534438 -0.033283
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.403727 0.933591
-2 0.909275 0.933591
-1 0.909275 0.783893
-0 0.403727 0.783893
-kids 0
-OBJECT poly
-name "sidestick-pos"
-loc 0.00091828 0.000425801 0.00376866
-texture "autoland.png"
-crease 45.000000
-numvert 4
-0 0.00511882 -0.00334632
-0 -0.00511882 -0.00334632
-0 -0.00511882 0.00615088
-0 0.00511882 0.00615088
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.791565 0.449709
-2 0.68209 0.449709
-1 0.68209 0.0104858
-0 0.791565 0.0104858
-kids 0
-OBJECT poly
-name "sidestick-max"
-loc 0.00091828 -0.0216617 0.0287131
-texture "autoland.png"
-crease 45.000000
-numvert 8
-0 0.00402807 0.00438482
-0 -0.00402807 0.00438482
-0 -0.00402807 -0.00238551
-0 0.00402807 -0.00238551
-0 0.00402807 -0.0523576
-0 -0.00402807 -0.0523576
-0 -0.00402807 -0.0455873
-0 0.00402807 -0.0455873
-numsurf 2
-SURF 0x30
-mat 0
-refs 4
-0 0.629302 0.44775
-1 0.520441 0.44775
-2 0.520441 0.0183234
-3 0.629302 0.0183234
-SURF 0x30
-mat 0
-refs 4
-7 0.629302 0.0183234
-6 0.520441 0.0183234
-5 0.520441 0.44775
-4 0.629302 0.44775
-kids 0
-OBJECT poly
-name "sidestick-max"
-loc 0.00091828 0.0234689 0.0287131
-texture "autoland.png"
-crease 45.000000
-numvert 8
-0 -0.00378506 -0.00238554
-0 -0.00378506 0.0043848
-0 0.00378506 0.0043848
-0 0.00378506 -0.00238554
-0 -0.00378506 -0.0455873
-0 -0.00378506 -0.0523576
-0 0.00378506 -0.0523576
-0 0.00378506 -0.0455873
-numsurf 2
-SURF 0x30
-mat 0
-refs 4
-3 0.629302 0.44775
-2 0.520441 0.44775
-1 0.520441 0.0183234
-0 0.629302 0.0183234
-SURF 0x30
-mat 0
-refs 4
-4 0.629302 0.0183234
-5 0.520441 0.0183234
-6 0.520441 0.44775
-7 0.629302 0.44775
-kids 0
-OBJECT poly
-name "autoland.retard"
-loc 0.00196986 0.0675344 0.0214274
-texture "autoland.png"
-crease 45.000000
-numvert 4
-0 -0.00336499 -0.0150037
-0 -0.00336499 0.0150037
-0 0.00336499 0.0150037
-0 0.00336499 -0.0150037
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.502273 0.503067
-2 0.00159529 0.503067
-1 0.00159529 0.00559068
-0 0.502273 0.00559068
-kids 0
-OBJECT poly
-name "autoland.flare"
-loc 0.00196986 0.0675344 0.0214274
-texture "autoland.png"
-crease 45.000000
-numvert 4
-0 0.00336499 -0.0150037
-0 0.00336499 0.0150037
-0 -0.00336499 0.0150037
-0 -0.00336499 -0.0150037
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 1 0.997604
-1 0.499322 0.997604
-2 0.499322 0.500127
-3 1 0.500127
-kids 0
-OBJECT poly
-name "autoland.land"
-loc 0.00196986 0.0675344 0.0214274
-texture "autoland.png"
-crease 45.000000
-numvert 4
-0 -0.00336499 -0.0150037
-0 -0.00336499 0.0150037
-0 0.00336499 0.0150037
-0 0.00336499 -0.0150037
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.500678 0.997604
-2 0 0.997604
-1 0 0.500127
-0 0.500678 0.500127
-kids 0
-OBJECT poly
-name "gsscale"
-loc 0.00091828 0.0004113 -0.0352752
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 -0.0361804 -0.00381497
-0 0.0361804 -0.00381499
-0 0.0361804 0.00381497
-0 -0.0361804 0.00381498
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.99826 0.988171
-1 0.99826 0.0824336
-2 0.947974 0.0824336
-3 0.947974 0.988171
-kids 0
-OBJECT poly
-name "locscale"
-loc 0.00091828 -0.0478575 0.00489046
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 -0.00428779 -0.0357276
-0 -0.00428779 0.0357276
-0 0.00428777 0.0357276
-0 0.00428777 -0.0357276
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.501561 0.112546
-2 0.964105 0.112546
-1 0.964105 0.00122176
-0 0.501561 0.00122176
-kids 0
-OBJECT poly
-name "gspointer"
-loc 0.00226889 9.10088e-06 -0.0356073
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 0.00547617 0.0031265
-0 -0.00547617 0.0031265
-0 -0.00547617 -0.00312652
-0 0.00547617 -0.00312652
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.239237 0.294683
-1 0.442683 0.294683
-2 0.442683 0.0549766
-3 0.239237 0.0549766
-kids 0
-OBJECT poly
-name "locpointer"
-loc 0.00226889 -0.0482638 0.00541306
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 -0.0031265 -0.00547615
-0 -0.0031265 0.00547617
-0 0.00312651 0.00547617
-0 0.00312651 -0.00547615
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.239237 0.294683
-2 0.442683 0.294683
-1 0.442683 0.0549766
-0 0.239237 0.0549766
-kids 0
-OBJECT poly
-name "stall-tape"
-loc 0.00091828 -0.000281699 0.0476063
-texture "spd-tape.png"
-crease 45.000000
-numvert 4
-0 0.0424935 -0.00136903
-0 0.0424935 0.00136901
-0 -0.0424935 0.00136901
-0 -0.0424935 -0.00136903
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.598403 0.321832
-1 0.501577 0.321832
-2 0.501577 0.0448185
-3 0.598403 0.0448185
-kids 0
-OBJECT poly
-name "vfe-tape"
-loc 0.00091828 -0.000281699 0.0476063
-texture "spd-tape.png"
-crease 45.000000
-numvert 4
-0 -0.0424935 -0.00136903
-0 -0.0424935 0.00136901
-0 0.0424935 0.00136901
-0 0.0424935 -0.00136903
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.66857 0.321965
-2 0.605455 0.321965
-1 0.605455 0.0450599
-0 0.66857 0.0450599
-kids 0
-OBJECT poly
-name "trgt-spd"
-loc 0.00091828 -0.000281699 0.0476063
-texture "trgt-spd2.png"
-crease 45.000000
-numvert 4
-0 -0.0424935 -0.00136903
-0 -0.0424935 0.00136901
-0 0.0424935 0.00136901
-0 0.0424935 -0.00136903
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.998074 0.321737
-2 0.800781 0.321737
-1 0.800781 0.0447528
-0 0.998074 0.0447528
-kids 0
-OBJECT poly
-name "bank"
-loc 0.00147448 0.0381779 0.00511426
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 -0.00444023 -0.00535177
-0 -0.00444022 0.00535178
-0 0.00444023 0.00535178
-0 0.00444023 -0.00535177
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.348876 0.567016
-2 0.505593 0.567016
-1 0.505593 0.295057
-0 0.348876 0.295057
-kids 0
-OBJECT poly
-name "a-thr_"
-loc 0.00091828 0.0546397 -0.0434552
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 0.0027526 -0.0116611
-0 0.0027526 0.0116611
-0 -0.00275262 0.0116611
-0 -0.00275262 -0.0116611
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.388594 0.753036
-1 0.216512 0.753036
-2 0.216512 0.66385
-3 0.388594 0.66385
-kids 0
-OBJECT poly
-name "hdg"
-loc 0.00091828 0.0546397 -0.0102825
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 -0.00275262 -0.0131034
-0 -0.00275262 0.0131034
-0 0.0027526 0.0131034
-0 0.0027526 -0.0131034
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.197081 0.0997394
-2 0.0102356 0.0997394
-1 0.0102351 0.010553
-0 0.197081 0.010553
-kids 0
-OBJECT poly
-name "lnav"
-loc 0.00091828 0.0607147 -0.0102825
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 -0.00275261 -0.0131034
-0 -0.00275261 0.0131034
-0 0.0027526 0.0131034
-0 0.0027526 -0.0131034
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.197477 0.212842
-2 0.0106309 0.212842
-1 0.0106304 0.123656
-0 0.197477 0.123656
-kids 0
-OBJECT poly
-name "loc_"
-loc 0.00091828 0.0667897 -0.0102825
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 0.00275261 -0.0131034
-0 0.00275261 0.0131034
-0 -0.00275262 0.0131034
-0 -0.00275262 -0.0131034
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.197477 0.319013
-1 0.0106309 0.319013
-2 0.0106304 0.229827
-3 0.197477 0.229827
-kids 0
-OBJECT poly
-name "lvlch"
-loc 0.00091828 0.0546397 0.0210761
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 0.0027526 -0.0131034
-0 0.0027526 0.0131034
-0 -0.00275262 0.0131034
-0 -0.00275262 -0.0131034
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.197581 0.427537
-1 0.0107353 0.427537
-2 0.0107348 0.338351
-3 0.197581 0.338351
-kids 0
-OBJECT poly
-name "hold"
-loc 0.00091828 0.0546397 0.0210761
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 -0.00275262 -0.0131034
-0 -0.00275262 0.0131034
-0 0.0027526 0.0131034
-0 0.0027526 -0.0131034
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.197581 0.536424
-2 0.0107353 0.536424
-1 0.0107348 0.447238
-0 0.197581 0.447238
-kids 0
-OBJECT poly
-name "vnav"
-loc 0.00091828 0.0607147 0.0210761
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 0.0027526 -0.0131034
-0 0.0027526 0.0131034
-0 -0.00275261 0.0131034
-0 -0.00275261 -0.0131034
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.195978 0.648574
-1 0.00913179 0.648574
-2 0.00913128 0.559387
-3 0.195978 0.559387
-kids 0
-OBJECT poly
-name "gs_"
-loc 0.00091828 0.0667897 0.0210761
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 -0.00275262 -0.0131034
-0 -0.00275262 0.0131034
-0 0.00275261 0.0131034
-0 0.00275261 -0.0131034
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.195978 0.754745
-2 0.00913179 0.754745
-1 0.00913128 0.665558
-0 0.195978 0.665558
-kids 0
-OBJECT poly
-name "spd-mach"
-loc 0.00091828 0.0606226 0.0520781
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 -0.00275261 -0.0131034
-0 -0.00275261 0.0131034
-0 0.00275262 0.0131034
-0 0.00275262 -0.0131034
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.198173 0.865458
-2 0.0113271 0.865458
-1 0.0113266 0.776272
-0 0.198173 0.776272
-kids 0
-OBJECT poly
-name "spd-ias"
-loc 0.00091828 0.0666976 0.0520781
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 0.00275261 -0.0131034
-0 0.00275261 0.0131034
-0 -0.00275259 0.0131034
-0 -0.00275259 -0.0131034
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.198173 0.971629
-1 0.0113271 0.971629
-2 0.0113266 0.882443
-3 0.198173 0.882443
-kids 0
diff --git a/Models/Instruments/PFD/res/sky.png b/Models/Instruments/PFD/res/sky.png
new file mode 100644
index 00000000..4a7c99eb
Binary files /dev/null and b/Models/Instruments/PFD/res/sky.png differ
diff --git a/Models/Instruments/PFD/res/symbols.png b/Models/Instruments/PFD/res/symbols.png
index b263961b..db8d3ee8 100644
Binary files a/Models/Instruments/PFD/res/symbols.png and b/Models/Instruments/PFD/res/symbols.png differ
diff --git a/Models/Liveries/A320/CFM/D-AIPE.png b/Models/Liveries/A320/CFM/D-AIPE.png
deleted file mode 100644
index 95f16398..00000000
Binary files a/Models/Liveries/A320/CFM/D-AIPE.png and /dev/null differ
diff --git a/Models/Liveries/A320/CFM/D-AIPE.xml b/Models/Liveries/A320/CFM/D-AIPE.xml
deleted file mode 100644
index 538c98f9..00000000
--- a/Models/Liveries/A320/CFM/D-AIPE.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<PropertyList>
- <sim>
- <model>
- <livery>
- <name type="string">Lufthansa (D-AIPE)</name>
- <texture>Liveries/A320/CFM/D-AIPE.png</texture>
- </livery>
- </model>
- </sim>
-
- <options>
- <EIS2 type="bool">1</EIS2>
- </options>
-
- <sharklet type="bool">0</sharklet>
-</PropertyList>
diff --git a/Models/Liveries/A320/CFM/DLH.png b/Models/Liveries/A320/CFM/DLH.png
index bb675e26..15e0896f 100644
Binary files a/Models/Liveries/A320/CFM/DLH.png and b/Models/Liveries/A320/CFM/DLH.png differ
diff --git a/Models/Liveries/A320/CFM/DLH.xml b/Models/Liveries/A320/CFM/DLH.xml
index 3e92f900..c4a51841 100644
--- a/Models/Liveries/A320/CFM/DLH.xml
+++ b/Models/Liveries/A320/CFM/DLH.xml
@@ -1,19 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- Deutsche Lufthansa AG livery for Airbus Industries A320-200 mady by D-SVEN. Have fun! -->
<PropertyList>
- <sim>
- <model>
- <livery>
- <name>Lufthansa</name>
- <texture>Liveries/A320/CFM/DLH.png</texture>
- </livery>
- </model>
- </sim>
-
+ <sim>
+ <model>
+ <livery>
+ <name type="string">Lufthansa D-AIZA</name>
+ <texture>Liveries/A320/CFM/DLH.png</texture>
+ </livery>
+ </model>
+ </sim>
+
<options>
- <EIS2 type="bool">0</EIS2>
+ <EIS2 type="bool">1</EIS2>
</options>
-
+
<sharklet type="bool">0</sharklet>
</PropertyList>
-
diff --git a/Models/Liveries/A320/CFM/DLH_WL.png b/Models/Liveries/A320/CFM/DLH_WL.png
new file mode 100644
index 00000000..19e58825
Binary files /dev/null and b/Models/Liveries/A320/CFM/DLH_WL.png differ
diff --git a/Models/Liveries/A320/CFM/DLH_WL.xml b/Models/Liveries/A320/CFM/DLH_WL.xml
new file mode 100644
index 00000000..9ad43fd7
--- /dev/null
+++ b/Models/Liveries/A320/CFM/DLH_WL.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- Deutsche Lufthansa AG livery for Airbus Industries A320-200 mady by D-SVEN. Have fun! -->
+<PropertyList>
+ <sim>
+ <model>
+ <livery>
+ <name>Lufthansa D-AIUA (WL)</name>
+ <texture>Liveries/A320/CFM/DLH_WL.png</texture>
+ </livery>
+ </model>
+ </sim>
+
+ <options>
+ <EIS2 type="bool">0</EIS2>
+ </options>
+
+ <sharklet type="bool">1</sharklet>
+</PropertyList>
+
+
diff --git a/Models/Liveries/A320/CFM/DLHold.png b/Models/Liveries/A320/CFM/DLHold.png
new file mode 100644
index 00000000..bb675e26
Binary files /dev/null and b/Models/Liveries/A320/CFM/DLHold.png differ
diff --git a/Nasal/PFD_FMA.nas b/Nasal/PFD_FMA.nas
index ebecbbeb..aeea539a 100644
--- a/Nasal/PFD_FMA.nas
+++ b/Nasal/PFD_FMA.nas
@@ -60,26 +60,35 @@ setlistener("/it-autoflight/mode/vert", func {
var vert = getprop("/it-autoflight/mode/vert");
if (vert == "ALT HLD") {
setprop("/modes/pfd/fma/pitch-mode", "ALT");
+ setprop("/modes/pfd/fma/pitch-mode2-armed", " ");
} else if (vert == "ALT CAP") {
setprop("/modes/pfd/fma/pitch-mode", "ALT");
+ setprop("/modes/pfd/fma/pitch-mode2-armed", " ");
} else if (vert == "V/S") {
setprop("/modes/pfd/fma/pitch-mode", "V/S");
+ setprop("/modes/pfd/fma/pitch-mode2-armed", "ALT");
} else if (vert == "G/S") {
setprop("/modes/pfd/fma/pitch-mode", "G/S");
+ setprop("/modes/pfd/fma/pitch-mode2-armed", " ");
} else if (vert == "SPD CLB") {
setprop("/modes/pfd/fma/pitch-mode", "OP CLB");
+ setprop("/modes/pfd/fma/pitch-mode2-armed", "ALT");
} else if (vert == "SPD DES") {
setprop("/modes/pfd/fma/pitch-mode", "OP DES");
+ setprop("/modes/pfd/fma/pitch-mode2-armed", "ALT");
} else if (vert == "FPA") {
setprop("/modes/pfd/fma/pitch-mode", "FPA");
+ setprop("/modes/pfd/fma/pitch-mode2-armed", "ALT");
} else if (vert == "LAND") {
setprop("/modes/pfd/fma/pitch-mode", "LAND");
} else if (vert == "FLARE") {
setprop("/modes/pfd/fma/pitch-mode", "FLARE");
} else if (vert == "T/O CLB") {
setprop("/modes/pfd/fma/pitch-mode", "SRS");
+ setprop("/modes/pfd/fma/pitch-mode2-armed", "CLB");
} else if (vert == "G/A CLB") {
setprop("/modes/pfd/fma/pitch-mode", "SRS");
+ setprop("/modes/pfd/fma/pitch-mode2-armed", "ALT");
}
});
@@ -111,6 +120,18 @@ var vnav_clbdes = func {
}
}
+# Arm HDG or NAV
+setlistener("/it-autoflight/mode/arm", func {
+ var arm = getprop("/it-autoflight/mode/arm");
+ if (arm == "HDG") {
+ setprop("/modes/pfd/fma/roll-mode-armed", "HDG");
+ } else if (arm == "LNV") {
+ setprop("/modes/pfd/fma/roll-mode-armed", "NAV");
+ } else if (arm == " ") {
+ setprop("/modes/pfd/fma/roll-mode-armed", " ");
+ }
+});
+
# Arm LOC
setlistener("/it-autoflight/output/loc-armed", func {
var loca = getprop("/it-autoflight/output/loc-armed");
diff --git a/Nasal/various.nas b/Nasal/various.nas
index d4069344..f77a2018 100644
--- a/Nasal/various.nas
+++ b/Nasal/various.nas
@@ -142,7 +142,7 @@ setlistener("/sim/signals/fdm-initialized", func {
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 aglft = agl - 11.101; # 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);
diff --git a/Paintkit/a320-sharklets.paintkit.xcf b/Paintkit/a320-sharklets.paintkit.xcf
new file mode 100644
index 00000000..1f8d534f
Binary files /dev/null and b/Paintkit/a320-sharklets.paintkit.xcf differ
diff --git a/Systems/engine-timing.xml b/Systems/engine-timing.xml
index e77f5950..4f951145 100644
--- a/Systems/engine-timing.xml
+++ b/Systems/engine-timing.xml
@@ -223,23 +223,6 @@
<max-rate-of-change>1000</max-rate-of-change>
</filter>
- <filter>
- <name>PFD IAS Sync</name>
- <type>gain</type>
- <gain>1</gain>
- <enable>
- <condition>
- <equals>
- <property>/it-autoflight/input/kts-mach</property>
- <value>1</value>
- </equals>
- </condition>
- </enable>
- <update-interval-secs type="double">0.5</update-interval-secs>
- <input>/instrumentation/airspeed-indicator/indicated-speed-kt</input>
- <output>/it-autoflight/input/spd-kts</output>
- </filter>
-
<filter>
<name>Throttle L</name>
<type>gain</type>
diff --git a/Systems/it-autoflight.xml b/Systems/it-autoflight.xml
index 19374337..fecce117 100644
--- a/Systems/it-autoflight.xml
+++ b/Systems/it-autoflight.xml
@@ -74,63 +74,285 @@
<!-- =============================================================== -->
<!-- Autopilot Helpers -->
<!-- =============================================================== -->
+
+ <filter>
+ <name>KTS INPUT FILTER</name>
+ <debug>false</debug>
+ <feedback-if-disabled>true</feedback-if-disabled>
+ <initialize-to>output</initialize-to>
+ <input>
+ <condition>
+ <not-equals>
+ <property>/it-autoflight/mode/vert</property>
+ <value>T/O CLB</value>
+ </not-equals>
+ </condition>
+ <property>/it-autoflight/input/spd-kts</property>
+ </input>
+ <input>
+ <condition>
+ <equals>
+ <property>/it-autoflight/mode/vert</property>
+ <value>T/O CLB</value>
+ </equals>
+ </condition>
+ <property>/it-autoflight/settings/togaspd</property>
+ </input>
+ <output>/it-autoflight/internal/flch-kts</output>
+ <type>noise-spike</type>
+ <max-rate-of-change>
+ <condition>
+ <or>
+ <equals>
+ <property>/gear/gear[1]/wow</property>
+ <value>1</value>
+ </equals>
+ <equals>
+ <property>/gear/gear[2]/wow</property>
+ <value>1</value>
+ </equals>
+ </or>
+ </condition>
+ <value>100</value>
+ </max-rate-of-change>
+ <max-rate-of-change>
+ <condition>
+ <and>
+ <equals>
+ <property>/gear/gear[1]/wow</property>
+ <value>0</value>
+ </equals>
+ <equals>
+ <property>/gear/gear[2]/wow</property>
+ <value>0</value>
+ </equals>
+ </and>
+ </condition>
+ <value>5</value>
+ </max-rate-of-change>
+ </filter>
+
+ <filter>
+ <name>MACH INPUT FILTER</name>
+ <debug>false</debug>
+ <feedback-if-disabled>true</feedback-if-disabled>
+ <initialize-to>output</initialize-to>
+ <input>
+ <property>/it-autoflight/input/spd-mach</property>
+ </input>
+ <output>/it-autoflight/internal/flch-mach</output>
+ <type>noise-spike</type>
+ <max-rate-of-change>
+ <condition>
+ <or>
+ <equals>
+ <property>/gear/gear[1]/wow</property>
+ <value>1</value>
+ </equals>
+ <equals>
+ <property>/gear/gear[2]/wow</property>
+ <value>1</value>
+ </equals>
+ </or>
+ </condition>
+ <value>1</value>
+ </max-rate-of-change>
+ <max-rate-of-change>
+ <condition>
+ <and>
+ <equals>
+ <property>/gear/gear[1]/wow</property>
+ <value>0</value>
+ </equals>
+ <equals>
+ <property>/gear/gear[2]/wow</property>
+ <value>0</value>
+ </equals>
+ </and>
+ </condition>
+ <value>0.05</value>
+ </max-rate-of-change>
+ </filter>
+
+ <filter>
+ <name>IAS SYNC</name>
+ <type>gain</type>
+ <gain>1</gain>
+ <enable>
+ <condition>
+ <equals>
+ <property>/it-autoflight/input/kts-mach</property>
+ <value>1</value>
+ </equals>
+ </condition>
+ </enable>
+ <update-interval-secs type="double">0.5</update-interval-secs>
+ <input>/instrumentation/airspeed-indicator/indicated-speed-kt</input>
+ <output>/it-autoflight/input/spd-kts</output>
+ </filter>
+
+ <filter>
+ <name>MACH SYNC</name>
+ <type>gain</type>
+ <gain>1</gain>
+ <enable>
+ <condition>
+ <equals>
+ <property>/it-autoflight/input/kts-mach</property>
+ <value>0</value>
+ </equals>
+ </condition>
+ </enable>
+ <update-interval-secs type="double">0.5</update-interval-secs>
+ <input>/instrumentation/airspeed-indicator/indicated-mach</input>
+ <output>/it-autoflight/input/spd-mach</output>
+ </filter>
<filter>
- <name>MAGNETIC HDG ERROR DEG</name>
+ <name>HEADING ERROR DEG</name>
<debug>false</debug>
<type>gain</type>
<input>
+ <condition>
+ <and>
+ <equals>
+ <property>/it-autoflight/output/lat</property>
+ <value>0</value>
+ </equals>
+ <equals>
+ <property>/it-autoflight/input/trk</property>
+ <value>0</value>
+ </equals>
+ </and>
+ </condition>
<property>/it-autoflight/input/hdg</property>
<offset>
<property>/orientation/heading-magnetic-deg</property>
<scale>-1.0</scale>
</offset>
</input>
- <output>/it-autoflight/internal/heading-bug-error-deg</output>
- <output>/it-autoflight/internal/fdm-heading-bug-error-deg</output>
- <period>
- <min>-180</min>
- <max>180</max>
- </period>
- <gain>1.0</gain>
- </filter>
-
- <filter>
- <name>TRUE HDG ERROR DEG</name>
- <debug>false</debug>
- <type>gain</type>
<input>
+ <condition>
+ <and>
+ <equals>
+ <property>/it-autoflight/output/lat</property>
+ <value>0</value>
+ </equals>
+ <equals>
+ <property>/it-autoflight/input/trk</property>
+ <value>1</value>
+ </equals>
+ </and>
+ </condition>
<property>/it-autoflight/input/hdg</property>
<offset>
<property>/orientation/heading-deg</property>
<scale>-1.0</scale>
</offset>
</input>
- <output>/it-autoflight/internal/true-heading-error-deg</output>
+ <input>
+ <condition>
+ <equals>
+ <property>/it-autoflight/output/lat</property>
+ <value>1</value>
+ </equals>
+ </condition>
+ <property>/it-autoflight/input/hdg</property>
+ <offset>
+ <property>/autopilot/settings/true-heading-deg</property>
+ <scale>-1.0</scale>
+ </offset>
+ </input>
+ <output>/it-autoflight/internal/heading-error-deg-cmd</output>
<period>
<min>-180</min>
<max>180</max>
</period>
<gain>1.0</gain>
</filter>
-
+
<filter>
- <name>LNAV HDG ERROR DEG</name>
+ <name>HEADING ERROR FILTER</name>
<debug>false</debug>
- <type>gain</type>
+ <feedback-if-disabled>true</feedback-if-disabled>
+ <initialize-to>output</initialize-to>
<input>
- <property>/autopilot/settings/true-heading-deg</property>
- <offset>
- <property>/orientation/heading-deg</property>
- <scale>-1.0</scale>
- </offset>
+ <property>/it-autoflight/internal/heading-error-deg-cmd</property>
</input>
- <output>/it-autoflight/internal/lnav-hdg-error-deg</output>
- <period>
- <min>-180</min>
- <max>180</max>
- </period>
- <gain>1.0</gain>
+ <output>/it-autoflight/internal/heading-error-deg</output>
+ <type>noise-spike</type>
+ <max-rate-of-change>
+ <condition>
+ <or>
+ <equals>
+ <property>/gear/gear[1]/wow</property>
+ <value>1</value>
+ </equals>
+ <equals>
+ <property>/gear/gear[2]/wow</property>
+ <value>1</value>
+ </equals>
+ </or>
+ </condition>
+ <value>90</value>
+ </max-rate-of-change>
+ <max-rate-of-change>
+ <condition>
+ <and>
+ <equals>
+ <property>/gear/gear[1]/wow</property>
+ <value>0</value>
+ </equals>
+ <equals>
+ <property>/gear/gear[2]/wow</property>
+ <value>0</value>
+ </equals>
+ </and>
+ </condition>
+ <value>2.5</value>
+ </max-rate-of-change>
+ </filter>
+
+ <filter>
+ <name>VERT SPEED FILTER</name>
+ <debug>false</debug>
+ <feedback-if-disabled>true</feedback-if-disabled>
+ <initialize-to>output</initialize-to>
+ <input>
+ <property>/it-autoflight/input/vs</property>
+ </input>
+ <output>/it-autoflight/internal/vs</output>
+ <type>noise-spike</type>
+ <max-rate-of-change>
+ <condition>
+ <or>
+ <equals>
+ <property>/gear/gear[1]/wow</property>
+ <value>1</value>
+ </equals>
+ <equals>
+ <property>/gear/gear[2]/wow</property>
+ <value>1</value>
+ </equals>
+ </or>
+ </condition>
+ <value>2000</value>
+ </max-rate-of-change>
+ <max-rate-of-change>
+ <condition>
+ <and>
+ <equals>
+ <property>/gear/gear[1]/wow</property>
+ <value>0</value>
+ </equals>
+ <equals>
+ <property>/gear/gear[2]/wow</property>
+ <value>0</value>
+ </equals>
+ </and>
+ </condition>
+ <value>300</value>
+ </max-rate-of-change>
</filter>
<filter>
@@ -171,44 +393,6 @@
<gain>1.0</gain>
</filter>
- <filter>
- <name>NAV COURSE ERROR</name>
- <debug>false</debug>
- <type>gain</type>
- <input>
- <condition>
- <equals>
- <property>/it-autoflight/settings/use-nav2-radio</property>
- <value>0</value>
- </equals>
- </condition>
- <property>/instrumentation/nav[0]/radials/selected-deg</property>
- <offset>
- <property>/orientation/heading-magnetic-deg</property>
- <scale>-1.0</scale>
- </offset>
- </input>
- <input>
- <condition>
- <equals>
- <property>/it-autoflight/settings/use-nav2-radio</property>
- <value>1</value>
- </equals>
- </condition>
- <property>/instrumentation/nav[1]/radials/selected-deg</property>
- <offset>
- <property>/orientation/heading-magnetic-deg</property>
- <scale>-1.0</scale>
- </offset>
- </input>
- <output>/it-autoflight/internal/nav-course-error</output>
- <period>
- <min>-180</min>
- <max>180</max>
- </period>
- <gain>1.0</gain>
- </filter>
-
<filter>
<name>INTERNAL VERTICAL SPEED COMPUTER</name>
<debug>false</debug>
@@ -244,34 +428,6 @@
<output>/it-autoflight/internal/target-fpm-b</output>
<gain>55.5</gain>
</filter>
-
- <filter>
- <name>STATIC PRESSURE COMPUTER</name>
- <debug>false</debug>
- <type>derivative</type>
- <input>/systems/static[0]/pressure-inhg</input>
- <output>/it-autoflight/internal/pressure-rate</output>
- <filter-time>1.0</filter-time>
- </filter>
-
- <filter>
- <name>NAV1 TRACK ERROR</name>
- <debug>false</debug>
- <type>gain</type>
- <input>
- <property>/instrumentation/nav[0]/radials/target-auto-hdg-deg</property>
- <offset>
- <property>/orientation/track-deg</property>
- <scale>-1.0</scale>
- </offset>
- </input>
- <output>/it-autoflight/internal/nav1-track-error-deg</output>
- <period>
- <min>-180</min>
- <max>180</max>
- </period>
- <gain>1.0</gain>
- </filter>
<filter>
<name>NAV1 G/S FPM Calc</name>
@@ -317,49 +473,7 @@
</condition>
</enable>
<input>
- <condition>
- <and>
- <equals>
- <property>/it-autoflight/output/lat</property>
- <value>0</value>
- </equals>
- <equals>
- <property>/it-autoflight/input/trk</property>
- <value>0</value>
- </equals>
- </and>
- </condition>
- <property>/it-autoflight/internal/heading-bug-error-deg</property>
- <scale>
- <property>/it-autoflight/config/cmd/roll-scale</property>
- </scale>
- </input>
- <input>
- <condition>
- <and>
- <equals>
- <property>/it-autoflight/output/lat</property>
- <value>0</value>
- </equals>
- <equals>
- <property>/it-autoflight/input/trk</property>
- <value>1</value>
- </equals>
- </and>
- </condition>
- <property>/it-autoflight/internal/true-heading-error-deg</property>
- <scale>
- <property>/it-autoflight/config/cmd/roll-scale</property>
- </scale>
- </input>
- <input>
- <condition>
- <equals>
- <property>/it-autoflight/output/lat</property>
- <value>1</value>
- </equals>
- </condition>
- <property>/it-autoflight/internal/lnav-hdg-error-deg</property>
+ <property>/it-autoflight/internal/heading-error-deg</property>
<scale>
<property>/it-autoflight/config/cmd/roll-scale</property>
</scale>
@@ -459,8 +573,8 @@
<gamma>0.0</gamma>
<Ti>10.0</Ti>
<Td>0.00001</Td>
- <u_min>-30</u_min>
- <u_max>30</u_max>
+ <u_min>-25</u_min>
+ <u_max>25</u_max>
</config>
</pid-controller>
@@ -678,10 +792,16 @@
<debug>false</debug>
<enable>
<condition>
- <equals>
- <property>/it-autoflight/output/vert</property>
- <value>4</value>
- </equals>
+ <or>
+ <equals>
+ <property>/it-autoflight/output/vert</property>
+ <value>4</value>
+ </equals>
+ <equals>
+ <property>/it-autoflight/output/vert</property>
+ <value>7</value>
+ </equals>
+ </or>
</condition>
</enable>
<input>
@@ -701,7 +821,7 @@
</equals>
</condition>
<property>/it-autoflight/internal/lookahead-15-sec-mach</property>
- <scale>350.0</scale>
+ <scale>500.0</scale>
</input>
<reference>
<condition>
@@ -710,7 +830,7 @@
<value>0</value>
</equals>
</condition>
- <property>/it-autoflight/input/spd-kts</property>
+ <property>/it-autoflight/internal/flch-kts</property>
</reference>
<reference>
<condition>
@@ -719,132 +839,104 @@
<value>1</value>
</equals>
</condition>
- <property>/it-autoflight/input/spd-mach</property>
- <scale>350.0</scale>
+ <property>/it-autoflight/internal/flch-mach</property>
+ <scale>500.0</scale>
</reference>
<output>
<property>/it-autoflight/internal/target-fpm-b</property>
</output>
<config>
- <Kp>-40</Kp>
+ <Kp>
+ <condition>
+ <equals>
+ <property>/it-autoflight/output/vert</property>
+ <value>4</value>
+ </equals>
+ </condition>
+ <value>-40</value>
+ </Kp>
+ <Kp>
+ <condition>
+ <equals>
+ <property>/it-autoflight/output/vert</property>
+ <value>7</value>
+ </equals>
+ </condition>
+ <value>-55</value>
+ </Kp>
<beta>1.0</beta>
<alpha>0.1</alpha>
<gamma>0.0</gamma>
<Ti>2.5</Ti>
- <Td>0.001</Td>
+ <Td>0.001</Td>
<u_min>
<condition>
- <greater-than>
- <property>/it-autoflight/internal/alt</property>
- <property>/instrumentation/altimeter/indicated-altitude-ft</property>
- </greater-than>
+ <equals>
+ <property>/it-autoflight/output/thr-mode</property>
+ <value>2</value>
+ </equals>
</condition>
- <value>200</value>
+ <value>150</value>
</u_min>
<u_min>
<condition>
- <less-than>
- <property>/it-autoflight/internal/alt</property>
- <property>/instrumentation/altimeter/indicated-altitude-ft</property>
- </less-than>
+ <equals>
+ <property>/it-autoflight/output/thr-mode</property>
+ <value>1</value>
+ </equals>
</condition>
<value>-6000</value>
</u_min>
<u_max>
<condition>
- <greater-than>
- <property>/it-autoflight/internal/alt</property>
- <property>/instrumentation/altimeter/indicated-altitude-ft</property>
- </greater-than>
+ <and>
+ <equals>
+ <property>/it-autoflight/output/thr-mode</property>
+ <value>2</value>
+ </equals>
+ <and>
+ <equals>
+ <property>/gear/gear[1]/wow</property>
+ <value>0</value>
+ </equals>
+ <equals>
+ <property>/gear/gear[2]/wow</property>
+ <value>0</value>
+ </equals>
+ </and>
+ </and>
</condition>
<value>10000</value>
</u_max>
- <u_max>
- <condition>
- <less-than>
- <property>/it-autoflight/internal/alt</property>
- <property>/instrumentation/altimeter/indicated-altitude-ft</property>
- </less-than>
- </condition>
- <value>-150</value>
- </u_max>
- </config>
- </pid-controller>
-
- <pid-controller>
- <name>TOGA SPEED BY PITCH</name>
- <debug>false</debug>
- <enable>
- <condition>
- <equals>
- <property>/it-autoflight/output/vert</property>
- <value>7</value>
- </equals>
- </condition>
- </enable>
- <input>
- <property>/it-autoflight/internal/lookahead-10-sec-airspeed-kt</property>
- </input>
- <reference>
- <condition>
- <equals>
- <property>/it-autoflight/mode/vert</property>
- <value>T/O CLB</value>
- </equals>
- </condition>
- <property>/it-autoflight/settings/togaspd</property>
- </reference>
- <reference>
- <condition>
- <equals>
- <property>/it-autoflight/mode/vert</property>
- <value>G/A CLB</value>
- </equals>
- </condition>
- <property>/it-autoflight/input/spd-kts</property>
- </reference>
- <output>
- <property>/it-autoflight/internal/target-fpm-b</property>
- </output>
- <config>
- <Kp>-55</Kp>
- <beta>1.0</beta>
- <alpha>0.1</alpha>
- <gamma>0.0</gamma>
- <Ti>2.5</Ti>
- <Td>0.001</Td>
- <u_min>
- <value>150</value>
- </u_min>
<u_max>
<condition>
<and>
<equals>
- <property>/gear/gear[1]/wow</property>
- <value>0</value>
- </equals>
- <equals>
- <property>/gear/gear[2]/wow</property>
- <value>0</value>
+ <property>/it-autoflight/output/thr-mode</property>
+ <value>2</value>
</equals>
+ <or>
+ <equals>
+ <property>/gear/gear[1]/wow</property>
+ <value>1</value>
+ </equals>
+ <equals>
+ <property>/gear/gear[2]/wow</property>
+ <value>1</value>
+ </equals>
+ </or>
</and>
</condition>
- <value>8000</value>
+ <value>1000</value>
</u_max>
<u_max>
<condition>
- <or>
- <equals>
- <property>/gear/gear[1]/wow</property>
- <value>1</value>
- </equals>
- <equals>
- <property>/gear/gear[2]/wow</property>
- <value>1</value>
- </equals>
- </or>
+ <equals>
+ <property>/it-autoflight/output/thr-mode</property>
+ <value>1</value>
+ </equals>
</condition>
- <value>1000</value>
+ <value>-150</value>
</u_max>
</config>
</pid-controller>
@@ -877,7 +969,7 @@
</equals>
</condition>
<property>/it-autoflight/internal/lookahead-15-sec-mach</property>
- <scale>350.0</scale>
+ <scale>500.0</scale>
</input>
<reference>
<condition>
@@ -886,7 +978,7 @@
<value>0</value>
</equals>
</condition>
- <property>/it-autoflight/input/spd-kts</property>
+ <property>/it-autoflight/internal/flch-kts</property>
</reference>
<reference>
<condition>
@@ -895,8 +987,8 @@
<value>1</value>
</equals>
</condition>
- <property>/it-autoflight/input/spd-mach</property>
- <scale>350.0</scale>
+ <property>/it-autoflight/internal/flch-mach</property>
+ <scale>500.0</scale>
</reference>
<output>
<property>/it-autoflight/internal/target-fpm-b</property>
@@ -915,7 +1007,7 @@
<property>/instrumentation/altimeter/indicated-altitude-ft</property>
</greater-than>
</condition>
- <value>200</value>
+ <value>150</value>
</u_min>
<u_min>
<condition>
@@ -1027,7 +1119,7 @@
<value>1</value>
</equals>
</condition>
- <property>/it-autoflight/input/vs</property>
+ <property>/it-autoflight/internal/vs</property>
<scale>0.16667</scale>
</reference>
<reference>
diff --git a/Systems/it-fbw-b.xml b/Systems/it-fbw-b.xml
index f1e88b28..3ba2867e 100644
--- a/Systems/it-fbw-b.xml
+++ b/Systems/it-fbw-b.xml
@@ -110,8 +110,8 @@
<beta>1</beta>
<alpha>0.1</alpha>
<gamma>0</gamma>
- <Ti>10</Ti>
- <Td>0.00001</Td>
+ <Ti>5</Ti>
+ <Td>0.1</Td>
<u_min>-1</u_min>
<u_max>1</u_max>
</config>
@@ -247,12 +247,12 @@
<property>/controls/flight/elevator-fbw-cmd</property>
</output>
<config>
- <Kp>-0.20</Kp>
+ <Kp>-0.29</Kp>
<beta>1</beta>
<alpha>0.1</alpha>
<gamma>0</gamma>
- <Ti>10</Ti>
- <Td>0.00001</Td>
+ <Ti>5</Ti>
+ <Td>0.1</Td>
<u_min>-1</u_min>
<u_max>1</u_max>
</config>
diff --git a/Systems/pfd.xml b/Systems/pfd.xml
index a3c86d72..e407ef44 100644
--- a/Systems/pfd.xml
+++ b/Systems/pfd.xml
@@ -370,5 +370,30 @@
<min>-0.24</min>
<max>0</max>
</filter>
+
+ <!-- =============================================================== -->
+ <!-- Other stuff -->
+ <!-- =============================================================== -->
+
+ <filter>
+ <name>Ground Horizon</name>
+ <type>gain</type>
+ <gain>1</gain>
+ <update-interval-secs type="double">0.05</update-interval-secs>
+ <input>
+ <expression>
+ <sum>
+ <property>/orientation/pitch-deg</property>
+ <table>
+ <property>/position/gear-agl-ft</property>
+ <entry><ind> 2</ind><dep> 0</dep></entry>
+ <entry><ind>150</ind><dep>16</dep></entry>
+ </table>
+ </sum>
+ </expression>
+ </input>
+ <output>/instrumentation/pfd/horizon-ground</output>
+ <max>16</max>
+ </filter>
</PropertyList>