Merge branch 'master' into fix_reverser_accel

flybywiresim · Mar 29, 2024 · cf0fe97 · cf0fe97
2 parents 1622c21 + aab1873
commit cf0fe97
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 11 deletions.
diff --git a/...ml_ui/Pages/VCockpit/Instruments/Airliners/FlyByWire_A320_Neo/FMC/A32NX_FMCMainDisplay.js b/...ml_ui/Pages/VCockpit/Instruments/Airliners/FlyByWire_A320_Neo/FMC/A32NX_FMCMainDisplay.js
@@ -4600,7 +4600,7 @@ class FMCMainDisplay extends BaseAirliners {
     }
 
     isPdFormat(s) {
-        const pd = s.match(/^([^\/]+)\/([0-9]{1,3}(\.[0-9])?)$/);
+        const pd = s.match(/^([^\/]+)\/([\-\+]?[0-9]{1,3}(\.[0-9])?)$/);
         return pd !== null && this.isPlaceFormat(pd[1]);
     }
 

diff --git a/fbw-a32nx/src/wasm/fadec_a320/build.sh b/fbw-a32nx/src/wasm/fadec_a320/build.sh
@@ -63,6 +63,11 @@ wasm-ld \
   --export malloc \
   --export free \
   --export __wasm_call_ctors \
+  --export mallinfo \
+  --export mchunkit_begin \
+  --export mchunkit_next \
+  --export get_pages_state \
+  --export mark_decommit_pages \
   --export-table \
   --gc-sections \
   -lc++ -lc++abi \

diff --git a/fbw-a32nx/src/wasm/fbw_a320/build.sh b/fbw-a32nx/src/wasm/fbw_a320/build.sh
@@ -156,6 +156,11 @@ wasm-ld \
   --export malloc \
   --export free \
   --export __wasm_call_ctors \
+  --export mallinfo \
+  --export mchunkit_begin \
+  --export mchunkit_next \
+  --export get_pages_state \
+  --export mark_decommit_pages \
   --export-table \
   --gc-sections \
   ${WASMLD_ARGS} \

diff --git a/.../src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/cameras.cfg b/.../src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/cameras.cfg
@@ -8,6 +8,10 @@ minor =0
 [VIEWS]
 eyepoint = 44.2, -1.72, 4.15 ; (feet) longitudinal, lateral, vertical distance from reference datum
 
+[CAMERA_RAY_NODE_COLLISION]
+; EFB auto-unfocus
+node.1 = ModelDefinition:Interior#Name:SCREEN_EFB
+
 ;===================== CAMERADEFINITION =====================
 
 [CAMERADEFINITION.0]

diff --git a/...ft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/behaviour/interactive-parts.xml b/...ft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/behaviour/interactive-parts.xml
@@ -557,14 +557,11 @@
             </UseTemplate>
             <UseTemplate Name = "ASOBO_GT_Interaction_LeftSingle_Leave_Code">
                 <LEFT_SINGLE_CODE>
-                    (L:FO_SLIDING_WINDOW) ! (&gt;L:FO_SLIDING_WINDOW)
-                    <!--
                     (L:A32NX_PRESS_CABIN_DELTA_PRESSURE, psi) 1.2 &lt; if{
                         (L:FO_SLIDING_WINDOW) ! (&gt;L:FO_SLIDING_WINDOW)
                     } els{
                         0 (&gt;L:FO_SLIDING_WINDOW)
                     }
-                    -->
                 </LEFT_SINGLE_CODE>
                 <TOOLTIPID>Open or Close FO Sliding Window</TOOLTIPID>
             </UseTemplate>
@@ -580,14 +577,11 @@
             </UseTemplate>
             <UseTemplate Name = "ASOBO_GT_Interaction_LeftSingle_Leave_Code">
                 <LEFT_SINGLE_CODE>
-                    (L:CPT_SLIDING_WINDOW) ! (&gt;L:CPT_SLIDING_WINDOW)
-                    <!--
-                    (L:A32NX_PRESS_CABIN_DELTA_PRESSURE, psi) 1.2 &lt; if{
+                    (A:IS CAMERA RAY INTERSECT WITH NODE:1, Bool) 0 == (L:A32NX_PRESS_CABIN_DELTA_PRESSURE, psi) 1.2 &lt; and if{
                         (L:CPT_SLIDING_WINDOW) ! (&gt;L:CPT_SLIDING_WINDOW)
                     } els{
                         0 (&gt;L:CPT_SLIDING_WINDOW)
                     }
-                    -->
                 </LEFT_SINGLE_CODE>
                 <TOOLTIPID>Open or Close CPT Sliding Window</TOOLTIPID>
             </UseTemplate>
@@ -744,7 +738,7 @@
                 <TOOLTIPID>Open or Close Landing Gear Pins Compartment</TOOLTIPID>
             </UseTemplate>
         </Component>
-		
+
         <!-- PAX DOOR M4L -->
 
         <Component ID="ANIM_DOOR_M4L" Node="ANIM_DOOR_M4L_CLICK">

diff --git a/fbw-a380x/src/wasm/fadec_a380/build.sh b/fbw-a380x/src/wasm/fadec_a380/build.sh
@@ -63,6 +63,11 @@ wasm-ld \
   --export malloc \
   --export free \
   --export __wasm_call_ctors \
+  --export mallinfo \
+  --export mchunkit_begin \
+  --export mchunkit_next \
+  --export get_pages_state \
+  --export mark_decommit_pages \
   --export-table \
   --gc-sections \
   -lc++ -lc++abi \

diff --git a/fbw-a380x/src/wasm/fbw_a380/build.sh b/fbw-a380x/src/wasm/fbw_a380/build.sh
@@ -150,6 +150,11 @@ wasm-ld \
   --export malloc \
   --export free \
   --export __wasm_call_ctors \
+  --export mallinfo \
+  --export mchunkit_begin \
+  --export mchunkit_next \
+  --export get_pages_state \
+  --export mark_decommit_pages \
   --export-table \
   --gc-sections \
   ${WASMLD_ARGS} \

diff --git a/fbw-common/src/systems/instruments/src/EFB/Dashboard/Widgets/WeatherWidget.tsx b/fbw-common/src/systems/instruments/src/EFB/Dashboard/Widgets/WeatherWidget.tsx
@@ -122,7 +122,7 @@ export const WeatherWidget: FC<WeatherWidgetProps> = ({ name, simbriefIcao, user
     };
 
     async function getMetar(icao: string, source: string): Promise<void> {
-        if (icao.length !== 4 || icao === '----') {
+        if (icao.length !== 4 || !(/^[a-z]{4}$/i.test(icao))) {
             setErrorMetar(t('Dashboard.ImportantInformation.Weather.NoIcaoProvided'));
             dispatch(setMetar(MetarParserTypeProp));
             return Promise.resolve();

diff --git a/fbw-common/src/wasm/cpp-msfs-framework/cmake/TargetDefinition.cmake b/fbw-common/src/wasm/cpp-msfs-framework/cmake/TargetDefinition.cmake
@@ -13,7 +13,7 @@ macro(add_wasm_library)
     endforeach()
 
     # wasm-ld general flags
-    set(CMAKE_WASM_LINKER_FLAGS --no-entry --allow-undefined --export __wasm_call_ctors --export-dynamic --export malloc --export free --export-table --gc-sections -lc++ -lc++abi -L${MSFS_SDK}/WASM/wasi-sysroot/lib/wasm32-wasi -lc ${MSFS_SDK}/WASM/wasi-sysroot/lib/wasm32-wasi/libclang_rt.builtins-wasm32.a)
+    set(CMAKE_WASM_LINKER_FLAGS --no-entry --allow-undefined --export __wasm_call_ctors --export-dynamic --export malloc --export free --export mallinfo --export mchunkit_begin --export mchunkit_next --export get_pages_state --export mark_decommit_pages --export-table --gc-sections -lc++ -lc++abi -L${MSFS_SDK}/WASM/wasi-sysroot/lib/wasm32-wasi -lc ${MSFS_SDK}/WASM/wasi-sysroot/lib/wasm32-wasi/libclang_rt.builtins-wasm32.a)
 
     # wasm build options for debug and release
     if (CMAKE_BUILD_TYPE STREQUAL "Debug")

diff --git a/fbw-common/src/wasm/terronnd/build.sh b/fbw-common/src/wasm/terronnd/build.sh
@@ -73,6 +73,11 @@ wasm-ld \
   --export malloc \
   --export free \
   --export __wasm_call_ctors \
+  --export mallinfo \
+  --export mchunkit_begin \
+  --export mchunkit_next \
+  --export get_pages_state \
+  --export mark_decommit_pages \
   --export-table \
   --gc-sections \
   ${WASMLD_ARGS} \