fly/A320-family
1
0
Fork 0
Code Activity

Fixes

Browse source
This commit is contained in:
legoboyvdlp R 2019-11-16 11:17:50 +00:00
parent 489b5e1789
commit b011cb431b
3 changed files with 55 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Nasal/payload.nas
View file

@ -2,6 +2,7 @@
# Jonathan Redpath
var fuelSvc = {
_needCenter: 0,
enable: props.globals.getNode("/services/fuel-truck/enable"),
connect: props.globals.getNode("/services/fuel-truck/connect"),
operate: props.globals.getNode("/services/fuel-truck/operate"),
@ -34,11 +35,13 @@ var fuelSvc = {
systems.FUEL.Valves.refuelRight.setBoolValue(1);
if (pts.Sim.aero.getValue() == "A320-200-CFM" and me.Nodes.requestTotalLbs.getValue() > 28229.9) {
systems.FUEL.Valves.refuelCenter.setBoolValue(1);
me._needCenter = 1;
} elsif ((pts.Sim.aero.getValue() == "A320-200-IAE" or pts.Sim.aero.getValue() == "A320-100-CFM") and me.Nodes.requestTotalLbs.getValue() > 27591.8) {
systems.FUEL.Valves.refuelCenter.setBoolValue(1);
me._needCenter = 1;
} elsif ((pts.Sim.aero.getValue() == "A320neo-CFM" or pts.Sim.aero.getValue() == "A320neo-PW") and me.Nodes.requestTotalLbs.getValue() > 27357.8) {
systems.FUEL.Valves.refuelCenter.setBoolValue(1);
me._needCenter = 1;
} else {
me._needCenter = 0;
}
},
@ -75,7 +78,7 @@ var fuelTimer = maketimer(0.25, func() {
} else {
systems.FUEL.Valves.refuelLeft.setBoolValue(1);
}
} elsif (Dialogs.valve_l.getValue() == 1.0) {
} elsif (Dialogs.valve_l.getValue() == 1.0 and systems.FUEL.Quantity.leftInnerPct.getValue() < 0.999) {
systems.FUEL.Valves.refuelLeft.setBoolValue(1);
} else {
systems.FUEL.Valves.refuelLeft.setBoolValue(0);
@ -87,19 +90,19 @@ var fuelTimer = maketimer(0.25, func() {
} else {
systems.FUEL.Valves.refuelRight.setBoolValue(1);
}
} elsif (Dialogs.valve_r.getValue() == 1.0) {
} elsif (Dialogs.valve_r.getValue() == 1.0 and systems.FUEL.Quantity.rightInnerPct.getValue() < 0.999) {
systems.FUEL.Valves.refuelRight.setBoolValue(1);
} else {
systems.FUEL.Valves.refuelRight.setBoolValue(0);
}
if (Dialogs.valve_c.getValue() == 0.5) {
if (systems.FUEL.Quantity.centerPct.getValue() >= 0.999) {
if (Dialogs.valve_c.getValue() == 0.5 and fuelSvc._needCenter == 1) {
if (systems.FUEL.Quantity.centerPct.getValue() >= 0.999 or systems.FUEL.Quantity.leftInnerPct.getValue() < 0.999 or systems.FUEL.Quantity.rightInnerPct.getValue() < 0.999) {
systems.FUEL.Valves.refuelCenter.setBoolValue(0);
} else {
systems.FUEL.Valves.refuelCenter.setBoolValue(1);
}
} elsif (Dialogs.valve_c.getValue() == 1.0) {
} elsif (Dialogs.valve_c.getValue() == 1.0 and systems.FUEL.Quantity.centerPct.getValue() < 0.999) {
systems.FUEL.Valves.refuelCenter.setBoolValue(1);
} else {
systems.FUEL.Valves.refuelCenter.setBoolValue(0);

14
Systems/a320-fuel.xml
View file

@ -623,6 +623,13 @@
<switch name="/systems/fuel/internal/left-wing-outer-to-inner-tank">
<default value="0"/>
<test logic="AND" value="/systems/fuel/internal/left-outer-wing-tank-refuel">
/systems/fuel/valves/outer-inner-transfer-valve-1 eq 1
/accelerations/pilot-gdamped ge 0.5
/consumables/fuel/tank[0]/level-gal_us gt /consumables/fuel/tank[0]/unusable-gal_us
/consumables/fuel/tank[1]/level-norm lt 0.9999
/systems/fuel/refuel/refuelling eq 1
</test>
<test logic="AND" value="9">
/systems/fuel/valves/outer-inner-transfer-valve-1 eq 1
/accelerations/pilot-gdamped ge 0.5
@ -633,6 +640,13 @@
<switch name="/systems/fuel/internal/right-wing-outer-to-inner-tank">
<default value="0"/>
<test logic="AND" value="/systems/fuel/internal/right-outer-wing-tank-refuel">
/systems/fuel/valves/outer-inner-transfer-valve-2 eq 1
/accelerations/pilot-gdamped ge 0.5
/consumables/fuel/tank[4]/level-gal_us gt /consumables/fuel/tank[0]/unusable-gal_us
/consumables/fuel/tank[3]/level-norm lt 0.9999
/systems/fuel/refuel/refuelling eq 1
</test>
<test logic="AND" value="9">
/systems/fuel/valves/outer-inner-transfer-valve-2 eq 1
/accelerations/pilot-gdamped ge 0.5

33
gui/dialogs/refuel.nas
View file

@ -502,7 +502,7 @@ var refuelClass = {
if (me._fuelPreselectAmount >= 10.0) {
me._FQI_pre.setText(sprintf("%2.1f", me._fuelPreselectAmount));
} else {
me._FQI_pre.setText(sprintf("%2.12", me._fuelPreselectAmount));
me._FQI_pre.setText(sprintf("%2.2f", me._fuelPreselectAmount));
}
if (me._fuelLeftAmount >= 10.0) {
@ -530,6 +530,25 @@ var refuelClass = {
}
# HI LVL indicator color: #0184f6
if (systems.FUEL.Quantity.leftInnerPct.getValue() >= 0.999) {
me._HI_LVL_L.setColorFill(0.0039, 0.5176, 0.9647);
} else {
me._HI_LVL_L.setColorFill(0.2353, 0.2117, 0.2117);
}
if (systems.FUEL.Quantity.centerPct.getValue() >= 0.999) {
me._HI_LVL_C.setColorFill(0.0039, 0.5176, 0.9647);
} else {
me._HI_LVL_C.setColorFill(0.2353, 0.2117, 0.2117);
}
if (systems.FUEL.Quantity.rightInnerPct.getValue() >= 0.999) {
me._HI_LVL_R.setColorFill(0.0039, 0.5176, 0.9647);
} else {
me._HI_LVL_R.setColorFill(0.2353, 0.2117, 0.2117);
}
# DEFUEL indicator color: #ffe23f
} else {
me._FQI_actual.hide();
@ -547,7 +566,11 @@ var refuelClass = {
target = amount.getValue();
if (target > 0) {
amount.setValue(target - 0.1);
me._FQI_pre.setText(sprintf("%2.1f", target - 0.1));
if (target - 0.1 >= 10.0) {
me._FQI_pre.setText(sprintf("%2.1f", target - 0.1));
} else {
me._FQI_pre.setText(sprintf("%2.2f", target - 0.1));
}
systems.fuelSvc.Nodes.requestLbs.setValue(((target - 0.1) - math.round(pts.Consumables.Fuel.totalFuelLbs.getValue() / 1000, 0.1)) * 1000);
}
},
@ -555,7 +578,11 @@ var refuelClass = {
target = amount.getValue();
if (target < max_fuel) {
amount.setValue(target + 0.1);
me._FQI_pre.setText(sprintf("%2.1f", target + 0.1));
if (target + 0.1 >= 10.0) {
me._FQI_pre.setText(sprintf("%2.1f", target + 0.1));
} else {
me._FQI_pre.setText(sprintf("%2.2f", target + 0.1));
}
systems.fuelSvc.Nodes.requestLbs.setValue(((target + 0.1) - math.round(pts.Consumables.Fuel.totalFuelLbs.getValue() / 1000, 0.1)) * 1000);
}
},