Merge branch 'master' into feat/a380-fix-info

# Conflicts:
#	.github/CHANGELOG.md
#	fbw-a380x/src/systems/instruments/src/MFD/FMC/FlightManagementComputer.ts
#	fbw-a380x/src/systems/instruments/src/MFD/FMC/FmcService.ts
#	fbw-a380x/src/systems/instruments/src/MFD/pages/README.md
#	fbw-a380x/src/systems/instruments/src/MFD/pages/common/Button.tsx

.gitattributes

@@ -8,6 +8,3 @@
 # line endings.
 /fbw-a32nx/src/localization/flypad/*.json text eol=lf
 /fbw-a32nx/src/localization/msfs/*.locPak text eol=lf
-
-# try to deconflict changelog
-.github/CHANGELOG.md merge=union

.github/CHANGELOG.md

@@ -36,8 +36,6 @@
 1. [A380X/MFD] MFD/SURV: Fixed TCAS not switching status when using DEFAULT SETTINGS button - @flogross89 (floridude)
 1. [A380X/FUEL] Recalibrated inital fuel settings - @sschiphorst (Yahtzee94)
 1. [A380X/ENG] Another adjustment to taxi thrust - @donstim (donbikes)
-1. [A380X/ANIM] Animation of flaps now from FPPU position. Interim fix for spoiler low end animation - @Crocket63 (crocket)
-1. [A380X/ENGINES] Another adjustment to taxi thrust - @donstim (donbikes)
 1. [A380/ANIM] Animation of flaps now from FPPU position. Interim fix for spoiler low end animation - @Crocket63 (crocket)
 1. [A380X/ENG] Improve oil pressure lookup table - @tracernz (Mike)
 1. [A380X/FADEC] Add N1 fan protection measures (METOTS, KOZ) - @flogross89 (floridude)
@@ -73,6 +71,7 @@
 1. [A380X/FMS] Added SURV Status & Switching page with TCAS fault indication - @Frenkii (Moritz)
 1. [FMS] Fix T/D not showing in selected speed - @BlueberryKing (BlueberryKing)
 1. [FMS] Fix Pause at T/D not working in selected speed - @BlueberryKing (BlueberryKing)
+1. [A380X/MFD] Various Fuel & Load Fixes - @BravoMike99 (bruno_pt99)
 1. [MISC] Replaced brake temperature simulation with physics based model of brakes - @Gurgel100 (Pascal)
 1. [A32NX/MCDU] Suppress TMPY FPLN when no modifications made in airways page - @robertxing2004 (robeet)
 1. [A380X/FWS] No "auto brake off" callout when double pressing A/THR instinctive disconnect - @flogross89 (floridude)
@@ -87,6 +86,7 @@
 1. [A380X/COND] Fix wasm crash during rapid decompression - @mjuhe (Miquel Juhe)
 1. [A32NX/EWD] Corrected fuel flow step to 20kg/40lbs per hour - @BravoMike99 (bruno_pt99)
 1. [A380X] Fix EWD avail. thrust fill area & PFD rudder trim visibility on ground - @flogross89 (floridude)
+1. [A380X/OANS] Fix "BTV/FMS RWY DISAGREE" message for single-digit runway identifiers - @flogross89 (floridude)
 1. [A380X/FWS] Add automatic normal checklists reset on powerup, go around & shutdown - @BravoMike99 (bruno_pt99)
 1. [A32NX/PFD] Synchronize flashing/pulsing components across PFD - @lukecologne (luke)
 1. [A380X/LIGHTS] Fix function of FCU brightness knobs - @heclak (Heclak)
@@ -101,17 +101,34 @@
 1. [ELEC] Improved elec system startup behaviour - @Gurgel100 (Pascal) - @saschl
 1. [A380X] Improve pilot and copilot camera positions - @heclak (Heclak)
 1. [A380X/EFIS] Illuminate ND range and mode selectors during light test - @BravoMike99 (bruno_pt99)
+1. [A380X/FCU] Automatically select LS on LOC mode arming - @BravoMike99 (bruno_pt99)
 1. [A380/PFD] Add DISCONNECT AP FOR LDG FMA message - @BravoMike99 (bruno_pt99)
 1. [A380X/ENG] Adjust climb thrust to be more accurate - @BlueberryKing (BlueberryKing)
-1. [A380X/ANIM] Animation of flaps now from FPPU position. Interim fix for spoiler low end animation - @Crocket63 (crocket)
-1. [A380X/ENGINES] Adjust climb thrust to be more accurate - @BlueberryKing (BlueberryKing)
 1. [A380X/EWD] Show THR limit in EWD instead of N1 - @flogross89 (floridude)
 1. [A380X/FLIGHT MODEL] Fix pitchup and unrecoverable stall - - @donstim (donbikes#4084)
 1. [ATC/TCAS] Fixed TCAS failure on baro corrected altitude going invalid - @tracernz (Mike)
 1. [ATC/TCAS] Fixed TCAS slant range computation - @tracernz (Mike)
 1. [A380X] Add baro unit (hPa/in.Hg) auto selection - @tracernz (Mike)
 1. [A380X/EFB] Improved Aircraft Presets configuration for the A380X - @frankkopp (cdr_maverick)
 1. [A32NX/AMU] Enable VHF3 audio, and allow switching off VHF1 - @tracernz (Mike)
+1. [A380X/PFD] Fix font colours on metric altitude display - @MrJigs7 (MrJigs.)
+1. [A380X/MFD] Fixed the altitude prediction not rounding to the nearest 10 on the FPLN page - @bulenteroglu (senolitam)
+1. [A380X/MFD] Use slashed zero as default font for FMS pages - @bulenteroglu (senolitam)
+1. [A380X/ND] Remove leading zeros from terrain elevation display - @BravoMike99 (bruno_pt99)
+1. [A32NX/FWS] Fix autopilot instinctive disconnect button logic for 3D model - @flogross89 (floridude)
+1. [A380X/EFIS] Fix VV pb indicator not turning on when TRK-FPA mode is selected - @heclak (Heclak)
+1. [FMS] Transition altitude/level and RNP now come from navdata in MSFS2024 - @tracernz (Mike)
+1. [ATSU] Fixed issues with the ALL-CALLSIGNS recipient on Hoppie - @CronixZero (CronixZero)
+1. [A380X/MFD] Add ATCCOM D-ATIS page layout - @heclak (Heclak)
+1. [A380X/FMS] Enable FMC reset through overhead reset panel push buttons - @flogross89 (floridude)
+1. [A380X/FCU] Add TRUE indication on FCU when TRUE North reference is selected on AFS CP - @heclak (Heclak)
+1. [A380X/MFD] Add airport data page into the MFD (DATA > AIRPORT) - @bulenteroglu (senolitam)
+1. [A380X/EFB] Adds PRIM/SEC/FCDC failures to EFB - @flogross89 (floridude)
+1. [A380X/PFD] Fix precision of pitch trim indicator - @flogross89 (floridude)
+1. [A380X/MFD] Add leading zero to altitude prediction and track from last waypoint on FPLN page - @bulenteroglu (senolitam)
+1. [FMS] Improved nav database error handling, preserving as much valid data as possible - @tracernz (Mike)
+1. [A32NX/FMS] Sort instrument procedures for display on the MCDU - @tracernz (Mike)
+1. [A380X/ELEC] Various fixes in the electrical system (battery voltage indicator switchup, AC GND SVC BUS and correct behavior of battery contactors) - @Gurgel100 (Pascal)
 1. [A380X/FMS] Add basic FIX INFO functionality - @Benjozork (Benjamin Dupont)
 
 ## 0.12.0

.github/ISSUE_TEMPLATE/bug_report_a32nx.yaml

@@ -5,6 +5,16 @@ body:
 - type: markdown
   attributes:
     value: "# A32NX Bug Report Form"
+- type: dropdown
+  id: sim
+  attributes:
+    label: Simulator Version
+    description: Which simulator are you using?
+    options:
+    - 2020
+    - 2024
+  validations:
+    required: true
 - type: dropdown
   id: version
   attributes:

.github/ISSUE_TEMPLATE/bug_report_a380x.yaml

@@ -8,13 +8,26 @@ body:
 - type: markdown
   attributes:
     value: "Please make sure to check existing issues (https://github.com/flybywiresim/aircraft/issues) and the list of INOP systems (https://github.com/flybywiresim/aircraft/tree/master/fbw-a380x). Only open an issue here if they don't already exist there. "
+- type: dropdown
+  id: sim
+  attributes:
+    label: Simulator
+    description: Which simulator are you using?
+    options:
+    - 2020
+    - 2024
+  validations:
+    required: true
 - type: dropdown
   id: version
   attributes:
     label: Aircraft Version
     description: What version of the A380X are you using?
     options:
-    - Stable
+    - Stable (8k)
+    - Stable (4k)
+    - Development (8k)
+    - Development (4k)
   validations:
     required: true
 - type: textarea

README.md

@@ -1,23 +1,24 @@
 ![FlyByWire Simulations](https://raw.githubusercontent.com/flybywiresim/branding/1391fc003d8b5d439d01ad86e2778ae0bfc8b682/tails-with-text/FBW-Color-Light.svg#gh-dark-mode-only)
 ![FlyByWire Simulations](https://github.com/flybywiresim/branding/blob/master/tails-with-text/FBW-Color-Dark.svg#gh-light-mode-only)
 
-# FlyByWire Simulations A32NX
+# FlyByWire Simulations Aircraft
 
-[![GitHub latest release version](https://img.shields.io/github/v/release/flybywiresim/a32nx.svg?style=flat)](https://github.com/flybywiresim/a32nx/releases/latest)
-[![Github All Releases download count](https://img.shields.io/github/downloads/flybywiresim/a32nx/total.svg?style=flat)](https://github.com/flybywiresim/a32nx/releases/latest)
-[![GitHub contributors](https://img.shields.io/github/contributors/flybywiresim/a32nx.svg?style=flat)](https://github.com/flybywiresim/a32nx/graphs/contributors)
+[![GitHub latest release version](https://img.shields.io/github/v/release/flybywiresim/aircraft.svg?style=flat)](https://github.com/flybywiresim/a32nx/releases/latest)
+[![Github All Releases download count](https://img.shields.io/github/downloads/flybywiresim/aircraft/total.svg?style=flat)](https://github.com/flybywiresim/a32nx/releases/latest)
+[![GitHub contributors](https://img.shields.io/github/contributors/flybywiresim/aircraft.svg?style=flat)](https://github.com/flybywiresim/a32nx/graphs/contributors)
 
-[![Discord](https://img.shields.io/discord/738864299392630914.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/UjzuHMU)
-[![Twitter](https://img.shields.io/badge/-@FlyByWireSim-e84393?label=&logo=twitter&logoColor=ffffff&color=6399AE&labelColor=00C2CB)](https://twitter.com/FlybywireSim)
+[![Discord](https://img.shields.io/discord/738864299392630914.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/flybywire)
+[![X](https://img.shields.io/badge/-@FlyByWireSim-e84393?label=&logo=X&logoColor=ffffff&color=6399AE&labelColor=00C2CB)](https://x.com/FlybywireSim)
 [![YouTube](https://img.shields.io/badge/-FlyByWireSimulations-e84393?label=&logo=youtube&logoColor=ffffff&color=6399AE&labelColor=00C2CB)](https://www.youtube.com/c/FlyByWire-Simulations)
 [![Facebook](https://img.shields.io/badge/-FlyByWireSimulations-e84393?label=&logo=facebook&logoColor=ffffff&color=6399AE&labelColor=00C2CB)](https://www.facebook.com/FlyByWireSimulations/)
 [![Instagram](https://img.shields.io/badge/-@FlyByWireSim-e84393?label=&logo=instagram&logoColor=ffffff&color=6399AE&labelColor=00C2CB)](https://instagram.com/flybywiresim)
+[![Bluesky](https://img.shields.io/badge/-@FlyByWireSim-e84393?label=&logo=Bluesky&logoColor=ffffff&color=6399AE&labelColor=00C2CB)](https://bsky.app/profile/flybywiresim.com)
 
-The A32NX Project is a community-driven open source project to create a free Airbus A320neo in Microsoft Flight Simulator that is as close to reality as possible.
+The A32NX and A380X Projects are community-driven open source projects to recreate a free Airbus A320-200N and A380-800 in Microsoft Flight Simulator that are as close to reality as possible.
 
-The following aircraft configuration is currently simulated or targeted:
+The following aircraft configurations are currently simulated or targeted:
 
-### A320neo
+### A320-200N (LEAP)
 
  ```
  Model       A320-251N
@@ -33,7 +34,20 @@ The following aircraft configuration is currently simulated or targeted:
  WXR         Honeywell RDR-4000
  ```
 
-Please note that this configuration may change in the future as the A32NX project evolves and changes.
+### A380-800 (Trent 900)
+
+```
+Model       A380-842
+Engines     Rolls-Royce Trent 972B-84
+APU         APU - Pratt & Whitney PW980
+WV          003
+TAWS        Honeywell AESS
+ACAS        Honeywell AESS
+ATC         Honeywell AESS
+WXR         Honeywell AESS
+```
+
+Please note that this configuration may change in the future as the projects evolve and change.
 
 ## How to download and use the aircraft
 
@@ -47,13 +61,15 @@ If you would like to contribute to the project, see [Contributing.md](.github/Co
 
 ### Known issues and bug reporting
 
-Our [known issues](https://docs.flybywiresim.com/start/reported-issues) list contains the most commonly reported issues. Should you have an issue not found on this list, then please take a look at the reported issues within the [issue tracker](https://github.com/flybywiresim/a32nx/issues) and report a new issue if your issue isn't found there. You can also use the issue tracker to request a new feature.
+Our [known issues](https://docs.flybywiresim.com/aircraft/support/known-issues/) list contains the most commonly reported issues. Should you have an issue not found on this list, then please take a look at the reported issues within the [issue tracker](https://github.com/flybywiresim/aircraft/issues/) and report a new issue if your issue isn't found there. You can also use the issue tracker to request a new feature.
 
 ## FAQ
 
 ### What liveries are available?
 
-Liveries for the A32NX can be found on [Flightsim.to](https://flightsim.to/c/liveries/flybywire-a32nx/).
+Liveries for the A32NX can be found on [Flightsim.to](https://flightsim.to/c/liveries/flybywire-a32nx/). 
+
+Liveries for the A380X can be found on [Flightsim.to](https://flightsim.to/liveries/flybywire-a380x/).
 
 ### When is the next update?
 
@@ -63,19 +79,19 @@ We don't know, since it depends on many factors. We will announce each new stabl
 
 Read [Contributing.md](.github/Contributing.md) and join our Discord to get started.
 
-### Is the A32NX payware?
+### Are FlyByWire aircraft payware?
 
-No, it is a completely free aircraft, open-source.
+No, they are completely free aircraft, open-source, including SimBridge and other FlyByWire projects which are publicly accessible via GitHub.
 
 ### How do we report bugs?
 
 Please read the [known Issues and bug reporting](#known-issues-and-bug-reporting) section.
 
 ### Is this going to be "study-level"?
 
-While many in the team dislike the term "study-level" as its use is mostly applicable to certified training devices, we are in fact very dedicated on bringing a high fidelity A320neo to the Microsoft Flight Simulator platform.
+While many in the team dislike the term "study-level" as its use is mostly applicable to certified training devices, we are in fact very dedicated on bringing a high fidelity A320-200N and A380-800 to the Microsoft Flight Simulator platform.
 
-### Is feature X from the A320neo going to be implemented?
+### Is feature X from the real aircraft going to be implemented?
 
 Chances are, yes! While we do not guarantee every single detail of the aircraft will eventually be represented, our goal is to produce an extremely accurate simulation based on technical data and real-world testing. This means you can be almost certain every feature of the aircraft will eventually be simulated to the best of the simulator's ability as long as the technical data backs it up.
 
@@ -87,11 +103,11 @@ It's very likely that the feature you are awaiting is already under development!
 
 We have two mainline versions: stable and development. The stable version is a 'snapshot' of the development which we regard as stable with the current version of the simulator. The developer build is updated daily and is a constant work in progress and although we test thoroughly each update, minor issues may occur from time to time.
 
-You can read more about the differences between the versions we offer [on our documentation portal](https://docs.flybywiresim.com/fbw-a32nx/fbw-versions/).
+You can read more about the differences between the versions we offer [on our documentation portal](https://docs.flybywiresim.com/aircraft/install/fbw-versions/).
 
 ### Is there a list of features or a changelog available?
 
-We do not keep a list of features implemented, but a lengthy [changelog](https://github.com/flybywiresim/a32nx/blob/master/.github/CHANGELOG.md) of what has been implemented, and their associated [pull requests](https://github.com/flybywiresim/a32nx/pulls) can be [found here](https://github.com/flybywiresim/a32nx/blob/master/.github/CHANGELOG.md).
+We do not keep a list of features implemented, but a lengthy [changelog](https://github.com/flybywiresim/aircraft/blob/master/.github/CHANGELOG.md) of what has been implemented, and their associated [pull requests](https://github.com/flybywiresim/aircraft/pulls) can be [found here](https://github.com/flybywiresim/aircraft/blob/master/.github/CHANGELOG.md).
 
 ## License
 

fbw-a32nx/src/base/flybywire-aircraft-a320-neo/html_ui/Pages/VCockpit/Instruments/Airliners/FlyByWire_A320_Neo/CDU/A320_Neo_CDU_AvailableArrivalsPage.js

@@ -143,8 +143,8 @@ class CDUAvailableArrivalsPage {
             // Filter out approaches with no matching runway
             // Approaches not going to a specific runway (i.e circling approaches are filtered out at DB level)
             .filter((a) => !!runways.find((rw) => rw.ident === a.runwayIdent))
-            // Sort the approaches in Honeywell's documented order
-            .sort((a, b) => ApproachTypeOrder[a.type] - ApproachTypeOrder[b.type])
+            // Sort the approaches in Honeywell's documented order, and alphabetical in between
+            .sort((a, b) => a.type != b.type ? ApproachTypeOrder[a.type] - ApproachTypeOrder[b.type] : a.ident.localeCompare(b.ident))
             .map((approach) => ({ approach }))
             .concat(
                 // Runway-by-itself approaches
@@ -252,7 +252,7 @@ class CDUAvailableArrivalsPage {
             const destinationRunway = targetPlan.destinationRunway;
 
             if (destinationRunway) {
-                const arrivals = targetPlan.availableArrivals;
+                const arrivals = [...targetPlan.availableArrivals].sort((a, b) => a.ident.localeCompare(b.ident));
 
                 for (let i = 0; i < arrivals.length; i++) {
                     const arrival = arrivals[i];

fbw-a32nx/src/base/flybywire-aircraft-a320-neo/html_ui/Pages/VCockpit/Instruments/Airliners/FlyByWire_A320_Neo/CDU/A320_Neo_CDU_AvailableDeparturesPage.js

@@ -47,7 +47,7 @@ class CDUAvailableDeparturesPage {
 
         /** @type {import('msfs-navdata').Runway[]} */
         const availableRunways = [...targetPlan.availableOriginRunways];
-        let availableSids = [...targetPlan.availableDepartures];
+        let availableSids = [...targetPlan.availableDepartures].sort((a, b) => a.ident.localeCompare(b.ident));
         let availableTransitions = [];
 
         if (selectedRunway) {

fbw-a32nx/src/behavior/src/A32NX_Interior_Misc.xml

@@ -368,6 +368,7 @@
             <UseTemplate Name="ASOBO_GT_Push_Button_Held">
                 <TOOLTIPID>%((L:A32NX_AUTOPILOT_ACTIVE, Bool))%{if}Disc. Autopilot%{else}Take priority%{end}</TOOLTIPID>
                 <LEFT_SINGLE_CODE>
+                    (&gt;K:AUTOPILOT_OFF)
                     1 (&gt;L:A32NX_PRIORITY_TAKEOVER:#ID#)
                 </LEFT_SINGLE_CODE>
                 <LEFT_LEAVE_CODE>

fbw-a32nx/src/systems/fmgc/src/NavigationDatabase.ts

@@ -12,6 +12,7 @@ import {
   IlsNavaid,
   MsfsBackend,
   NdbNavaid,
+  ProcedureLeg,
   VhfNavaid,
   Waypoint,
 } from '@flybywiresim/fbw-sdk';
@@ -83,6 +84,10 @@ export class NavigationDatabase {
     return this.backendDatabase.getAirways([ident]);
   }
 
+  public getHolds(fixIdentifier: string, airportIdentifier: string): Promise<ProcedureLeg[]> {
+    return this.backendDatabase.getHolds(fixIdentifier, airportIdentifier);
+  }
+
   public getDatabaseIdent(): Promise<DatabaseIdent> {
     return this.backendDatabase.getDatabaseIdent();
   }