fly/A320-family
1
0
Fork 0
Code Activity

Merge branch 'dev' into fuel-prediction

Browse source
This commit is contained in:
legoboyvdlp R 2020-05-22 14:41:13 +01:00
commit 01a05e3194
13 changed files with 310 additions and 324 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
A320-main.xml
View file

@ -3954,7 +3954,6 @@
<file>Aircraft/A320-family/Nasal/Libraries/buttons.nas</file>
<file>Aircraft/A320-family/Nasal/Libraries/shake.nas</file>
<file>Aircraft/A320-family/Nasal/Libraries/zoom-views.nas</file>
<file>Aircraft/A320-family/Nasal/Libraries/efis.nas</file>
</libraries>
<acconfig>
<file>Aircraft/A320-family/AircraftConfig/acconfig.nas</file>
@ -3998,6 +3997,7 @@
</fbw>
<fcu>
<file>Aircraft/A320-family/Nasal/FMGC/FCU.nas</file>
<file>Aircraft/A320-family/Nasal/Panels/efis.nas</file>
</fcu>
<fmgc>
<file>Aircraft/A320-family/Nasal/FMGC/flightplan-waypoints.nas</file>

42
Models/Effects/wing-condensation-L.xml
View file

@ -11,44 +11,18 @@
<condition>
<and>
<or>
<greater-than-equals>
<expression>
<sum>
<product>
<property>environment/relative-humidity</property>
<value>0.1</value>
<value>0.075</value>
</product>
<property>systems/navigation/adr/output/aoa-1</property>
<property>fdm/jsbsim/aero/alpha-deg</property>
</sum>
</expression>
<value>13.5</value>
</greater-than-equals>
<greater-than-equals>
<expression>
<sum>
<product>
<property>environment/relative-humidity</property>
<value>0.1</value>
</product>
<property>systems/navigation/adr/output/aoa-2</property>
</sum>
</expression>
<value>13.5</value>
</greater-than-equals>
<greater-than-equals>
<expression>
<sum>
<product>
<property>environment/relative-humidity</property>
<value>0.1</value>
</product>
<property>systems/navigation/adr/output/aoa-3</property>
</sum>
</expression>
<value>13.5</value>
</greater-than-equals>
</or>
<greater-than>
<property>velocities/groundspeed-kt</property>
<value>100</value>
@ -73,20 +47,10 @@
<property>position/altitude-agl-ft</property>
<value>8000</value>
</less-than>
<or>
<greater-than>
<property>systems/navigation/adr/output/aoa-1</property>
<property>fdm/jsbsim/aero/alpha-deg</property>
<value>0</value>
</greater-than>
<greater-than>
<property>systems/navigation/adr/output/aoa-2</property>
<value>0</value>
</greater-than>
<greater-than>
<property>systems/navigation/adr/output/aoa-3</property>
<value>0</value>
</greater-than>
</or>
</and>
</condition>

42
Models/Effects/wing-condensation-R.xml
View file

@ -11,44 +11,18 @@
<condition>
<and>
<or>
<greater-than-equals>
<expression>
<sum>
<product>
<property>environment/relative-humidity</property>
<value>0.1</value>
<value>0.075</value>
</product>
<property>systems/navigation/adr/output/aoa-1</property>
<property>fdm/jsbsim/aero/alpha-deg</property>
</sum>
</expression>
<value>13.5</value>
</greater-than-equals>
<greater-than-equals>
<expression>
<sum>
<product>
<property>environment/relative-humidity</property>
<value>0.1</value>
</product>
<property>systems/navigation/adr/output/aoa-2</property>
</sum>
</expression>
<value>13.5</value>
</greater-than-equals>
<greater-than-equals>
<expression>
<sum>
<product>
<property>environment/relative-humidity</property>
<value>0.1</value>
</product>
<property>systems/navigation/adr/output/aoa-3</property>
</sum>
</expression>
<value>13.5</value>
</greater-than-equals>
</or>
<greater-than>
<property>velocities/groundspeed-kt</property>
<value>100</value>
@ -73,20 +47,10 @@
<property>position/altitude-agl-ft</property>
<value>8000</value>
</less-than>
<or>
<greater-than>
<property>systems/navigation/adr/output/aoa-1</property>
<property>fdm/jsbsim/aero/alpha-deg</property>
<value>0</value>
</greater-than>
<greater-than>
<property>systems/navigation/adr/output/aoa-2</property>
<value>0</value>
</greater-than>
<greater-than>
<property>systems/navigation/adr/output/aoa-3</property>
<value>0</value>
</greater-than>
</or>
</and>
</condition>

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

@ -3262,9 +3262,9 @@
<command>nasal</command>
<script>
if (getprop("instrumentation/efis/inputs/CSTR") != 1) {
libraries.cpt_efis_btns("cstr");
fcu.cpt_efis_btns("cstr");
} else {
libraries.cpt_efis_btns("off");
fcu.cpt_efis_btns("off");
}
setprop("sim/sounde/btn1", 1);
</script>
@ -3304,9 +3304,9 @@
<command>nasal</command>
<script>
if (getprop("instrumentation/efis[1]/inputs/CSTR") != 1) {
libraries.fo_efis_btns("cstr");
fcu.fo_efis_btns("cstr");
} else {
libraries.fo_efis_btns("off");
fcu.fo_efis_btns("off");
}
setprop("sim/sounde/btn1", 1);
</script>
@ -3346,9 +3346,9 @@
<command>nasal</command>
<script>
if (getprop("instrumentation/efis/inputs/wpt") != 1) {
libraries.cpt_efis_btns("wpt");
fcu.cpt_efis_btns("wpt");
} else {
libraries.cpt_efis_btns("off");
fcu.cpt_efis_btns("off");
}
setprop("sim/sounde/btn1", 1);
</script>
@ -3388,9 +3388,9 @@
<command>nasal</command>
<script>
if (getprop("instrumentation/efis[1]/inputs/wpt") != 1) {
libraries.fo_efis_btns("wpt");
fcu.fo_efis_btns("wpt");
} else {
libraries.fo_efis_btns("off");
fcu.fo_efis_btns("off");
}
setprop("sim/sounde/btn1", 1);
</script>
@ -3430,9 +3430,9 @@
<command>nasal</command>
<script>
if (getprop("instrumentation/efis/inputs/VORD") != 1) {
libraries.cpt_efis_btns("vord");
fcu.cpt_efis_btns("vord");
} else {
libraries.cpt_efis_btns("off");
fcu.cpt_efis_btns("off");
}
setprop("sim/sounde/btn1", 1);
</script>
@ -3472,9 +3472,9 @@
<command>nasal</command>
<script>
if (getprop("instrumentation/efis[1]/inputs/VORD") != 1) {
libraries.fo_efis_btns("vord");
fcu.fo_efis_btns("vord");
} else {
libraries.fo_efis_btns("off");
fcu.fo_efis_btns("off");
}
setprop("sim/sounde/btn1", 1);
</script>
@ -3514,9 +3514,9 @@
<command>nasal</command>
<script>
if (getprop("instrumentation/efis/inputs/NDB") != 1) {
libraries.cpt_efis_btns("ndb");
fcu.cpt_efis_btns("ndb");
} else {
libraries.cpt_efis_btns("off");
fcu.cpt_efis_btns("off");
}
setprop("sim/sounde/btn1", 1);
</script>
@ -3556,9 +3556,9 @@
<command>nasal</command>
<script>
if (getprop("instrumentation/efis[1]/inputs/NDB") != 1) {
libraries.fo_efis_btns("ndb");
fcu.fo_efis_btns("ndb");
} else {
libraries.fo_efis_btns("off");
fcu.fo_efis_btns("off");
}
setprop("sim/sounde/btn1", 1);
</script>
@ -3598,9 +3598,9 @@
<command>nasal</command>
<script>
if (getprop("instrumentation/efis/inputs/arpt") != 1) {
libraries.cpt_efis_btns("arpt");
fcu.cpt_efis_btns("arpt");
} else {
libraries.cpt_efis_btns("off");
fcu.cpt_efis_btns("off");
}
setprop("sim/sounde/btn1", 1);
</script>
@ -3640,9 +3640,9 @@
<command>nasal</command>
<script>
if (getprop("instrumentation/efis[1]/inputs/arpt") != 1) {
libraries.fo_efis_btns("arpt");
fcu.fo_efis_btns("arpt");
} else {
libraries.fo_efis_btns("off");
fcu.fo_efis_btns("off");
}
setprop("sim/sounde/btn1", 1);
</script>
@ -3675,7 +3675,7 @@
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>libraries.setCptND(1);</script>
<script>fcu.setCptND(1);</script>
</binding>
</action>
<action>
@ -3684,7 +3684,7 @@
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>libraries.setCptND(-1);</script>
<script>fcu.setCptND(-1);</script>
</binding>
</action>
</animation>
@ -3713,7 +3713,7 @@
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>libraries.setFoND(1);</script>
<script>fcu.setFoND(1);</script>
</binding>
</action>
<action>
@ -3722,7 +3722,7 @@
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>libraries.setFoND(-1);</script>
<script>fcu.setFoND(-1);</script>
</binding>
</action>
</animation>
@ -3751,7 +3751,7 @@
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>libraries.setNDRange(0, 1);</script>
<script>fcu.setNDRange(0, 1);</script>
</binding>
</action>
<action>
@ -3760,7 +3760,7 @@
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>libraries.setNDRange(0, -1);</script>
<script>fcu.setNDRange(0, -1);</script>
</binding>
</action>
</animation>
@ -3790,7 +3790,7 @@
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>libraries.setNDRange(1, 1);</script>
<script>fcu.setNDRange(1, 1);</script>
</binding>
</action>
<action>
@ -3799,7 +3799,7 @@
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>libraries.setNDRange(1, -1);</script>
<script>fcu.setNDRange(1, -1);</script>
</binding>
</action>
</animation>

17
Nasal/FMGC/flightplan.nas
View file

@ -56,6 +56,14 @@ var flightPlanController = {
_timeTemp: nil,
_altTemp: nil,
init: func() {
me.resetFlightplan(2);
me.insertPPOS(2);
me.addDiscontinuity(1, 2, 1);
me.currentToWptIndex.setValue(0);
me.flightPlanChanged(2);
},
reset: func() {
me.temporaryFlag[0] = 0;
me.temporaryFlag[1] = 0;
@ -208,8 +216,11 @@ var flightPlanController = {
# Check if a discontinuity already exists either immediately before or at that index
# If it does, don't add another one
# Optional flag DEBUG_DISCONT to disable discontinuities totally
addDiscontinuity: func(index, plan) {
addDiscontinuity: func(index, plan, force = 0) {
if (DEBUG_DISCONT) { return; }
if (force) {
me.flightplans[plan].insertWP(createDiscontinuity(), index);
}
if (index > 0) {
if (me.flightplans[plan].getWP(index).wp_name != "DISCONTINUITY" and me.flightplans[plan].getWP(index - 1).wp_name != "DISCONTINUITY") {
me.flightplans[plan].insertWP(createDiscontinuity(), index);
@ -231,6 +242,10 @@ var flightPlanController = {
me.flightplans[n].insertWP(createWP(geo.aircraft_position(), "T-P"), index);
},
insertPPOS: func(n, index = 0) {
me.flightplans[n].insertWP(createWP(geo.aircraft_position(), "PPOS"), index);
},
# childWPBearingDistance - return waypoint at bearing and distance from specified waypoint ghost
# args: wpt, bearing, dist, name, typeStr
# wpt: waypoint ghost

1
Nasal/Libraries/libraries.nas
View file

@ -222,6 +222,7 @@ var systemsInit = func {
atc.init();
fcu.FCUController.init();
dmc.DMController.init();
fmgc.flightPlanController.init();
}
setlistener("/sim/signals/fdm-initialized", func {

2
Nasal/MCDU/ARRIVAL.nas
View file

@ -80,9 +80,11 @@ var arrivalPage = {
}
if (fmgc.flightPlanController.flightplans[me.computer].star != nil) {
me.selectedSTAR = fmgc.flightPlanController.flightplans[me.computer].star;
me.selectedTransition = fmgc.flightPlanController.flightplans[me.computer].star_trans;
isNoStar[me.computer] = 0;
} elsif (fmgc.flightPlanController.flightplans[2].star != nil) {
me.selectedSTAR = fmgc.flightPlanController.flightplans[2].star;
me.selectedTransition = fmgc.flightPlanController.flightplans[2].star_trans;
isNoStar[me.computer] = 0;
} elsif (isNoStar[me.computer] == 1) {
me.selectedSTAR = "NO STAR";

6
Nasal/MCDU/DEPARTURE.nas
View file

@ -77,9 +77,11 @@ var departurePage = {
}
if (fmgc.flightPlanController.flightplans[me.computer].sid != nil) {
me.selectedSID = fmgc.flightPlanController.flightplans[me.computer].sid;
me.selectedTransition = fmgc.flightPlanController.flightplans[me.computer].sid_trans;
isNoSid[me.computer] = 0;
} elsif (fmgc.flightPlanController.flightplans[2].sid != nil) {
me.selectedSID = fmgc.flightPlanController.flightplans[2].sid;
me.selectedTransition = fmgc.flightPlanController.flightplans[2].sid_trans;
isNoSid[me.computer] = 0;
} elsif (isNoSid[me.computer] == 1) {
me.selectedSID = "NO SID";
@ -196,7 +198,7 @@ var departurePage = {
me.R1 = ["-------", "TRANS ", "wht"];
}
} elsif (fmgc.flightPlanController.flightplans[me.computer].sid_trans != nil) {
me.C1 = [fmgc.flightPlanController.flightplans[me.computer].sid_trans.id, "SID", "yel"];
me.R1 = [fmgc.flightPlanController.flightplans[me.computer].sid_trans.id, "SID", "yel"];
} else {
me.R1 = ["-------", "TRANS ", "wht"];
}
@ -558,7 +560,7 @@ var departurePage = {
if (!dirToFlag) {
me.selectedTransition = me.transitions[index - 2];
me.makeTmpy();
fmgc.flightPlanController.flightplans[me.computer].sid = me.depAirport[0].getSid(me.selectedSID).transition(me.selectedTransition);
fmgc.flightPlanController.flightplans[me.computer].sid_trans = me.depAirport[0].getSid(me.selectedSID).transition(me.selectedTransition);
me.updateActiveTransitions();
me.updateTransitions();
fmgc.flightPlanController.flightPlanChanged(me.computer);

3
Nasal/MCDU/INITA.nas
View file

@ -168,7 +168,8 @@ var initInputA = func(key, i) {
setprop("/FMGC/internal/fuel-calculating", 0);
setprop("/FMGC/internal/fuel-calculating", 1);
}
fmgc.flightPlanController.reset();
fmgc.flightPlanController.reset(2);
fmgc.flightPlanController.init();
setprop("MCDU[" ~ i ~ "]/scratchpad-msg", 0);
mcdu.clearScratchpad(i);
#} else if (scratchpad == "") {

11
Nasal/MCDU/MCDU.nas
View file

@ -772,7 +772,6 @@ var pagebutton = func(btn, i) {
setprop("/MCDU[" ~ i ~ "]/scratchpad", "SELECT DESIRED SYSTEM");
setprop("/MCDU[" ~ i ~ "]/page", "MCDU");
} else if (btn == "f-pln" or btn == "airport") {
if (fmgc.flightPlanController.active.getBoolValue()) {
if (canvas_mcdu.myFpln[i] == nil) {
canvas_mcdu.myFpln[i] = fplnPage.new(2, i);
}
@ -788,14 +787,10 @@ var pagebutton = func(btn, i) {
}
}
setprop("/MCDU[" ~ i ~ "]/page", "F-PLNA");
} else {
setprop("/MCDU[" ~ i ~ "]/scratchpad-msg", 1);
setprop("/MCDU[" ~ i ~ "]/scratchpad", "ERROR. INITIALIZE ROUTE"); # Should be ERROR:, but the : character doesn't show in our MCDU font right now...
}
} else if (btn == "fuel-pred") {
setprop("/MCDU[" ~ i ~ "]/page", "FUELPRED");
} else if (btn == "dirto") {
if (fmgc.flightPlanController.active.getBoolValue()) {
if (fmgc.flightPlanController.temporaryFlag[i] and !dirToFlag) {
setprop("/MCDU[" ~ i ~ "]/scratchpad-msg", 1);
setprop("/MCDU[" ~ i ~ "]/scratchpad", "INSRT / ERASE TMPY FIRST");
@ -804,10 +799,6 @@ var pagebutton = func(btn, i) {
canvas_mcdu.myDirTo[i] = dirTo.new(i);
}
setprop("/MCDU[" ~ i ~ "]/page", "DIRTO");
} else {
setprop("/MCDU[" ~ i ~ "]/scratchpad-msg", 1);
setprop("/MCDU[" ~ i ~ "]/scratchpad", "ERROR. INITIALIZE ROUTE"); # Should be ERROR:, but the : character doesn't show in our MCDU font right now...
}
}
}
}

2
Nasal/MCDU/PERFAPPR.nas
View file

@ -82,7 +82,7 @@ var perfAPPRInput = func(key, i) {
setprop("/FMGC/internal/vapp-speed-set", 0);
setprop("/MCDU[" ~ i ~ "]/scratchpad-msg", 0);
mcdu.clearScratchpad(i);
} else if (int(scratchpad) != nil and scratchpad >= 0 and scratchpad <= 200) {
} else if (int(scratchpad) != nil and scratchpad >= 100 and scratchpad <= 350) {
setprop("/FMGC/internal/vapp-speed-set", 1);
setprop("/FMGC/internal/computed-speeds/vapp_appr", scratchpad);
mcdu.clearScratchpad(i);

84
Nasal/Panels/acp.nas
View file

@ -7,32 +7,56 @@
# NOTE: This is just temporary until FG allows a full implementation of the audio system.
var vhf1_recive = props.globals.initNode("/controls/audio/acp[0]/vhf1-recive", 1, "BOOL");
var vhf2_recive = props.globals.initNode("/controls/audio/acp[0]/vhf2-recive", 1, "BOOL");
var vhf1_capt_recive = props.globals.initNode("/controls/audio/acp[0]/vhf1-recive", 1, "BOOL");
var vhf2_capt_recive = props.globals.initNode("/controls/audio/acp[0]/vhf2-recive", 1, "BOOL");
var vhf1_capt_volume = props.globals.initNode("/controls/audio/acp[0]/vhf1-volume", 1, "DOUBLE");
var vhf2_capt_volume = props.globals.initNode("/controls/audio/acp[0]/vhf2-volume", 1, "DOUBLE");
var vhf1_volume = props.globals.initNode("/controls/audio/acp[0]/vhf1-volume", 1, "DOUBLE");
var vhf2_volume = props.globals.initNode("/controls/audio/acp[0]/vhf2-volume", 1, "DOUBLE");
var vhf1_fo_recive = props.globals.initNode("/controls/audio/acp[1]/vhf1-recive", 1, "BOOL");
var vhf2_fo_recive = props.globals.initNode("/controls/audio/acp[1]/vhf2-recive", 1, "BOOL");
var vhf1_fo_volume = props.globals.initNode("/controls/audio/acp[1]/vhf1-volume", 1, "DOUBLE");
var vhf2_fo_volume = props.globals.initNode("/controls/audio/acp[1]/vhf2-volume", 1, "DOUBLE");
var com1_volume = props.globals.getNode("instrumentation/comm[0]/volume");
var com2_volume = props.globals.getNode("instrumentation/comm[1]/volume");
var init = func() {
vhf1_recive.setValue(1);
vhf2_recive.setValue(1);
vhf1_volume.setValue(1);
vhf2_volume.setValue(0.8);
vhf1_capt_recive.setValue(1);
vhf2_capt_recive.setValue(1);
vhf1_capt_volume.setValue(1);
vhf2_capt_volume.setValue(0.8);
vhf1_fo_recive.setValue(1);
vhf2_fo_recive.setValue(1);
vhf1_fo_volume.setValue(0.8);
vhf2_fo_volume.setValue(1);
}
var update_instruments = func(com_no) {
if (com_no == 0) {
if (vhf1_recive.getValue()) {
com1_volume.setValue(vhf1_volume.getValue());
var update_com1 = func() {
if (getprop("systems/acconfig/options/fo-view") == 1) {
if (vhf1_fo_recive.getValue()) {
com1_volume.setValue(vhf1_fo_volume.getValue());
} else {
com1_volume.setValue(0);
}
} else if (com_no == 1) {
if (vhf2_recive.getValue()) {
com2_volume.setValue(vhf2_volume.getValue());
} else {
if (vhf1_capt_recive.getValue()) {
com1_volume.setValue(vhf1_capt_volume.getValue());
} else {
com1_volume.setValue(0);
}
}
}
var update_com2 = func() {
if (getprop("systems/acconfig/options/fo-view") == 1) {
if (vhf2_fo_recive.getValue()) {
com2_volume.setValue(vhf2_fo_volume.getValue());
} else {
com2_volume.setValue(0);
}
} else {
if (vhf2_capt_recive.getValue()) {
com2_volume.setValue(vhf2_capt_volume.getValue());
} else {
com2_volume.setValue(0);
}
@ -40,17 +64,39 @@ var update_instruments = func(com_no) {
}
setlistener("/controls/audio/acp[0]/vhf1-recive", func {
update_instruments(0);
update_com1();
});
setlistener("/controls/audio/acp[0]/vhf1-volume", func {
update_instruments(0);
update_com1();
});
setlistener("/controls/audio/acp[0]/vhf2-recive", func {
update_instruments(1);
update_com2();
});
setlistener("/controls/audio/acp[0]/vhf2-volume", func {
update_instruments(1);
update_com2();
});
setlistener("/controls/audio/acp[1]/vhf1-recive", func {
update_com1();
});
setlistener("/controls/audio/acp[1]/vhf1-volume", func {
update_com1();
});
setlistener("/controls/audio/acp[1]/vhf2-recive", func {
update_com2();
});
setlistener("/controls/audio/acp[1]/vhf2-volume", func {
update_com2();
});
setlistener("/systems/acconfig/options/fo-view", func {
update_com1();
update_com2();
});

0
Nasal/Libraries/efis.nas → Nasal/Panels/efis.nas
View file