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

Merge branch 'master' of https://www.github.com/it0uchpods/A320Family

Browse source 
Conflicts:
	A320-main.xml
This commit is contained in:
Jonathan Redpath 2017-06-21 10:51:47 +01:00
commit 2009de11d5
31 changed files with 398 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
A320-main.xml
View file

@ -344,7 +344,7 @@
<cmd>
<roll-kp>-0.9</roll-kp>
<roll-scale>1.6</roll-scale>
<vorloc>-4.0</vorloc>
<vorloc>-2.8</vorloc>
<vs>0.01</vs>
<fpa>0.30</fpa>
</cmd>

4
Engines/cfm56_5a1.xml
View file

@ -2,8 +2,8 @@
<turbine_engine name="CFM56_5A1">
<milthrust> 27000 </milthrust> <!-- Will put proper thrust amount once FDE sorted out -->
<bypassratio> 7.2 </bypassratio>
<tsfc> 0.412 </tsfc>
<bypassratio> 8.1 </bypassratio>
<tsfc> 0.5 </tsfc>
<bleed> 0.03 </bleed>
<idlen1> 22.4 </idlen1>
<idlen2> 60.9 </idlen2>

4
Engines/cfm56_5b3.xml
View file

@ -2,8 +2,8 @@
<turbine_engine name="CFM56_5B3">
<milthrust> 27000 </milthrust> <!-- Will put proper thrust amount once FDE sorted out -->
<bypassratio> 7.2 </bypassratio>
<tsfc> 0.412 </tsfc>
<bypassratio> 8.1 </bypassratio>
<tsfc> 0.5 </tsfc>
<bleed> 0.03 </bleed>
<idlen1> 22.4 </idlen1>
<idlen2> 60.9 </idlen2>

4
Engines/cfm56_5b4.xml
View file

@ -2,8 +2,8 @@
<turbine_engine name="CFM56_5B4">
<milthrust> 27000 </milthrust>
<bypassratio> 7.2 </bypassratio>
<tsfc> 0.412 </tsfc>
<bypassratio> 8.1 </bypassratio>
<tsfc> 0.5 </tsfc>
<bleed> 0.03 </bleed>
<idlen1> 22.4 </idlen1>
<idlen2> 60.9 </idlen2>

4
Engines/cfm56_5b6.xml
View file

@ -2,8 +2,8 @@
<turbine_engine name="CFM56_5B6">
<milthrust> 27000 </milthrust> <!-- Will put proper thrust amount once FDE sorted out -->
<bypassratio> 7.2 </bypassratio>
<tsfc> 0.412 </tsfc>
<bypassratio> 8.1 </bypassratio>
<tsfc> 0.5 </tsfc>
<bleed> 0.03 </bleed>
<idlen1> 22.4 </idlen1>
<idlen2> 60.9 </idlen2>

4
Engines/leap1a26.xml
View file

@ -2,8 +2,8 @@
<turbine_engine name="leap1a26">
<milthrust> 27000 </milthrust> <!-- Will put proper thrust amount once FDE sorted out -->
<bypassratio> 7.2 </bypassratio>
<tsfc> 0.412 </tsfc>
<bypassratio> 8.1 </bypassratio>
<tsfc> 0.5 </tsfc>
<bleed> 0.03 </bleed>
<idlen1> 22.4 </idlen1>
<idlen2> 60.9 </idlen2>

4
Engines/leap1a32.xml
View file

@ -2,8 +2,8 @@
<turbine_engine name="leap1a32">
<milthrust> 27000 </milthrust> <!-- Will put proper thrust amount once FDE sorted out -->
<bypassratio> 7.2 </bypassratio>
<tsfc> 0.412 </tsfc>
<bypassratio> 8.1 </bypassratio>
<tsfc> 0.5 </tsfc>
<bleed> 0.03 </bleed>
<idlen1> 22.4 </idlen1>
<idlen2> 60.9 </idlen2>

4
Engines/v2522_a5.xml
View file

@ -2,8 +2,8 @@
<turbine_engine name="V2527_A5">
<milthrust> 26600 </milthrust> <!-- Will put proper thrust amount once FDE sorted out -->
<bypassratio> 7.1 </bypassratio>
<tsfc> 0.412 </tsfc>
<bypassratio> 10.1 </bypassratio>
<tsfc> 0.5 </tsfc>
<bleed> 0.03 </bleed>
<idlen1> 22.4 </idlen1>
<idlen2> 60.9 </idlen2>

4
Engines/v2527_a5.xml
View file

@ -2,8 +2,8 @@
<turbine_engine name="V2527_A5">
<milthrust> 26600 </milthrust>
<bypassratio> 7.1 </bypassratio>
<tsfc> 0.412 </tsfc>
<bypassratio> 10.1 </bypassratio>
<tsfc> 0.5 </tsfc>
<bleed> 0.03 </bleed>
<idlen1> 22.4 </idlen1>
<idlen2> 60.9 </idlen2>

4
Engines/v2533_a5.xml
View file

@ -2,8 +2,8 @@
<turbine_engine name="V2527_A5">
<milthrust> 26600 </milthrust> <!-- Will put proper thrust amount once FDE sorted out -->
<bypassratio> 7.1 </bypassratio>
<tsfc> 0.412 </tsfc>
<bypassratio> 10.1 </bypassratio>
<tsfc> 0.5 </tsfc>
<bleed> 0.03 </bleed>
<idlen1> 22.4 </idlen1>
<idlen2> 60.9 </idlen2>

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

@ -195,6 +195,38 @@
</equals>
<not><property>/gear/gear[1]/wow</property></not>
<not><property>/gear/gear[2]/wow</property></not>
<equals>
<property>/it-autoflight/custom/trk-fpa</property>
<value>0</value>
</equals>
<less-than>
<property>orientation/roll-deg</property>
<value>45</value>
</less-than>
<greater-than>
<property>orientation/roll-deg</property>
<value>-45</value>
</greater-than>
</and>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>fpd</object-name>
<object-name>fpv</object-name>
<condition>
<and>
<equals>
<property>/it-autoflight/output/fd1</property>
<value>1</value>
</equals>
<not><property>/gear/gear[1]/wow</property></not>
<not><property>/gear/gear[2]/wow</property></not>
<equals>
<property>/it-autoflight/custom/trk-fpa</property>
<value>1</value>
</equals>
<less-than>
<property>orientation/roll-deg</property>
<value>45</value>
@ -329,10 +361,86 @@
</axis>
</animation>
<animation>
<type>translate</type>
<object-name>fpv</object-name>
<property>/instrumentation/pfd/track-diff</property>
<factor>0.00260</factor>
<axis>
<x>0</x>
<y>1</y>
<z>0</z>
</axis>
</animation>
<animation>
<type>translate</type>
<object-name>fpv</object-name>
<property>/orientation/pitch-deg</property>
<factor>0.001955078</factor>
<axis>
<x>0</x>
<y>0</y>
<z>-1</z>
</axis>
</animation>
<animation>
<type>translate</type>
<object-name>fpd</object-name>
<property>/instrumentation/pfd/track-diff</property>
<factor>0.00260</factor>
<axis>
<x>0</x>
<y>1</y>
<z>0</z>
</axis>
</animation>
<animation>
<type>translate</type>
<object-name>fpd</object-name>
<property>/orientation/pitch-deg</property>
<factor>0.001955078</factor>
<axis>
<x>0</x>
<y>0</y>
<z>-1</z>
</axis>
</animation>
<animation>
<type>translate</type>
<object-name>fpd</object-name>
<property>/it-autoflight/fd/pitch-bar</property>
<factor>0.001955078</factor>
<axis>
<x>0</x>
<y>0</y>
<z>1</z>
</axis>
</animation>
<animation>
<type>rotate</type>
<object-name>fpd</object-name>
<property>/it-autoflight/fd/roll-bar</property>
<center>
<x-m>0.0</x-m>
<y-m>-0.005</y-m>
<z-m>-0.0005</z-m>
</center>
<axis>
<x>-1</x>
<y>0</y>
<z>0</z>
</axis>
</animation>
<animation>
<type>textranslate</type>
<object-name>spd-tape</object-name>
<property>instrumentation/airspeed-indicator/indicated-speed-kt</property>
<property>/instrumentation/airspeed-indicator/indicated-speed-kt</property>
<interpolation>
<entry><ind> 0</ind><dep> 0</dep></entry>
<entry><ind> 20</ind><dep>0.040</dep></entry>

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

@ -195,6 +195,38 @@
</equals>
<not><property>/gear/gear[1]/wow</property></not>
<not><property>/gear/gear[2]/wow</property></not>
<equals>
<property>/it-autoflight/custom/trk-fpa</property>
<value>0</value>
</equals>
<less-than>
<property>orientation/roll-deg</property>
<value>45</value>
</less-than>
<greater-than>
<property>orientation/roll-deg</property>
<value>-45</value>
</greater-than>
</and>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>fpd</object-name>
<object-name>fpv</object-name>
<condition>
<and>
<equals>
<property>/it-autoflight/output/fd2</property>
<value>1</value>
</equals>
<not><property>/gear/gear[1]/wow</property></not>
<not><property>/gear/gear[2]/wow</property></not>
<equals>
<property>/it-autoflight/custom/trk-fpa</property>
<value>1</value>
</equals>
<less-than>
<property>orientation/roll-deg</property>
<value>45</value>
@ -329,10 +361,86 @@
</axis>
</animation>
<animation>
<type>translate</type>
<object-name>fpv</object-name>
<property>/instrumentation/pfd/track-diff</property>
<factor>0.00260</factor>
<axis>
<x>0</x>
<y>1</y>
<z>0</z>
</axis>
</animation>
<animation>
<type>translate</type>
<object-name>fpv</object-name>
<property>/orientation/pitch-deg</property>
<factor>0.001955078</factor>
<axis>
<x>0</x>
<y>0</y>
<z>-1</z>
</axis>
</animation>
<animation>
<type>translate</type>
<object-name>fpd</object-name>
<property>/instrumentation/pfd/track-diff</property>
<factor>0.00260</factor>
<axis>
<x>0</x>
<y>1</y>
<z>0</z>
</axis>
</animation>
<animation>
<type>translate</type>
<object-name>fpd</object-name>
<property>/orientation/pitch-deg</property>
<factor>0.001955078</factor>
<axis>
<x>0</x>
<y>0</y>
<z>-1</z>
</axis>
</animation>
<animation>
<type>translate</type>
<object-name>fpd</object-name>
<property>/it-autoflight/fd/pitch-bar</property>
<factor>0.001955078</factor>
<axis>
<x>0</x>
<y>0</y>
<z>1</z>
</axis>
</animation>
<animation>
<type>rotate</type>
<object-name>fpd</object-name>
<property>/it-autoflight/fd/roll-bar</property>
<center>
<x-m>0.0</x-m>
<y-m>-0.005</y-m>
<z-m>-0.0005</z-m>
</center>
<axis>
<x>-1</x>
<y>0</y>
<z>0</z>
</axis>
</animation>
<animation>
<type>textranslate</type>
<object-name>spd-tape</object-name>
<property>instrumentation/airspeed-indicator/indicated-speed-kt</property>
<property>/instrumentation/airspeed-indicator/indicated-speed-kt</property>
<interpolation>
<entry><ind> 0</ind><dep> 0</dep></entry>
<entry><ind> 20</ind><dep>0.040</dep></entry>

58
Models/Instruments/PFD/res/box.ac
View file

@ -1,58 +0,0 @@
AC3Db
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
OBJECT world
kids 1
OBJECT poly
name "Box-speed"
loc 0.002941 0.0876799 0.042908
data 6
Circle
texture "box.png"
crease 30.000000
numvert 16
0 -0.00312543 -0.0156029
0 -0.00377741 -0.0156029
0 -0.00377742 0.0155739
0 -0.00312544 0.0155739
0 0.00374188 -0.0155771
0 0.0030899 -0.0155771
0 0.00308989 0.0155997
0 0.00374188 0.0155997
0 0.00379864 0.0162948
0 0.00379864 0.0156428
0 -0.00384059 0.0156428
0 -0.00384059 0.0162948
0 0.0038406 -0.0156428
0 0.0038406 -0.0162948
0 -0.00379863 -0.0162948
0 -0.00379863 -0.0156428
numsurf 4
SURF 0x0
mat 0
refs 4
3 0.654297 0.439453
2 0.679687 0.439453
1 0.679687 0.464844
0 0.654297 0.464844
SURF 0x0
mat 0
refs 4
7 0.654297 0.439453
6 0.679687 0.439453
5 0.679687 0.464844
4 0.654297 0.464844
SURF 0x0
mat 0
refs 4
11 0.654297 0.439453
10 0.679687 0.439453
9 0.679687 0.464844
8 0.654297 0.464844
SURF 0x0
mat 0
refs 4
15 0.654297 0.439453
14 0.679687 0.439453
13 0.679687 0.464844
12 0.654297 0.464844
kids 0

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

@ -3,7 +3,45 @@ 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 "ac3dmat0" rgb 0 0 0 amb 0 0 0 emis 0 0 0 spec 0 0 0 shi 0 trans 0
OBJECT world
kids 46
kids 48
OBJECT poly
name "fpd"
loc 0.00031928 0.00206621 -0.013179
texture "fpd.png"
crease 45.000000
numvert 4
0 0.000714729 0.0410065
0 -0.00397787 0.0410065
0 -0.00397787 -0.00440941
0 0.000714729 -0.00440941
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 "fpv"
loc 0.000590373 8.6652e-005 0.00320951
texture "fpv.png"
crease 45.000000
numvert 4
0 0.00651645 0.00810495
0 -0.00384307 0.00810495
0 -0.00384307 -0.00440941
0 0.00651645 -0.00440941
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 "land-mode-box"
loc 0.000386977 0.0698612 0.00523137

BIN
Models/Instruments/PFD/res/rudder-bar.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 342 B

After

Width:  |  Height:  |  Size: 342 B

BIN
Models/Liveries/A319/CFM/UAL.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 544 KiB

16
Models/Liveries/A319/CFM/UAL.xml Normal file
View file

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8" ?>
<PropertyList>
<sim>
<model>
<livery>
<name>United Airlines (Post Continental merger livery)</name>
<texture>Liveries/A319/CFM/UAL.png</texture>
</livery>
</model>
</sim>
<options>
<EIS2 type="bool">1</EIS2>
</options>
<sharklet type="bool">0</sharklet>
</PropertyList>

BIN
Models/Liveries/A319/IAE/UAL3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 544 KiB

16
Models/Liveries/A319/IAE/UAL3.xml Normal file
View file

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8" ?>
<PropertyList>
<sim>
<model>
<livery>
<name>United Airlines (Post Continental merger livery)</name>
<texture>Liveries/A319/IAE/UAL3.png</texture>
</livery>
</model>
</sim>
<options>
<EIS2 type="bool">1</EIS2>
</options>
<sharklet type="bool">0</sharklet>
</PropertyList>

BIN
Models/Liveries/A320/IAE/N475UA.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 447 KiB

16
Models/Liveries/A320/IAE/N475UA.xml Normal file
View file

@ -0,0 +1,16 @@
<PropertyList>
<sim>
<model>
<livery>
<name type="string">United Airlines (Retro livery)</name>
<texture>Liveries/A320/IAE/N475UA.png</texture>
</livery>
</model>
</sim>
<options>
<EIS2 type="bool">1</EIS2>
</options>
<sharklet type="bool">0</sharklet>
</PropertyList>

2
Models/Liveries/A320/IAE/UAL.xml
View file

@ -2,7 +2,7 @@
<sim>
<model>
<livery>
<name type="string">United Airlines</name>
<name type="string">United Airlines (Blue Tulip livery)</name>
<texture>Liveries/A320/IAE/UAL.png</texture>
</livery>
</model>

2
Models/Liveries/A320/IAE/UAL2.xml
View file

@ -4,7 +4,7 @@
<sim>
<model>
<livery>
<name>United Airlines (Battleship)</name>
<name>United Airlines (Battleship livery)</name>
<texture>Liveries/A320/IAE/UAL2.png</texture>
</livery>
</model>

BIN
Models/Liveries/A320/IAE/UAL3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 544 KiB

18
Models/Liveries/A320/IAE/UAL3.xml Normal file
View file

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8" ?>
<PropertyList>
<sim>
<model>
<livery>
<name>United Airlines (Post Continental merger livery)</name>
<texture>Liveries/A320/IAE/UAL3.png</texture>
</livery>
</model>
</sim>
<options>
<EIS2 type="bool">0</EIS2>
</options>
<sharklet type="bool">0</sharklet>
</PropertyList>

24
Nasal/PFD_FMA.nas
View file

@ -52,14 +52,32 @@ setlistener("/it-autoflight/output/thr-mode", func {
speedmach();
});
var hdgmde = func {
var lat = getprop("/it-autoflight/mode/lat");
var newlat = getprop("/modes/pfd/fma/roll-mode");
var trk = getprop("/it-autoflight/custom/trk-fpa");
if (lat == "HDG" and trk == 0) {
if (newlat != "HDG") {
setprop("/modes/pfd/fma/roll-mode", "HDG");
}
} else if (lat == "HDG" and trk == 1) {
if (newlat != "TRACK") {
setprop("/modes/pfd/fma/roll-mode", "TRACK");
}
}
}
# HDG/TRK
setlistener("/it-autoflight/custom/trk-fpa", func {
hdgmde();
});
# Master Lateral
setlistener("/it-autoflight/mode/lat", func {
var lat = getprop("/it-autoflight/mode/lat");
var newlat = getprop("/modes/pfd/fma/roll-mode");
if (lat == "HDG") {
if (newlat != "HDG") {
setprop("/modes/pfd/fma/roll-mode", "HDG");
}
hdgmde();
} else if (lat == "LNAV") {
if (newlat != "NAV") {
setprop("/modes/pfd/fma/roll-mode", "NAV");

16
Systems/custom-autothrust.xml
View file

@ -158,7 +158,7 @@
<property>/controls/engines/engine[0]/throttle-cmd-pid</property>
</output>
<config>
<Kp>0.1</Kp>
<Kp>0.05</Kp>
<beta>1.0</beta>
<alpha>0.1</alpha>
<gamma>0.0</gamma>
@ -222,7 +222,7 @@
<property>/controls/engines/engine[0]/throttle-cmd-pid</property>
</output>
<config>
<Kp>0.1</Kp>
<Kp>0.05</Kp>
<beta>1.0</beta>
<alpha>0.1</alpha>
<gamma>0.0</gamma>
@ -277,7 +277,7 @@
<property>/controls/engines/engine[0]/throttle-cmd-pid</property>
</output>
<config>
<Kp>0.01</Kp>
<Kp>0.008</Kp>
<beta>1.0</beta>
<alpha>0.1</alpha>
<gamma>0.0</gamma>
@ -332,7 +332,7 @@
<property>/controls/engines/engine[0]/throttle-cmd-pid</property>
</output>
<config>
<Kp>0.01</Kp>
<Kp>0.008</Kp>
<beta>1.0</beta>
<alpha>0.1</alpha>
<gamma>0.0</gamma>
@ -405,7 +405,7 @@
<property>/controls/engines/engine[1]/throttle-cmd-pid</property>
</output>
<config>
<Kp>0.1</Kp>
<Kp>0.05</Kp>
<beta>1.0</beta>
<alpha>0.1</alpha>
<gamma>0.0</gamma>
@ -469,7 +469,7 @@
<property>/controls/engines/engine[1]/throttle-cmd-pid</property>
</output>
<config>
<Kp>0.1</Kp>
<Kp>0.05</Kp>
<beta>1.0</beta>
<alpha>0.1</alpha>
<gamma>0.0</gamma>
@ -524,7 +524,7 @@
<property>/controls/engines/engine[1]/throttle-cmd-pid</property>
</output>
<config>
<Kp>0.01</Kp>
<Kp>0.008</Kp>
<beta>1.0</beta>
<alpha>0.1</alpha>
<gamma>0.0</gamma>
@ -579,7 +579,7 @@
<property>/controls/engines/engine[1]/throttle-cmd-pid</property>
</output>
<config>
<Kp>0.01</Kp>
<Kp>0.008</Kp>
<beta>1.0</beta>
<alpha>0.1</alpha>
<gamma>0.0</gamma>

4
Systems/fcs.xml
View file

@ -42,7 +42,7 @@
<aerosurface_scale name="Left Aileron Control">
<input>fcs/roll-trim-sum</input>
<gain>0.02</gain>
<gain>0.022</gain>
<range>
<min>-15</min>
<max>15</max>
@ -52,7 +52,7 @@
<aerosurface_scale name="Right Aileron Control">
<input>-fcs/roll-trim-sum</input>
<gain>0.02</gain>
<gain>0.022</gain>
<range>
<min>-15</min>
<max>15</max>

15
Systems/fmgc-b.xml
View file

@ -541,6 +541,19 @@
<!-- Flight Director -->
<!-- =============================================================== -->
<filter>
<name>IT-CONTROLLER: TARGET ROLL CMD</name>
<debug>false</debug>
<feedback-if-disabled>true</feedback-if-disabled>
<initialize-to>output</initialize-to>
<input>
<property>/it-autoflight/internal/target-roll-deg</property>
</input>
<output>/it-autoflight/internal/target-roll-fd</output>
<type>noise-spike</type>
<max-rate-of-change>15</max-rate-of-change>
</filter>
<filter>
<name>FD: ROLL</name>
<debug>false</debug>
@ -561,7 +574,7 @@
</condition>
<expression>
<dif>
<property>/it-autoflight/internal/target-roll</property>
<property>/it-autoflight/internal/target-roll-fd</property>
<property>/orientation/roll-deg</property>
</dif>
</expression>

18
Systems/fmgc-roll-yaw.xml
View file

@ -72,7 +72,7 @@
</config>
</pi-simple-controller>
<pid-controller>
<pi-simple-controller>
<name>VORLOC TRK</name>
<debug>false</debug>
<enable>
@ -131,20 +131,16 @@
<Kp>
<property>/it-autoflight/config/cmd/vorloc</property>
</Kp>
<beta>1.0</beta>
<alpha>0.1</alpha>
<gamma>0.0</gamma>
<Ti>10.0</Ti>
<Td>0.00001</Td>
<u_min>
<Ki>0.0001</Ki>
<min>
<property>/it-autoflight/internal/bank-limit</property>
<scale>-1</scale>
</u_min>
<u_max>
</min>
<max>
<property>/it-autoflight/internal/bank-limit</property>
</u_max>
</max>
</config>
</pid-controller>
</pi-simple-controller>
<filter>
<name>ROLL DEG SYNC</name>

2
Systems/pfd.xml
View file

@ -98,7 +98,7 @@
<gain>1.0</gain>
<input>
<condition>
<property>instrumentation/efis/mfd/true-north</property>
<property>/it-autoflight/custom/trk-fpa</property>
</condition>
<property>/orientation/track-deg</property>
</input>