[fbw] fix(GSX): Fixed GSX pin not actually disabling NWS (#8403) & Ai…

…rcraft State fix
Horizon-Simulations · Jan 16, 2024 · e9564df · e9564df
1 parent 5774312
commit e9564df
Show file tree

Hide file tree

Showing 29 changed files with 75 additions and 348 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -53,13 +53,4 @@ add_definitions(
 add_subdirectory(fbw-common/src/wasm)
 
 # add the A318 components
-add_subdirectory(hsim-a318ceo/src/wasm)
-
-# add the A319 components
-add_subdirectory(hsim-a319ceo/src/wasm)
-
-# add the A320 components
-add_subdirectory(hsim-a320ceo/src/wasm)
-
-# add the A321 components
-add_subdirectory(hsim-a321neo/src/wasm)
+add_subdirectory(build-a318ceo/src/wasm)
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,9 +3,9 @@ resolver = "2"
 exclude = ["a32nx"]
 
 members = [
-    "build-a321neo/src/wasm/systems/a320_systems",
-    "build-a321neo/src/wasm/systems/a320_systems_wasm",
-    "build-a321neo/src/wasm/systems/a320_hydraulic_simulation_graphs",
+    "build-a318ceo/src/wasm/systems/a320_systems",
+    "build-a318ceo/src/wasm/systems/a320_systems_wasm",
+    "build-a318ceo/src/wasm/systems/a320_hydraulic_simulation_graphs",
     "fbw-common/src/wasm/systems/systems",
     "fbw-common/src/wasm/systems/systems_wasm",
 ]

diff --git a/a318ceo-igniter.config.mjs b/a318ceo-igniter.config.mjs
@@ -13,6 +13,10 @@ export default new TaskOfTasks("all", [
                     "copy-cargo-config",
                     "npm run build-a318ceo:copy-cargo-config"
                 ),
+                new ExecTask(
+                    "copy-cmake-config",
+                    "npm run build-a318ceo:copy-cmake-config"
+                ),
                 new TaskOfTasks(
                     "localization",
                     [
@@ -146,7 +150,7 @@ export default new TaskOfTasks("all", [
                 ),
                 new ExecTask(
                     "extra-backend-a32nx",
-                    "npm run build-a318ceo:extra-backend-a32nx",
+                    "npm run build-a318ceo:cpp-wasm-cmake",
                     [
                         'fbw-common/src/wasm/cpp-msfs-framework',
                         'fbw-common/src/wasm/extra-backend',

diff --git a/a319ceo-igniter.config.mjs b/a319ceo-igniter.config.mjs
@@ -13,6 +13,10 @@ export default new TaskOfTasks("all", [
                     "copy-cargo-config",
                     "npm run build-a319ceo:copy-cargo-config"
                 ),
+                new ExecTask(
+                    "copy-cargo-config",
+                    "npm run build-a319ceo:copy-cmake-config"
+                ),
                 new TaskOfTasks(
                     "localization",
                     [
@@ -160,7 +164,7 @@ export default new TaskOfTasks("all", [
                 ),
                 new ExecTask(
                     "extra-backend-a32nx",
-                    "npm run build-a319ceo:extra-backend-a32nx",
+                    "npm run build-a319ceo:cpp-wasm-cmake",
                     [
                         'fbw-common/src/wasm/cpp-msfs-framework',
                         'fbw-common/src/wasm/extra-backend',

diff --git a/a320ceo-igniter.config.mjs b/a320ceo-igniter.config.mjs
@@ -13,6 +13,10 @@ export default new TaskOfTasks("all", [
                     "copy-cargo-config",
                     "npm run build-a320ceo:copy-cargo-config"
                 ),
+                new ExecTask(
+                    "copy-cmake-config",
+                    "npm run build-a320ceo:copy-cmake-config"
+                ),
                 new TaskOfTasks(
                     "localization",
                     [
@@ -164,7 +168,7 @@ export default new TaskOfTasks("all", [
                 ),
                 new ExecTask(
                     "extra-backend-a32nx",
-                    "npm run build-a320ceo:extra-backend-a32nx",
+                    "npm run build-a320ceo:cpp-wasm-cmake",
                     [
                         'fbw-common/src/wasm/cpp-msfs-framework',
                         'fbw-common/src/wasm/extra-backend',

diff --git a/a321neo-igniter.config.mjs b/a321neo-igniter.config.mjs
@@ -13,6 +13,10 @@ export default new TaskOfTasks("all", [
                     "copy-cargo-config",
                     "npm run build-a321neo:copy-cargo-config"
                 ),
+                new ExecTask(
+                    "copy-cmake-config",
+                    "npm run build-a321neo:copy-cmake-config"
+                ),
                 new TaskOfTasks(
                     "localization",
                     [
@@ -156,7 +160,7 @@ export default new TaskOfTasks("all", [
                 ),
                 new ExecTask(
                     "extra-backend-a32nx",
-                    "npm run build-a321neo:extra-backend-a32nx",
+                    "npm run build-a321neo:cpp-wasm-cmake",
                     [
                         'fbw-common/src/wasm/cpp-msfs-framework',
                         'fbw-common/src/wasm/extra-backend',

diff --git a/flybywire b/flybywire
diff --git a/hsim-a318ceo/src/behavior/src/A32NX_Exterior.xml b/hsim-a318ceo/src/behavior/src/A32NX_Exterior.xml
@@ -214,7 +214,7 @@
         <DefaultTemplateParameters>
             <GND_ENABLE_OVRD></GND_ENABLE_OVRD>
             <GND_EQUIPMENT_LOGIC>
-                (A:SIM ON GROUND, bool) (L:A32NX_ENGINE_N1:1, Number) 3.5 &lt; and (L:A32NX_ENGINE_N1:2, Number) 3.5 &lt; and (L:A32NX_HYD_NW_STRG_DISC_ECAM_MEMO, bool) 0 == and (A:LIGHT BEACON, bool) 0 == and
+                (A:SIM ON GROUND, bool) (L:A32NX_ENGINE_N1:1, Number) 3.5 &lt; and (L:A32NX_ENGINE_N1:2, Number) 3.5 &lt; and (L:A32NX_HYD_NW_STRG_DISC_ECAM_MEMO, bool) 0 == and (A:LIGHT BEACON, bool) 0 == and (L:FSDT_GSX_DEPARTURE_STATE, number) 2 &lt;= (L:FSDT_GSX_DEPARTURE_STATE, number) 6 == or and
             </GND_EQUIPMENT_LOGIC>
         </DefaultTemplateParameters>
         <Component ID="#NODE_ID#" Node="#NODE_ID#">

diff --git a/hsim-a318ceo/src/wasm/CMakeLists.txt b/hsim-a318ceo/src/wasm/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 # folder structure
-set(OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../out/lvfr-horizonsim-airbus-a318-ceo/SimObjects/Airplanes/A318ceoCFM/panel)
+set(OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-a318ceo/out/lvfr-horizonsim-airbus-a318-ceo/SimObjects/Airplanes/A318ceoCFM/panel)
 
 # add compiler definitions
 add_definitions(-DA32NX)

diff --git a/hsim-a318ceo/src/wasm/extra-backend-a32nx/build.sh b/hsim-a318ceo/src/wasm/extra-backend-a32nx/build.sh
diff --git a/hsim-a318ceo/src/wasm/systems/a320_systems_wasm/src/lib.rs b/hsim-a318ceo/src/wasm/systems/a320_systems_wasm/src/lib.rs
@@ -368,6 +368,14 @@ async fn systems(mut gauge: msfs::Gauge) -> Result<(), Box<dyn Error>> {
     .provides_named_variable("FSDT_GSX_NUMPASSENGERS_DEBOARDING_TOTAL")?
     .provides_named_variable("FSDT_GSX_BOARDING_CARGO_PERCENT")?
     .provides_named_variable("FSDT_GSX_DEBOARDING_CARGO_PERCENT")?
+    .provides_named_variable("FSDT_GSX_BYPASS_PIN")?
+    .with_aspect(|builder| {
+        builder.copy(
+            Variable::named("FSDT_GSX_BYPASS_PIN"),
+            Variable::aspect("EXTERNAL_BYPASS_PIN_INSERTED"),
+        );
+        Ok(())
+    })?
     .provides_aircraft_variable(
         "ROTATION ACCELERATION BODY X",
         "radian per second squared",

diff --git a/hsim-a319ceo/src/behavior/src/A32NX_Exterior.xml b/hsim-a319ceo/src/behavior/src/A32NX_Exterior.xml
@@ -214,7 +214,7 @@
         <DefaultTemplateParameters>
             <GND_ENABLE_OVRD></GND_ENABLE_OVRD>
             <GND_EQUIPMENT_LOGIC>
-                (A:SIM ON GROUND, bool) (L:A32NX_ENGINE_N1:1, Number) 3.5 &lt; and (L:A32NX_ENGINE_N1:2, Number) 3.5 &lt; and (L:A32NX_HYD_NW_STRG_DISC_ECAM_MEMO, bool) 0 == and (A:LIGHT BEACON, bool) 0 == and
+                (A:SIM ON GROUND, bool) (L:A32NX_ENGINE_N1:1, Number) 3.5 &lt; and (L:A32NX_ENGINE_N1:2, Number) 3.5 &lt; and (L:A32NX_HYD_NW_STRG_DISC_ECAM_MEMO, bool) 0 == and (A:LIGHT BEACON, bool) 0 == and (L:FSDT_GSX_DEPARTURE_STATE, number) 2 &lt;= (L:FSDT_GSX_DEPARTURE_STATE, number) 6 == or and
             </GND_EQUIPMENT_LOGIC>
         </DefaultTemplateParameters>
         <Component ID="#NODE_ID#" Node="#NODE_ID#">

diff --git a/hsim-a319ceo/src/wasm/CMakeLists.txt b/hsim-a319ceo/src/wasm/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 # folder structure
-set(OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../out/lvfr-horizonsim-airbus-a319-ceo/SimObjects/Airplanes/A319ceoCFM/panel)
+set(OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-a319ceo/out/lvfr-horizonsim-airbus-a319-ceo/SimObjects/Airplanes/A319ceoCFM/panel)
 
 # add compiler definitions
 add_definitions(-DA32NX)

diff --git a/hsim-a319ceo/src/wasm/extra-backend-a32nx/build.sh b/hsim-a319ceo/src/wasm/extra-backend-a32nx/build.sh
diff --git a/hsim-a319ceo/src/wasm/systems/a320_systems_wasm/src/lib.rs b/hsim-a319ceo/src/wasm/systems/a320_systems_wasm/src/lib.rs
@@ -368,6 +368,14 @@ async fn systems(mut gauge: msfs::Gauge) -> Result<(), Box<dyn Error>> {
     .provides_named_variable("FSDT_GSX_NUMPASSENGERS_DEBOARDING_TOTAL")?
     .provides_named_variable("FSDT_GSX_BOARDING_CARGO_PERCENT")?
     .provides_named_variable("FSDT_GSX_DEBOARDING_CARGO_PERCENT")?
+    .provides_named_variable("FSDT_GSX_BYPASS_PIN")?
+    .with_aspect(|builder| {
+        builder.copy(
+            Variable::named("FSDT_GSX_BYPASS_PIN"),
+            Variable::aspect("EXTERNAL_BYPASS_PIN_INSERTED"),
+        );
+        Ok(())
+    })?
     .provides_aircraft_variable(
         "ROTATION ACCELERATION BODY X",
         "radian per second squared",

diff --git a/hsim-a320ceo/src/behavior/src/A32NX_Exterior.xml b/hsim-a320ceo/src/behavior/src/A32NX_Exterior.xml
@@ -214,7 +214,7 @@
         <DefaultTemplateParameters>
             <GND_ENABLE_OVRD></GND_ENABLE_OVRD>
             <GND_EQUIPMENT_LOGIC>
-                (A:SIM ON GROUND, bool) (L:A32NX_ENGINE_N1:1, Number) 3.5 &lt; and (L:A32NX_ENGINE_N1:2, Number) 3.5 &lt; and (L:A32NX_HYD_NW_STRG_DISC_ECAM_MEMO, bool) 0 == and (A:LIGHT BEACON, bool) 0 == and
+                (A:SIM ON GROUND, bool) (L:A32NX_ENGINE_N1:1, Number) 3.5 &lt; and (L:A32NX_ENGINE_N1:2, Number) 3.5 &lt; and (L:A32NX_HYD_NW_STRG_DISC_ECAM_MEMO, bool) 0 == and (A:LIGHT BEACON, bool) 0 == and (L:FSDT_GSX_DEPARTURE_STATE, number) 2 &lt;= (L:FSDT_GSX_DEPARTURE_STATE, number) 6 == or and
             </GND_EQUIPMENT_LOGIC>
         </DefaultTemplateParameters>
         <Component ID="#NODE_ID#" Node="#NODE_ID#">

diff --git a/hsim-a320ceo/src/wasm/CMakeLists.txt b/hsim-a320ceo/src/wasm/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 # folder structure
-set(OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../out/lvfr-horizonsim-airbus-a320-ceo/SimObjects/Airplanes/A320ceoCFM/panel)
+set(OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-a320ceo/out/lvfr-horizonsim-airbus-a320-ceo/SimObjects/Airplanes/A320ceoCFM/panel)
 
 # add compiler definitions
 add_definitions(-DA32NX)
+6 −0		.github/CHANGELOG.md
+0 −84		.github/workflows/experimental.yml
+2 −3		.github/workflows/ingamepanels-checklist-fix.yml
+91 −11		.github/workflows/master.yml
+1 −1		.github/workflows/pr-target.yml
+60 −14		.github/workflows/pr.yml
+4 −4		.github/workflows/pre-release.yml
+4 −4		.github/workflows/release.yml
+1 −1		build-utils.js
+0 −4		fbw-a32nx/docs/a320-simvars.md
+2 −2		fbw-a32nx/src/base/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/GSX.cfg
+1 −1		fbw-a32nx/src/base/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/flight_model.cfg
+1 −1		fbw-a32nx/src/base/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/model/A320_NEO.xml
+1 −0		fbw-a32nx/src/base/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/systems.cfg
+0 −9		...src/base/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/_FlyByWire_A320_NEO-CHRISTMAS/MODEL.FBW/model.cfg
+ −		...20-neo/SimObjects/AirPlanes/_FlyByWire_A320_NEO-CHRISTMAS/TEXTURE.FBW/A320NEO_AIRFRAME_ENGINES_ALBD.PNG.DDS
+0 −1		...o/SimObjects/AirPlanes/_FlyByWire_A320_NEO-CHRISTMAS/TEXTURE.FBW/A320NEO_AIRFRAME_ENGINES_ALBD.PNG.DDS.json
+ −		...0-neo/SimObjects/AirPlanes/_FlyByWire_A320_NEO-CHRISTMAS/TEXTURE.FBW/A320NEO_AIRFRAME_FUSELAGE_ALBD.PNG.DDS
+0 −1		.../SimObjects/AirPlanes/_FlyByWire_A320_NEO-CHRISTMAS/TEXTURE.FBW/A320NEO_AIRFRAME_FUSELAGE_ALBD.PNG.DDS.json
+ −		...0-neo/SimObjects/AirPlanes/_FlyByWire_A320_NEO-CHRISTMAS/TEXTURE.FBW/A320NEO_AIRFRAME_FUSELAGE_COMP.PNG.DDS
+0 −1		.../SimObjects/AirPlanes/_FlyByWire_A320_NEO-CHRISTMAS/TEXTURE.FBW/A320NEO_AIRFRAME_FUSELAGE_COMP.PNG.DDS.json
+ −		...320-neo/SimObjects/AirPlanes/_FlyByWire_A320_NEO-CHRISTMAS/TEXTURE.FBW/A320NEO_AIRFRAME_LIVERY_ALBD.PNG.DDS
+0 −1		...eo/SimObjects/AirPlanes/_FlyByWire_A320_NEO-CHRISTMAS/TEXTURE.FBW/A320NEO_AIRFRAME_LIVERY_ALBD.PNG.DDS.json
+ −		...o/SimObjects/AirPlanes/_FlyByWire_A320_NEO-CHRISTMAS/TEXTURE.FBW/A320NEO_AIRFRAME_LIVERY_TEXTS_ALBD.PNG.DDS
+0 −1		...Objects/AirPlanes/_FlyByWire_A320_NEO-CHRISTMAS/TEXTURE.FBW/A320NEO_AIRFRAME_LIVERY_TEXTS_ALBD.PNG.DDS.json
+ −		...a320-neo/SimObjects/AirPlanes/_FlyByWire_A320_NEO-CHRISTMAS/TEXTURE.FBW/A320NEO_AIRFRAME_WINGS_ALBD.PNG.DDS
+0 −1		...neo/SimObjects/AirPlanes/_FlyByWire_A320_NEO-CHRISTMAS/TEXTURE.FBW/A320NEO_AIRFRAME_WINGS_ALBD.PNG.DDS.json
+ −		...a320-neo/SimObjects/AirPlanes/_FlyByWire_A320_NEO-CHRISTMAS/TEXTURE.FBW/A320NEO_AIRFRAME_WINGS_COMP.PNG.DDS
+0 −1		...neo/SimObjects/AirPlanes/_FlyByWire_A320_NEO-CHRISTMAS/TEXTURE.FBW/A320NEO_AIRFRAME_WINGS_COMP.PNG.DDS.json
+0 −7		...base/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/_FlyByWire_A320_NEO-CHRISTMAS/TEXTURE.FBW/texture.CFG
+ −		...se/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/_FlyByWire_A320_NEO-CHRISTMAS/TEXTURE.FBW/thumbnail.jpg
+ −		...bywire-aircraft-a320-neo/SimObjects/AirPlanes/_FlyByWire_A320_NEO-CHRISTMAS/TEXTURE.FBW/thumbnail_small.jpg
+0 −16		fbw-a32nx/src/base/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/_FlyByWire_A320_NEO-CHRISTMAS/aircraft.cfg
+31 −11		...rcraft-a320-neo/html_ui/Pages/VCockpit/Instruments/Airliners/FlyByWire_A320_Neo/FMC/A32NX_FMCMainDisplay.js
+1 −1		fbw-a32nx/src/behavior/src/A32NX_Exterior.xml
+4 −2		fbw-a32nx/src/systems/instruments/buildSrc/directories.mjs
+8 −12		fbw-a32nx/src/systems/instruments/src/EFB/Settings/Pages/SimOptionsPage.tsx
+9 −18		fbw-a32nx/src/systems/instruments/src/EFB/Settings/Pages/ThirdPartyOptionsPage.tsx
+5 −1		fbw-a32nx/src/wasm/fadec_a320/build.sh
+5 −1		fbw-a32nx/src/wasm/fbw_a320/build.sh
+2 −2		fbw-a32nx/src/wasm/fbw_a320/src/FlyByWireInterface.cpp
+17 −11		fbw-a32nx/src/wasm/systems/a320_systems/src/hydraulic/mod.rs
+8 −0		fbw-a32nx/src/wasm/systems/a320_systems_wasm/src/lib.rs
+6 −6		fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/A380_EXTERIOR.xml
+ −		fbw-a380x/src/base/flybywire-aircraft-a380-842/html_ui/Images/SD_ELEC_AC_ENG.png
+ −		fbw-a380x/src/base/flybywire-aircraft-a380-842/html_ui/Images/SD_FCTL_TAIL.png
+ −		fbw-a380x/src/base/flybywire-aircraft-a380-842/html_ui/Images/SD_FCTL_WING.png
+ −		fbw-a380x/src/base/flybywire-aircraft-a380-842/html_ui/Images/SD_FUEL_BG.png
+ −		fbw-a380x/src/base/flybywire-aircraft-a380-842/html_ui/Images/SD_FUEL_BG_TRIM.png
+ −		fbw-a380x/src/base/flybywire-aircraft-a380-842/html_ui/Images/SD_FUEL_ENG_L.png
+ −		fbw-a380x/src/base/flybywire-aircraft-a380-842/html_ui/Images/SD_FUEL_ENG_R.png
+0 −2		fbw-a380x/src/systems/instruments/buildSrc/directories.mjs
+1 −1		fbw-a380x/src/wasm/fadec_a380/build.sh
+1 −1		fbw-a380x/src/wasm/fbw_a380/build.sh
+18 −13		fbw-a380x/src/wasm/systems/a380_systems/src/hydraulic/mod.rs
+43 −0		fbw-a380x/src/wasm/systems/a380_systems/src/structural_flex.rs
+8 −0		fbw-a380x/src/wasm/systems/a380_systems_wasm/src/lib.rs
+12 −8		fbw-common/src/systems/datalink/router/src/webinterfaces/NXApiConnector.ts
+8 −1		fbw-common/src/systems/instruments/src/ND/Chrono.tsx
+42 −0		fbw-common/src/wasm/systems/systems/src/hydraulic/bypass_pin.rs
+1 −0		fbw-common/src/wasm/systems/systems/src/hydraulic/mod.rs
+27 −26		fbw-common/src/wasm/systems/systems/src/hydraulic/nose_steering.rs
+1 −11		fbw-common/src/wasm/systems/systems/src/hydraulic/pushback.rs
+1 −1		fbw-common/src/wasm/terronnd/build.sh
+1 −1		scripts/build.sh
+1 −1		scripts/build_a32nx.sh
+1 −1		scripts/build_a380x.sh
+1 −1		scripts/build_ingamepanels_checklist_fix.sh
+32 −0		scripts/fragment_a380x.js
+9 −0		scripts/install-source_a380x.js
+1 −1		scripts/lint-rust.sh
+1 −1		scripts/setup.sh
+1 −1		scripts/test-js.sh
+1 −1		scripts/test-rust.sh
+1 −1		tools/fdr2csv/build.sh