Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(a380x/fcu): Fix visual issues with FCU light test and missing labels #9570

Merged
merged 18 commits into from
Dec 8, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,10 @@
1. [FMS] Fix Pause at T/D not working in selected speed - @BlueberryKing (BlueberryKing)
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/FMC] Fix reset of perf data on done phase or database swap - @tracernz (Mike)
1. [A32NX/ATC] Fixed ATC/TCAS power supply - @tracernz (Mike)
1. [A32NX] Fixed appearance of FCU decals on MSFS2024 - @tracernz (Mike)
2. [A380X/FMC] Fix reset of perf data on done phase or database swap - @tracernz (Mike)
3. [A32NX/ATC] Fixed ATC/TCAS power supply - @tracernz (Mike)
4. [A32NX] Fixed appearance of FCU decals on MSFS2024 - @tracernz (Mike)
5. [A380X/FCU] Fix display of values on FCU during light test - @heclak (Heclak)
heclak marked this conversation as resolved.
Show resolved Hide resolved

## 0.12.0

Expand Down
Binary file not shown.
25 changes: 13 additions & 12 deletions fbw-a380x/src/fonts/A380X_FCU.sfd
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ OS2Version: 4
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1603675803
ModificationTime: 1706370840
ModificationTime: 1732149751
PfmFamily: 17
TTFWeight: 400
TTFWidth: 5
Expand Down Expand Up @@ -85,7 +85,7 @@ NameList: AGL For New Fonts
DisplaySize: -48
AntiAlias: 1
FitToEm: 0
WinInfo: 58 29 11
WinInfo: 0 29 11
BeginChars: 65539 36

StartChar: .notdef
Expand Down Expand Up @@ -218,21 +218,21 @@ EndChar

StartChar: period
Encoding: 46 46 5
Width: 180
Width: 0
GlyphClass: 1
Flags: W
LayerCount: 2
Fore
SplineSet
28 -100 m 128,-1,1
28 -71 28 -71 49 -50 c 128,-1,2
70 -29 70 -29 99 -29 c 128,-1,3
128 -29 128 -29 149 -50 c 128,-1,4
170 -71 170 -71 170 -100 c 128,-1,5
170 -129 170 -129 149 -150 c 128,-1,6
128 -171 128 -171 99 -171 c 128,-1,7
70 -171 70 -171 49 -150 c 128,-1,0
28 -129 28 -129 28 -100 c 128,-1,1
-70 -100 m 128,-1,1
-70 -71 -70 -71 -49 -50 c 128,-1,2
-28 -29 -28 -29 1 -29 c 128,-1,3
30 -29 30 -29 51 -50 c 128,-1,4
72 -71 72 -71 72 -100 c 128,-1,5
72 -129 72 -129 51 -150 c 128,-1,6
30 -171 30 -171 1 -171 c 128,-1,7
-28 -171 -28 -171 -49 -150 c 128,-1,0
-70 -129 -70 -129 -70 -100 c 128,-1,1
EndSplineSet
Validated: 1
EndChar
Expand Down Expand Up @@ -1993,6 +1993,7 @@ SplineSet
159 798 159 798 191 766 c 128,-1,8
223 734 223 734 223 689 c 128,-1,9
EndSplineSet
Validated: 1
EndChar

StartChar: d
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export class Altitude extends DisplayComponent<AltitudeProps> {
private readonly altText = MappedSubject.create(
([isLightTest, altitude]) => {
if (isLightTest) {
return '88888';
return '8.8.8.8.8';
}
const value = Math.floor(Math.max(altitude, 100));
return value.toString().padStart(5, '0');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export class Baro extends DisplayComponent<BaroProps> {
private readonly baroText = MappedSubject.create(
([mode, correction, isLightTest]) => {
if (isLightTest) {
return '88.88';
return '8.8.8.8';
}
switch (mode) {
case 'STD':
Expand Down
11 changes: 7 additions & 4 deletions fbw-a380x/src/systems/instruments/src/FCU/Components/Heading.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,19 @@ export class Heading extends DisplayComponent<HeadingProps> {
return (
<div id="Heading">
<svg width="100%" height="100%">
<text id="HDG" class="Common Active" x="13%" y="20%">
<text id="TRUE" class="Common Active " x="23%" y="20%">
TRUE
</text>
<text id="HDG" class="Common Active" x="48%" y="20%">
HDG
</text>
<text id="TRK" class="Common Inactive" x="47%" y="20%">
<text id="TRK" class="Common Inactive" x="68%" y="20%">
TRK
</text>
<text id="Value" class="Common Value" x="11%" y="86%">
<text id="Value" class="Common Value" x="47%" y="86%">
---
</text>
<text id="DEGREES" class="Common Value" x="86%" y="86%">
<text id="DEGREES" class="Common Value" x="89%" y="86%">
&#176;
</text>
</svg>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ export class VerticalSpeed extends DisplayComponent<VerticalSpeedProps> {
return (
<div id="VerticalSpeed">
<svg width="100%" height="100%">
<text id="VS" class="Common Active" x="68%" y="20%" text-anchor="end">
<text id="VS" class="Common Active" x="71%" y="20%" text-anchor="end">
V/S
</text>
<text id="FPA" class="Common Inactive" x="90%" y="20%" text-anchor="end">
<text id="FPA" class="Common Inactive" x="50%" y="20%" text-anchor="end">
FPA
</text>
<text id="Value" class="Common Value" x="15%" y="86%">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export class HeadingManager extends TemporaryHax implements Instrument {
private _rotaryEncoderIncrement = 0.1;
private _rotaryEncoderPreviousTimestamp = 0;

private textTRUE?: ReturnType<typeof this.getTextElement>;
private textHDG?: ReturnType<typeof this.getTextElement>;
private textTRK?: ReturnType<typeof this.getTextElement>;
private signDegrees?: ReturnType<typeof this.getTextElement>;
Expand All @@ -39,6 +40,7 @@ export class HeadingManager extends TemporaryHax implements Instrument {
}

public init(): void {
this.textTRUE = this.getTextElement('TRUE');
this.textHDG = this.getTextElement('HDG');
this.textTRK = this.getTextElement('TRK');
this.signDegrees = this.getTextElement('DEGREES');
Expand Down Expand Up @@ -220,14 +222,16 @@ export class HeadingManager extends TemporaryHax implements Instrument {
this.isTRKMode = _isTRKMode;
this.showSelectedHeading = _showSelectedHeading;
this.currentValue = _value;
this.setTextElementActive(this.textTRUE, false);
this.setTextElementActive(this.textHDG, !this.isTRKMode);
this.setTextElementActive(this.textTRK, !!this.isTRKMode);
this.lightsTest = _lightsTest;
if (this.lightsTest) {
this.setTextElementActive(this.textTRUE, true);
this.setTextElementActive(this.textHDG, true);
this.setTextElementActive(this.textTRK, true);
this.setElementVisibility(this.signDegrees, true);
this.textValueContent = '.8.8.8';
this.textValueContent = '8.8.8';
return;
}
if ((this.isManagedArmed || this.isManagedActive) && !this.showSelectedHeading) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ export class SpeedManager extends TemporaryHax implements Instrument {
}
this.lightsTest = _lightsTest;
if (this.lightsTest) {
this.textValueContent = '.8.8.8';
this.textValueContent = '8.8.8';
this.setTextElementActive(this.textSPD, true);
this.setTextElementActive(this.textMACH, true);
this.setTextElementActive(this.textKNOTS, true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ export class VerticalSpeedManager extends TemporaryHax implements Instrument {
if (this.lightsTest) {
this.setTextElementActive(this.textVS, true);
this.setTextElementActive(this.textFPA, true);
this.textValueContent = '+8.888';
this.textValueContent = '+8.8.8.8';
return;
}
this.setTextElementActive(this.textVS, !this.isFPAMode);
Expand Down
4 changes: 2 additions & 2 deletions fbw-a380x/src/systems/instruments/src/FCU/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,9 @@ text.Label.Visible {
}

#FCU_CONTENT #Mainframe #LargeScreen #Heading {
width: 30%;
width: 50%;
height: 100%;
left: 50%;
left: 30%;
position: absolute;
}

Expand Down