From c64dce5e13bb00096bf917fc65abdfbc437b073d Mon Sep 17 00:00:00 2001 From: Benjamin Dupont <4503241+Benjozork@users.noreply.github.com> Date: Sat, 9 Nov 2024 21:47:51 -0500 Subject: [PATCH] chore: rename FMS interface types --- fbw-a32nx/src/systems/fmgc/src/NavigationDatabase.ts | 2 +- .../systems/fmgc/src/flightplanning/DataManager.ts | 4 ++-- .../src/flightplanning/WaypointEntryUtils.spec.ts | 6 +++--- .../fmgc/src/flightplanning/WaypointEntryUtils.ts | 12 ++++++------ .../{DataInterface.ts => FmsDataInterface.ts} | 2 +- .../{DisplayInterface.ts => FmsDisplayInterface.ts} | 2 +- .../flightplanning/uplink/CoRouteUplinkAdapter.ts | 6 +++--- .../flightplanning/uplink/SimBriefUplinkAdapter.ts | 6 +++--- .../src/MFD/FMC/FlightManagementComputer.ts | 8 ++++---- .../systems/instruments/src/MFD/FMC/FmcInterface.ts | 10 +++++----- .../systems/instruments/src/MFD/FMC/FmcService.ts | 8 ++++---- .../instruments/src/MFD/FMC/FmcServiceInterface.ts | 6 +++--- fbw-a380x/src/systems/instruments/src/MFD/MFD.tsx | 9 ++++++--- .../systems/instruments/src/MFD/MfdPageDirectory.tsx | 6 +++--- .../src/MFD/pages/FMS/F-PLN/DestinationWindow.tsx | 4 ++-- .../src/MFD/pages/FMS/F-PLN/InsertNextWptFrom.tsx | 4 ++-- .../src/MFD/pages/FMS/F-PLN/MfdFmsFplnAirways.tsx | 4 ++-- .../src/MFD/pages/common/AbstractHeader.tsx | 4 ++-- 18 files changed, 53 insertions(+), 50 deletions(-) rename fbw-a32nx/src/systems/fmgc/src/flightplanning/interface/{DataInterface.ts => FmsDataInterface.ts} (95%) rename fbw-a32nx/src/systems/fmgc/src/flightplanning/interface/{DisplayInterface.ts => FmsDisplayInterface.ts} (97%) diff --git a/fbw-a32nx/src/systems/fmgc/src/NavigationDatabase.ts b/fbw-a32nx/src/systems/fmgc/src/NavigationDatabase.ts index 960956852ee..314647276a4 100644 --- a/fbw-a32nx/src/systems/fmgc/src/NavigationDatabase.ts +++ b/fbw-a32nx/src/systems/fmgc/src/NavigationDatabase.ts @@ -48,7 +48,7 @@ export class NavigationDatabase { return this.backendDatabase.getWaypoints([ident]); } - async searchAllFix(ident: string): Promise<(Waypoint | VhfNavaid | NdbNavaid)[]> { + async searchAllFix(ident: string): Promise { return [ ...(await this.backendDatabase.getWaypoints([ident])), ...(await this.backendDatabase.getNavaids([ident])), diff --git a/fbw-a32nx/src/systems/fmgc/src/flightplanning/DataManager.ts b/fbw-a32nx/src/systems/fmgc/src/flightplanning/DataManager.ts index b9ecb4c5f38..e79e4f7069e 100644 --- a/fbw-a32nx/src/systems/fmgc/src/flightplanning/DataManager.ts +++ b/fbw-a32nx/src/systems/fmgc/src/flightplanning/DataManager.ts @@ -4,7 +4,7 @@ import { NXDataStore, Waypoint } from '@flybywiresim/fbw-sdk'; import { FmsError, FmsErrorType } from '@fmgc/FmsError'; -import { DisplayInterface } from '@fmgc/flightplanning/interface/DisplayInterface'; +import { FmsDisplayInterface } from '@fmgc/flightplanning/interface/FmsDisplayInterface'; import { WaypointFactory } from '@fmgc/flightplanning/waypoints/WaypointFactory'; import { Coordinates } from 'msfs-geo'; @@ -61,7 +61,7 @@ export class DataManager { private latLonExtendedFormat = false; - constructor(private fmc: DisplayInterface) { + constructor(private fmc: FmsDisplayInterface) { // we keep these in localStorage so they live for the same length of time as the flightplan (that they could appear in) // if the f-pln is not stored there anymore we can delete this const stored = localStorage.getItem(DataManager.STORED_WP_KEY); diff --git a/fbw-a32nx/src/systems/fmgc/src/flightplanning/WaypointEntryUtils.spec.ts b/fbw-a32nx/src/systems/fmgc/src/flightplanning/WaypointEntryUtils.spec.ts index 40b7f5c12dc..5321cd84b76 100644 --- a/fbw-a32nx/src/systems/fmgc/src/flightplanning/WaypointEntryUtils.spec.ts +++ b/fbw-a32nx/src/systems/fmgc/src/flightplanning/WaypointEntryUtils.spec.ts @@ -7,16 +7,16 @@ import { jest } from '@jest/globals'; import { FlightPlanService } from '@fmgc/flightplanning/FlightPlanService'; import { setupNavigraphDatabase } from '@fmgc/flightplanning/test/Database'; import { WaypointEntryUtils } from '@fmgc/flightplanning/WaypointEntryUtils'; -import { DisplayInterface } from '@fmgc/flightplanning/interface/DisplayInterface'; +import { FmsDisplayInterface } from '@fmgc/flightplanning/interface/FmsDisplayInterface'; import { DatabaseItem, Waypoint } from '@flybywiresim/fbw-sdk'; import { FmsErrorType } from '@fmgc/FmsError'; import { Coordinates, placeBearingDistance, placeBearingIntersection } from 'msfs-geo'; import { WaypointFactory } from '@fmgc/flightplanning/waypoints/WaypointFactory'; -import { DataInterface } from './interface/DataInterface'; +import { FmsDataInterface } from './interface/FmsDataInterface'; jest.setTimeout(120_000); -const fms: DisplayInterface & DataInterface = { +const fms: FmsDisplayInterface & FmsDataInterface = { showFmsErrorMessage(errorType: FmsErrorType) { console.error(FmsErrorType[errorType]); }, diff --git a/fbw-a32nx/src/systems/fmgc/src/flightplanning/WaypointEntryUtils.ts b/fbw-a32nx/src/systems/fmgc/src/flightplanning/WaypointEntryUtils.ts index 7c30bb2c325..c0840056192 100644 --- a/fbw-a32nx/src/systems/fmgc/src/flightplanning/WaypointEntryUtils.ts +++ b/fbw-a32nx/src/systems/fmgc/src/flightplanning/WaypointEntryUtils.ts @@ -6,9 +6,9 @@ import { Fix, NdbNavaid, VhfNavaid, Waypoint } from '@flybywiresim/fbw-sdk'; import { NavigationDatabaseService } from '@fmgc/flightplanning/NavigationDatabaseService'; import { WaypointFactory } from '@fmgc/flightplanning/waypoints/WaypointFactory'; -import { DisplayInterface } from '@fmgc/flightplanning/interface/DisplayInterface'; +import { FmsDisplayInterface } from '@fmgc/flightplanning/interface/FmsDisplayInterface'; import { Coordinates } from 'msfs-geo'; -import { DataInterface } from '@fmgc/flightplanning/interface/DataInterface'; +import { FmsDataInterface } from '@fmgc/flightplanning/interface/FmsDataInterface'; import { FmsError, FmsErrorType } from '@fmgc/FmsError'; import { MagVar } from '@microsoft/msfs-sdk'; @@ -23,7 +23,7 @@ export class WaypointEntryUtils { * @returns a waypoint, or `undefined` if the operation is cancelled */ static async getOrCreateWaypoint( - fms: DataInterface & DisplayInterface, + fms: FmsDataInterface & FmsDisplayInterface, place: string, stored: boolean, ident?: string, @@ -54,7 +54,7 @@ export class WaypointEntryUtils { /** * Parse a place string into a position */ - static async parsePlace(fms: DisplayInterface & DataInterface, place: string): Promise { + static async parsePlace(fms: FmsDisplayInterface & FmsDataInterface, place: string): Promise { if (WaypointEntryUtils.isRunwayFormat(place)) { return WaypointEntryUtils.parseRunway(place); } @@ -158,7 +158,7 @@ export class WaypointEntryUtils { * * @returns place and true bearing * 2 */ - static async parsePbx(fms: DisplayInterface & DataInterface, str: string): Promise<[Fix, number, Fix, number]> { + static async parsePbx(fms: FmsDisplayInterface & FmsDataInterface, str: string): Promise<[Fix, number, Fix, number]> { const pbx = str.match(/^([^\-/]+)-([0-9]{1,3})\/([^\-/]+)-([0-9]{1,3})$/); if (pbx === null) { @@ -186,7 +186,7 @@ export class WaypointEntryUtils { * @param {string} s */ static async parsePbd( - fms: DataInterface & DisplayInterface, + fms: FmsDataInterface & FmsDisplayInterface, s: string, ): Promise<[wp: Fix, trueBearing: number, dist: number]> { const [place, brg, dist] = WaypointEntryUtils.splitPbd(s); diff --git a/fbw-a32nx/src/systems/fmgc/src/flightplanning/interface/DataInterface.ts b/fbw-a32nx/src/systems/fmgc/src/flightplanning/interface/FmsDataInterface.ts similarity index 95% rename from fbw-a32nx/src/systems/fmgc/src/flightplanning/interface/DataInterface.ts rename to fbw-a32nx/src/systems/fmgc/src/flightplanning/interface/FmsDataInterface.ts index a157a5d72dc..5fd87430e3c 100644 --- a/fbw-a32nx/src/systems/fmgc/src/flightplanning/interface/DataInterface.ts +++ b/fbw-a32nx/src/systems/fmgc/src/flightplanning/interface/FmsDataInterface.ts @@ -7,7 +7,7 @@ import { Coordinates, DegreesTrue } from 'msfs-geo'; import { Fix } from '@flybywiresim/fbw-sdk'; import { PilotWaypoint } from '@fmgc/flightplanning/DataManager'; -export interface DataInterface { +export interface FmsDataInterface { createLatLonWaypoint(coordinates: Coordinates, stored: boolean, ident?: string): PilotWaypoint; createPlaceBearingPlaceBearingWaypoint( diff --git a/fbw-a32nx/src/systems/fmgc/src/flightplanning/interface/DisplayInterface.ts b/fbw-a32nx/src/systems/fmgc/src/flightplanning/interface/FmsDisplayInterface.ts similarity index 97% rename from fbw-a32nx/src/systems/fmgc/src/flightplanning/interface/DisplayInterface.ts rename to fbw-a32nx/src/systems/fmgc/src/flightplanning/interface/FmsDisplayInterface.ts index 55e46c8e023..940ac5f6cf2 100644 --- a/fbw-a32nx/src/systems/fmgc/src/flightplanning/interface/DisplayInterface.ts +++ b/fbw-a32nx/src/systems/fmgc/src/flightplanning/interface/FmsDisplayInterface.ts @@ -6,7 +6,7 @@ import { DatabaseItem, Waypoint } from '@flybywiresim/fbw-sdk'; import { FmsErrorType } from '@fmgc/FmsError'; -export interface DisplayInterface { +export interface FmsDisplayInterface { /** * Called when a flight plan uplink is in progress */ diff --git a/fbw-a32nx/src/systems/fmgc/src/flightplanning/uplink/CoRouteUplinkAdapter.ts b/fbw-a32nx/src/systems/fmgc/src/flightplanning/uplink/CoRouteUplinkAdapter.ts index 51c0b0c944a..789bbe4e1a4 100644 --- a/fbw-a32nx/src/systems/fmgc/src/flightplanning/uplink/CoRouteUplinkAdapter.ts +++ b/fbw-a32nx/src/systems/fmgc/src/flightplanning/uplink/CoRouteUplinkAdapter.ts @@ -10,9 +10,9 @@ import { FlightPlanIndex } from '@fmgc/flightplanning/FlightPlanManager'; import { NavigationDatabaseService } from '@fmgc/flightplanning/NavigationDatabaseService'; import { Fix, Airway } from '@flybywiresim/fbw-sdk'; import { Coordinates, distanceTo } from 'msfs-geo'; -import { DisplayInterface } from '@fmgc/flightplanning/interface/DisplayInterface'; +import { FmsDisplayInterface } from '@fmgc/flightplanning/interface/FmsDisplayInterface'; import type { Fix as CoRouteFix } from '@simbridge/Coroute/Fix'; -import { DataInterface } from '../interface/DataInterface'; +import { FmsDataInterface } from '../interface/FmsDataInterface'; import { FmsErrorType } from '@fmgc/FmsError'; export interface OfpRoute { @@ -104,7 +104,7 @@ type CoRoute = { export class CoRouteUplinkAdapter { static async uplinkFlightPlanFromCoRoute( - fms: DataInterface & DisplayInterface, + fms: FmsDataInterface & FmsDisplayInterface, flightPlanService: FlightPlanService, ofp: CoRoute, ) { diff --git a/fbw-a32nx/src/systems/fmgc/src/flightplanning/uplink/SimBriefUplinkAdapter.ts b/fbw-a32nx/src/systems/fmgc/src/flightplanning/uplink/SimBriefUplinkAdapter.ts index dfb428a346b..8046d5f6be4 100644 --- a/fbw-a32nx/src/systems/fmgc/src/flightplanning/uplink/SimBriefUplinkAdapter.ts +++ b/fbw-a32nx/src/systems/fmgc/src/flightplanning/uplink/SimBriefUplinkAdapter.ts @@ -10,14 +10,14 @@ import { FlightPlanIndex } from '@fmgc/flightplanning/FlightPlanManager'; import { NavigationDatabaseService } from '@fmgc/flightplanning/NavigationDatabaseService'; import { Airway, Fix } from '@flybywiresim/fbw-sdk'; import { Coordinates, distanceTo } from 'msfs-geo'; -import { DisplayInterface } from '@fmgc/flightplanning/interface/DisplayInterface'; +import { FmsDisplayInterface } from '@fmgc/flightplanning/interface/FmsDisplayInterface'; import { FlightPlanPerformanceData } from '@fmgc/flightplanning/plans/performance/FlightPlanPerformanceData'; import { FmsErrorType } from '@fmgc/FmsError'; import { ISimbriefData, simbriefDataParser, } from '../../../../../../../fbw-common/src/systems/instruments/src/EFB/Apis/Simbrief'; -import { DataInterface } from '../interface/DataInterface'; +import { FmsDataInterface } from '../interface/FmsDataInterface'; const SIMBRIEF_API_URL = 'https://www.simbrief.com/api/xml.fetcher.php?json=1'; @@ -114,7 +114,7 @@ export interface SimBriefUplinkOptions { export class SimBriefUplinkAdapter { static async uplinkFlightPlanFromSimbrief

( - fms: DataInterface & DisplayInterface, + fms: FmsDataInterface & FmsDisplayInterface, flightPlanService: FlightPlanService

, ofp: ISimbriefData, options: SimBriefUplinkOptions, diff --git a/fbw-a380x/src/systems/instruments/src/MFD/FMC/FlightManagementComputer.ts b/fbw-a380x/src/systems/instruments/src/MFD/FMC/FlightManagementComputer.ts index 8ac3b264036..765243e20d2 100644 --- a/fbw-a380x/src/systems/instruments/src/MFD/FMC/FlightManagementComputer.ts +++ b/fbw-a380x/src/systems/instruments/src/MFD/FMC/FlightManagementComputer.ts @@ -42,7 +42,7 @@ import { } from 'instruments/src/MFD/shared/NXSystemMessages'; import { PilotWaypoint } from '@fmgc/flightplanning/DataManager'; import { distanceTo, Coordinates } from 'msfs-geo'; -import { DisplayInterface } from '@fmgc/flightplanning/interface/DisplayInterface'; +import { FmsDisplayInterface } from '@fmgc/flightplanning/interface/FmsDisplayInterface'; import { MfdDisplayInterface } from 'instruments/src/MFD/MFD'; import { FmcIndex } from 'instruments/src/MFD/FMC/FmcServiceInterface'; import { FmsErrorType } from '@fmgc/FmsError'; @@ -64,13 +64,13 @@ export interface FmsErrorMessage { export class FlightManagementComputer implements FmcInterface { protected subs = [] as Subscription[]; - #mfdReference: (DisplayInterface & MfdDisplayInterface) | null; + #mfdReference: (FmsDisplayInterface & MfdDisplayInterface) | null; get mfdReference() { return this.#mfdReference; } - set mfdReference(value: (DisplayInterface & MfdDisplayInterface) | null) { + set mfdReference(value: (FmsDisplayInterface & MfdDisplayInterface) | null) { this.#mfdReference = value; if (value) { @@ -174,7 +174,7 @@ export class FlightManagementComputer implements FmcInterface { operatingMode: FmcOperatingModes, private readonly bus: EventBus, private readonly isPowered: Subscribable, - mfdReference: (DisplayInterface & MfdDisplayInterface) | null, + mfdReference: (FmsDisplayInterface & MfdDisplayInterface) | null, private readonly failuresConsumer: FailuresConsumer, ) { this.#operatingMode = operatingMode; diff --git a/fbw-a380x/src/systems/instruments/src/MFD/FMC/FmcInterface.ts b/fbw-a380x/src/systems/instruments/src/MFD/FMC/FmcInterface.ts index a71d9c28081..f2f8e2a668b 100644 --- a/fbw-a380x/src/systems/instruments/src/MFD/FMC/FmcInterface.ts +++ b/fbw-a380x/src/systems/instruments/src/MFD/FMC/FmcInterface.ts @@ -1,6 +1,6 @@ import { FmsErrorType } from '@fmgc/FmsError'; -import { DataInterface } from '@fmgc/flightplanning/interface/DataInterface'; -import { DisplayInterface } from '@fmgc/flightplanning/interface/DisplayInterface'; +import { FmsDataInterface } from '@fmgc/flightplanning/interface/FmsDataInterface'; +import { FmsDisplayInterface } from '@fmgc/flightplanning/interface/FmsDisplayInterface'; import { DataManager, FlightPlanIndex, FlightPlanService, GuidanceController } from '@fmgc/index'; import { NavaidTuner } from '@fmgc/navigation/NavaidTuner'; import { NavigationProvider } from '@fmgc/navigation/NavigationProvider'; @@ -34,7 +34,7 @@ export interface FlightPhaseManagerProxyInterface { * Handles requests inside each FlightManagementComputer (FMC). * DisplayInterface shouldn't be here, but WaypointEntryUtils requires on parameter with both DisplayInterface and DataInterface */ -export interface FmcInterface extends FlightPhaseManagerProxyInterface, DataInterface, DisplayInterface { +export interface FmcInterface extends FlightPhaseManagerProxyInterface, FmsDataInterface, FmsDisplayInterface { /** * Which operation mode is FMC in? Can be master, slave or standby. */ @@ -44,8 +44,8 @@ export interface FmcInterface extends FlightPhaseManagerProxyInterface, DataInte /** * Mfd reference, used for navigating to pages and opening prompts */ - get mfdReference(): (DisplayInterface & MfdDisplayInterface) | null; - set mfdReference(value: DisplayInterface & MfdDisplayInterface); + get mfdReference(): (FmsDisplayInterface & MfdDisplayInterface) | null; + set mfdReference(value: FmsDisplayInterface & MfdDisplayInterface); /** * FlightPlanService interface diff --git a/fbw-a380x/src/systems/instruments/src/MFD/FMC/FmcService.ts b/fbw-a380x/src/systems/instruments/src/MFD/FMC/FmcService.ts index 2a1516b62fd..e861d25af02 100644 --- a/fbw-a380x/src/systems/instruments/src/MFD/FMC/FmcService.ts +++ b/fbw-a380x/src/systems/instruments/src/MFD/FMC/FmcService.ts @@ -1,5 +1,5 @@ import { FailuresConsumer } from '@flybywiresim/fbw-sdk'; -import { DisplayInterface } from '@fmgc/flightplanning/interface/DisplayInterface'; +import { FmsDisplayInterface } from '@fmgc/flightplanning/interface/FmsDisplayInterface'; import { ConsumerSubject, EventBus, Subscription } from '@microsoft/msfs-sdk'; import { FlightManagementComputer } from 'instruments/src/MFD/FMC/FlightManagementComputer'; import { FmcInterface, FmcOperatingModes } from 'instruments/src/MFD/FMC/FmcInterface'; @@ -25,7 +25,7 @@ export class FmcService implements FmcServiceInterface { constructor( private bus: EventBus, - mfdReference: (DisplayInterface & MfdDisplayInterface) | null, + mfdReference: (FmsDisplayInterface & MfdDisplayInterface) | null, private readonly failuresConsumer: FailuresConsumer, ) { this.createFmc(mfdReference); @@ -43,7 +43,7 @@ export class FmcService implements FmcServiceInterface { return this.fmc.find((it) => it.operatingMode === FmcOperatingModes.Standby) ?? null; } - createFmc(mfdReference: (DisplayInterface & MfdDisplayInterface) | null): void { + createFmc(mfdReference: (FmsDisplayInterface & MfdDisplayInterface) | null): void { // Only FMC-A is operative for now, this takes up enough resources already // Before more FMC can be added, they have to be synced this.fmc.push( @@ -91,7 +91,7 @@ export class FmcService implements FmcServiceInterface { return this.fmc[forFmcIndex]; } - setMfdReference(forFmcIndex: FmcIndex, mfd: DisplayInterface & MfdDisplayInterface) { + setMfdReference(forFmcIndex: FmcIndex, mfd: FmsDisplayInterface & MfdDisplayInterface) { if (this.fmc[forFmcIndex] === undefined) { return; } diff --git a/fbw-a380x/src/systems/instruments/src/MFD/FMC/FmcServiceInterface.ts b/fbw-a380x/src/systems/instruments/src/MFD/FMC/FmcServiceInterface.ts index 27c2b0d8eeb..fe1807272ac 100644 --- a/fbw-a380x/src/systems/instruments/src/MFD/FMC/FmcServiceInterface.ts +++ b/fbw-a380x/src/systems/instruments/src/MFD/FMC/FmcServiceInterface.ts @@ -1,4 +1,4 @@ -import { DisplayInterface } from '@fmgc/flightplanning/interface/DisplayInterface'; +import { FmsDisplayInterface } from '@fmgc/flightplanning/interface/FmsDisplayInterface'; import { FmcInterface } from 'instruments/src/MFD/FMC/FmcInterface'; import { MfdDisplayInterface } from 'instruments/src/MFD/MFD'; @@ -30,7 +30,7 @@ export interface FmcServiceInterface { /** * Instantiate FMCs. Currently, only FMC-A is instantiated. */ - createFmc(mfdReference: DisplayInterface & MfdDisplayInterface): void; + createFmc(mfdReference: FmsDisplayInterface & MfdDisplayInterface): void; /** * Check whether given FMC is instantiated @@ -45,5 +45,5 @@ export interface FmcServiceInterface { /** * Sets mfd reference for given FMC, used for navigating to pages and opening prompts */ - setMfdReference(forFmcIndex: FmcIndex, mfd: DisplayInterface & MfdDisplayInterface): void; + setMfdReference(forFmcIndex: FmcIndex, mfd: FmsDisplayInterface & MfdDisplayInterface): void; } diff --git a/fbw-a380x/src/systems/instruments/src/MFD/MFD.tsx b/fbw-a380x/src/systems/instruments/src/MFD/MFD.tsx index 87c5fe4136e..31eb777a42b 100644 --- a/fbw-a380x/src/systems/instruments/src/MFD/MFD.tsx +++ b/fbw-a380x/src/systems/instruments/src/MFD/MFD.tsx @@ -22,7 +22,7 @@ import { MfdMsgList } from 'instruments/src/MFD/pages/FMS/MfdMsgList'; import { ActiveUriInformation, MfdUiService } from 'instruments/src/MFD/pages/common/MfdUiService'; import { MfdFmsFplnDuplicateNames } from 'instruments/src/MFD/pages/FMS/F-PLN/MfdFmsFplnDuplicateNames'; import { headerForSystem, pageForUrl } from 'instruments/src/MFD/MfdPageDirectory'; -import { DisplayInterface } from '@fmgc/flightplanning/interface/DisplayInterface'; +import { FmsDisplayInterface } from '@fmgc/flightplanning/interface/FmsDisplayInterface'; import { FmsErrorType } from '@fmgc/FmsError'; import { FmcServiceInterface } from 'instruments/src/MFD/FMC/FmcServiceInterface'; import { CdsDisplayUnit, DisplayUnitID } from '../MsfsAvionicsCommon/CdsDisplayUnit'; @@ -36,7 +36,7 @@ export const getDisplayIndex = () => { export interface AbstractMfdPageProps extends ComponentProps { pageTitle?: string; bus: EventBus; - mfd: DisplayInterface & MfdDisplayInterface; + mfd: FmsDisplayInterface & MfdDisplayInterface; fmcService: FmcServiceInterface; } @@ -62,7 +62,10 @@ export enum InteractionMode { Kccu, } -export class MfdComponent extends DisplayComponent implements DisplayInterface, MfdDisplayInterface { +export class MfdComponent + extends DisplayComponent + implements FmsDisplayInterface, MfdDisplayInterface +{ private readonly sub = this.props.bus.getSubscriber(); #uiService = new MfdUiService(this.props.captOrFo); diff --git a/fbw-a380x/src/systems/instruments/src/MFD/MfdPageDirectory.tsx b/fbw-a380x/src/systems/instruments/src/MFD/MfdPageDirectory.tsx index ea57d0e7aa3..7e53441fd49 100644 --- a/fbw-a380x/src/systems/instruments/src/MFD/MfdPageDirectory.tsx +++ b/fbw-a380x/src/systems/instruments/src/MFD/MfdPageDirectory.tsx @@ -22,7 +22,7 @@ import { FcuBkupHeader } from 'instruments/src/MFD/pages/common/FcuBkupHeader'; import { FmsHeader } from 'instruments/src/MFD/pages/common/FmsHeader'; import { SurvHeader } from 'instruments/src/MFD/pages/common/SurvHeader'; import { FmcServiceInterface } from 'instruments/src/MFD/FMC/FmcServiceInterface'; -import { DisplayInterface } from '@fmgc/flightplanning/interface/DisplayInterface'; +import { FmsDisplayInterface } from '@fmgc/flightplanning/interface/FmsDisplayInterface'; import { MfdDisplayInterface } from 'instruments/src/MFD/MFD'; import { MfdUiService } from 'instruments/src/MFD/pages/common/MfdUiService'; import { MfdFmsDataDebug } from 'instruments/src/MFD/pages/FMS/DATA/MfdFmsDataDebug'; @@ -32,7 +32,7 @@ import { MfdFmsFplnFixInfo } from './pages/FMS/F-PLN/MfdFmsFplnFixInfo'; export function pageForUrl( url: string, bus: EventBus, - mfd: DisplayInterface & MfdDisplayInterface, + mfd: FmsDisplayInterface & MfdDisplayInterface, fmcService: FmcServiceInterface, ): VNode { switch (url) { @@ -103,7 +103,7 @@ export function pageForUrl( export function headerForSystem( sys: string, - mfd: DisplayInterface & MfdDisplayInterface, + mfd: FmsDisplayInterface & MfdDisplayInterface, atcCallsign: Subscribable, activeFmsSource: Subscribable<'FMS 1' | 'FMS 2' | 'FMS 1-C' | 'FMS 2-C'>, uiService: MfdUiService, diff --git a/fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/F-PLN/DestinationWindow.tsx b/fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/F-PLN/DestinationWindow.tsx index 30976f3ca8f..3c773ad1d5f 100644 --- a/fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/F-PLN/DestinationWindow.tsx +++ b/fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/F-PLN/DestinationWindow.tsx @@ -3,13 +3,13 @@ import '../../common/style.scss'; import { Button } from 'instruments/src/MFD/pages/common/Button'; import { InputField } from 'instruments/src/MFD/pages/common/InputField'; import { AirportFormat } from 'instruments/src/MFD/pages/common/DataEntryFormats'; -import { DisplayInterface } from '@fmgc/flightplanning/interface/DisplayInterface'; +import { FmsDisplayInterface } from '@fmgc/flightplanning/interface/FmsDisplayInterface'; import { MfdDisplayInterface } from 'instruments/src/MFD/MFD'; import { FmcServiceInterface } from 'instruments/src/MFD/FMC/FmcServiceInterface'; interface DestinationWindowProps extends ComponentProps { fmcService: FmcServiceInterface; - mfd: DisplayInterface & MfdDisplayInterface; + mfd: FmsDisplayInterface & MfdDisplayInterface; visible: Subject; } export class DestinationWindow extends DisplayComponent { diff --git a/fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/F-PLN/InsertNextWptFrom.tsx b/fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/F-PLN/InsertNextWptFrom.tsx index 31745afd0f0..d693d919488 100644 --- a/fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/F-PLN/InsertNextWptFrom.tsx +++ b/fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/F-PLN/InsertNextWptFrom.tsx @@ -15,7 +15,7 @@ import { DropdownMenu } from 'instruments/src/MFD/pages/common/DropdownMenu'; import { WaypointEntryUtils } from '@fmgc/flightplanning/WaypointEntryUtils'; import { FmcServiceInterface } from 'instruments/src/MFD/FMC/FmcServiceInterface'; import { FlightPlanIndex } from '@fmgc/index'; -import { DisplayInterface } from '@fmgc/flightplanning/interface/DisplayInterface'; +import { FmsDisplayInterface } from '@fmgc/flightplanning/interface/FmsDisplayInterface'; import { MfdDisplayInterface } from 'instruments/src/MFD/MFD'; import { FmsError } from '@fmgc/FmsError'; @@ -25,7 +25,7 @@ export type NextWptInfo = { }; interface InsertNextWptFromWindowProps extends ComponentProps { fmcService: FmcServiceInterface; - mfd: DisplayInterface & MfdDisplayInterface; + mfd: FmsDisplayInterface & MfdDisplayInterface; availableWaypoints: SubscribableArray; visible: Subject; contentContainerStyle?: string; diff --git a/fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/F-PLN/MfdFmsFplnAirways.tsx b/fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/F-PLN/MfdFmsFplnAirways.tsx index 14764a6d7a8..7acb4c4f3f9 100644 --- a/fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/F-PLN/MfdFmsFplnAirways.tsx +++ b/fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/F-PLN/MfdFmsFplnAirways.tsx @@ -15,7 +15,7 @@ import { NXSystemMessages } from 'instruments/src/MFD/shared/NXSystemMessages'; import { FmcInterface } from 'instruments/src/MFD/FMC/FmcInterface'; import { NavigationDatabaseService } from '@fmgc/flightplanning/NavigationDatabaseService'; import { Fix } from '@flybywiresim/fbw-sdk'; -import { DisplayInterface } from '@fmgc/flightplanning/interface/DisplayInterface'; +import { FmsDisplayInterface } from '@fmgc/flightplanning/interface/FmsDisplayInterface'; interface MfdFmsFplnAirwaysProps extends AbstractMfdPageProps {} @@ -169,7 +169,7 @@ export class MfdFmsFplnAirways extends FmsPage { interface AirwayLineProps extends ComponentProps { fmc: FmcInterface; - mfd: DisplayInterface & MfdDisplayInterface; + mfd: FmsDisplayInterface & MfdDisplayInterface; pendingAirways: PendingAirways; fromFix: Fix; isFirstLine: boolean; diff --git a/fbw-a380x/src/systems/instruments/src/MFD/pages/common/AbstractHeader.tsx b/fbw-a380x/src/systems/instruments/src/MFD/pages/common/AbstractHeader.tsx index 6725d61f989..f1a61ed8fed 100644 --- a/fbw-a380x/src/systems/instruments/src/MFD/pages/common/AbstractHeader.tsx +++ b/fbw-a380x/src/systems/instruments/src/MFD/pages/common/AbstractHeader.tsx @@ -1,4 +1,4 @@ -import { DisplayInterface } from '@fmgc/flightplanning/interface/DisplayInterface'; +import { FmsDisplayInterface } from '@fmgc/flightplanning/interface/FmsDisplayInterface'; import { ArraySubject, DisplayComponent, @@ -16,7 +16,7 @@ interface AbstractMfdHeaderProps { activeFmsSource: Subscribable<'FMS 1' | 'FMS 2' | 'FMS 1-C' | 'FMS 2-C'>; callsign: Subscribable; uiService: MfdUiService; - mfd: DisplayInterface & MfdDisplayInterface; + mfd: FmsDisplayInterface & MfdDisplayInterface; } /*