diff --git a/Nasal/FMGC.nas b/Nasal/FMGC.nas
index c48bbcdd..93f6b529 100644
--- a/Nasal/FMGC.nas
+++ b/Nasal/FMGC.nas
@@ -115,7 +115,6 @@ var phasecheck = maketimer(0.2, func {
if ((((n1_left >= 85) and (n1_right >= 85)) or (gs > 90 )) and flaps < 4 and (mode == "SRS")) {
setprop("/FMGC/status/phase", "1");
- setprop("/systems/pressurization/mode", "TO");
}
if ((aglalt >= reduc_agl_ft) and (alt <= cruiseft) and (phase == "1") and (phase != "4") and (mode != "SRS")) {
@@ -129,7 +128,6 @@ var phasecheck = maketimer(0.2, func {
if (alt <= cruiseft and (mode == "DES" or mode == "OP DES") and phase == "3") {
setprop("/FMGC/status/phase", "4");
- setprop("/systems/pressurization/mode", "DE");
}
if (getprop("/FMGC/status/to-state") == 0 and flaps >= 3 and ((phase == "3") or (phase == "4")) and alt < 7200) {
diff --git a/Nasal/fuel.nas b/Nasal/fuel.nas
index d4cba1ce..b41b179e 100644
--- a/Nasal/fuel.nas
+++ b/Nasal/fuel.nas
@@ -6,6 +6,10 @@
#############
var fuel_init = func {
+ setprop("/systems/fuel/gravityfeedL", 0);
+ setprop("/systems/fuel/gravityfeedR", 0);
+ setprop("/systems/fuel/gravityfeedL-output", 0);
+ setprop("/systems/fuel/gravityfeedR-output", 0);
setprop("/controls/fuel/x-feed", 0);
setprop("/controls/fuel/tank2pump1", 0);
setprop("/controls/fuel/tank2pump2", 0);
@@ -40,15 +44,37 @@ var master_fuel = func {
var xfeed = getprop("/systems/fuel/x-feed");
var ac1 = getprop("/systems/electrical/bus/ac1");
var ac2 = getprop("/systems/electrical/bus/ac2");
+ var gravityfeedL = getprop("/systems/fuel/gravityfeedL");
+ var gravityfeedR = getprop("/systems/fuel/gravityfeedR");
+ var gload = getprop("/accelerations/pilot-gdamped");
+
+ if (gload >= 0.7 and gravityfeedL) {
+ setprop("/systems/fuel/gravityfeedL-output", 1);
+ } else {
+ setprop("/systems/fuel/gravityfeedL-output", 0);
+ }
+
+ if (gload >= 0.7 and gravityfeedR) {
+ setprop("/systems/fuel/gravityfeedR-output", 1);
+ } else {
+ setprop("/systems/fuel/gravityfeedR-output", 0);
+ }
+
+ var gravityfeedL_output = getprop("/systems/fuel/gravityfeedL-output");
+ var gravityfeedR_output = getprop("/systems/fuel/gravityfeedR-output");
if ((ac1 >= 110 or ac2 >= 110) and tank2pump1_sw) {
setprop("/systems/fuel/tank[2]/feed0", 1);
+ } else if (gravityfeedL_output) {
+ setprop("/systems/fuel/tank[2]/feed0", 1);
} else {
setprop("/systems/fuel/tank[2]/feed0", 0);
}
if ((ac1 >= 110 or ac2 >= 110) and tank2pump2_sw) {
setprop("/systems/fuel/tank[2]/feed1", 1);
+ } else if (gravityfeedL_output) {
+ setprop("/systems/fuel/tank[2]/feed1", 1);
} else {
setprop("/systems/fuel/tank[2]/feed1", 0);
}
@@ -67,12 +93,16 @@ var master_fuel = func {
if ((ac1 >= 110 or ac2 >= 110) and tank4pump1_sw) {
setprop("/systems/fuel/tank[4]/feed0", 1);
+ } else if (gravityfeedR_output) {
+ setprop("/systems/fuel/tank[2]/feed0", 1);
} else {
setprop("/systems/fuel/tank[4]/feed0", 0);
}
if ((ac1 >= 110 or ac2 >= 110) and tank4pump2_sw) {
setprop("/systems/fuel/tank[4]/feed1", 1);
+ } else if (gravityfeedR_output) {
+ setprop("/systems/fuel/tank[2]/feed1", 1);
} else {
setprop("/systems/fuel/tank[4]/feed1", 0);
}
@@ -90,7 +120,22 @@ var master_fuel = func {
var tank4feed0 = getprop("/systems/fuel/tank[4]/feed0");
var tank4feed1 = getprop("/systems/fuel/tank[4]/feed1");
- if ((getprop("/fdm/jsbsim/propulsion/tank[3]/contents-lbs") >= 50) and tank3feed0 and tank3feed1) {
+ if (((ac1 >= 110 or ac2 >= 110) and tank2pump1_sw and tank2pump1_sw)) {
+ setprop("/systems/fuel/gravityfeedL", 0);
+ } else {
+ setprop("/systems/fuel/gravityfeedL", 1);
+ }
+
+ if (((ac1 >= 110 or ac2 >= 110) and tank4pump1_sw and tank4pump1_sw)) {
+ setprop("/systems/fuel/gravityfeedR", 0);
+ } else {
+ setprop("/systems/fuel/gravityfeedR", 1);
+ }
+
+ var gravityfeedL = getprop("/systems/fuel/gravityfeedL");
+ var gravityfeedR = getprop("/systems/fuel/gravityfeedR");
+
+ if ((getprop("/fdm/jsbsim/propulsion/tank[3]/contents-lbs") >= 50) and tank3feed0 and tank3feed1 and !gravityfeedL and !gravityfeedR) {
setprop("/systems/fuel/only-use-ctr-tank", 1);
} else {
setprop("/systems/fuel/only-use-ctr-tank", 0);
diff --git a/Nasal/pneumatics.nas b/Nasal/pneumatics.nas
index ac5295d4..e28b6092 100644
--- a/Nasal/pneumatics.nas
+++ b/Nasal/pneumatics.nas
@@ -183,7 +183,7 @@ var master_pneu = func {
}
if (cabinalt != targetalt and !wowl and !wowr and !pause) {
- setprop("/systems/pressurization/cabinalt", cabinalt + vs);
+ setprop("/systems/pressurization/cabinalt", cabinalt + ((vs / 60) / 10));
}
if (ditch and auto) {
diff --git a/Resources/eicasIAE.svg b/Resources/eicasIAE.svg
new file mode 100644
index 00000000..5bda2ec3
--- /dev/null
+++ b/Resources/eicasIAE.svg
@@ -0,0 +1,821 @@
+
+
diff --git a/Resources/eicasIAE.txt b/Resources/eicasIAE.txt
new file mode 100644
index 00000000..a02f04a4
--- /dev/null
+++ b/Resources/eicasIAE.txt
@@ -0,0 +1,15 @@
+no1eprarc
+no2eprarc
+no1n1arc
+no2n1arc
+no1egtarc
+no2egtarc
+n12egtarcred
+no2egtarcred
+
+egt-1-text
+egt-2-text
+n1-1-text
+n1-2-text
+no1-epr
+no2-epr
\ No newline at end of file
diff --git a/Systems/libraries.xml b/Systems/libraries.xml
index f51dcea3..d284b651 100644
--- a/Systems/libraries.xml
+++ b/Systems/libraries.xml
@@ -28,9 +28,9 @@
/engines/engine[0]/fuel-flow_pph
- 0 0
- 2000 2387
- 900013847
+ 0 0
+ 20002387
+ 90009847
@@ -46,9 +46,9 @@
/engines/engine[1]/fuel-flow_pph
- 0 0
- 2000 2359
- 900013831
+ 0 0
+ 20002387
+ 90009847