fly/A320-family
1
0
Fork 0
Code Activity

Fix Nasal errors, fix payload dialog

Browse source
This commit is contained in:
legoboyvdlp R 2020-07-17 20:58:39 +01:00
parent 998db7162f
commit c50d42c138
4 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Nasal/MCDU/CLOSESTAIRPORT.nas
View file

@ -112,13 +112,13 @@ var closestAirportPage = {
} }
if (size(id) > 4) { if (size(id) > 4) {
mcdu_message(me.computer, "NOT ALLOWED"); mcdu_message(me.computer, "NOT ALLOWED");
} elsif (airportinfo(id) == nil) {
mcdu_message(me.computer, "NOT IN DATA BASE");
} else {
me.manAirport = airportinfo(id);
me.L5 = [id, nil, "grn"];
me.R5 = ["----", nil, "grn"];
} }
if (airportinfo(id) == nil) {
notInDataBase(me.computer);
}
me.manAirport = airportinfo(id);
me.L5 = [id, nil, "grn"];
me.R5 = ["----", nil, "grn"];
canvas_mcdu.pageSwitch[me.computer].setBoolValue(0); canvas_mcdu.pageSwitch[me.computer].setBoolValue(0);
} }
}; };

2
Nasal/MCDU/LATREV.nas
View file

@ -132,7 +132,7 @@ var latRev = {
var returny = fmgc.flightPlanController.scratchpad(mcdu_scratchpad.scratchpads[me.computer].scratchpad, me.index + 1, me.computer); var returny = fmgc.flightPlanController.scratchpad(mcdu_scratchpad.scratchpads[me.computer].scratchpad, me.index + 1, me.computer);
if (returny == 0) { if (returny == 0) {
notInDataBase(me.computer); mcdu_message(me.computer, "NOT IN DATA BASE");
} elsif (returny == 1) { } elsif (returny == 1) {
mcdu_message(me.computer, "NOT ALLOWED"); mcdu_message(me.computer, "NOT ALLOWED");
} else { } else {

1
Nasal/Systems/payload.nas
View file

@ -9,6 +9,7 @@ var fuelSvc = {
Nodes: { Nodes: {
requestLbs: props.globals.getNode("services/fuel-truck/request-lbs"), requestLbs: props.globals.getNode("services/fuel-truck/request-lbs"),
requestTotalLbs: props.globals.getNode("services/fuel-truck/request-total-lbs"), requestTotalLbs: props.globals.getNode("services/fuel-truck/request-total-lbs"),
requestFuelLbs: props.globals.initNode("services/fuel-truck/fuel-on-board-at-request", pts.Consumables.Fuel.totalFuelLbs.getValue(), "DOUBLE"),
}, },
newRequest: func() { newRequest: func() {

7
gui/dialogs/refuel.nas
View file

@ -63,8 +63,6 @@ var refuelClass = {
me._svg = me._root.createChild("group"); me._svg = me._root.createChild("group");
canvas.parsesvg(me._svg, "Aircraft/A320-family/gui/dialogs/refuel.svg"); canvas.parsesvg(me._svg, "Aircraft/A320-family/gui/dialogs/refuel.svg");
amount.setValue(math.round((pts.Consumables.Fuel.totalFuelLbs.getValue() + systems.fuelSvc.Nodes.requestLbs.getValue()) / 1000, 0.1));
me._HI_LVL_L = me._svg.getElementById("HI-LVL-L"); me._HI_LVL_L = me._svg.getElementById("HI-LVL-L");
me._HI_LVL_C = me._svg.getElementById("HI-LVL-C"); me._HI_LVL_C = me._svg.getElementById("HI-LVL-C");
@ -405,8 +403,8 @@ var refuelClass = {
me._Mode_refuel.show(); me._Mode_refuel.show();
me._Mode_off.hide(); me._Mode_off.hide();
me._Mode_defuel.hide(); me._Mode_defuel.hide();
systems.fuelSvc.Nodes.requestFuelLbs.setValue(pts.Consumables.Fuel.totalFuelLbs.getValue());
systems.fuelSvc.refuel(); systems.fuelSvc.refuel();
} }
}); });
@ -484,6 +482,9 @@ var refuelClass = {
me._timerUp.stop(); me._timerUp.stop();
}); });
amount.setValue(math.round((systems.fuelSvc.Nodes.requestFuelLbs.getValue() + systems.fuelSvc.Nodes.requestLbs.getValue()) / 1000, 0.1));
me._timerf(); me._timerf();
me._timer.start(); me._timer.start();
}, },