refactor: aircraft type check

.github/workflows/a380x-exp.yml

@@ -17,6 +17,7 @@ jobs:
       FBW_PRODUCTION_BUILD: 1
       A32NX_INSTRUMENTS_BUILD_WORKERS: 2
       BUILD_DIR_NAME: a380x-experimental-a32nx
+      AIRCRAFT_PROJECT_PREFIX: a32nx
     steps:
       - name: Checkout source
         uses: actions/checkout@v4
@@ -29,6 +30,7 @@ jobs:
           echo CLIENT_SECRET=\"${{ secrets.NAVIGRAPH_CLIENT_SECRET }}\" >> fbw-a32nx/.env
           echo CHARTFOX_SECRET=\"${{ secrets.CHARTFOX_SECRET }}\" >> fbw-a32nx/.env
           echo SENTRY_DSN=\"${{ secrets.SENTRY_DSN }}\" >> fbw-a32nx/.env
+          echo AIRCRAFT_PROJECT_PREFIX=${{ env.AIRCRAFT_PREFIX }} >> fbw-a32nx/.env
           echo BUILD_DIR_NAME=${{ env.BUILD_DIR_NAME }} >> .env
           echo LOCALAZY_READ_KEY=${{ secrets.LOCALAZY_READ_KEY }} >> .env
           echo VITE_BUILD=false >> .env
@@ -66,6 +68,7 @@ jobs:
     env:
       FBW_PRODUCTION_BUILD: 1
       BUILD_DIR_NAME: a380x-experimental-a380x
+      AIRCRAFT_PREFIX: a380x
     steps:
       - name: Checkout source
         uses: actions/checkout@v4
@@ -78,6 +81,7 @@ jobs:
           echo CLIENT_SECRET=\"${{ secrets.NAVIGRAPH_CLIENT_SECRET_A380X }}\" >> fbw-a380x/.env
           echo CHARTFOX_SECRET=\"${{ secrets.CHARTFOX_SECRET }}\" >> fbw-a380x/.env
           echo SENTRY_DSN=\"${{ secrets.SENTRY_DSN }}\" >> fbw-a380x/.env
+          echo AIRCRAFT_PREFIX=${{ env.AIRCRAFT_PREFIX }} >> fbw-a380x/.env
           echo BUILD_DIR_NAME=${{ env.BUILD_DIR_NAME }} >> .env
           echo LOCALAZY_READ_KEY=${{ secrets.LOCALAZY_READ_KEY }} >> .env
           echo VITE_BUILD=false >> .env

.github/workflows/ingamepanels-checklist-fix.yml

@@ -21,6 +21,7 @@ jobs:
       FBW_PRODUCTION_BUILD: 1
       MASTER_ZIP_NAME: ingamepanels-checklist-fix-master.zip
       BUILD_DIR_NAME: master
+      AIRCRAFT_PROJECT_PREFIX: a32nx
     steps:
       - name: Checkout source
         uses: actions/checkout@v2
@@ -33,6 +34,7 @@ jobs:
           echo CLIENT_SECRET=${{ secrets.NAVIGRAPH_CLIENT_SECRET }} >> .env
           echo CHARTFOX_SECRET=${{ secrets.CHARTFOX_SECRET }} >> .env
           echo SENTRY_DSN=${{ secrets.SENTRY_DSN }} >> .env
+          echo AIRCRAFT_PROJECT_PREFIX=${{ env.AIRCRAFT_PROJECT_PREFIX }} >> .env
           echo BUILD_DIR_NAME=${{ env.BUILD_DIR_NAME }} >> .env
           echo LOCALAZY_READ_KEY=${{ secrets.LOCALAZY_READ_KEY }} >> .env
       - name: Build In-Game Panels Checklist Fix

.github/workflows/master.yml

@@ -22,6 +22,7 @@ jobs:
       VMASTER_PRE_RELEASE_ID: 32243965
       VMASTER_PRE_RELEASE_TAG: vmaster
       BUILD_DIR_NAME: master-a32nx
+      AIRCRAFT_PROJECT_PREFIX: a32nx
     steps:
       - name: Checkout source
         uses: actions/checkout@v4
@@ -34,6 +35,7 @@ jobs:
           echo CLIENT_SECRET=\"${{ secrets.NAVIGRAPH_CLIENT_SECRET }}\" >> fbw-a32nx/.env
           echo CHARTFOX_SECRET=\"${{ secrets.CHARTFOX_SECRET }}\" >> fbw-a32nx/.env
           echo SENTRY_DSN=\"${{ secrets.SENTRY_DSN }}\" >> fbw-a32nx/.env
+          echo AIRCRAFT_PROJECT_PREFIX=\"${{ env.AIRCRAFT_PROJECT_PREFIX }}\" >> fbw-a32nx/.env
           echo BUILD_DIR_NAME=${{ env.BUILD_DIR_NAME }} >> .env
           echo LOCALAZY_READ_KEY=${{ secrets.LOCALAZY_READ_KEY }} >> .env
           echo VITE_BUILD=false >> .env
@@ -100,6 +102,7 @@ jobs:
       VMASTER_PRE_RELEASE_ID: 32243965
       VMASTER_PRE_RELEASE_TAG: vmaster
       BUILD_DIR_NAME: master-a380x
+      AIRCRAFT_PROJECT_PREFIX: a380x
     steps:
       - name: Checkout source
         uses: actions/checkout@v4
@@ -112,6 +115,7 @@ jobs:
           echo CLIENT_SECRET=\"${{ secrets.NAVIGRAPH_CLIENT_SECRET_A380X }}\" >> fbw-a380x/.env
           echo CHARTFOX_SECRET=\"${{ secrets.CHARTFOX_SECRET }}\" >> fbw-a380x/.env
           echo SENTRY_DSN=\"${{ secrets.SENTRY_DSN }}\" >> fbw-a380x/.env
+          echo AIRCRAFT_PROJECT_PREFIX=\"${{ env.AIRCRAFT_PROJECT_PREFIX }}\" >> fbw-a380x/.env
           echo BUILD_DIR_NAME=${{ env.BUILD_DIR_NAME }} >> .env
           echo LOCALAZY_READ_KEY=${{ secrets.LOCALAZY_READ_KEY }} >> .env
           echo VITE_BUILD=false >> .env

.github/workflows/pr.yml

@@ -49,6 +49,7 @@ jobs:
     if: github.event.pull_request.draft == false
     env:
       FBW_PRODUCTION_BUILD: 1
+      AIRCRAFT_PROJECT_PREFIX: a32nx
     steps:
       - name: Checkout source
         uses: actions/checkout@v4
@@ -60,6 +61,7 @@ jobs:
           echo CLIENT_SECRET=\"${{ secrets.NAVIGRAPH_CLIENT_SECRET_A380X }}\" >> fbw-a32nx/.env
           echo CHARTFOX_SECRET=\"${{ secrets.CHARTFOX_SECRET }}\" >> fbw-a32nx/.env
           echo SENTRY_DSN=\"${{ secrets.SENTRY_DSN }}\" >> fbw-a32nx/.env
+          echo AIRCRAFT_PROJECT_PREFIX=\"${{ env.AIRCRAFT_PROJECT_PREFIX }}\" >> fbw-a32nx/.env
           echo LOCALAZY_READ_KEY=${{ secrets.LOCALAZY_READ_KEY }} >> .env
           echo VITE_BUILD=false >> .env
           cat fbw-a32nx/.env
@@ -124,4 +126,4 @@ jobs:
         if: github.event.pull_request.auto_merge == false
         with:
           name: flybywire-aircraft-a380-842
-          path: ./fbw-a380x/out/flybywire-aircraft-a380-842/
+          path: ./fbw-a380x/out/flybywire-aircraft-a380-842/

.github/workflows/pre-release.yml

@@ -12,6 +12,7 @@ jobs:
       FBW_PRODUCTION_BUILD: 1
       RELEASE_ZIP_NAME: A32NX-stable.7z
       BUILD_DIR_NAME: stable
+      AIRCRAFT_PROJECT_PREFIX: a32nx
     steps:
       - name: Checkout source
         uses: actions/checkout@v2
@@ -23,6 +24,7 @@ jobs:
           echo CHARTFOX_SECRET=\"${{ secrets.CHARTFOX_SECRET }}\" >> fbw-a32nx/.env
           echo SENTRY_DSN=\"${{ secrets.SENTRY_DSN }}\" >> fbw-a32nx/.env
           echo BUILD_DIR_NAME=${{ env.BUILD_DIR_NAME }} >> .env
+          echo BUILD_DIR_NAME=${{ env.AIRCRAFT_PROJECT_PREFIX }} >> fbw-a32nx/.env
           echo LOCALAZY_READ_KEY=${{ secrets.LOCALAZY_READ_KEY }} >> .env
           echo VITE_BUILD=false >> .env
       - name: Build A32NX

.github/workflows/release.yml

@@ -15,6 +15,7 @@ jobs:
       STABLE_PRE_RELEASE_TAG: assets/stable
       STABLE_ZIP_NAME: A32NX-stable.7z
       BUILD_DIR_NAME: stable
+      AIRCRAFT_PROJECT_PREFIX: a32nx
     steps:
       - name: Checkout source
         uses: actions/checkout@v2
@@ -25,6 +26,7 @@ jobs:
           echo CLIENT_SECRET=\"${{ secrets.NAVIGRAPH_CLIENT_SECRET }}\" >> fbw-a32nx/.env
           echo CHARTFOX_SECRET=\"${{ secrets.CHARTFOX_SECRET }}\" >> fbw-a32nx/.env
           echo SENTRY_DSN=\"${{ secrets.SENTRY_DSN }}\" >> fbw-a32nx/.env
+          echo AIRCRAFT_PROJECT_PREFIX=\"${{ secrets.AIRCRAFT_PROJECT_PREFIX }}\" >> fbw-a32nx/.env
           echo BUILD_DIR_NAME=${{ env.BUILD_DIR_NAME }} >> .env
           echo LOCALAZY_READ_KEY=${{ secrets.LOCALAZY_READ_KEY }} >> .env
           echo VITE_BUILD=false >> .env

fbw-a32nx/.env

@@ -3,3 +3,4 @@ NODE_ENV=production
 CLIENT_SECRET=""
 CLIENT_ID=""
 SENTRY_DSN=""
+AIRCRAFT_PROJECT_PREFIX="a32nx"

fbw-a32nx/docs/a320-simvars.md

@@ -26,6 +26,15 @@
 
 ## Uncategorized
 
+- A32NX_AIRCRAFT_TYPE
+    - Enum
+    - Indicates the aircraft type
+        Aircraft | Value
+        --- | ---
+        Unknown | 0
+        A320_251N | 1
+        A380_842 | 2
+
 - A32NX_IS_READY
     - Bool
     - Indicates that the JavaScript part is ready
@@ -42,16 +51,16 @@
 - A32NX_START_STATE
     - Enum
     - Indicates the state in which MSFS started
-    - State | Value
-            --- | ---
-      Hangar | 1
-      Apron | 2
-      Taxi | 3
-      Runway | 4
-      Climb | 5
-      Cruise | 6
-      Approach | 7
-      Final | 8
+        State | Value
+        --- | ---
+        Hangar | 1
+        Apron | 2
+        Taxi | 3
+        Runway | 4
+        Climb | 5
+        Cruise | 6
+        Approach | 7
+        Final | 8
 
 - A32NX_NO_SMOKING_MEMO
     - Boolean that determines whether the NO SMOKING memo should be visible on the upper ECAM

fbw-a32nx/src/base/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/panel/panel.cfg

@@ -122,7 +122,7 @@ size_mm = 1430,1000
 pixel_size = 1430,1000
 texture = $EFB
 
-htmlgauge00 = A32NX/EFB/efb.html?Airframe=A320_251N, 0,0,1430,1000
+htmlgauge00 = A32NX/EFB/efb.html, 0,0,1430,1000
 
 [VCockpit17]
 size_mm = 0,0
@@ -149,7 +149,7 @@ pixel_size = 0,0
 texture = NO_TEXTURE
 background_color = 0,0,0
 
-htmlgauge00 = A32NX/ExtrasHost/extras-host.html,0,0,1,1
+htmlgauge00 = A32NX/ExtrasHost/extras-host.html?Airframe=A320_251N,0,0,1,1
 
 [VPainting01]
 size_mm = 2048,512

fbw-a32nx/src/systems/extras-host/index.ts

@@ -7,6 +7,7 @@ import { ExtrasSimVarPublisher } from 'extras-host/modules/common/ExtrasSimVarPu
 import { PushbuttonCheck } from 'extras-host/modules/pushbutton_check/PushbuttonCheck';
 import { KeyInterceptor } from './modules/key_interceptor/KeyInterceptor';
 import { VersionCheck } from './modules/version_check/VersionCheck';
+import { AircraftSync } from './modules/aircraft_sync/AircraftSync';
 
 /**
  * This is the main class for the extras-host instrument.
@@ -40,6 +41,10 @@ class ExtrasHost extends BaseInstrument {
 
     private readonly keyInterceptor: KeyInterceptor;
 
+    private readonly aircraftSync: AircraftSync;
+
+    public readonly xmlConfig: Document;
+
     /**
      * "mainmenu" = 0
      * "loading" = 1
@@ -58,8 +63,9 @@ class ExtrasHost extends BaseInstrument {
         this.notificationManager = new NotificationManager();
 
         this.pushbuttonCheck = new PushbuttonCheck(this.bus, this.notificationManager);
-        this.versionCheck = new VersionCheck(this.bus);
         this.keyInterceptor = new KeyInterceptor(this.bus, this.notificationManager);
+        this.versionCheck = new VersionCheck(process.env.AIRCRAFT_PROJECT_PREFIX, this.bus);
+        this.aircraftSync = new AircraftSync(process.env.AIRCRAFT_PROJECT_PREFIX, this.bus);
 
         console.log('A32NX_EXTRASHOST: Created');
     }
@@ -82,6 +88,12 @@ class ExtrasHost extends BaseInstrument {
         this.pushbuttonCheck.connectedCallback();
         this.versionCheck.connectedCallback();
         this.keyInterceptor.connectedCallback();
+        this.aircraftSync.connectedCallback();
+    }
+
+    public parseXMLConfig(): void {
+        super.parseXMLConfig();
+        this.aircraftSync.parseXMLConfig(this.xmlConfig);
     }
 
     public Update(): void {
@@ -94,6 +106,7 @@ class ExtrasHost extends BaseInstrument {
                 this.versionCheck.startPublish();
                 this.keyInterceptor.startPublish();
                 this.simVarPublisher.startPublish();
+                this.aircraftSync.startPublish();
             }
             this.gameState = gs;
         } else {
@@ -102,6 +115,7 @@ class ExtrasHost extends BaseInstrument {
 
         this.versionCheck.update();
         this.keyInterceptor.update();
+        this.aircraftSync.update();
     }
 }
 

fbw-a32nx/src/systems/extras-host/modules/aircraft_sync/AircraftSync.ts

@@ -0,0 +1,50 @@
+// Copyright (c) 2022 FlyByWire Simulations
+// SPDX-License-Identifier: GPL-3.0
+
+import { AircraftType } from '@flybywiresim/fbw-sdk';
+import { EventBus } from '@microsoft/msfs-sdk';
+
+/**
+ * This class is used to check the airframe of the aircraft and set the LVar
+ */
+export class AircraftSync {
+    public xmlConfig: Document
+
+    constructor(private readonly aircraftProjectPrefix: string, private readonly bus: EventBus) {
+        console.log('AircraftSync: Created');
+    }
+
+    public connectedCallback(): void {
+        // empty
+    }
+
+    public parseXMLConfig(xmlConfig: Document): void {
+        this.xmlConfig = xmlConfig;
+    }
+
+    // TODO: Remove this sync when VFS config is done.
+    // Replace with new function for commbus implementation to sync VFS markup config to WASM
+    public startPublish(): void {
+        console.log('AicraftSync: startPublish()');
+
+        const airframe = new URL(document.querySelectorAll('vcockpit-panel > *')[0].getAttribute('url')).searchParams.get('Airframe');
+        let aircraftType: AircraftType;
+
+        switch (airframe) {
+        case 'A380_842':
+            aircraftType = AircraftType.A380_842;
+            break;
+        case 'A320_251N':
+        default:
+            aircraftType = AircraftType.A320_251N;
+            break;
+        }
+
+        SimVar.SetSimVarValue('L:A32NX_AIRCRAFT_TYPE', 'enum', aircraftType);
+        console.log(`AirframeCheck: set ${aircraftType}`);
+    }
+
+    public update(): void {
+        // empty
+    }
+}

fbw-a32nx/src/systems/extras-host/modules/version_check/VersionCheck.ts

@@ -2,13 +2,13 @@
 // SPDX-License-Identifier: GPL-3.0
 
 import { EventBus } from '@microsoft/msfs-sdk';
-import { AircraftVersionChecker } from '@fbw-common/shared/AircraftVersionChecker';
+import { AircraftGithubVersionChecker } from '@fbw-common/shared/AircraftGithubVersionChecker';
 
 /**
  * This class is used to check the version of the aircraft and display a warning if it is too old.
  */
 export class VersionCheck {
-    constructor(private readonly bus: EventBus) {
+    constructor(private readonly aircraftProjectPrefix: string, private readonly bus: EventBus) {
         console.log('VersionCheck: Created');
     }
 
@@ -18,7 +18,7 @@ export class VersionCheck {
 
     public startPublish(): void {
         console.log('VersionCheck: startPublish()');
-        AircraftVersionChecker.checkVersion('a32nx');
+        AircraftGithubVersionChecker.checkVersion(this.aircraftProjectPrefix);
     }
 
     public update(): void {

fbw-a32nx/src/systems/instruments/buildSrc/plugins.mjs

@@ -79,6 +79,7 @@ export function baseCompile(instrumentName, instrumentFolder) {
             'process.env.CLIENT_SECRET': JSON.stringify(process.env.CLIENT_SECRET),
             'process.env.CHARTFOX_SECRET': JSON.stringify(process.env.CHARTFOX_SECRET),
             'process.env.SENTRY_DSN': JSON.stringify(process.env.SENTRY_DSN),
+            'process.env.AIRCRAFT_PROJECT_PREFIX': JSON.stringify(process.env.AIRCRAFT_PROJECT_PREFIX),
         }),
         postCss(instrumentName, instrumentFolder),
     ];

fbw-a32nx/src/systems/instruments/src/Common/index.tsx

@@ -15,7 +15,7 @@ export const render = (Slot: React.ReactElement, enableSentryTracing = false, se
     const doRender = () => {
         new FbwAircraftSentryClient().onInstrumentLoaded({
             dsn: process.env.SENTRY_DSN,
-            buildInfoFilePrefix: 'a32nx',
+            buildInfoFilePrefix: process.env.AIRCRAFT_PROJECT_PREFIX,
             enableTracing: enableSentryTracing,
             root: sentryRootClient,
         });

fbw-a32nx/src/systems/sentry-client/src/index.ts

@@ -8,7 +8,7 @@ declare const process: any;
 
 new FbwAircraftSentryClient().onInstrumentLoaded({
     dsn: process.env.SENTRY_DSN,
-    buildInfoFilePrefix: 'a32nx',
+    buildInfoFilePrefix: process.env.AIRCRAFT_PROJECT_PREFIX,
     root: false,
     enableTracing: false,
 });

fbw-a380x/.env

@@ -3,3 +3,4 @@ NODE_ENV=production
 CLIENT_SECRET=""
 CLIENT_ID=""
 SENTRY_DSN=""
+AIRCRAFT_PROJECT_PREFIX="a380x"

fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/panel/panel.cfg

@@ -120,7 +120,7 @@ size_mm=1430,1000
 pixel_size=1430,1000
 texture=$SCREEN_EFB
 
-htmlgauge00=A380X/EFB/efb.html?Airframe=A380_842, 0,0,1430,1000
+htmlgauge00=A380X/EFB/efb.html, 0,0,1430,1000
 
 [VCockpit16]
 size_mm=1664,1024
@@ -168,4 +168,4 @@ pixel_size=0,0
 texture=NO_TEXTURE
 background_color=0,0,0
 
-htmlgauge04=A380X/ExtrasHost/extras-host.html,0,0,1,1
+htmlgauge04=A380X/ExtrasHost/extras-host.html?Airframe=A380_842,0,0,1,1