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: apu fuel consumption #8145

Merged
merged 3 commits into from
Jul 31, 2023
Merged

feat: apu fuel consumption #8145

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3425f98
feat: apu fuel consumption
tracernz Jul 30, 2023
cb3b3a0
chore: whitespace changes from fbw code format
tracernz Jul 30, 2023
3ad2d61
Merge branch 'master' into mrc-apu-fuel
Saschl Jul 31, 2023
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
Prev Previous commit
Next Next commit
chore: whitespace changes from fbw code format
  • Loading branch information
@tracernz
tracernz committed Jul 30, 2023
commit cb3b3a04009173377beb87c786df4ed8a945cfc3
4 changes: 2 additions & 2 deletions fbw-a32nx/src/wasm/fadec_a320/src/EngineControl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@ class EngineControl {
outFlow = 0;
} else {
outFlow = max(0, (correctedFuelFlow * LBS_TO_KGS * ratios->delta2(mach, ambientPressure) * sqrt(ratios->theta2(mach, ambientTemp))) -
paramImbalance);
paramImbalance);
}

if (engine == 1) {
Expand Down Expand Up @@ -719,7 +719,7 @@ class EngineControl {
double xfrAuxRight = 0;
double fuelTotalActual = leftQuantity + rightQuantity + leftAuxQuantity + rightAuxQuantity + centerQuantity; // LBS
double fuelTotalPre = fuelLeftPre + fuelRightPre + fuelAuxLeftPre + fuelAuxRightPre + fuelCenterPre; // LBS
double deltaFuelRate = abs(fuelTotalActual - fuelTotalPre) / (fuelWeightGallon * deltaTime); // LBS/ sec
double deltaFuelRate = abs(fuelTotalActual - fuelTotalPre) / (fuelWeightGallon * deltaTimeSeconds); // LBS/ sec

double engine1State = simVars->getEngine1State();
double engine2State = simVars->getEngine2State();
Expand Down
6 changes: 3 additions & 3 deletions fbw-a32nx/src/wasm/fadec_a320/src/SimVars.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ class SimVars {
Engine1VibN1 = register_named_variable("A32NX_ENGINE_VIB_N1:1");
Engine2VibN1 = register_named_variable("A32NX_ENGINE_VIB_N1:2");
Engine1VibN2 = register_named_variable("A32NX_ENGINE_VIB_N2:1");
Engine2VibN2 = register_named_variable("A32NX_ENGINE_VIB_N2:2");
Engine2VibN2 = register_named_variable("A32NX_ENGINE_VIB_N2:2");
Engine1FF = register_named_variable("A32NX_ENGINE_FF:1");
Engine2FF = register_named_variable("A32NX_ENGINE_FF:2");
Engine1PreFF = register_named_variable("A32NX_ENGINE_PRE_FF:1");
Expand Down Expand Up @@ -324,7 +324,7 @@ class SimVars {
FLOAT64 getEngine1VibN1() { return get_named_variable_value(Engine1VibN1); }
FLOAT64 getEngine2VibN1() { return get_named_variable_value(Engine2VibN1); }
FLOAT64 getEngine1VibN2() { return get_named_variable_value(Engine1VibN2); }
FLOAT64 getEngine2VibN2() { return get_named_variable_value(Engine2VibN2); }
FLOAT64 getEngine2VibN2() { return get_named_variable_value(Engine2VibN2); }
FLOAT64 getEngine1PreFF() { return get_named_variable_value(Engine1PreFF); }
FLOAT64 getEngine2PreFF() { return get_named_variable_value(Engine2PreFF); }
FLOAT64 getEngineImbalance() { return get_named_variable_value(EngineImbalance); }
Expand Down Expand Up @@ -383,4 +383,4 @@ class SimVars {
/// @return Fuel line flow rate in gallons/hour
FLOAT64 getLineFlow(int index) { return aircraft_varget(FuelLineFlow, m_Units->Gph, index); }
FLOAT64 getJunctionSetting(int index) { return aircraft_varget(FuelJunctionSetting, m_Units->Number, index); }
};
};
Loading