fly/A320-family
1
0
Fork 0
Code Activity

Merge branch 'dev' into 3D

Browse source
This commit is contained in:
Josh Davidson 2021-09-25 10:58:05 -05:00
commit 1d35c163d7
8 changed files with 41 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Models/FlightDeck/a320.flightdeck.xml
View file

@ -2902,7 +2902,7 @@
<binding>
<command>nasal</command>
<script>
setprop("instrumentation/altimeter/setting-inhg", getprop("instrumentation/altimeter/setting-inhg") + 0.01);
setprop("/instrumentation/altimeter/setting-inhg", getprop("/instrumentation/altimeter/setting-inhg") + 0.01);
</script>
<condition>
<and>
@ -2924,7 +2924,7 @@
<binding>
<command>nasal</command>
<script>
setprop("instrumentation/altimeter/setting-hpa", getprop("instrumentation/altimeter/setting-hpa") + 1.0);
setprop("/instrumentation/altimeter/setting-hpa", getprop("/instrumentation/altimeter/setting-hpa") + 1.0);
</script>
<condition>
<and>
@ -2958,7 +2958,7 @@
<binding>
<command>nasal</command>
<script>
setprop("instrumentation/altimeter/setting-inhg", getprop("instrumentation/altimeter/setting-inhg") - 0.01);
setprop("/instrumentation/altimeter/setting-inhg", getprop("/instrumentation/altimeter/setting-inhg") - 0.01);
</script>
<condition>
<and>
@ -2980,7 +2980,7 @@
<binding>
<command>nasal</command>
<script>
setprop("instrumentation/altimeter/setting-hpa", getprop("instrumentation/altimeter/setting-hpa") - 1.0);
setprop("/instrumentation/altimeter/setting-hpa", getprop("/instrumentation/altimeter/setting-hpa") - 1.0);
</script>
<condition>
<and>
@ -3504,7 +3504,7 @@
</condition>
<command>nasal</command>
<script>
if (getprop("instrumentation/efis/inputs/CSTR") != 1) {
if (getprop("/instrumentation/efis/inputs/CSTR") != 1) {
fcu.cpt_efis_btns("cstr");
} else {
fcu.cpt_efis_btns("off");
@ -3549,7 +3549,7 @@
</condition>
<command>nasal</command>
<script>
if (getprop("instrumentation/efis[1]/inputs/CSTR") != 1) {
if (getprop("/instrumentation/efis[1]/inputs/CSTR") != 1) {
fcu.fo_efis_btns("cstr");
} else {
fcu.fo_efis_btns("off");
@ -3594,7 +3594,7 @@
</condition>
<command>nasal</command>
<script>
if (getprop("instrumentation/efis/inputs/wpt") != 1) {
if (getprop("/instrumentation/efis/inputs/wpt") != 1) {
fcu.cpt_efis_btns("wpt");
} else {
fcu.cpt_efis_btns("off");
@ -3639,7 +3639,7 @@
</condition>
<command>nasal</command>
<script>
if (getprop("instrumentation/efis[1]/inputs/wpt") != 1) {
if (getprop("/instrumentation/efis[1]/inputs/wpt") != 1) {
fcu.fo_efis_btns("wpt");
} else {
fcu.fo_efis_btns("off");
@ -3684,7 +3684,7 @@
</condition>
<command>nasal</command>
<script>
if (getprop("instrumentation/efis/inputs/VORD") != 1) {
if (getprop("/instrumentation/efis/inputs/VORD") != 1) {
fcu.cpt_efis_btns("vord");
} else {
fcu.cpt_efis_btns("off");
@ -3729,7 +3729,7 @@
</condition>
<command>nasal</command>
<script>
if (getprop("instrumentation/efis[1]/inputs/VORD") != 1) {
if (getprop("/instrumentation/efis[1]/inputs/VORD") != 1) {
fcu.fo_efis_btns("vord");
} else {
fcu.fo_efis_btns("off");
@ -3774,7 +3774,7 @@
</condition>
<command>nasal</command>
<script>
if (getprop("instrumentation/efis/inputs/NDB") != 1) {
if (getprop("/instrumentation/efis/inputs/NDB") != 1) {
fcu.cpt_efis_btns("ndb");
} else {
fcu.cpt_efis_btns("off");
@ -3819,7 +3819,7 @@
</condition>
<command>nasal</command>
<script>
if (getprop("instrumentation/efis[1]/inputs/NDB") != 1) {
if (getprop("/instrumentation/efis[1]/inputs/NDB") != 1) {
fcu.fo_efis_btns("ndb");
} else {
fcu.fo_efis_btns("off");
@ -3864,7 +3864,7 @@
</condition>
<command>nasal</command>
<script>
if (getprop("instrumentation/efis/inputs/arpt") != 1) {
if (getprop("/instrumentation/efis/inputs/arpt") != 1) {
fcu.cpt_efis_btns("arpt");
} else {
fcu.cpt_efis_btns("off");
@ -3909,7 +3909,7 @@
</condition>
<command>nasal</command>
<script>
if (getprop("instrumentation/efis[1]/inputs/arpt") != 1) {
if (getprop("/instrumentation/efis[1]/inputs/arpt") != 1) {
fcu.fo_efis_btns("arpt");
} else {
fcu.fo_efis_btns("off");

2
Nasal/Displays/DMC.nas
View file

@ -17,7 +17,7 @@ var DMC = {
d.sats = [props.globals.getNode("/systems/navigation/adr/output/sat-1", 1), props.globals.getNode("/systems/navigation/adr/output/sat-2", 1), props.globals.getNode("/systems/navigation/adr/output/sat-3", 1)];
d.tats = [props.globals.getNode("/systems/navigation/adr/output/tat-1", 1), props.globals.getNode("/systems/navigation/adr/output/tat-2", 1), props.globals.getNode("/systems/navigation/adr/output/tat-3", 1)];
d.trends = [props.globals.getNode("/instrumentation/pfd/speed-lookahead-1", 1), props.globals.getNode("/instrumentation/pfd/speed-lookahead-2", 1), props.globals.getNode("/instrumentation/pfd/speed-lookahead-3", 1)];
d.altitudeDiffs = [props.globals.getNode("//instrumentation/pfd/alt-diff[0]", 1), props.globals.getNode("//instrumentation/pfd/alt-diff[1]", 1), props.globals.getNode("//instrumentation/pfd/alt-diff[2]", 1)];
d.altitudeDiffs = [props.globals.getNode("/instrumentation/pfd/alt-diff[0]", 1), props.globals.getNode("/instrumentation/pfd/alt-diff[1]", 1), props.globals.getNode("/instrumentation/pfd/alt-diff[2]", 1)];
d.outputs = [nil, nil, nil, nil, nil, nil, nil, nil]; # airspeed, altitude, mach, pfd altitude, sat, tat, speed trend, altitudeDiffs
return d;
},

BIN
Paintkit/A320.star_alliance.paintkit.xcf
View file

Binary file not shown.

BIN
Paintkit/a320.paintkit.xcf
View file

Binary file not shown.

BIN
Paintkit/a320.sharklets.paintkit.xcf
View file

Binary file not shown.

BIN
Paintkit/a320.template.xcf
View file

Binary file not shown.

BIN
Paintkit/a32x.neopw-painkit.xcf
View file

Binary file not shown.

26
Systems/a320-adr.xml
View file

@ -767,6 +767,32 @@
<channel name="ADR Output" execrate="2"> <!-- todo - need lowpass? -->
<!-- Copy Altimeter Settings -->
<pure_gain name="/instrumentation/altimeter[1]/setting-inhg">
<input>/instrumentation/altimeter[0]/setting-inhg</input>
<gain>1</gain>
</pure_gain>
<pure_gain name="/instrumentation/altimeter[2]/setting-inhg">
<input>/instrumentation/altimeter[0]/setting-inhg</input>
<gain>1</gain>
</pure_gain>
<pure_gain name="/instrumentation/altimeter[3]/setting-inhg">
<input>/instrumentation/altimeter[0]/setting-inhg</input>
<gain>1</gain>
</pure_gain>
<pure_gain name="/instrumentation/altimeter[4]/setting-inhg">
<input>/instrumentation/altimeter[0]/setting-inhg</input>
<gain>1</gain>
</pure_gain>
<pure_gain name="/instrumentation/altimeter[5]/setting-inhg">
<input>/instrumentation/altimeter[0]/setting-inhg</input>
<gain>1</gain>
</pure_gain>
<pure_gain name="/systems/navigation/adr/output/aoa-1">
<input>/systems/navigation/probes/aoa-1</input>
<gain>/systems/navigation/adr/operating-1</gain>