From b6f24ef5aaea0b936189c74f547c9ca7ae52b7ca Mon Sep 17 00:00:00 2001 From: jet2code Date: Wed, 15 Jan 2025 19:10:19 -0500 Subject: [PATCH 1/4] Set atcCallsign initial value to null --- fbw-a380x/src/systems/instruments/src/MFD/FMC/fmgc.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fbw-a380x/src/systems/instruments/src/MFD/FMC/fmgc.ts b/fbw-a380x/src/systems/instruments/src/MFD/FMC/fmgc.ts index 9b7b741d070..302d97ef800 100644 --- a/fbw-a380x/src/systems/instruments/src/MFD/FMC/fmgc.ts +++ b/fbw-a380x/src/systems/instruments/src/MFD/FMC/fmgc.ts @@ -57,7 +57,7 @@ export class FmgcData { public readonly cpnyFplnUplinkInProgress = Subject.create(false); - public readonly atcCallsign = Subject.create('----------'); + public readonly atcCallsign = Subject.create(null); /** in degrees celsius. null if not set. */ public readonly cruiseTemperaturePilotEntry = Subject.create(null); From 9efd977f24a50d66981a21b01a413bdba9f26032 Mon Sep 17 00:00:00 2001 From: jet2code Date: Wed, 15 Jan 2025 19:11:23 -0500 Subject: [PATCH 2/4] Update changelog.md --- .github/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index 196116ce971..89dd2a41a36 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -4,6 +4,7 @@ +1. [A380X/MFD] Fixed FLT NBR not displaying as a mandatory input field - @jet2code (john.xyz) ## 0.13.0 From cf5df8b5d03718d58b8f6511e277e379a7d9f1c5 Mon Sep 17 00:00:00 2001 From: jet2code Date: Fri, 17 Jan 2025 12:40:37 -0500 Subject: [PATCH 3/4] Update changelog.md --- .github/CHANGELOG.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index 2b3a7943a47..251bf24eb04 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -4,8 +4,6 @@ -1. [A380X/MFD] Fixed FLT NBR not displaying as a mandatory input field - @jet2code (john.xyz) - ## 0.13.0 1. [GENERAL] Fixed issue in C++ WASM Framework that caused performance degradation in some WASM modules - @frankkopp (cdr_maverick) @@ -126,7 +124,7 @@ 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] Fixed FLT NBR not displaying as a mandatory input field - @jet2code (john.xyz) ## 0.12.0 From b95c1d823066dd53e447e78c6e375617a9df0282 Mon Sep 17 00:00:00 2001 From: jet2code Date: Fri, 17 Jan 2025 12:40:54 -0500 Subject: [PATCH 4/4] Set atcCallsign string in header when it is null --- .../src/systems/instruments/src/MFD/MfdPageDirectory.tsx | 2 +- .../instruments/src/MFD/pages/common/AbstractHeader.tsx | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fbw-a380x/src/systems/instruments/src/MFD/MfdPageDirectory.tsx b/fbw-a380x/src/systems/instruments/src/MFD/MfdPageDirectory.tsx index 8b84d3d9a92..fde3a77b18b 100644 --- a/fbw-a380x/src/systems/instruments/src/MFD/MfdPageDirectory.tsx +++ b/fbw-a380x/src/systems/instruments/src/MFD/MfdPageDirectory.tsx @@ -116,7 +116,7 @@ export function pageForUrl( export function headerForSystem( sys: string, mfd: DisplayInterface & MfdDisplayInterface, - atcCallsign: Subscribable, + atcCallsign: Subscribable, activeFmsSource: Subscribable<'FMS 1' | 'FMS 2' | 'FMS 1-C' | 'FMS 2-C'>, uiService: MfdUiService, ): VNode { diff --git a/fbw-a380x/src/systems/instruments/src/MFD/pages/common/AbstractHeader.tsx b/fbw-a380x/src/systems/instruments/src/MFD/pages/common/AbstractHeader.tsx index 6725d61f989..14814248ed3 100644 --- a/fbw-a380x/src/systems/instruments/src/MFD/pages/common/AbstractHeader.tsx +++ b/fbw-a380x/src/systems/instruments/src/MFD/pages/common/AbstractHeader.tsx @@ -14,7 +14,7 @@ import { MfdUiService } from 'instruments/src/MFD/pages/common/MfdUiService'; interface AbstractMfdHeaderProps { activeFmsSource: Subscribable<'FMS 1' | 'FMS 2' | 'FMS 1-C' | 'FMS 2-C'>; - callsign: Subscribable; + callsign: Subscribable; uiService: MfdUiService; mfd: DisplayInterface & MfdDisplayInterface; } @@ -108,7 +108,9 @@ export abstract class AbstractHeader extends DisplayComponent - {this.props.callsign} + + {this.props.callsign.map((cs) => (cs !== null ? this.props.callsign : '----------'))} + ); }