A3XX: Improve FMA
This commit is contained in:
Joshua Davidson
parent
6cefc42cff
commit
535e77bdf8
3 changed files with 81 additions and 281 deletions
|
|
@ -2141,29 +2141,6 @@
|
||||||
</font-resolution>
|
</font-resolution>
|
||||||
</text>
|
</text>
|
||||||
|
|
||||||
<text>
|
|
||||||
<name>athr-thrlvr-fma</name>
|
|
||||||
<offsets>
|
|
||||||
<x-m>0.00091828</x-m>
|
|
||||||
<y-m>-0.0546226</y-m>
|
|
||||||
<z-m>0.0710781</z-m>
|
|
||||||
</offsets>
|
|
||||||
<alignment>center-center</alignment>
|
|
||||||
<axis-alignment>yz-plane</axis-alignment>
|
|
||||||
<type type="string">text-value</type>
|
|
||||||
<format type="string">THR LVR</format>
|
|
||||||
<property>autopilot/serviceable</property>
|
|
||||||
<font type="string">helvetica_medium.txf</font>
|
|
||||||
<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>
|
|
||||||
|
|
||||||
<animation>
|
<animation>
|
||||||
<type>select</type>
|
<type>select</type>
|
||||||
<object-name>thrust-mode-fma</object-name>
|
<object-name>thrust-mode-fma</object-name>
|
||||||
|
|
@ -2174,68 +2151,22 @@
|
||||||
<value>1</value>
|
<value>1</value>
|
||||||
</equals>
|
</equals>
|
||||||
<or>
|
<or>
|
||||||
<and>
|
<equals>
|
||||||
<equals>
|
<property>/systems/thrust/state1</property>
|
||||||
<property>/it-autoflight/output/thr-mode</property>
|
<value>MAN</value>
|
||||||
<value>2</value>
|
</equals>
|
||||||
</equals>
|
<equals>
|
||||||
<or>
|
<property>/systems/thrust/state2</property>
|
||||||
<equals>
|
<value>MAN</value>
|
||||||
<property>/it-autoflight/output/fd1</property>
|
</equals>
|
||||||
<value>1</value>
|
<equals>
|
||||||
</equals>
|
<property>/systems/thrust/state1</property>
|
||||||
<equals>
|
<value>CL</value>
|
||||||
<property>/it-autoflight/output/fd2</property>
|
</equals>
|
||||||
<value>1</value>
|
<equals>
|
||||||
</equals>
|
<property>/systems/thrust/state2</property>
|
||||||
</or>
|
<value>CL</value>
|
||||||
<or>
|
</equals>
|
||||||
<equals>
|
|
||||||
<property>/systems/thrust/state1</property>
|
|
||||||
<value>CL</value>
|
|
||||||
</equals>
|
|
||||||
<equals>
|
|
||||||
<property>/systems/thrust/state2</property>
|
|
||||||
<value>CL</value>
|
|
||||||
</equals>
|
|
||||||
</or>
|
|
||||||
</and>
|
|
||||||
<and>
|
|
||||||
<or>
|
|
||||||
<not-equals>
|
|
||||||
<property>/it-autoflight/output/thr-mode</property>
|
|
||||||
<value>2</value>
|
|
||||||
</not-equals>
|
|
||||||
<and>
|
|
||||||
<equals>
|
|
||||||
<property>/it-autoflight/output/fd1</property>
|
|
||||||
<value>0</value>
|
|
||||||
</equals>
|
|
||||||
<equals>
|
|
||||||
<property>/it-autoflight/output/fd2</property>
|
|
||||||
<value>0</value>
|
|
||||||
</equals>
|
|
||||||
</and>
|
|
||||||
</or>
|
|
||||||
<or>
|
|
||||||
<equals>
|
|
||||||
<property>/systems/thrust/state1</property>
|
|
||||||
<value>MAN</value>
|
|
||||||
</equals>
|
|
||||||
<equals>
|
|
||||||
<property>/systems/thrust/state2</property>
|
|
||||||
<value>MAN</value>
|
|
||||||
</equals>
|
|
||||||
<equals>
|
|
||||||
<property>/systems/thrust/state1</property>
|
|
||||||
<value>CL</value>
|
|
||||||
</equals>
|
|
||||||
<equals>
|
|
||||||
<property>/systems/thrust/state2</property>
|
|
||||||
<value>CL</value>
|
|
||||||
</equals>
|
|
||||||
</or>
|
|
||||||
</and>
|
|
||||||
</or>
|
</or>
|
||||||
</and>
|
</and>
|
||||||
</condition>
|
</condition>
|
||||||
|
|
@ -2350,41 +2281,6 @@
|
||||||
</and>
|
</and>
|
||||||
</condition>
|
</condition>
|
||||||
</animation>
|
</animation>
|
||||||
|
|
||||||
<animation>
|
|
||||||
<type>select</type>
|
|
||||||
<object-name>athr-thrlvr-fma</object-name>
|
|
||||||
<condition>
|
|
||||||
<and>
|
|
||||||
<equals>
|
|
||||||
<property>/it-autoflight/output/athr</property>
|
|
||||||
<value>1</value>
|
|
||||||
</equals>
|
|
||||||
<equals>
|
|
||||||
<property>/it-autoflight/output/thr-mode</property>
|
|
||||||
<value>2</value>
|
|
||||||
</equals>
|
|
||||||
<or>
|
|
||||||
<equals>
|
|
||||||
<property>/it-autoflight/output/fd1</property>
|
|
||||||
<value>1</value>
|
|
||||||
</equals>
|
|
||||||
<equals>
|
|
||||||
<property>/it-autoflight/output/fd2</property>
|
|
||||||
<value>1</value>
|
|
||||||
</equals>
|
|
||||||
</or>
|
|
||||||
<less-than>
|
|
||||||
<property>/controls/engines/engine[0]/throttle</property>
|
|
||||||
<value>0.60</value>
|
|
||||||
</less-than>
|
|
||||||
<less-than>
|
|
||||||
<property>/controls/engines/engine[1]/throttle</property>
|
|
||||||
<value>0.60</value>
|
|
||||||
</less-than>
|
|
||||||
</and>
|
|
||||||
</condition>
|
|
||||||
</animation>
|
|
||||||
|
|
||||||
<text>
|
<text>
|
||||||
<name>athr-man-fma</name>
|
<name>athr-man-fma</name>
|
||||||
|
|
@ -2883,7 +2779,6 @@
|
||||||
<type>select</type>
|
<type>select</type>
|
||||||
<object-name>thrust-mode-fma</object-name>
|
<object-name>thrust-mode-fma</object-name>
|
||||||
<object-name>athr-lvrclb-fma</object-name>
|
<object-name>athr-lvrclb-fma</object-name>
|
||||||
<object-name>athr-thrlvr-fma</object-name>
|
|
||||||
<object-name>athr-thr-fma</object-name>
|
<object-name>athr-thr-fma</object-name>
|
||||||
<object-name>athr-mct-fma</object-name>
|
<object-name>athr-mct-fma</object-name>
|
||||||
<object-name>athr-toga-fma</object-name>
|
<object-name>athr-toga-fma</object-name>
|
||||||
|
|
@ -3396,7 +3291,6 @@
|
||||||
<object-name>pitch-mode-fma</object-name>
|
<object-name>pitch-mode-fma</object-name>
|
||||||
<object-name>land-mode-fma</object-name>
|
<object-name>land-mode-fma</object-name>
|
||||||
<object-name>roll-mode-fma</object-name>
|
<object-name>roll-mode-fma</object-name>
|
||||||
<object-name>athr-thrlvr-fma</object-name>
|
|
||||||
<diffuse>
|
<diffuse>
|
||||||
<red>0</red>
|
<red>0</red>
|
||||||
<green>0.843</green>
|
<green>0.843</green>
|
||||||
|
|
|
||||||
|
|
@ -2141,29 +2141,6 @@
|
||||||
</font-resolution>
|
</font-resolution>
|
||||||
</text>
|
</text>
|
||||||
|
|
||||||
<text>
|
|
||||||
<name>athr-thrlvr-fma</name>
|
|
||||||
<offsets>
|
|
||||||
<x-m>0.00091828</x-m>
|
|
||||||
<y-m>-0.0546226</y-m>
|
|
||||||
<z-m>0.0710781</z-m>
|
|
||||||
</offsets>
|
|
||||||
<alignment>center-center</alignment>
|
|
||||||
<axis-alignment>yz-plane</axis-alignment>
|
|
||||||
<type type="string">text-value</type>
|
|
||||||
<format type="string">THR LVR</format>
|
|
||||||
<property>autopilot/serviceable</property>
|
|
||||||
<font type="string">helvetica_medium.txf</font>
|
|
||||||
<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>
|
|
||||||
|
|
||||||
<animation>
|
<animation>
|
||||||
<type>select</type>
|
<type>select</type>
|
||||||
<object-name>thrust-mode-fma</object-name>
|
<object-name>thrust-mode-fma</object-name>
|
||||||
|
|
@ -2174,68 +2151,22 @@
|
||||||
<value>1</value>
|
<value>1</value>
|
||||||
</equals>
|
</equals>
|
||||||
<or>
|
<or>
|
||||||
<and>
|
<equals>
|
||||||
<equals>
|
<property>/systems/thrust/state1</property>
|
||||||
<property>/it-autoflight/output/thr-mode</property>
|
<value>MAN</value>
|
||||||
<value>2</value>
|
</equals>
|
||||||
</equals>
|
<equals>
|
||||||
<or>
|
<property>/systems/thrust/state2</property>
|
||||||
<equals>
|
<value>MAN</value>
|
||||||
<property>/it-autoflight/output/fd1</property>
|
</equals>
|
||||||
<value>1</value>
|
<equals>
|
||||||
</equals>
|
<property>/systems/thrust/state1</property>
|
||||||
<equals>
|
<value>CL</value>
|
||||||
<property>/it-autoflight/output/fd2</property>
|
</equals>
|
||||||
<value>1</value>
|
<equals>
|
||||||
</equals>
|
<property>/systems/thrust/state2</property>
|
||||||
</or>
|
<value>CL</value>
|
||||||
<or>
|
</equals>
|
||||||
<equals>
|
|
||||||
<property>/systems/thrust/state1</property>
|
|
||||||
<value>CL</value>
|
|
||||||
</equals>
|
|
||||||
<equals>
|
|
||||||
<property>/systems/thrust/state2</property>
|
|
||||||
<value>CL</value>
|
|
||||||
</equals>
|
|
||||||
</or>
|
|
||||||
</and>
|
|
||||||
<and>
|
|
||||||
<or>
|
|
||||||
<not-equals>
|
|
||||||
<property>/it-autoflight/output/thr-mode</property>
|
|
||||||
<value>2</value>
|
|
||||||
</not-equals>
|
|
||||||
<and>
|
|
||||||
<equals>
|
|
||||||
<property>/it-autoflight/output/fd1</property>
|
|
||||||
<value>0</value>
|
|
||||||
</equals>
|
|
||||||
<equals>
|
|
||||||
<property>/it-autoflight/output/fd2</property>
|
|
||||||
<value>0</value>
|
|
||||||
</equals>
|
|
||||||
</and>
|
|
||||||
</or>
|
|
||||||
<or>
|
|
||||||
<equals>
|
|
||||||
<property>/systems/thrust/state1</property>
|
|
||||||
<value>MAN</value>
|
|
||||||
</equals>
|
|
||||||
<equals>
|
|
||||||
<property>/systems/thrust/state2</property>
|
|
||||||
<value>MAN</value>
|
|
||||||
</equals>
|
|
||||||
<equals>
|
|
||||||
<property>/systems/thrust/state1</property>
|
|
||||||
<value>CL</value>
|
|
||||||
</equals>
|
|
||||||
<equals>
|
|
||||||
<property>/systems/thrust/state2</property>
|
|
||||||
<value>CL</value>
|
|
||||||
</equals>
|
|
||||||
</or>
|
|
||||||
</and>
|
|
||||||
</or>
|
</or>
|
||||||
</and>
|
</and>
|
||||||
</condition>
|
</condition>
|
||||||
|
|
@ -2350,41 +2281,6 @@
|
||||||
</and>
|
</and>
|
||||||
</condition>
|
</condition>
|
||||||
</animation>
|
</animation>
|
||||||
|
|
||||||
<animation>
|
|
||||||
<type>select</type>
|
|
||||||
<object-name>athr-thrlvr-fma</object-name>
|
|
||||||
<condition>
|
|
||||||
<and>
|
|
||||||
<equals>
|
|
||||||
<property>/it-autoflight/output/athr</property>
|
|
||||||
<value>1</value>
|
|
||||||
</equals>
|
|
||||||
<equals>
|
|
||||||
<property>/it-autoflight/output/thr-mode</property>
|
|
||||||
<value>2</value>
|
|
||||||
</equals>
|
|
||||||
<or>
|
|
||||||
<equals>
|
|
||||||
<property>/it-autoflight/output/fd1</property>
|
|
||||||
<value>1</value>
|
|
||||||
</equals>
|
|
||||||
<equals>
|
|
||||||
<property>/it-autoflight/output/fd2</property>
|
|
||||||
<value>1</value>
|
|
||||||
</equals>
|
|
||||||
</or>
|
|
||||||
<less-than>
|
|
||||||
<property>/controls/engines/engine[0]/throttle</property>
|
|
||||||
<value>0.60</value>
|
|
||||||
</less-than>
|
|
||||||
<less-than>
|
|
||||||
<property>/controls/engines/engine[1]/throttle</property>
|
|
||||||
<value>0.60</value>
|
|
||||||
</less-than>
|
|
||||||
</and>
|
|
||||||
</condition>
|
|
||||||
</animation>
|
|
||||||
|
|
||||||
<text>
|
<text>
|
||||||
<name>athr-man-fma</name>
|
<name>athr-man-fma</name>
|
||||||
|
|
@ -2883,7 +2779,6 @@
|
||||||
<type>select</type>
|
<type>select</type>
|
||||||
<object-name>thrust-mode-fma</object-name>
|
<object-name>thrust-mode-fma</object-name>
|
||||||
<object-name>athr-lvrclb-fma</object-name>
|
<object-name>athr-lvrclb-fma</object-name>
|
||||||
<object-name>athr-thrlvr-fma</object-name>
|
|
||||||
<object-name>athr-thr-fma</object-name>
|
<object-name>athr-thr-fma</object-name>
|
||||||
<object-name>athr-mct-fma</object-name>
|
<object-name>athr-mct-fma</object-name>
|
||||||
<object-name>athr-toga-fma</object-name>
|
<object-name>athr-toga-fma</object-name>
|
||||||
|
|
@ -3396,7 +3291,6 @@
|
||||||
<object-name>pitch-mode-fma</object-name>
|
<object-name>pitch-mode-fma</object-name>
|
||||||
<object-name>land-mode-fma</object-name>
|
<object-name>land-mode-fma</object-name>
|
||||||
<object-name>roll-mode-fma</object-name>
|
<object-name>roll-mode-fma</object-name>
|
||||||
<object-name>athr-thrlvr-fma</object-name>
|
|
||||||
<diffuse>
|
<diffuse>
|
||||||
<red>0</red>
|
<red>0</red>
|
||||||
<green>0.843</green>
|
<green>0.843</green>
|
||||||
|
|
|
||||||
|
|
@ -1,33 +1,59 @@
|
||||||
# Airbus PFD FMA
|
# Airbus PFD FMA
|
||||||
# Joshua Davidson (it0uchpods/411)
|
# Joshua Davidson (it0uchpods)
|
||||||
|
|
||||||
setprop("/FMGC/internal/cruise-ft", 10000);
|
setprop("/FMGC/internal/cruise-ft", 10000);
|
||||||
setprop("/it-autoflight/internal/alt", 10000);
|
setprop("/it-autoflight/internal/alt", 10000);
|
||||||
|
|
||||||
# Speed or Mach?
|
setlistener("sim/signals/fdm-initialized", func {
|
||||||
var speedmach = func {
|
speedmach.start();
|
||||||
if ((getprop("/it-autoflight/output/vert") == 4) or (getprop("/it-autoflight/output/vert") == 6) or (getprop("/it-autoflight/output/vert") == 7) or (getprop("/it-autoflight/output/vert") == 8)) {
|
});
|
||||||
if (getprop("/it-autoflight/output/fd1") == 0 and getprop("/it-autoflight/output/fd2") == 0 and getprop("/it-autoflight/output/ap1") == 0 and getprop("/it-autoflight/output/ap2") == 0) {
|
|
||||||
speedmach_b();
|
# Master Thrust
|
||||||
} else {
|
var speedmach = maketimer(0.05, func {
|
||||||
var thr = getprop("/it-autoflight/output/thr-mode");
|
var state1 = getprop("/systems/thrust/state1");
|
||||||
var newthr = getprop("/modes/pfd/fma/throttle-mode");
|
var state2 = getprop("/systems/thrust/state2");
|
||||||
if (thr == 0) {
|
var newthr = getprop("/modes/pfd/fma/throttle-mode");
|
||||||
speedmach_b();
|
if (state1 == "TOGA" or state2 == "TOGA") {
|
||||||
} else if (thr == 1) {
|
if (newthr != " ") {
|
||||||
if (newthr != "THR IDLE") {
|
setprop("/modes/pfd/fma/throttle-mode", " ");
|
||||||
setprop("/modes/pfd/fma/throttle-mode", "THR IDLE");
|
}
|
||||||
}
|
} else if (state1 == "MCT" or state2 == "MCT") {
|
||||||
} else if (thr == 2) {
|
if (newthr != " ") {
|
||||||
if (newthr != "THR CLB") {
|
setprop("/modes/pfd/fma/throttle-mode", " ");
|
||||||
setprop("/modes/pfd/fma/throttle-mode", "THR CLB");
|
}
|
||||||
}
|
} else if (state1 == "MAN THR" or state2 == "MAN THR") {
|
||||||
}
|
if (newthr != " ") {
|
||||||
|
setprop("/modes/pfd/fma/throttle-mode", " ");
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
speedmach_b();
|
if ((getprop("/it-autoflight/output/vert") == 4) or (getprop("/it-autoflight/output/vert") == 6) or (getprop("/it-autoflight/output/vert") == 7) or (getprop("/it-autoflight/output/vert") == 8)) {
|
||||||
|
if (getprop("/it-autoflight/output/fd1") == 0 and getprop("/it-autoflight/output/fd2") == 0 and getprop("/it-autoflight/output/ap1") == 0 and getprop("/it-autoflight/output/ap2") == 0) {
|
||||||
|
speedmach_b();
|
||||||
|
} else {
|
||||||
|
var thr = getprop("/it-autoflight/output/thr-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 (state1 == "CL" or state2 == "CL") {
|
||||||
|
if (newthr != "THR CLB") {
|
||||||
|
setprop("/modes/pfd/fma/throttle-mode", "THR CLB");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (newthr != "THR LVR") {
|
||||||
|
setprop("/modes/pfd/fma/throttle-mode", "THR LVR");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
speedmach_b();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
});
|
||||||
|
|
||||||
var speedmach_b = func {
|
var speedmach_b = func {
|
||||||
var newthr = getprop("/modes/pfd/fma/throttle-mode");
|
var newthr = getprop("/modes/pfd/fma/throttle-mode");
|
||||||
|
|
@ -42,16 +68,7 @@ var speedmach_b = func {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# Update Speed or Mach
|
# HDG/TRK
|
||||||
setlistener("/it-autoflight/input/kts-mach", func {
|
|
||||||
speedmach();
|
|
||||||
});
|
|
||||||
|
|
||||||
# Master Thrust
|
|
||||||
setlistener("/it-autoflight/output/thr-mode", func {
|
|
||||||
speedmach();
|
|
||||||
});
|
|
||||||
|
|
||||||
var hdgmde = func {
|
var hdgmde = func {
|
||||||
var lat = getprop("/it-autoflight/mode/lat");
|
var lat = getprop("/it-autoflight/mode/lat");
|
||||||
var newlat = getprop("/modes/pfd/fma/roll-mode");
|
var newlat = getprop("/modes/pfd/fma/roll-mode");
|
||||||
|
|
@ -67,7 +84,6 @@ var hdgmde = func {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# HDG/TRK
|
|
||||||
setlistener("/it-autoflight/custom/trk-fpa", func {
|
setlistener("/it-autoflight/custom/trk-fpa", func {
|
||||||
hdgmde();
|
hdgmde();
|
||||||
});
|
});
|
||||||
|
|
@ -389,22 +405,18 @@ var boxchk_b = func {
|
||||||
|
|
||||||
# Update AP FD ATHR
|
# Update AP FD ATHR
|
||||||
setlistener("/it-autoflight/output/ap1", func {
|
setlistener("/it-autoflight/output/ap1", func {
|
||||||
speedmach();
|
|
||||||
ap();
|
ap();
|
||||||
boxchk();
|
boxchk();
|
||||||
});
|
});
|
||||||
setlistener("/it-autoflight/output/ap2", func {
|
setlistener("/it-autoflight/output/ap2", func {
|
||||||
speedmach();
|
|
||||||
ap();
|
ap();
|
||||||
boxchk();
|
boxchk();
|
||||||
});
|
});
|
||||||
setlistener("/it-autoflight/output/fd1", func {
|
setlistener("/it-autoflight/output/fd1", func {
|
||||||
speedmach();
|
|
||||||
fd();
|
fd();
|
||||||
boxchk();
|
boxchk();
|
||||||
});
|
});
|
||||||
setlistener("/it-autoflight/output/fd2", func {
|
setlistener("/it-autoflight/output/fd2", func {
|
||||||
speedmach();
|
|
||||||
fd();
|
fd();
|
||||||
boxchk();
|
boxchk();
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Reference in a new issue