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

flybywiresim · Jan 5, 2025 · d9fea49 · d9fea49
2 parents a9cd915 + 19343d7
commit d9fea49
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -113,6 +113,8 @@
 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/FMS] Add basic FIX INFO functionality - @Benjozork (Benjamin Dupont)
+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)
 
 ## 0.12.0
 

diff --git a/fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/F-PLN/MfdFmsFpln.tsx b/fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/F-PLN/MfdFmsFpln.tsx
@@ -5,6 +5,7 @@
   DisplayComponent,
   FSComponent,
   MappedSubject,
+  MathUtils,
   NodeReference,
   Subject,
   Subscribable,
@@ -1452,7 +1453,8 @@ class FplnLegLine extends DisplayComponent<FplnLegLineProps> {
       } else if (!isBelowTransAlt) {
         altStr = <span>{`FL${Math.round(data.altitudePrediction / 100).toString()}`}</span>;
       } else {
-        altStr = <span>{data.altitudePrediction.toFixed(0)}</span>;
+        const roundedAltitude = MathUtils.round(data.altitudePrediction, 10).toFixed(0);
+        altStr = <span>{roundedAltitude}</span>;
       }
     }
     if (data.hasAltitudeConstraint && data.altitudePrediction) {

diff --git a/fbw-a380x/src/systems/instruments/src/PFD/AltitudeIndicator.tsx b/fbw-a380x/src/systems/instruments/src/PFD/AltitudeIndicator.tsx
@@ -952,7 +952,7 @@ class MetricAltIndicator extends DisplayComponent<{ bus: EventBus }> {
         <text
           ref={this.metricAltText}
           id="MetricAltText"
-          class="FontMedium Cyan MiddleAlign"
+          class="FontMedium Green MiddleAlign"
           x="128.64708"
           y="145.86191"
         >
@@ -962,7 +962,7 @@ class MetricAltIndicator extends DisplayComponent<{ bus: EventBus }> {
           <text
             id="MetricAltTargetText"
             ref={this.metricAltTargetText}
-            class="FontSmallest Green MiddleAlign"
+            class="FontSmallest Cyan MiddleAlign"
             x="94.088852"
             y="37.926617"
           >