Skip to content

Commit

Permalink
fix(a380x): Add RTPI + ISIS to a380x (#8868)
Browse files Browse the repository at this point in the history
* add RTPI + ISIS to a380x

* add some more a32nx stuff

* remove unused

* rename ISIS to ISISlegacy

* remove unused files from a380x FCU

* fix(efb): font paths

* clean up fonts

* some more fixes

---------

Co-authored-by: Michael Corcoran <[email protected]>
Co-authored-by: alepouna <[email protected]>
  • Loading branch information
3 people authored Sep 4, 2024
1 parent f6ace93 commit 6af156d
Show file tree
Hide file tree
Showing 113 changed files with 3,561 additions and 82 deletions.
6 changes: 6 additions & 0 deletions fbw-a32nx/src/systems/instruments/src/Clock/Clock.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// Copyright (c) 2023-2024 FlyByWire Simulations
// SPDX-License-Identifier: GPL-3.0

$font-file-path: '/Fonts/fbw-a32nx';

@import "../../../../../../fbw-common/src/systems/instruments/src/Clock/style.scss";
2 changes: 2 additions & 0 deletions fbw-a32nx/src/systems/instruments/src/Clock/instrument.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
import { EventBus, FSComponent, HEventPublisher } from '@microsoft/msfs-sdk';
import { ClockRoot, ClockSimvarPublisher } from '@flybywiresim/clock';

import './Clock.scss';

// eslint-disable-next-line camelcase
class A32NX_Clock extends BaseInstrument {
private bus: EventBus;
Expand Down
6 changes: 6 additions & 0 deletions fbw-a32nx/src/systems/instruments/src/EFB/Efb.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// Copyright (c) 2023-2024 FlyByWire Simulations
// SPDX-License-Identifier: GPL-3.0

$font-file-path: '/Fonts/fbw-a32nx';

@import "../../../../../../fbw-common/src/systems/instruments/src/EFB/Assets/Efb.scss";
2 changes: 2 additions & 0 deletions fbw-a32nx/src/systems/instruments/src/EFB/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import { A320251NTakeoffPerformanceCalculator } from '@shared/performance/a32nx_
import { AutomaticCallOutsPage } from './Pages/AutomaticCallOutsPage';
import { a32nxSyncedSettings } from 'instruments/src/EFB/settingsSync';

import './Efb.scss';

function aircraftEfbSetup(): void {
syncSettingsFromPersistentStorage(a32nxSyncedSettings);
}
Expand Down
4 changes: 3 additions & 1 deletion fbw-a380x/mach.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ module.exports = {

reactInstrument('BAT'),
reactInstrument('EFB', ['/Pages/VCockpit/Instruments/Shared/Map/MapInstrument.html']),
reactInstrument('ISISlegacy'),
reactInstrument('OIT'),
reactInstrument('RTPI'),
reactInstrument('SD'),
],
};
Expand All @@ -51,7 +53,7 @@ function msfsAvionicsInstrument(name, folder = name) {
templateId: `A380X_${name}`,
mountElementId: `${name}_CONTENT`,
fileName: name.toLowerCase(),
imports: ['/JS/dataStorage.js', '/JS/fbw-a32nx/A32NX_Util.js'],
imports: ['/JS/dataStorage.js', '/JS/fbw-a380x/A32NX_Util.js'],
},
};
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,14 @@ size_mm=512,512
pixel_size=512,512
texture=$ISIS1

htmlgauge00=A32NX/ISIS/isis.html, 0,0,512,512
htmlgauge00=A380X/ISISlegacy/isislegacy.html, 0,0,512,512

[VCockpit11]
size_mm=512,512
pixel_size=512,512
texture=$ISIS2

;htmlgauge00=A32NX/ISIS/isis.html, 0,0,512,512
;htmlgauge00=A380X/ISISlegacy/isislegacy.html, 0,0,512,512
; FIXME re-enable second ISIS when A380X ISIS implementation is in place

[VCockpit12]
Expand All @@ -111,7 +111,7 @@ size_mm=338,128
pixel_size=338,128
texture=$RTPI

htmlgauge00=A32NX/RTPI/rtpi.html, 0,0,338,128
htmlgauge00=A380X/RTPI/rtpi.html, 0,0,338,128

[VCockpit14]
size_mm=256,128
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 6af156d

Please sign in to comment.