Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: engine shutdown and start-up/ shutdown animation #6284

Merged
merged 15 commits into from
Dec 15, 2021
Merged

feat: engine shutdown and start-up/ shutdown animation #6284

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e39ca63
feat/ fix: Engine shutdown and Start-up/Shutdown animation
Taz5150 Nov 30, 2021
4b59725
Merge branch 'animation-test' of https://github.com/Taz5150/a32nx int…
Taz5150 Nov 30, 2021
fa14e1a
Update CHANGELOG.md
Taz5150 Nov 30, 2021
700de1a
Update A320_Neo_UpperECAM.js
Taz5150 Nov 30, 2021
0d32505
fixed windmilling
Taz5150 Dec 3, 2021
388fd9e
Merge branch 'master' into animation-test
Taz5150 Dec 6, 2021
f61fc0b
fixed EGT on re-startup
Taz5150 Dec 7, 2021
338efd2
Update CHANGELOG.md
Taz5150 Dec 7, 2021
edce243
Merge branch 'master' into animation-test
Taz5150 Dec 9, 2021
b2e7678
fixed right engine fuel reset
Taz5150 Dec 12, 2021
ebc3e8f
Merge branch 'master' into animation-test
Taz5150 Dec 12, 2021
e1cfd44
Update CHANGELOG.md
Taz5150 Dec 12, 2021
39ad8a1
Update CHANGELOG.md
Taz5150 Dec 12, 2021
453f36f
Update A32NX_Exterior.xml
Taz5150 Dec 13, 2021
049b530
Merge branch 'master' into animation-test
Taz5150 Dec 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
1. [ATHR] Fixed ATHR being armed in flight when TOGA applied without GA condition - @aguther (Andreas Guther)
1. [ECAM] Fixed gross weight being shown without engines running - @BlueberryKing (BlueberryKing)
1. [FLIGHT MODEL] Fixes co-pilot not being shown in external view - @donstim (donbikes#4084)
1. [ENGINE/ MODEL] Implement engine shutdown and realistic engine animation - @Taz5150 (TazX [Z+2]#0405)

## 0.7.0

Expand Down
8 changes: 7 additions & 1 deletion .../Pages/VCockpit/Instruments/Airliners/FlyByWire_A320_Neo/EICAS/ECAM/A320_Neo_UpperECAM.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2142,7 +2142,13 @@ var A320_Neo_UpperECAM;
}
getN1GaugeValue() {
const engineId = (this.index + 1);
return Math.max(SimVar.GetSimVarValue("L:A32NX_ENGINE_N1:" + engineId, "percent"), 0);
const value = Math.max(SimVar.GetSimVarValue("L:A32NX_ENGINE_N1:" + engineId, "percent"), 0);
const state = SimVar.GetSimVarValue("L:A32NX_ENGINE_STATE:" + engineId, "number");
if (value <= 1.2 && state == 2) {
return 0;
} else {
return value;
}
}
getN1GaugeThrottleValue() {
const throttle = Math.abs(SimVar.GetSimVarValue("L:A32NX_AUTOTHRUST_TLA_N1:" + (this.index + 1), "number"));
Expand Down
14 changes: 7 additions & 7 deletions src/behavior/src/A32NX_Exterior.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<MIN_N1_PCT_FOR_BLUR>110</MIN_N1_PCT_FOR_BLUR>
<FROSTED>False</FROSTED>
</DefaultTemplateParameters>
<UseTemplate Name="A32NX_ENGINE_Turbine_SubTemplate"></UseTemplate>
<UseTemplate Name="A32NX_ENGINE_Turbine_SubTemplate"/>
</Template>
<Template Name="A32NX_ENGINE_Turbine_SubTemplate">
<DefaultTemplateParameters>
Expand Down Expand Up @@ -56,29 +56,29 @@

<Template Name="A32NX_ENGINE_Turbine_Rotation_Template">
<UseTemplate Name="ASOBO_GT_Anim">
<!-- 3894 is the max rated N1 of the LEAP, times 6 is from RPM to deg/s, times 0.01 because percentages -->
<ANIM_CODE>0.01 6 3894 (A:TURB ENG N1:#ID#, Percent) (A:ANIMATION DELTA TIME, seconds) * * * *</ANIM_CODE>
<!-- 3856 is the rated 100% N1 of the LEAP, times 6 is from RPM to deg/s, times 0.01 because percentages -->
<ANIM_CODE>0.01 6 3856 (L:A32NX_ENGINE_N1:#ID#, Percent) (A:ANIMATION DELTA TIME, seconds) * * * *</ANIM_CODE>
<ANIM_LENGTH>360</ANIM_LENGTH>
<ANIM_WRAP>1</ANIM_WRAP>
<ANIM_DELTA>1</ANIM_DELTA>
</UseTemplate>
</Template>
<Template Name="A32NX_ENGINE_Turbine_Still_Visibility_Template">
<UseTemplate Name="ASOBO_GT_Visibility">
<VISIBILITY_CODE>(A:TURB ENG N1:#ID#, Percent) #MIN_N1_PCT_FOR_SLOW# &lt;</VISIBILITY_CODE>
<VISIBILITY_CODE>(L:A32NX_ENGINE_N1:#ID#, Percent) #MIN_N1_PCT_FOR_SLOW# &lt;</VISIBILITY_CODE>
</UseTemplate>
</Template>
<Template Name="A32NX_ENGINE_Turbine_Slow_Visibility_Template">
<UseTemplate Name="ASOBO_GT_Visibility">
<VISIBILITY_CODE>
(A:TURB ENG N1:#ID#, Percent) #MIN_N1_PCT_FOR_SLOW# &gt;
(A:TURB ENG N1:#ID#, Percent) #MIN_N1_PCT_FOR_BLUR# &lt; and
(L:A32NX_ENGINE_N1:#ID#, Percent) #MIN_N1_PCT_FOR_SLOW# &gt;
(L:A32NX_ENGINE_N1:#ID#, Percent) #MIN_N1_PCT_FOR_BLUR# &lt; and
</VISIBILITY_CODE>
</UseTemplate>
</Template>
<Template Name="A32NX_ENGINE_Turbine_Blurred_Visibility_Template">
<UseTemplate Name="ASOBO_GT_Visibility">
<VISIBILITY_CODE>(A:TURB ENG N1:#ID#, Percent) #MIN_N1_PCT_FOR_BLUR# &gt;</VISIBILITY_CODE>
<VISIBILITY_CODE>(L:A32NX_ENGINE_N1:#ID#, Percent) #MIN_N1_PCT_FOR_BLUR# &gt;</VISIBILITY_CODE>
</UseTemplate>
</Template>
<!-- Base visibility template for turbines -->
Expand Down
157 changes: 133 additions & 24 deletions src/fadec/src/EngineControl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ class EngineControl {
double animationDeltaTime;
double timer;
double ambientTemp;
double ambientPressure;
double simOnGround;

int engine;
Expand Down Expand Up @@ -61,15 +62,15 @@ class EngineControl {
/// <summary>
/// Generate Idle/ Initial Engine Parameters (non-imbalanced)
/// </summary>
void generateIdleParameters(double pressAltitude, double ambientTemp) {
void generateIdleParameters(double pressAltitude, double ambientTemp, double ambientPressure) {
double idleCN1;
double idleCFF;

idleCN1 = iCN1(pressAltitude, ambientTemp);
idleN1 = idleCN1 * sqrt(ratios->theta2(0, ambientTemp));
idleN2 = iCN2(pressAltitude) * sqrt((273.15 + ambientTemp) / 288.15);
idleCFF = poly->correctedFuelFlow(idleCN1, 0, pressAltitude); // lbs/hr
idleFF = idleCFF * LBS_TO_KGS * ratios->delta2(0, ambientTemp) * sqrt(ratios->theta2(0, ambientTemp)); // Kg/hr
idleN2 = iCN2(pressAltitude) * sqrt(ratios->theta(ambientTemp));
idleCFF = poly->correctedFuelFlow(idleCN1, 0, pressAltitude); // lbs/hr
idleFF = idleCFF * LBS_TO_KGS * ratios->delta2(0, ambientPressure) * sqrt(ratios->theta2(0, ambientTemp)); // Kg/hr
idleEGT = poly->correctedEGT(idleCN1, idleCFF, 0, pressAltitude) * ratios->theta2(0, ambientTemp);

simVars->setEngineIdleN1(idleN1);
Expand Down Expand Up @@ -135,7 +136,7 @@ class EngineControl {

/// <summary>
/// Engine State Machine
/// 0 - Engine OFF, 1 - Engine ON, 2 - Engine Starting & 3 - Engine Shutting
/// 0 - Engine OFF, 1 - Engine ON, 2 - Engine Starting, 3 - Engine Re-starting & 4 - Engine Shutting
/// </summary>
void engineStateMachine(int engine,
double engineIgniter,
Expand All @@ -146,13 +147,16 @@ class EngineControl {
double ambientTemp,
double deltaTimeDiff) {
int resetTimer = 0;
double egtFbw = 0;

switch (engine) {
case 1:
engineState = simVars->getEngine1State();
egtFbw = simVars->getEngine1EGT();
break;
case 2:
engineState = simVars->getEngine2State();
egtFbw = simVars->getEngine2EGT();
break;
}
// Present State PAUSED
Expand Down Expand Up @@ -181,7 +185,7 @@ class EngineControl {
if (engineStarter == 1) {
engineState = 1;
} else {
engineState = 3;
engineState = 4;
}
}

Expand All @@ -191,23 +195,38 @@ class EngineControl {
engineState = 1;
resetTimer = 1;
} else if (engineStarter == 0) {
engineState = 3;
engineState = 4;
resetTimer = 1;
} else {
engineState = 2;
}
}

// Present State Shutting
// Present State Re-Starting.
if (engineState == 3 || engineState == 13) {
if (engineStarter == 1 && simN2 >= (idleN2 - 0.1)) {
engineState = 1;
resetTimer = 1;
} else if (engineStarter == 0) {
engineState = 4;
resetTimer = 1;
} else {
engineState = 3;
}
}

// Present State Shutting
if (engineState == 4 || engineState == 14) {
if (engineIgniter == 2 && engineStarter == 1) {
engineState = 2;
} else if (engineStarter == 0 && simN2 < 0.05) {
engineState = 3;
} else if (engineStarter == 0 && simN2 < 0.05 && egtFbw <= ambientTemp) {
engineState = 0;
resetTimer = 1;
} else if (engineStarter == 1 && simN2 > 50) {
engineState = 1;
} else {
engineState = 3;
resetTimer = 1;
} else {
engineState = 4;
}
}
}
Expand All @@ -230,8 +249,9 @@ class EngineControl {

/// <summary>
/// Engine Start Procedure
/// </summary>
/// </summary>TIT
void engineStartProcedure(int engine,
double engineState,
double imbalance,
double deltaTime,
double timer,
Expand All @@ -241,8 +261,10 @@ class EngineControl {
double startCN2Left;
double startCN2Right;
double preN2Fbw;
double preEgtFbw;
double newN2Fbw;
double preEgtFbw;
double startEgtFbw;
double shutdownEgtFbw;

n2Imbalance = 0;
ffImbalance = 0;
Expand Down Expand Up @@ -276,10 +298,26 @@ class EngineControl {
preN2Fbw = simVars->getEngine1N2();
preEgtFbw = simVars->getEngine1EGT();
newN2Fbw = poly->startN2(simN2, preN2Fbw, idleN2 - n2Imbalance);
startEgtFbw = poly->startEGT(newN2Fbw, idleN2 - n2Imbalance, ambientTemp, idleEGT - egtImbalance);
shutdownEgtFbw = poly->shutdownEGT(preEgtFbw, ambientTemp, deltaTime);

simVars->setEngine1N2(newN2Fbw);
simVars->setEngine1N1(poly->startN1(newN2Fbw, idleN2 - n2Imbalance, idleN1));
simVars->setEngine1FF(poly->startFF(newN2Fbw, idleN2 - n2Imbalance, idleFF - ffImbalance));
simVars->setEngine1EGT(poly->startEGT(newN2Fbw, preEgtFbw, idleN2 - n2Imbalance, ambientTemp, idleEGT - egtImbalance));

if (engineState == 3) {
if (abs(startEgtFbw - preEgtFbw) <= 1.5) {
simVars->setEngine1EGT(startEgtFbw);
simVars->setEngine1State(2);
} else if (startEgtFbw > preEgtFbw) {
simVars->setEngine1EGT(preEgtFbw + (0.75 * deltaTime * (idleN2 - newN2Fbw)));
} else {
simVars->setEngine1EGT(shutdownEgtFbw);
}
} else {
simVars->setEngine1EGT(startEgtFbw);
}

oilTemperature = poly->startOilTemp(newN2Fbw, idleN2, ambientTemp);
oilTemperatureLeftPre = oilTemperature;
SimConnect_SetDataOnSimObject(hSimConnect, DataTypesID::OilTempLeft, SIMCONNECT_OBJECT_ID_USER, 0, 0, sizeof(double),
Expand All @@ -288,7 +326,7 @@ class EngineControl {
} else {
if (timer < 1.7) {
if (simOnGround == 1) {
simVars->setFuelUsedLeft(0);
simVars->setFuelUsedRight(0);
}
simVars->setEngine2Timer(timer + deltaTime);
startCN2Right = 0;
Expand All @@ -298,10 +336,26 @@ class EngineControl {
preN2Fbw = simVars->getEngine2N2();
preEgtFbw = simVars->getEngine2EGT();
newN2Fbw = poly->startN2(simN2, preN2Fbw, idleN2 - n2Imbalance);
startEgtFbw = poly->startEGT(newN2Fbw, idleN2 - n2Imbalance, ambientTemp, idleEGT - egtImbalance);
shutdownEgtFbw = poly->shutdownEGT(preEgtFbw, ambientTemp, deltaTime);

simVars->setEngine2N2(newN2Fbw);
simVars->setEngine2N1(poly->startN1(newN2Fbw, idleN2 - n2Imbalance, idleN1));
simVars->setEngine2FF(poly->startFF(newN2Fbw, idleN2 - n2Imbalance, idleFF - ffImbalance));
simVars->setEngine2EGT(poly->startEGT(newN2Fbw, preEgtFbw, idleN2 - n2Imbalance, ambientTemp, idleEGT - egtImbalance));

if (engineState == 3) {
if (abs(startEgtFbw - preEgtFbw) <= 1.5) {
simVars->setEngine2EGT(startEgtFbw);
simVars->setEngine2State(2);
} else if (startEgtFbw > preEgtFbw) {
simVars->setEngine2EGT(preEgtFbw + (0.75 * deltaTime * (idleN2 - newN2Fbw)));
} else {
simVars->setEngine2EGT(shutdownEgtFbw);
}
} else {
simVars->setEngine2EGT(startEgtFbw);
}

oilTemperature = poly->startOilTemp(newN2Fbw, idleN2, ambientTemp);
oilTemperatureRightPre = oilTemperature;
SimConnect_SetDataOnSimObject(hSimConnect, DataTypesID::OilTempRight, SIMCONNECT_OBJECT_ID_USER, 0, 0, sizeof(double),
Expand All @@ -310,6 +364,54 @@ class EngineControl {
}
}

/// <summary>
/// Engine Shutdown Procedure - TEMPORAL SOLUTION
/// </summary>
void engineShutdownProcedure(int engine, double ambientTemp, double simN1, double deltaTime, double timer) {
double preN1Fbw;
double preN2Fbw;
double preEgtFbw;
double newN1Fbw;
double newN2Fbw;
double newEgtFbw;

if (engine == 1) {
if (timer < 1.8) {
simVars->setEngine1Timer(timer + deltaTime);
} else {
preN1Fbw = simVars->getEngine1N1();
preN2Fbw = simVars->getEngine1N2();
preEgtFbw = simVars->getEngine1EGT();
newN1Fbw = poly->shutdownN1(preN1Fbw, deltaTime);
if (simN1 < 5 && simN1 > newN1Fbw) { // Takes care of windmilling
newN1Fbw = simN1;
}
newN2Fbw = poly->shutdownN2(preN2Fbw, deltaTime);
newEgtFbw = poly->shutdownEGT(preEgtFbw, ambientTemp, deltaTime);
simVars->setEngine1N1(newN1Fbw);
simVars->setEngine1N2(newN2Fbw);
simVars->setEngine1EGT(newEgtFbw);
}

} else {
if (timer < 1.8) {
simVars->setEngine2Timer(timer + deltaTime);
} else {
preN1Fbw = simVars->getEngine2N1();
preN2Fbw = simVars->getEngine2N2();
preEgtFbw = simVars->getEngine2EGT();
newN1Fbw = poly->shutdownN1(preN1Fbw, deltaTime);
if (simN1 < 5 && simN1 > newN1Fbw) { // Takes care of windmilling
newN1Fbw = simN1;
}
newN2Fbw = poly->shutdownN2(preN2Fbw, deltaTime);
newEgtFbw = poly->shutdownEGT(preEgtFbw, ambientTemp, deltaTime);
simVars->setEngine2N1(newN1Fbw);
simVars->setEngine2N2(newN2Fbw);
simVars->setEngine2EGT(newEgtFbw);
}
}
}
/// <summary>
/// FBW Engine RPM (N1 and N2)
/// Updates Engine N1 and N2 with our own algorithm for start-up and shutdown
Expand Down Expand Up @@ -388,7 +490,8 @@ class EngineControl {
/// FBW Fuel FLow (in Kg/h)
/// Updates Fuel Flow with realistic values
/// </summary>
double updateFF(int engine, double imbalance, double simCN1, double mach, double pressAltitude, double ambientTemp) {
double
updateFF(int engine, double imbalance, double simCN1, double mach, double pressAltitude, double ambientTemp, double ambientPressure) {
double outFlow = 0;

// Engine imbalance
Expand All @@ -406,8 +509,8 @@ class EngineControl {
if (correctedFuelFlow < 1) {
outFlow = 0;
} else {
outFlow =
(correctedFuelFlow * LBS_TO_KGS * ratios->delta2(mach, ambientTemp) * sqrt(ratios->theta2(mach, ambientTemp))) - paramImbalance;
outFlow = (correctedFuelFlow * LBS_TO_KGS * ratios->delta2(mach, ambientPressure) * sqrt(ratios->theta2(mach, ambientTemp))) -
paramImbalance;
}

if (engine == 1) {
Expand Down Expand Up @@ -901,15 +1004,17 @@ class EngineControl {
mach = simVars->getMach();
pressAltitude = simVars->getPressureAltitude();
ambientTemp = simVars->getAmbientTemperature();
ambientPressure = simVars->getAmbientPressure();
simOnGround = simVars->getSimOnGround();
imbalance = simVars->getEngineImbalance();

generateIdleParameters(pressAltitude, ambientTemp);
generateIdleParameters(pressAltitude, ambientTemp, ambientPressure);

// Timer timer;
for (engine = 1; engine <= 2; engine++) {
engineStarter = simVars->getEngineStarter(engine);
engineIgniter = simVars->getEngineIgniter(engine);
simCN1 = simVars->getCN1(engine);
simN1 = simVars->getN1(engine);
simN2 = simVars->getN2(engine);
thrust = simVars->getThrust(engine);
Expand All @@ -931,12 +1036,16 @@ class EngineControl {

switch (int(engineState)) {
case 2:
engineStartProcedure(engine, imbalance, deltaTime, timer, simN2, pressAltitude, ambientTemp);
case 3:
engineStartProcedure(engine, engineState, imbalance, deltaTime, timer, simN2, pressAltitude, ambientTemp);
break;
case 4:
engineShutdownProcedure(engine, ambientTemp, simN1, deltaTime, timer);
cFbwFF = updateFF(engine, imbalance, simCN1, mach, pressAltitude, ambientTemp, ambientPressure);
break;
default:
simCN1 = simVars->getCN1(engine);
updatePrimaryParameters(engine, imbalance, simN1, simN2);
cFbwFF = updateFF(engine, imbalance, simCN1, mach, pressAltitude, ambientTemp);
cFbwFF = updateFF(engine, imbalance, simCN1, mach, pressAltitude, ambientTemp, ambientPressure);
updateEGT(engine, imbalance, deltaTime, simOnGround, engineState, simCN1, cFbwFF, mach, pressAltitude, ambientTemp);
// updateOil(engine, imbalance, thrust, simN2, deltaN2, deltaTime, ambientTemp);
}
Expand Down
Loading