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

A3XX: Improved PFD FMA

Browse source 
PFD: Add boxes when AP modes change
This commit is contained in:
Joshua Davidson 2017-06-05 13:28:38 -04:00
parent 77a8d27c08
commit 7e16d5a3e9
10 changed files with 630 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1590,6 +1590,67 @@
</condition>
</animation>
<animation>
<type>select</type>
<object-name>throttle-mode-box</object-name>
<condition>
<equals>
<property>/modes/pfd/fma/throttle-mode-box</property>
<value>1</value>
</equals>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>pitch-mode-box</object-name>
<condition>
<equals>
<property>/modes/pfd/fma/pitch-mode-box</property>
<value>1</value>
</equals>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>pitch-mode-armed-box</object-name>
<condition>
<or>
<equals>
<property>/modes/pfd/fma/pitch-mode-armed-box</property>
<value>1</value>
</equals>
<equals>
<property>/modes/pfd/fma/pitch-mode2-armed-box</property>
<value>1</value>
</equals>
</or>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>roll-mode-box</object-name>
<condition>
<equals>
<property>/modes/pfd/fma/roll-mode-box</property>
<value>1</value>
</equals>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>roll-mode-armed-box</object-name>
<condition>
<equals>
<property>/modes/pfd/fma/roll-mode-armed-box</property>
<value>1</value>
</equals>
</condition>
</animation>
<text>
<name>ap-mode-fma</name>
<offsets>

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

@ -1590,6 +1590,67 @@
</condition>
</animation>
<animation>
<type>select</type>
<object-name>throttle-mode-box</object-name>
<condition>
<equals>
<property>/modes/pfd/fma/throttle-mode-box</property>
<value>1</value>
</equals>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>pitch-mode-box</object-name>
<condition>
<equals>
<property>/modes/pfd/fma/pitch-mode-box</property>
<value>1</value>
</equals>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>pitch-mode-armed-box</object-name>
<condition>
<or>
<equals>
<property>/modes/pfd/fma/pitch-mode-armed-box</property>
<value>1</value>
</equals>
<equals>
<property>/modes/pfd/fma/pitch-mode2-armed-box</property>
<value>1</value>
</equals>
</or>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>roll-mode-box</object-name>
<condition>
<equals>
<property>/modes/pfd/fma/roll-mode-box</property>
<value>1</value>
</equals>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>roll-mode-armed-box</object-name>
<condition>
<equals>
<property>/modes/pfd/fma/roll-mode-armed-box</property>
<value>1</value>
</equals>
</condition>
</animation>
<text>
<name>ap-mode-fma</name>
<offsets>

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

@ -0,0 +1,58 @@
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

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 65 KiB

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

@ -1,7 +1,278 @@
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
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 35
kids 40
OBJECT poly
name "throttle-mode-box"
loc 0.000380651 0.0698612 0.054728
data 6
Circle
texture "box.png"
crease 30.000000
numvert 16
0 -0.00244377 -0.0145566
0 -0.00244377 -0.0151633
0 0.004665 -0.0151633
0 0.004665 -0.0145566
0 -0.00248282 0.0151633
0 -0.00248282 0.0145566
0 0.00462595 0.0145566
0 0.00462595 0.0151633
0 0.00457313 0.0145165
0 0.00396641 0.0145165
0 0.00396641 -0.0144955
0 0.00457313 -0.0144955
0 -0.00181733 0.0144925
0 -0.00242404 0.0144925
0 -0.00242402 -0.0145195
0 -0.00181732 -0.0145195
numsurf 4
SURF 0x0
mat 1
refs 4
0 0.654297 0.439453
1 0.679687 0.439453
2 0.679687 0.464844
3 0.654297 0.464844
SURF 0x0
mat 1
refs 4
4 0.654297 0.439453
5 0.679687 0.439453
6 0.679687 0.464844
7 0.654297 0.464844
SURF 0x0
mat 1
refs 4
8 0.654297 0.439453
9 0.679687 0.439453
10 0.679687 0.464844
11 0.654297 0.464844
SURF 0x0
mat 1
refs 4
12 0.654297 0.439453
13 0.679687 0.439453
14 0.679687 0.464844
15 0.654297 0.464844
kids 0
OBJECT poly
name "roll-mode-armed-box"
loc 0.000380651 0.06242 -0.0107672
data 6
Circle
texture "box.png"
crease 30.000000
numvert 16
0 -0.00181732 -0.0145195
0 -0.00242402 -0.0145195
0 -0.00242404 0.0144925
0 -0.00181733 0.0144925
0 0.00457313 -0.0144955
0 0.00396642 -0.0144955
0 0.00396642 0.0145165
0 0.00457313 0.0145165
0 0.00462596 0.0151633
0 0.00462596 0.0145566
0 -0.00248282 0.0145566
0 -0.00248282 0.0151633
0 0.004665 -0.0145566
0 0.004665 -0.0151633
0 -0.00244377 -0.0151633
0 -0.00244377 -0.0145566
numsurf 4
SURF 0x0
mat 1
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 1
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 1
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 1
refs 4
15 0.654297 0.439453
14 0.679687 0.439453
13 0.679687 0.464844
12 0.654297 0.464844
kids 0
OBJECT poly
name "roll-mode-box"
loc 0.000380651 0.0698612 -0.0107672
data 6
Circle
texture "box.png"
crease 30.000000
numvert 16
0 -0.00244377 -0.0145566
0 -0.00244377 -0.0151633
0 0.004665 -0.0151633
0 0.004665 -0.0145566
0 -0.00248282 0.0151633
0 -0.00248282 0.0145566
0 0.00462595 0.0145566
0 0.00462595 0.0151633
0 0.00457313 0.0145165
0 0.00396641 0.0145165
0 0.00396641 -0.0144955
0 0.00457313 -0.0144955
0 -0.00181733 0.0144925
0 -0.00242404 0.0144925
0 -0.00242402 -0.0145195
0 -0.00181732 -0.0145195
numsurf 4
SURF 0x0
mat 1
refs 4
0 0.654297 0.439453
1 0.679687 0.439453
2 0.679687 0.464844
3 0.654297 0.464844
SURF 0x0
mat 1
refs 4
4 0.654297 0.439453
5 0.679687 0.439453
6 0.679687 0.464844
7 0.654297 0.464844
SURF 0x0
mat 1
refs 4
8 0.654297 0.439453
9 0.679687 0.439453
10 0.679687 0.464844
11 0.654297 0.464844
SURF 0x0
mat 1
refs 4
12 0.654297 0.439453
13 0.679687 0.439453
14 0.679687 0.464844
15 0.654297 0.464844
kids 0
OBJECT poly
name "pitch-mode-armed-box"
loc 0.000380651 0.06242 0.0211119
data 6
Circle
texture "box.png"
crease 30.000000
numvert 16
0 -0.00244377 -0.0145566
0 -0.00244377 -0.0151633
0 0.004665 -0.0151633
0 0.004665 -0.0145566
0 -0.00248282 0.0151633
0 -0.00248282 0.0145566
0 0.00462596 0.0145566
0 0.00462596 0.0151633
0 0.00457313 0.0145165
0 0.00396642 0.0145165
0 0.00396642 -0.0144955
0 0.00457313 -0.0144955
0 -0.00181733 0.0144925
0 -0.00242404 0.0144925
0 -0.00242402 -0.0145195
0 -0.00181732 -0.0145195
numsurf 4
SURF 0x0
mat 1
refs 4
0 0.654297 0.439453
1 0.679687 0.439453
2 0.679687 0.464844
3 0.654297 0.464844
SURF 0x0
mat 1
refs 4
4 0.654297 0.439453
5 0.679687 0.439453
6 0.679687 0.464844
7 0.654297 0.464844
SURF 0x0
mat 1
refs 4
8 0.654297 0.439453
9 0.679687 0.439453
10 0.679687 0.464844
11 0.654297 0.464844
SURF 0x0
mat 1
refs 4
12 0.654297 0.439453
13 0.679687 0.439453
14 0.679687 0.464844
15 0.654297 0.464844
kids 0
OBJECT poly
name "pitch-mode-box"
loc 0.000380651 0.0698612 0.0211119
data 6
Circle
texture "box.png"
crease 30.000000
numvert 16
0 -0.00181732 -0.0145195
0 -0.00242402 -0.0145195
0 -0.00242404 0.0144925
0 -0.00181733 0.0144925
0 0.00457313 -0.0144955
0 0.00396641 -0.0144955
0 0.00396641 0.0145165
0 0.00457313 0.0145165
0 0.00462595 0.0151633
0 0.00462595 0.0145566
0 -0.00248282 0.0145566
0 -0.00248282 0.0151633
0 0.004665 -0.0145566
0 0.004665 -0.0151633
0 -0.00244377 -0.0151633
0 -0.00244377 -0.0145566
numsurf 4
SURF 0x0
mat 1
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 1
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 1
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 1
refs 4
15 0.654297 0.439453
14 0.679687 0.439453
13 0.679687 0.464844
12 0.654297 0.464844
kids 0
OBJECT poly
name "trgt-spd-mng"
loc 0.00121828 0.000747255 0.0473924

2
Models/Interior/a320.interior.xml
View file

@ -2,7 +2,7 @@
<PropertyList>
<path>res/libraries.interior.ac</path>
<path>res/a320.interior.ac</path>
<!-- ANIMATIONS -->
<!-- Lighting -->

8
Nasal/FMGC.nas
View file

@ -122,10 +122,16 @@ var phasecheck = maketimer(0.2, func {
setprop("/systems/pressurization/mode", "DE");
}
if (getprop("/FMGC/status/to-state") == 0 and flaps >= 3 and ((phase == "2") or (phase == "4"))) {
if (getprop("/FMGC/status/to-state") == 0 and flaps >= 3 and ((phase == "3") or (phase == "4")) and alt < 7200) {
setprop("/FMGC/status/phase", "5");
}
if (getprop("/autopilot/route-manager/route/num") > 0 and getprop("/autopilot/route-manager/active") == 1 and getprop("/autopilot/route-manager/distance-remaining-nm") <= 15) {
setprop("/FMGC/internal/decel", 1);
} else {
setprop("/FMGC/internal/decel", 0);
}
if ((phase == "5") and (state1 == "TOGA") and (state2 == "TOGA")) {
setprop("/FMGC/status/phase", "6");
setprop("/it-autoflight/input/toga", 1);

2
Nasal/MCDU/MCDU1.nas
View file

@ -242,7 +242,7 @@ var initInputB = func(key) {
setprop("/MCDU[0]/scratchpad", "");
} else {
var tfs = size(scratchpad);
if (tfs == 3 or tfs == 4) {
if (tfs == 2 or tfs == 4) {
if (scratchpad >= 1.0 and scratchpad <= 45.0) {
setprop("/FMGC/internal/block", scratchpad);
setprop("/FMGC/internal/block-set", 1);

2
Nasal/MCDU/MCDU2.nas
View file

@ -242,7 +242,7 @@ var initInputB = func(key) {
setprop("/MCDU[1]/scratchpad", "");
} else {
var tfs = size(scratchpad);
if (tfs == 3 or tfs == 4) {
if (tfs == 2 or tfs == 4) {
if (scratchpad >= 1.0 and scratchpad <= 45.0) {
setprop("/FMGC/internal/block", scratchpad);
setprop("/FMGC/internal/block-set", 1);

158
Nasal/PFD_FMA.nas
View file

@ -8,26 +8,36 @@ var speedmach = func {
speedmach_b();
} else {
var thr = getprop("/it-autoflight/output/thr-mode");
var newthr = getprop("/modes/pfd/fma/throttle-mode");
if (thr == 0) {
speedmach_b();
} else if (thr == 1) {
if (newthr != "THR IDLE") {
setprop("/modes/pfd/fma/throttle-mode", "THR IDLE");
}
} else if (thr == 2) {
if (newthr != "THR CLB") {
setprop("/modes/pfd/fma/throttle-mode", "THR CLB");
}
}
}
} else {
speedmach_b();
}
}
var speedmach_b = func {
var newthr = getprop("/modes/pfd/fma/throttle-mode");
if (getprop("/it-autoflight/input/kts-mach") == 0) {
if (newthr != "SPEED") {
setprop("/modes/pfd/fma/throttle-mode", "SPEED");
}
} else if (getprop("/it-autoflight/input/kts-mach") == 1) {
if (newthr != "MACH") {
setprop("/modes/pfd/fma/throttle-mode", "MACH");
}
}
}
# Update Speed or Mach
setlistener("/it-autoflight/input/kts-mach", func {
@ -42,114 +52,156 @@ setlistener("/it-autoflight/output/thr-mode", func {
# 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");
}
} else if (lat == "LNAV") {
if (newlat != "NAV") {
setprop("/modes/pfd/fma/roll-mode", "NAV");
}
} else if (lat == "LOC") {
if (newlat != "LOC") {
setprop("/modes/pfd/fma/roll-mode", "LOC");
}
} else if (lat == "ALGN") {
if (newlat != "LAND") {
setprop("/modes/pfd/fma/roll-mode", "LAND");
}
} else if (lat == "T/O") {
if (newlat != "RWY") {
setprop("/modes/pfd/fma/roll-mode", "RWY");
}
}
});
# Master Vertical
setlistener("/it-autoflight/mode/vert", func {
var vert = getprop("/it-autoflight/mode/vert");
var newvert = getprop("/modes/pfd/fma/pitch-mode");
var newvertarm = getprop("/modes/pfd/fma/pitch-mode2-armed");
if (vert == "ALT HLD") {
if (newvert != "ALT") {
setprop("/modes/pfd/fma/pitch-mode", "ALT");
}
if (newvertarm != " ") {
setprop("/modes/pfd/fma/pitch-mode2-armed", " ");
}
} else if (vert == "ALT CAP") {
if (newvert != "ALT") {
setprop("/modes/pfd/fma/pitch-mode", "ALT");
}
if (newvertarm != " ") {
setprop("/modes/pfd/fma/pitch-mode2-armed", " ");
}
} else if (vert == "V/S") {
if (newvert != "V/S") {
setprop("/modes/pfd/fma/pitch-mode", "V/S");
}
if (newvertarm != "ALT") {
setprop("/modes/pfd/fma/pitch-mode2-armed", "ALT");
}
} else if (vert == "G/S") {
if (newvert != "G/S") {
setprop("/modes/pfd/fma/pitch-mode", "G/S");
}
if (newvertarm != " ") {
setprop("/modes/pfd/fma/pitch-mode2-armed", " ");
}
} else if (vert == "SPD CLB") {
if (newvert != "OP CLB") {
setprop("/modes/pfd/fma/pitch-mode", "OP CLB");
}
if (newvertarm != "ALT") {
setprop("/modes/pfd/fma/pitch-mode2-armed", "ALT");
}
} else if (vert == "SPD DES") {
if (newvert != "OP DES") {
setprop("/modes/pfd/fma/pitch-mode", "OP DES");
}
if (newvertarm != "ALT") {
setprop("/modes/pfd/fma/pitch-mode2-armed", "ALT");
}
} else if (vert == "FPA") {
if (newvert != "FPA") {
setprop("/modes/pfd/fma/pitch-mode", "FPA");
}
if (newvertarm != "ALT") {
setprop("/modes/pfd/fma/pitch-mode2-armed", "ALT");
}
} else if (vert == "LAND") {
if (newvert != "LAND") {
setprop("/modes/pfd/fma/pitch-mode", "LAND");
}
} else if (vert == "FLARE") {
if (newvert != "FLARE") {
setprop("/modes/pfd/fma/pitch-mode", "FLARE");
}
} else if (vert == "T/O CLB") {
if (newvert != "SRS") {
setprop("/modes/pfd/fma/pitch-mode", "SRS");
}
if (newvertarm != "CLB") {
setprop("/modes/pfd/fma/pitch-mode2-armed", "CLB");
}
} else if (vert == "G/A CLB") {
if (newvert != "SRS") {
setprop("/modes/pfd/fma/pitch-mode", "SRS");
}
if (newvertarm != "ALT") {
setprop("/modes/pfd/fma/pitch-mode2-armed", "ALT");
}
});
# Master VNAV
setlistener("/it-autoflight/mode/prof", func {
var prof = getprop("/it-autoflight/mode/prof");
if (prof == "VNAV HLD") {
setprop("/modes/pfd/fma/pitch-mode", "ALT");
} else if (prof == "VNAV CAP") {
setprop("/modes/pfd/fma/pitch-mode", "ALT");
} else if (prof == "VNAV SPD") {
vnav_clbdes();
} else if (prof == "VNAV PTH") {
vnav_clbdes();
}
});
var vnav_clbdes = func {
var vert = getprop("/it-autoflight/output/vert");
if (vert == 8) {
var prof = getprop("/it-autoflight/internal/prof-mode");
if (prof == "XX") {
# Do nothing
} else if (prof == "DES") {
setprop("/modes/pfd/fma/pitch-mode", "DES");
} else if (prof == "CLB") {
setprop("/modes/pfd/fma/pitch-mode", "CLB");
}
}
}
# Arm HDG or NAV
setlistener("/it-autoflight/mode/arm", func {
var arm = getprop("/it-autoflight/mode/arm");
var newarm = getprop("/modes/pfd/fma/roll-mode-armed");
if (arm == "HDG") {
if (newarm != "HDG") {
setprop("/modes/pfd/fma/roll-mode-armed", "HDG");
}
} else if (arm == "LNV") {
if (newarm != "NAV") {
setprop("/modes/pfd/fma/roll-mode-armed", "NAV");
}
} else if (arm == " ") {
if (newarm != " ") {
setprop("/modes/pfd/fma/roll-mode-armed", " ");
}
}
});
# Arm LOC
setlistener("/it-autoflight/output/loc-armed", func {
var loca = getprop("/it-autoflight/output/loc-armed");
var newarm = getprop("/modes/pfd/fma/roll-mode-armed");
if (loca) {
if (newarm != "LOC") {
setprop("/modes/pfd/fma/roll-mode-armed", "LOC");
}
} else {
if (newarm != " ") {
setprop("/modes/pfd/fma/roll-mode-armed", " ");
}
}
});
# Arm G/S
setlistener("/it-autoflight/output/appr-armed", func {
var appa = getprop("/it-autoflight/output/appr-armed");
var newvert2arm = getprop("/modes/pfd/fma/pitch-mode-armed");
if (appa) {
if (newvert2arm != "G/S") {
setprop("/modes/pfd/fma/pitch-mode-armed", "G/S");
}
} else {
if (newvert2arm != " ") {
setprop("/modes/pfd/fma/pitch-mode-armed", " ");
}
}
});
# AP
@ -210,3 +262,55 @@ setlistener("/it-autoflight/output/fd2", func {
setlistener("/it-autoflight/output/athr", func {
at();
});
# Boxes
setlistener("/modes/pfd/fma/throttle-mode", func {
setprop("/modes/pfd/fma/throttle-mode-box", 1);
settimer(func {
setprop("/modes/pfd/fma/throttle-mode-box", 0);
}, 5);
});
setlistener("/modes/pfd/fma/roll-mode", func {
setprop("/modes/pfd/fma/roll-mode-box", 1);
settimer(func {
setprop("/modes/pfd/fma/roll-mode-box", 0);
}, 5);
});
setlistener("/modes/pfd/fma/pitch-mode", func {
setprop("/modes/pfd/fma/pitch-mode-box", 1);
settimer(func {
setprop("/modes/pfd/fma/pitch-mode-box", 0);
}, 5);
});
setlistener("/modes/pfd/fma/roll-mode-armed", func {
var newarm = getprop("/modes/pfd/fma/roll-mode-armed");
if (newarm != " ") {
setprop("/modes/pfd/fma/roll-mode-armed-box", 1);
settimer(func {
setprop("/modes/pfd/fma/roll-mode-armed-box", 0);
}, 5);
}
});
setlistener("/modes/pfd/fma/pitch-mode-armed", func {
var newarm = getprop("/modes/pfd/fma/pitch-mode-armed");
if (newarm != " ") {
setprop("/modes/pfd/fma/pitch-mode-armed-box", 1);
settimer(func {
setprop("/modes/pfd/fma/pitch-mode-armed-box", 0);
}, 5);
}
});
setlistener("/modes/pfd/fma/pitch-mode2-armed", func {
var newarm = getprop("/modes/pfd/fma/pitch-mode2-armed");
if (newarm != " ") {
setprop("/modes/pfd/fma/pitch-mode2-armed-box", 1);
settimer(func {
setprop("/modes/pfd/fma/pitch-mode2-armed-box", 0);
}, 5);
}
});