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.

Sign up for GitHub

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

fix(a380x/nd): Update ND and VD Range Change Messages #9739

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

fix(a380x/nd): Update ND and VD Range Change Messages #9739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
30e8e7b
Updated RANGE CHANGE flag to use a prop
MrJigs7 Jan 9, 2025
8d7a910
Added CSS Class for A380 ND Range Change
MrJigs7 Jan 9, 2025
dd93f11
Added VD Range Change (needs further work)
MrJigs7 Jan 9, 2025
3a69196
Updated MODE CHANGE to use a prop
MrJigs7 Jan 11, 2025
d08dcb4
Fixed VD Range Change message display using event
MrJigs7 Jan 13, 2025
3f8ef61
Updated CSS name to be more suitable
MrJigs7 Jan 13, 2025
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
11 changes: 10 additions & 1 deletion fbw-a32nx/src/systems/instruments/src/ND/instrument.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,14 @@ import {
InstrumentBackplane,
Subject,
} from '@microsoft/msfs-sdk';
import { a320EfisRangeSettings, a320TerrainThresholdPadValue, ArincEventBus, EfisSide } from '@flybywiresim/fbw-sdk';
import {
a320EfisRangeSettings,
a320NdModeChange,
a320NdRangeChange,
a320TerrainThresholdPadValue,
ArincEventBus,
EfisSide,
} from '@flybywiresim/fbw-sdk';
import { NDComponent } from '@flybywiresim/navigation-display';

import { NDSimvarPublisher, NDSimvars } from './NDSimvarPublisher';
Expand Down Expand Up @@ -146,6 +153,8 @@ class NDInstrument implements FsInstrument {
side={this.efisSide}
rangeValues={a320EfisRangeSettings}
terrainThresholdPaddingText={a320TerrainThresholdPadValue}
rangeChangeMessage={a320NdRangeChange}
modeChangeMessage={a320NdModeChange}
/>
</DisplayUnit>,
document.getElementById('ND_CONTENT'),
Expand Down
5 changes: 5 additions & 0 deletions fbw-a380x/src/systems/instruments/src/ND/NDControlEvents.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,9 @@ export interface NDControlEvents {
* Event for the CHRONO button being pushed
*/
chrono_pushed: void;

/**
* Set if a range change is in progress for VD (true, false)
*/
set_range_change: boolean;
}
10 changes: 9 additions & 1 deletion fbw-a380x/src/systems/instruments/src/ND/VerticalDisplay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
} from '@microsoft/msfs-sdk';
import { NDSimvars } from 'instruments/src/ND/NDSimvarPublisher';
import { DmcLogicEvents } from 'instruments/src/MsfsAvionicsCommon/providers/DmcPublisher';
import { NDControlEvents } from './NDControlEvents';

import './style.scss';
import { SimplaneValues } from 'instruments/src/MsfsAvionicsCommon/providers/SimplaneValueProvider';
Expand All @@ -36,7 +37,7 @@ export class VerticalDisplayDummy extends DisplayComponent<VerticalDisplayProps>
private readonly maxAlt = 24000;

private readonly sub = this.props.bus.getArincSubscriber<
GenericFcuEvents & NDSimvars & DmcLogicEvents & SimplaneValues
GenericFcuEvents & NDSimvars & DmcLogicEvents & SimplaneValues & NDControlEvents
>();

private topRef = FSComponent.createRef<SVGElement>();
Expand All @@ -47,6 +48,8 @@ export class VerticalDisplayDummy extends DisplayComponent<VerticalDisplayProps>
(r) => a380EfisRangeSettings[r],
);

private readonly RangeChangeInProgress = ConsumerSubject.create(this.sub.on('set_range_change').whenChanged(), false);

private readonly visible = MappedSubject.create(
([mode, range]) =>
[EfisNdMode.PLAN, EfisNdMode.ROSE_ILS, EfisNdMode.ROSE_VOR].includes(mode) || range === -1 ? 'none' : 'block',
Expand Down Expand Up @@ -189,6 +192,11 @@ export class VerticalDisplayDummy extends DisplayComponent<VerticalDisplayProps>
FL
</text>
</g>
<g visibility={this.RangeChangeInProgress.map((it) => (it ? 'visible' : 'hidden'))}>
<text x="422" y="920" class="Green FontSmall MiddleAlign">
VD RANGE CHANGE
</text>
</g>
</svg>
);
}
Expand Down
4 changes: 4 additions & 0 deletions fbw-a380x/src/systems/instruments/src/ND/instrument.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import {
import {
A380EfisNdRangeValue,
a380EfisRangeSettings,
a380NdModeChange,
a380NdRangeChange,
a380TerrainThresholdPadValue,
ArincEventBus,
BtvSimvarPublisher,
Expand Down Expand Up @@ -286,6 +288,8 @@ class NDInstrument implements FsInstrument {
side={this.efisSide}
rangeValues={a380EfisRangeSettings}
terrainThresholdPaddingText={a380TerrainThresholdPadValue}
rangeChangeMessage={a380NdRangeChange}
modeChangeMessage={a380NdModeChange}
/>
<ContextMenu
ref={this.contextMenuRef}
Expand Down
5 changes: 5 additions & 0 deletions fbw-a380x/src/systems/instruments/src/ND/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,8 @@
.a380xInvisible {
display: none;
}

.a380xModeRangeChange {
font-size: 35px;
transform: translateX(0) translateY(-5px)
}
21 changes: 17 additions & 4 deletions fbw-common/src/systems/instruments/src/ND/ND.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ export interface NDProps<T extends number> {
rangeValues: T[];

terrainThresholdPaddingText: string;

rangeChangeMessage: string;

modeChangeMessage: string;
}

export class NDComponent<T extends number> extends DisplayComponent<NDProps<T>> {
Expand Down Expand Up @@ -213,6 +217,10 @@ export class NDComponent<T extends number> extends DisplayComponent<NDProps<T>>
this.invalidateRange();
});

this.rangeChangeInProgress.sub((rangechange) => {
this.props.bus.getPublisher<NDControlEvents>().pub('set_range_change', rangechange);
});

sub
.on('ndMode')
.whenChanged()
Expand Down Expand Up @@ -449,8 +457,13 @@ export class NDComponent<T extends number> extends DisplayComponent<NDProps<T>>
HDG
</Flag>

<Flag visible={this.rangeChangeInProgress} x={384} y={320} class="Green FontIntermediate">
RANGE CHANGE
<Flag
visible={this.rangeChangeInProgress}
x={384}
y={320}
class="Green FontIntermediate a380xModeRangeChange"
>
{this.props.rangeChangeMessage}
</Flag>
<Flag
visible={MappedSubject.create(
Expand All @@ -460,9 +473,9 @@ export class NDComponent<T extends number> extends DisplayComponent<NDProps<T>>
)}
x={384}
y={320}
class="Green FontIntermediate"
class="Green FontIntermediate a380xModeRangeChange"
>
MODE CHANGE
{this.props.modeChangeMessage}
</Flag>

<TerrainMapThresholds bus={this.props.bus} paddingText={this.props.terrainThresholdPaddingText} />
Expand Down
5 changes: 5 additions & 0 deletions fbw-common/src/systems/instruments/src/ND/NDControlEvents.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,9 @@ export interface NDControlEvents {
* Event for the CHRONO button being pushed
*/
chrono_pushed: void;

/**
* Set if a range change is in progress for VD (true, false)
*/
set_range_change: boolean;
}
8 changes: 8 additions & 0 deletions fbw-common/src/systems/instruments/src/NavigationDisplay.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,14 @@ export const a320TerrainThresholdPadValue = '0';

export const a380TerrainThresholdPadValue = '\\xa0';

export const a320NdRangeChange = 'RANGE CHANGE';

export const a380NdRangeChange = 'ND RANGE CHANGE';

export const a320NdModeChange = 'MODE CHANGE';

export const a380NdModeChange = 'ND MODE CHANGE';

export enum EfisNdMode {
ROSE_ILS,
ROSE_VOR,
Expand Down
Loading