refactor: Refactor pushback for multi aircraft and tune for A320/A380…

… (#8465), fix(EFB): Missing translation function calls
Horizon-Simulations · Feb 27, 2024 · 79d4f3a · 79d4f3a
1 parent e83f98b
commit 79d4f3a
Show file tree

Hide file tree

Showing 65 changed files with 1,652 additions and 3,220 deletions.
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -11,7 +11,7 @@ jobs:
   build-a318:
     runs-on: ubuntu-latest
     env:
-      A32NX_PRODUCTION_BUILD: 1
+      FBW_PRODUCTION_BUILD: 1
       A32NX_INSTRUMENTS_BUILD_WORKERS: 2
       PRE_RELEASE_ID: 64125785
       PRE_RELEASE_TAG: vdev
@@ -38,7 +38,7 @@ jobs:
         run: echo "BUILT_DATE_TIME=$(date -u -Iseconds)" >> $GITHUB_ENV
       - name: Create .env file
         run: |
-          echo A32NX_PRODUCTION_BUILD=1 >> hsim-a318ceo/.env
+          echo FBW_PRODUCTION_BUILD=1 >> hsim-a318ceo/.env
           echo CLIENT_ID=\"${{ secrets.NAVIGRAPH_CLIENT_ID }}\" >> hsim-a318ceo/.env
           echo CLIENT_SECRET=\"${{ secrets.NAVIGRAPH_CLIENT_SECRET }}\" >> hsim-a318ceo/.env
           echo SENTRY_DSN=\"${{ secrets.SENTRY_DSN }}\" >> hsim-a318ceo/.env
@@ -84,7 +84,7 @@ jobs:
   build-a319:
     runs-on: ubuntu-latest
     env:
-      A32NX_PRODUCTION_BUILD: 1
+      FBW_PRODUCTION_BUILD: 1
       A32NX_INSTRUMENTS_BUILD_WORKERS: 2
       PRE_RELEASE_ID: 64125785
       PRE_RELEASE_TAG: vdev
@@ -111,7 +111,7 @@ jobs:
         run: echo "BUILT_DATE_TIME=$(date -u -Iseconds)" >> $GITHUB_ENV
       - name: Create .env file
         run: |
-          echo A32NX_PRODUCTION_BUILD=1 >> hsim-a319ceo/.env
+          echo FBW_PRODUCTION_BUILD=1 >> hsim-a319ceo/.env
           echo CLIENT_ID=\"${{ secrets.NAVIGRAPH_CLIENT_ID }}\" >> hsim-a319ceo/.env
           echo CLIENT_SECRET=\"${{ secrets.NAVIGRAPH_CLIENT_SECRET }}\" >> hsim-a319ceo/.env
           echo SENTRY_DSN=\"${{ secrets.SENTRY_DSN }}\" >> hsim-a319ceo/.env
@@ -157,7 +157,7 @@ jobs:
   build-a320:
     runs-on: ubuntu-latest
     env:
-      A32NX_PRODUCTION_BUILD: 1
+      FBW_PRODUCTION_BUILD: 1
       A32NX_INSTRUMENTS_BUILD_WORKERS: 2
       PRE_RELEASE_ID: 64125785
       PRE_RELEASE_TAG: vdev
@@ -184,7 +184,7 @@ jobs:
         run: echo "BUILT_DATE_TIME=$(date -u -Iseconds)" >> $GITHUB_ENV
       - name: Create .env file
         run: |
-          echo A32NX_PRODUCTION_BUILD=1 >> hsim-a320ceo/.env
+          echo FBW_PRODUCTION_BUILD=1 >> hsim-a320ceo/.env
           echo CLIENT_ID=\"${{ secrets.NAVIGRAPH_CLIENT_ID }}\" >> hsim-a320ceo/.env
           echo CLIENT_SECRET=\"${{ secrets.NAVIGRAPH_CLIENT_SECRET }}\" >> hsim-a320ceo/.env
           echo SENTRY_DSN=\"${{ secrets.SENTRY_DSN }}\" >> hsim-a320ceo/.env
@@ -230,7 +230,7 @@ jobs:
   build-a321:
     runs-on: ubuntu-latest
     env:
-      A32NX_PRODUCTION_BUILD: 1
+      FBW_PRODUCTION_BUILD: 1
       A32NX_INSTRUMENTS_BUILD_WORKERS: 2
       PRE_RELEASE_ID: 64125785
       PRE_RELEASE_TAG: vdev
@@ -257,7 +257,7 @@ jobs:
         run: echo "BUILT_DATE_TIME=$(date -u -Iseconds)" >> $GITHUB_ENV
       - name: Create .env file
         run: |
-          echo A32NX_PRODUCTION_BUILD=1 >> hsim-a321neo/.env
+          echo FBW_PRODUCTION_BUILD=1 >> hsim-a321neo/.env
           echo CLIENT_ID=\"${{ secrets.NAVIGRAPH_CLIENT_ID }}\" >> hsim-a321neo/.env
           echo CLIENT_SECRET=\"${{ secrets.NAVIGRAPH_CLIENT_SECRET }}\" >> hsim-a321neo/.env
           echo SENTRY_DSN=\"${{ secrets.SENTRY_DSN }}\" >> hsim-a321neo/.env

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
@@ -8,7 +8,7 @@ jobs:
   build-a318:
     runs-on: ubuntu-latest
     env:
-      A32NX_PRODUCTION_BUILD: 1
+      FBW_PRODUCTION_BUILD: 1
       A32NX_INSTRUMENTS_BUILD_WORKERS: 2
       PRE_RELEASE_ID: 64125785
       PRE_RELEASE_TAG: vmain
@@ -33,7 +33,7 @@ jobs:
         run: echo "BUILT_DATE_TIME=$(date -u -Iseconds)" >> $GITHUB_ENV
       - name: Create .env file
         run: |
-          echo A32NX_PRODUCTION_BUILD=1 >> hsim-a318ceo/.env
+          echo FBW_PRODUCTION_BUILD=1 >> hsim-a318ceo/.env
           echo CLIENT_ID=\"${{ secrets.NAVIGRAPH_CLIENT_ID }}\" >> hsim-a318ceo/.env
           echo CLIENT_SECRET=\"${{ secrets.NAVIGRAPH_CLIENT_SECRET }}\" >> hsim-a318ceo/.env
           echo SENTRY_DSN=\"${{ secrets.SENTRY_DSN }}\" >> hsim-a318ceo/.env
@@ -76,7 +76,7 @@ jobs:
   build-a319:
     runs-on: ubuntu-latest
     env:
-      A32NX_PRODUCTION_BUILD: 1
+      FBW_PRODUCTION_BUILD: 1
       A32NX_INSTRUMENTS_BUILD_WORKERS: 2
       PRE_RELEASE_ID: 64125785
       PRE_RELEASE_TAG: vmain
@@ -101,7 +101,7 @@ jobs:
         run: echo "BUILT_DATE_TIME=$(date -u -Iseconds)" >> $GITHUB_ENV
       - name: Create .env file
         run: |
-          echo A32NX_PRODUCTION_BUILD=1 >> hsim-a319ceo/.env
+          echo FBW_PRODUCTION_BUILD=1 >> hsim-a319ceo/.env
           echo CLIENT_ID=\"${{ secrets.NAVIGRAPH_CLIENT_ID }}\" >> hsim-a319ceo/.env
           echo CLIENT_SECRET=\"${{ secrets.NAVIGRAPH_CLIENT_SECRET }}\" >> hsim-a319ceo/.env
           echo SENTRY_DSN=\"${{ secrets.SENTRY_DSN }}\" >> hsim-a319ceo/.env
@@ -144,7 +144,7 @@ jobs:
   build-a320:
     runs-on: ubuntu-latest
     env:
-      A32NX_PRODUCTION_BUILD: 1
+      FBW_PRODUCTION_BUILD: 1
       A32NX_INSTRUMENTS_BUILD_WORKERS: 2
       PRE_RELEASE_ID: 64125785
       PRE_RELEASE_TAG: vmain
@@ -169,7 +169,7 @@ jobs:
         run: echo "BUILT_DATE_TIME=$(date -u -Iseconds)" >> $GITHUB_ENV
       - name: Create .env file
         run: |
-          echo A32NX_PRODUCTION_BUILD=1 >> hsim-a320ceo/.env
+          echo FBW_PRODUCTION_BUILD=1 >> hsim-a320ceo/.env
           echo CLIENT_ID=\"${{ secrets.NAVIGRAPH_CLIENT_ID }}\" >> hsim-a320ceo/.env
           echo CLIENT_SECRET=\"${{ secrets.NAVIGRAPH_CLIENT_SECRET }}\" >> hsim-a320ceo/.env
           echo SENTRY_DSN=\"${{ secrets.SENTRY_DSN }}\" >> hsim-a320ceo/.env
@@ -212,7 +212,7 @@ jobs:
   build-a321:
     runs-on: ubuntu-latest
     env:
-      A32NX_PRODUCTION_BUILD: 1
+      FBW_PRODUCTION_BUILD: 1
       A32NX_INSTRUMENTS_BUILD_WORKERS: 2
       PRE_RELEASE_ID: 64125785
       PRE_RELEASE_TAG: vmain
@@ -237,7 +237,7 @@ jobs:
         run: echo "BUILT_DATE_TIME=$(date -u -Iseconds)" >> $GITHUB_ENV
       - name: Create .env file
         run: |
-          echo A32NX_PRODUCTION_BUILD=1 >> hsim-a321neo/.env
+          echo FBW_PRODUCTION_BUILD=1 >> hsim-a321neo/.env
           echo CLIENT_ID=\"${{ secrets.NAVIGRAPH_CLIENT_ID }}\" >> hsim-a321neo/.env
           echo CLIENT_SECRET=\"${{ secrets.NAVIGRAPH_CLIENT_SECRET }}\" >> hsim-a321neo/.env
           echo SENTRY_DSN=\"${{ secrets.SENTRY_DSN }}\" >> hsim-a321neo/.env

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,7 +8,7 @@ jobs:
   build-a318:
     runs-on: ubuntu-latest
     env:
-      A32NX_PRODUCTION_BUILD: 1
+      FBW_PRODUCTION_BUILD: 1
       A32NX_INSTRUMENTS_BUILD_WORKERS: 2
       PRE_RELEASE_ID: 64125785
       PRE_RELEASE_TAG: vmain
@@ -35,7 +35,7 @@ jobs:
         run: echo "BUILT_DATE_TIME=$(date -u -Iseconds)" >> $GITHUB_ENV
       - name: Create .env file
         run: |
-          echo A32NX_PRODUCTION_BUILD=1 >> hsim-a318ceo/.env
+          echo FBW_PRODUCTION_BUILD=1 >> hsim-a318ceo/.env
           echo CLIENT_ID=\"${{ secrets.NAVIGRAPH_CLIENT_ID }}\" >> hsim-a318ceo/.env
           echo CLIENT_SECRET=\"${{ secrets.NAVIGRAPH_CLIENT_SECRET }}\" >> hsim-a318ceo/.env
           echo SENTRY_DSN=\"${{ secrets.SENTRY_DSN }}\" >> hsim-a318ceo/.env
@@ -86,7 +86,7 @@ jobs:
   build-a319:
     runs-on: ubuntu-latest
     env:
-      A32NX_PRODUCTION_BUILD: 1
+      FBW_PRODUCTION_BUILD: 1
       A32NX_INSTRUMENTS_BUILD_WORKERS: 2
       PRE_RELEASE_ID: 64125785
       PRE_RELEASE_TAG: vmain
@@ -113,7 +113,7 @@ jobs:
         run: echo "BUILT_DATE_TIME=$(date -u -Iseconds)" >> $GITHUB_ENV
       - name: Create .env file
         run: |
-          echo A32NX_PRODUCTION_BUILD=1 >> hsim-a319ceo/.env
+          echo FBW_PRODUCTION_BUILD=1 >> hsim-a319ceo/.env
           echo CLIENT_ID=\"${{ secrets.NAVIGRAPH_CLIENT_ID }}\" >> hsim-a319ceo/.env
           echo CLIENT_SECRET=\"${{ secrets.NAVIGRAPH_CLIENT_SECRET }}\" >> hsim-a319ceo/.env
           echo SENTRY_DSN=\"${{ secrets.SENTRY_DSN }}\" >> hsim-a319ceo/.env
@@ -164,7 +164,7 @@ jobs:
   build-a320:
     runs-on: ubuntu-latest
     env:
-      A32NX_PRODUCTION_BUILD: 1
+      FBW_PRODUCTION_BUILD: 1
       A32NX_INSTRUMENTS_BUILD_WORKERS: 2
       PRE_RELEASE_ID: 64125785
       PRE_RELEASE_TAG: vmain
@@ -191,7 +191,7 @@ jobs:
         run: echo "BUILT_DATE_TIME=$(date -u -Iseconds)" >> $GITHUB_ENV
       - name: Create .env file
         run: |
-          echo A32NX_PRODUCTION_BUILD=1 >> hsim-a320ceo/.env
+          echo FBW_PRODUCTION_BUILD=1 >> hsim-a320ceo/.env
           echo CLIENT_ID=\"${{ secrets.NAVIGRAPH_CLIENT_ID }}\" >> hsim-a320ceo/.env
           echo CLIENT_SECRET=\"${{ secrets.NAVIGRAPH_CLIENT_SECRET }}\" >> hsim-a320ceo/.env
           echo SENTRY_DSN=\"${{ secrets.SENTRY_DSN }}\" >> hsim-a320ceo/.env
@@ -242,7 +242,7 @@ jobs:
   build-a321:
     runs-on: ubuntu-latest
     env:
-      A32NX_PRODUCTION_BUILD: 1
+      FBW_PRODUCTION_BUILD: 1
       A32NX_INSTRUMENTS_BUILD_WORKERS: 2
       PRE_RELEASE_ID: 64125785
       PRE_RELEASE_TAG: vmain
@@ -269,7 +269,7 @@ jobs:
         run: echo "BUILT_DATE_TIME=$(date -u -Iseconds)" >> $GITHUB_ENV
       - name: Create .env file
         run: |
-          echo A32NX_PRODUCTION_BUILD=1 >> hsim-a321neo/.env
+          echo FBW_PRODUCTION_BUILD=1 >> hsim-a321neo/.env
           echo CLIENT_ID=\"${{ secrets.NAVIGRAPH_CLIENT_ID }}\" >> hsim-a321neo/.env
           echo CLIENT_SECRET=\"${{ secrets.NAVIGRAPH_CLIENT_SECRET }}\" >> hsim-a321neo/.env
           echo SENTRY_DSN=\"${{ secrets.SENTRY_DSN }}\" >> hsim-a321neo/.env

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,7 +11,7 @@ jobs:
   build-a318:
     runs-on: ubuntu-latest
     env:
-      A32NX_PRODUCTION_BUILD: 1
+      FBW_PRODUCTION_BUILD: 1
       A32NX_INSTRUMENTS_BUILD_WORKERS: 2
       PRE_RELEASE_ID: 64125785
       PRE_RELEASE_TAG: vstable
@@ -38,7 +38,7 @@ jobs:
         run: echo "BUILT_DATE_TIME=$(date -u -Iseconds)" >> $GITHUB_ENV
       - name: Create .env file
         run: |
-          echo A32NX_PRODUCTION_BUILD=1 >> hsim-a318ceo/.env
+          echo FBW_PRODUCTION_BUILD=1 >> hsim-a318ceo/.env
           echo CLIENT_ID=\"${{ secrets.NAVIGRAPH_CLIENT_ID }}\" >> hsim-a318ceo/.env
           echo CLIENT_SECRET=\"${{ secrets.NAVIGRAPH_CLIENT_SECRET }}\" >> hsim-a318ceo/.env
           echo SENTRY_DSN=\"${{ secrets.SENTRY_DSN }}\" >> hsim-a318ceo/.env
@@ -84,7 +84,7 @@ jobs:
   build-a319:
     runs-on: ubuntu-latest
     env:
-      A32NX_PRODUCTION_BUILD: 1
+      FBW_PRODUCTION_BUILD: 1
       A32NX_INSTRUMENTS_BUILD_WORKERS: 2
       PRE_RELEASE_ID: 64125785
       PRE_RELEASE_TAG: vstable
@@ -111,7 +111,7 @@ jobs:
         run: echo "BUILT_DATE_TIME=$(date -u -Iseconds)" >> $GITHUB_ENV
       - name: Create .env file
         run: |
-          echo A32NX_PRODUCTION_BUILD=1 >> hsim-a319ceo/.env
+          echo FBW_PRODUCTION_BUILD=1 >> hsim-a319ceo/.env
           echo CLIENT_ID=\"${{ secrets.NAVIGRAPH_CLIENT_ID }}\" >> hsim-a319ceo/.env
           echo CLIENT_SECRET=\"${{ secrets.NAVIGRAPH_CLIENT_SECRET }}\" >> hsim-a319ceo/.env
           echo SENTRY_DSN=\"${{ secrets.SENTRY_DSN }}\" >> hsim-a319ceo/.env
@@ -157,7 +157,7 @@ jobs:
   build-a320:
     runs-on: ubuntu-latest
     env:
-      A32NX_PRODUCTION_BUILD: 1
+      FBW_PRODUCTION_BUILD: 1
       A32NX_INSTRUMENTS_BUILD_WORKERS: 2
       PRE_RELEASE_ID: 64125785
       PRE_RELEASE_TAG: vstable
@@ -184,7 +184,7 @@ jobs:
         run: echo "BUILT_DATE_TIME=$(date -u -Iseconds)" >> $GITHUB_ENV
       - name: Create .env file
         run: |
-          echo A32NX_PRODUCTION_BUILD=1 >> hsim-a320ceo/.env
+          echo FBW_PRODUCTION_BUILD=1 >> hsim-a320ceo/.env
           echo CLIENT_ID=\"${{ secrets.NAVIGRAPH_CLIENT_ID }}\" >> hsim-a320ceo/.env
           echo CLIENT_SECRET=\"${{ secrets.NAVIGRAPH_CLIENT_SECRET }}\" >> hsim-a320ceo/.env
           echo SENTRY_DSN=\"${{ secrets.SENTRY_DSN }}\" >> hsim-a320ceo/.env
@@ -230,7 +230,7 @@ jobs:
   build-a321:
     runs-on: ubuntu-latest
     env:
-      A32NX_PRODUCTION_BUILD: 1
+      FBW_PRODUCTION_BUILD: 1
       A32NX_INSTRUMENTS_BUILD_WORKERS: 2
       PRE_RELEASE_ID: 64125785
       PRE_RELEASE_TAG: vstable
@@ -257,7 +257,7 @@ jobs:
         run: echo "BUILT_DATE_TIME=$(date -u -Iseconds)" >> $GITHUB_ENV
       - name: Create .env file
         run: |
-          echo A32NX_PRODUCTION_BUILD=1 >> hsim-a321neo/.env
+          echo FBW_PRODUCTION_BUILD=1 >> hsim-a321neo/.env
           echo CLIENT_ID=\"${{ secrets.NAVIGRAPH_CLIENT_ID }}\" >> hsim-a321neo/.env
           echo CLIENT_SECRET=\"${{ secrets.NAVIGRAPH_CLIENT_SECRET }}\" >> hsim-a321neo/.env
           echo SENTRY_DSN=\"${{ secrets.SENTRY_DSN }}\" >> hsim-a321neo/.env

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -52,5 +52,5 @@ add_definitions(
 # add the common components
 add_subdirectory(fbw-common/src/wasm)
 
-# add the A318 components
-add_subdirectory(build-a318ceo/src/wasm)
+# add the A321 components
+add_subdirectory(build-a321neo/src/wasm)
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,9 +3,9 @@ resolver = "2"
 exclude = ["a32nx"]
 
 members = [
-    "build-a318ceo/src/wasm/systems/a320_systems",
-    "build-a318ceo/src/wasm/systems/a320_systems_wasm",
-    "build-a318ceo/src/wasm/systems/a320_hydraulic_simulation_graphs",
+    "build-a321neo/src/wasm/systems/a320_systems",
+    "build-a321neo/src/wasm/systems/a320_systems_wasm",
+    "build-a321neo/src/wasm/systems/a320_hydraulic_simulation_graphs",
     "fbw-common/src/wasm/systems/systems",
     "fbw-common/src/wasm/systems/systems_wasm",
 ]

diff --git a/Cargo_a321.toml b/Cargo_a321.toml
@@ -20,4 +20,4 @@ strip = true
 opt-level=1
 lto = false
 debug-assertions=true
-debug=true
+debug=true
diff --git a/hsim-a21n-common/src/systems/tsconfig.json b/hsim-a21n-common/src/systems/tsconfig.json
@@ -11,14 +11,15 @@
     "jsx": "react",
     "skipLibCheck": true,
     "paths": {
-      "@datalink/aoc": ["datalink/aoc/src/index.ts"],
-      "@datalink/atc": ["datalink/atc/src/index.ts"],
-      "@datalink/common": ["datalink/common/src/index.ts"],
-      "@datalink/router": ["datalink/router/src/index.ts"],
+//      "@datalink/aoc": ["datalink/aoc/src/index.ts"],
+//      "@datalink/atc": ["datalink/atc/src/index.ts"],
+//      "@datalink/common": ["datalink/common/src/index.ts"],
+//      "@datalink/router": ["datalink/router/src/index.ts"],
       "@fmgc/*": ["../../../build-a321neo/src/systems/fmgc/src/*"],
       "@shared/*": ["../../../build-a321neo/src/systems/shared/src/*"],
       "@typings/*": ["../typings/*"],
-      "@flybywiresim/fbw-sdk": ["./index.ts"]
+      "@flybywiresim/fbw-sdk": ["./index.ts"],
+      "@flybywiresim/flypad": ["./instruments/src/EFB/index.ts"]
     }
   }
-}
+}
diff --git a/hsim-a318-common/src/systems/tsconfig.json b/hsim-a318-common/src/systems/tsconfig.json
@@ -11,14 +11,15 @@
     "jsx": "react",
     "skipLibCheck": true,
     "paths": {
-      "@datalink/aoc": ["datalink/aoc/src/index.ts"],
-      "@datalink/atc": ["datalink/atc/src/index.ts"],
-      "@datalink/common": ["datalink/common/src/index.ts"],
-      "@datalink/router": ["datalink/router/src/index.ts"],
+//      "@datalink/aoc": ["datalink/aoc/src/index.ts"],
+//      "@datalink/atc": ["datalink/atc/src/index.ts"],
+//      "@datalink/common": ["datalink/common/src/index.ts"],
+//      "@datalink/router": ["datalink/router/src/index.ts"],
       "@fmgc/*": ["../../../build-a318ceo/src/systems/fmgc/src/*"],
       "@shared/*": ["../../../build-a318ceo/src/systems/shared/src/*"],
       "@typings/*": ["../typings/*"],
-      "@flybywiresim/fbw-sdk": ["./index.ts"]
+      "@flybywiresim/fbw-sdk": ["./index.ts"],
+      "@flybywiresim/flypad": ["./instruments/src/EFB/index.ts"]
     }
   }
-}
+}
diff --git a/hsim-a318ceo/mach.config.js b/hsim-a318ceo/mach.config.js
@@ -17,7 +17,7 @@ module.exports = {
             extract: true,
             postcss: {
                 plugins: [
-                    tailwind('src/systems/instruments/src/EFB/tailwind.config.js'),
+                    tailwind('../fbw-common/src/systems/instruments/src/EFB/tailwind.config.js'),
 
                     // transform: hsl(x y z / alpha) -> hsl(x, y, z, alpha)
                     postCssColorFunctionalNotation(),