fly/A320-family
1
0
Fork 0
Code Activity

fix nodes

Browse source
This commit is contained in:
legoboyvdlp R 2021-07-06 12:44:11 +01:00
parent 081c075b79
commit 593d6be6cf
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Models/Instruments/Lower-ECAM/Lower-ECAM.nas
View file

@ -200,6 +200,7 @@ var canvas_lowerECAMPage =
obj.displayedGForce = 0;
obj.updateItemsBottom = [
props.UpdateManager.FromHashValue("acconfigUnits", nil, func(val) {
obj.units = val;
if (val) {
obj["GW-weight-unit"].setText("KG");
} else {
@ -254,18 +255,6 @@ var canvas_lowerECAMPage =
me["TAT"].setText(sprintf("%s", "XX"));
me["TAT"].setColor(0.7333,0.3803,0);
}
if (fmgc.FMGCInternal.fuelRequest and fmgc.FMGCInternal.blockConfirmed and !fmgc.FMGCInternal.fuelCalculating and ecam.phaseNode.getValue() != 1) {
if (acconfig_weight_kgs.getValue()) {
me["GW"].setText(sprintf("%s", math.round(fmgc.FMGCInternal.fuelPredGw * 1000 * LBS2KGS, 100)));
} else {
me["GW"].setText(sprintf("%s", math.round(fmgc.FMGCInternal.fuelPredGw * 1000, 100)));
}
me["GW"].setColor(0.0509,0.7529,0.2941);
} else {
me["GW"].setText(sprintf("%s", "-----"));
me["GW"].setColor(0.0901,0.6039,0.7176);
}
},
update: func(notification) {
me.updatePower();
@ -288,6 +277,18 @@ var canvas_lowerECAMPage =
update_item_bottom.update(notification);
}
if (fmgc.FMGCInternal.fuelRequest and fmgc.FMGCInternal.blockConfirmed and !fmgc.FMGCInternal.fuelCalculating and notification.FWCPhase != 1) {
if (me.units) {
me["GW"].setText(sprintf("%s", math.round(fmgc.FMGCInternal.fuelPredGw * 1000 * LBS2KGS, 100)));
} else {
me["GW"].setText(sprintf("%s", math.round(fmgc.FMGCInternal.fuelPredGw * 1000, 100)));
}
me["GW"].setColor(0.0509,0.7529,0.2941);
} else {
me["GW"].setText(sprintf("%s", "-----"));
me["GW"].setColor(0.0901,0.6039,0.7176);
}
me.updateTemperatures();
},
updateTest: func(notification) {

11
Nasal/ECAM/ECAM-logic.nas
View file

@ -4,7 +4,6 @@
# props.nas:
var dualFailNode = props.globals.initNode("/ECAM/dual-failure-enabled", 0, "BOOL");
var phaseNode = props.globals.getNode("/ECAM/warning-phase", 1);
var apWarn = props.globals.getNode("/it-autoflight/output/ap-warning", 1);
var athrWarn = props.globals.getNode("/it-autoflight/output/athr-warning", 1);
var emerGen = props.globals.getNode("/controls/electrical/switches/emer-gen", 1);
@ -46,7 +45,7 @@ var _SATval = nil;
var ecamConfigTest = props.globals.initNode("/ECAM/to-config-test", 0, "BOOL");
var messages_priority_3 = func {
phaseVar3 = phaseNode.getValue();
phaseVar3 = pts.ECAM.fwcWarningPhase.getValue();
# Stall
# todo - altn law and emer cancel flipflops page 2440
@ -1161,7 +1160,7 @@ var messages_priority_3 = func {
}
var messages_priority_2 = func {
phaseVar2 = phaseNode.getValue();
phaseVar2 = pts.ECAM.fwcWarningPhase.getValue();
if ((phaseVar2 == 2 or phaseVar2 == 3 or phaseVar2 == 9) and warningNodes.Logic.thrLeversNotSet.getValue() and engThrustLvrNotSet.clearFlag == 0) {
engThrustLvrNotSet.active = 1;
@ -3130,7 +3129,7 @@ var messages_priority_0 = func {
}
var messages_config_memo = func {
phaseVarMemo = phaseNode.getValue();
phaseVarMemo = pts.ECAM.fwcWarningPhase.getValue();
if (pts.Controls.Flight.flapsInput.getValue() == 0 or pts.Controls.Flight.flapsInput.getValue() == 4 or pts.Controls.Flight.speedbrake.getValue() != 0 or getprop("/fdm/jsbsim/hydraulics/elevator-trim/final-deg") > 1.75 or getprop("/fdm/jsbsim/hydraulics/elevator-trim/final-deg") < -3.65 or getprop("/fdm/jsbsim/hydraulics/rudder/trim-cmd-deg") < -3.55 or getprop("/fdm/jsbsim/hydraulics/rudder/trim-cmd-deg") > 3.55) {
setprop("/ECAM/to-config-normal", 0);
} else {
@ -3296,7 +3295,7 @@ var messages_config_memo = func {
}
var messages_memo = func {
phaseVarMemo2 = phaseNode.getValue();
phaseVarMemo2 = pts.ECAM.fwcWarningPhase.getValue();
if (getprop("/services/fuel-truck/enable") == 1 and toMemoLine1.active != 1 and ldgMemoLine1.active != 1) {
refuelg.active = 1;
} else {
@ -3399,7 +3398,7 @@ var messages_memo = func {
}
var messages_right_memo = func {
phaseVarMemo3 = phaseNode.getValue();
phaseVarMemo3 = pts.ECAM.fwcWarningPhase.getValue();
if (FWC.Timer.toInhibitOutput.getValue() == 1) {
to_inhibit.active = 1;
} else {