feat(fms): fms-v2 aircraft specific config / VNAV parameters #8493

flogross89 · 2024-02-15T01:43:35Z

Summary of Changes

Introduces A380 specific engine and flight model parameters to enable VNAV (predictions).
Includes changes to fms-v2 to enable TS strict mode compliance for the MFD
Adds units to JSDoc in FlightPlanPerformanceData

Screenshots (if necessary)

n/a

References

Additional context

Discord username (if different from GitHub): floridude

Testing instructions

For A320: Should behave exactly as before, no change expected. Pay attention to VNAV predictions and vertical guidance, e.g. during approach
For A380: Testing being done separately

How to download the PR for QA

Every new commit to this PR will cause a new A32NX artifact to be created, built, and uploaded.

Make sure you are signed in to GitHub
Click on the Checks tab on the PR
On the left side, click on the bottom PR tab
Click on the A32NX download link at the bottom of the page

BlueberryKing · 2024-02-16T09:35:12Z

fbw-a32nx/src/systems/fmgc/src/flightplanning/new/plans/FlightPlan.ts

@@ -471,7 +471,7 @@ export class FlightPlan<P extends FlightPlanPerformanceData = FlightPlanPerforma
     *
     * The union type in the signature is to work around https://github.com/microsoft/TypeScript/issues/28662.
     */
-    setPerformanceData<k extends(keyof (P & FlightPlanPerformanceDataProperties)) & string>(key: k, value: P[k], notify = true) {
+    setPerformanceData<k extends(keyof (P & FlightPlanPerformanceDataProperties)) & string>(key: k, value: P[k] | null, notify = true) {


Why can value be null? If anything, it should be undefined I think?

I always prefer null, because it has to be explicit, and more importantly, it avoids bugs with the EventBus.

I agree, but then the performance data properties should also be marked as nullable.

I removed this part, and marked the values themselves as nullable.

BlueberryKing · 2024-02-16T09:36:04Z

...a32nx/src/systems/fmgc/src/flightplanning/new/plans/performance/FlightPlanPerformanceData.ts

@@ -6,25 +6,34 @@
 import { MathUtils } from '@flybywiresim/fbw-sdk';

 export interface FlightPlanPerformanceData {
+    /** in knots */


For all of these properties, specify what value they take if not filled in.

And also what they are, not just the unit.

BlueberryKing · 2024-02-16T09:40:19Z

fbw-a32nx/src/systems/fmgc/src/guidance/vnav/Predictions.ts

@@ -87,7 +90,7 @@ export class Predictions {
        const theta2 = Common.getTheta2(theta, mach);
        const delta2 = Common.getDelta2(delta, mach);
        const correctedN1 = EngineModel.getCorrectedN1(commandedN1, theta2);
-        const correctedThrust = EngineModel.tableInterpolation(EngineModel.table1506, correctedN1, mach) * 2 * EngineModel.maxThrust;
+        const correctedThrust = EngineModel.tableInterpolation(EngineModel.table1506, correctedN1, mach) * 2 * config.engineModelParameters.maxThrust;


What do you intend to do with the tables in EngineModel? They should also be aircraft-specific.

I would want to wait for the A380 engine model to decide where to put these tables. Maybe we would have to use a completely different approach. Refactoring it later on should be easy.

BlueberryKing · 2024-02-16T09:47:32Z

fbw-a32nx/src/systems/fmgc/src/navigation/Navigation.ts

@@ -79,7 +79,7 @@ export class Navigation implements NavigationProvider {
        facility: null,
    }));

-    constructor(private flightPlanService: FlightPlanService, private readonly facLoader: FacilityLoader) {
+    constructor(private flightPlanService: FlightPlanService, private readonly facLoader?: FacilityLoader) {


Why can facLoader be optional?

As far as I can see, it's currently not used in this class?

I see. In this case, we should probably just remove facLoader as an argument.

You're right. Just pushed that in the latest commit.

fbw-a32nx/src/systems/fmgc/src/efis/EfisSymbols.ts

fbw-a32nx/src/systems/fmgc/src/flightplanning/new/DataManager.ts

BlueberryKing

LGTM!

… code; revert change on PilotWaypoint

2hwk · 2024-04-25T05:50:29Z

Will be impacted by the potential future merge freeze. #8466 will be required to be merged into this PR at some point.

…-v2-aircraft-config-2 # Conflicts: # fbw-a32nx/src/systems/fmgc/src/guidance/GuidanceController.ts

…-v2-aircraft-config-2 # Conflicts: # fbw-a32nx/src/systems/fmgc/src/efis/EfisSymbols.ts # fbw-a32nx/src/systems/fmgc/src/flightplanning/new/FlightPlanService.ts # fbw-a32nx/src/systems/fmgc/src/flightplanning/new/WaypointEntryUtils.ts # fbw-a32nx/src/systems/fmgc/src/flightplanning/new/interface/DisplayInterface.ts # fbw-a32nx/src/systems/fmgc/src/flightplanning/new/plans/BaseFlightPlan.ts # fbw-a32nx/src/systems/fmgc/src/flightplanning/new/plans/FlightPlan.ts # fbw-a32nx/src/systems/fmgc/src/flightplanning/new/plans/performance/FlightPlanPerformanceData.ts # fbw-a32nx/src/systems/fmgc/src/guidance/GuidanceController.ts # fbw-a32nx/src/systems/fmgc/src/guidance/lnav/LnavDriver.ts # fbw-a32nx/src/systems/fmgc/src/guidance/vnav/CostIndex.ts # fbw-a32nx/src/systems/fmgc/src/guidance/vnav/CruiseToDescentCoordinator.ts # fbw-a32nx/src/systems/fmgc/src/guidance/vnav/EngineModel.ts # fbw-a32nx/src/systems/fmgc/src/guidance/vnav/FlightModel.ts # fbw-a32nx/src/systems/fmgc/src/guidance/vnav/Predictions.ts # fbw-a32nx/src/systems/fmgc/src/guidance/vnav/VerticalProfileManager.ts # fbw-a32nx/src/systems/fmgc/src/guidance/vnav/VnavDriver.ts # fbw-a32nx/src/systems/fmgc/src/guidance/vnav/climb/ClimbPathBuilder.ts # fbw-a32nx/src/systems/fmgc/src/guidance/vnav/climb/ClimbStrategy.ts # fbw-a32nx/src/systems/fmgc/src/guidance/vnav/cruise/CruisePathBuilder.ts # fbw-a32nx/src/systems/fmgc/src/guidance/vnav/descent/ApproachPathBuilder.ts # fbw-a32nx/src/systems/fmgc/src/guidance/vnav/descent/DescentPathBuilder.ts # fbw-a32nx/src/systems/fmgc/src/guidance/vnav/descent/DescentStrategy.ts # fbw-a32nx/src/systems/fmgc/src/guidance/vnav/descent/GeometricPathBuilder.ts # fbw-a32nx/src/systems/fmgc/src/guidance/vnav/descent/TacticalDescentPathBuilder.ts # fbw-a32nx/src/systems/fmgc/src/guidance/vnav/takeoff/TakeoffPathBuilder.ts # fbw-a32nx/src/systems/fmgc/src/index.ts # fbw-a32nx/src/systems/fmgc/src/navigation/Navigation.ts

flogross89 · 2024-04-28T23:29:32Z

lint-fixed

github-actions bot added this to 🟡 Code Review: Ready for Review in Quality Assurance Feb 15, 2024

flogross89 mentioned this pull request Feb 15, 2024

feat(fms): fms-v2 aircraft specific config / parameters #8471

Closed

BlueberryKing requested changes Feb 16, 2024

View reviewed changes

Quality Assurance automation moved this from 🟡 Code Review: Ready for Review to 🔴 Code Review: In progress Feb 16, 2024

flogross89 force-pushed the feat-fms-v2-aircraft-config-2 branch from 872645b to 4c1acb2 Compare February 17, 2024 17:37

flogross89 requested a review from BlueberryKing February 17, 2024 17:46

BlueberryKing approved these changes Mar 2, 2024

View reviewed changes

Quality Assurance automation moved this from 🔴 Code Review: In progress to 🟣 QA Team Review: Ready to Test Mar 2, 2024

2hwk added QA Ready to Test QA Tier 2 Do Not Merge labels Mar 21, 2024

flogross89 added Not Ready For Testing Not ready for testing as still being discussed or developed. and removed QA Tier 2 QA Ready to Test labels Apr 2, 2024

flogross89 moved this from 🟣 QA Team Review: Ready to Test to ⌛ Awaiting Actions in Quality Assurance Apr 2, 2024

flogross89 force-pushed the feat-fms-v2-aircraft-config-2 branch from 0077126 to 4923dcd Compare April 16, 2024 23:52

flogross89 added 4 commits April 21, 2024 20:40

clean up after git mess

b7dbd97

make performance data nullable (incl. FMC implications); remove dead…

e3d1c0b

… code; revert change on PilotWaypoint

GeometricPathBuilder fix

b7e57cf

update from a380 branch

4741730

flogross89 force-pushed the feat-fms-v2-aircraft-config-2 branch from bea2f6b to 4741730 Compare April 21, 2024 18:47

merge fix

68f50ff

flogross89 force-pushed the feat-fms-v2-aircraft-config-2 branch from 08e840c to 68f50ff Compare April 21, 2024 20:18

flogross89 added 2 commits April 21, 2024 23:16

re-insert MathUtils, to be deleted with MFD PR

6f3599f

updated fms type improvements (make nullable, don't use undefined)

1701ca2

flogross89 added 4 commits April 29, 2024 01:23

Merge commit '8aee5c4d4b46dc2e46f1ff0098b0f2f07eafe17b' into feat-fms…

1708525

…-v2-aircraft-config-2 # Conflicts: # fbw-a32nx/src/systems/fmgc/src/guidance/GuidanceController.ts

Merge branch 'fms-v2' into feat-fms-v2-aircraft-config-2

24a1872

lint-fix

1c92aa8

flogross89 added 2 commits May 1, 2024 00:58

fix lint error, don't include debug switches in a/c specific lnav config

897e322

fix build :/

a8ada8c

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(fms): fms-v2 aircraft specific config / VNAV parameters #8493

feat(fms): fms-v2 aircraft specific config / VNAV parameters #8493

flogross89 commented Feb 15, 2024 •

edited

BlueberryKing Feb 16, 2024

tracernz Feb 17, 2024

BlueberryKing Feb 17, 2024

flogross89 Feb 17, 2024

BlueberryKing Feb 16, 2024

tracernz Feb 17, 2024

BlueberryKing Feb 16, 2024

flogross89 Feb 17, 2024

BlueberryKing Feb 16, 2024

flogross89 Feb 17, 2024

BlueberryKing Feb 18, 2024

flogross89 Feb 18, 2024

BlueberryKing left a comment

2hwk commented Apr 25, 2024

flogross89 commented Apr 28, 2024

feat(fms): fms-v2 aircraft specific config / VNAV parameters #8493

Are you sure you want to change the base?

feat(fms): fms-v2 aircraft specific config / VNAV parameters #8493

Conversation

flogross89 commented Feb 15, 2024 • edited

Summary of Changes

Screenshots (if necessary)

References

Additional context

Testing instructions

How to download the PR for QA

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

BlueberryKing left a comment

Choose a reason for hiding this comment

2hwk commented Apr 25, 2024

flogross89 commented Apr 28, 2024

flogross89 commented Feb 15, 2024 •

edited