1
0
Fork 0

Merge branch '3D' into 3D-flightdeck

This commit is contained in:
Jonathan Redpath 2022-03-09 15:22:42 +00:00
commit 2a5dc2cd50
3 changed files with 20 additions and 4 deletions

View file

@ -491,6 +491,7 @@ var canvas_upperECAM = {
obj._cachedEGT = [nil, nil];
obj._cachedEPR = [nil, nil];
obj._cachedFF = [nil, nil];
obj._doneNoPower = 0;
obj.updateFadecN1Power1({reverser_1: 0, eng1_n1: 0, eng1_epr: 0, N1_mode_1: 0});
obj.updateFadecN1Power2({reverser_2: 0, eng2_n1: 0, eng2_epr: 0, N1_mode_2: 0});
@ -616,10 +617,17 @@ var canvas_upperECAM = {
}
if (notification.eng1_n1 or notification.eng2_n1 or notification.eng1_epr or notification.eng2_epr) {
me._doneNoPower = 0;
foreach(var update_item; me.update_items_fadec_powered)
{
update_item.update(notification);
}
} else {
if (!me._doneNoPower) {
me._doneNoPower = 1;
me.updateFadecN1Power1(notification);
me.updateFadecN1Power2(notification);
}
}
if (notification.eng1_n1 or notification.eng2_n1) {

View file

@ -54,7 +54,11 @@ var FADEC_S = {
if (systems.ELEC.Bus.ac1.getValue() >= 110 or systems.ELEC.Bus.ac2.getValue() >= 110 or systems.ELEC.Bus.acEss.getValue() >= 110) {
if (powerAvailTemp != 1) {
me.Power.poweredTime.setValue(elapsedSec);
if (acconfig.SYSTEM.autoConfigRunning.getBoolValue()) {
me.Power.poweredTime.setValue(elapsedSec - 300);
} else {
me.Power.poweredTime.setValue(elapsedSec);
}
me.Power.powerAvail.setValue(1);
}
} else {
@ -115,7 +119,7 @@ var FADEC_S = {
state1 = pts.Engines.Engine.state[0].getValue();
state2 = pts.Engines.Engine.state[1].getValue();
modeSel = pts.Controls.Engines.startSw.getValue();
modeSel = pts.Controls.Engines.startSw.getValue();
if (state1 == 3) {
me.Power.powered1.setValue(1);

View file

@ -54,7 +54,11 @@ var FADEC_S = {
if (systems.ELEC.Bus.ac1.getValue() >= 110 or systems.ELEC.Bus.ac2.getValue() >= 110 or systems.ELEC.Bus.acEss.getValue() >= 110) {
if (powerAvailTemp != 1) {
me.Power.poweredTime.setValue(elapsedSec);
if (acconfig.SYSTEM.autoConfigRunning.getBoolValue()) {
me.Power.poweredTime.setValue(elapsedSec - 300);
} else {
me.Power.poweredTime.setValue(elapsedSec);
}
me.Power.powerAvail.setValue(1);
}
} else {
@ -115,7 +119,7 @@ var FADEC_S = {
state1 = pts.Engines.Engine.state[0].getValue();
state2 = pts.Engines.Engine.state[1].getValue();
modeSel = pts.Controls.Engines.startSw.getValue();
modeSel = pts.Controls.Engines.startSw.getValue();
if (state1 == 3) {
me.Power.powered1.setValue(1);