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

refactor(build/efb): aircraft project prefix overhaul to better support different a/c and variants (v0.1) #8599

Merged
merged 54 commits into from
Apr 15, 2024
Merged
Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
79acc30
refactor: aircraft type check
Revyn112 Feb 16, 2024
75de63e
lint fix
Revyn112 Feb 16, 2024
92c4131
lint fix
Revyn112 Feb 16, 2024
1e3f0f0
add extra-host module for airframe check, remove airframe check from efb
Revyn112 Feb 19, 2024
8f8b1e5
update conflict files: overview, flight widget
Revyn112 Feb 19, 2024
a597fb1
remove airframe enum
Revyn112 Feb 19, 2024
5a0c15a
fix lint, add missing aircraft type docs
Revyn112 Feb 19, 2024
e454639
Merge branch 'master' into master
Revyn112 Feb 22, 2024
2cde737
Merge remote-tracking branch 'aircraft/master' into PR 8500
2hwk Mar 24, 2024
7ab219f
refactor: boolean logic
2hwk Mar 24, 2024
735e79e
fix: panel cfg
2hwk Mar 24, 2024
8859982
feat: A/C prefix environ
2hwk Mar 25, 2024
ce3cf3a
feat: bones for xml config to AirCraftSync (from AirframeCheck)
2hwk Mar 30, 2024
53f0eef
refactor: env.AIRCRAFT_PREFIX -> env.AIRCRAFT_PROJECT_PREFIX
2hwk Mar 31, 2024
0b29cb4
refactor: remove getAircraftType redundant function and clean up 'a32…
2hwk Mar 31, 2024
3bdbd57
fix: broken index.ts
2hwk Mar 31, 2024
3e37b2b
fix: remove aboutpage diff
2hwk Mar 31, 2024
968cc0f
fix: adding aircraftsync to a380 and removing aircraftTypeCheck
2hwk Mar 31, 2024
7c6e15a
fix: AircraftType
2hwk Mar 31, 2024
63c8f74
feat: aircraft.json init
2hwk Mar 31, 2024
d580f61
refactor: env.AIRCRAFT_PREFIX -> env.AIRCRAFT_PROJECT_PREFIX
2hwk Mar 31, 2024
15a3858
refactor: json format changes
2hwk Mar 31, 2024
c71a702
fix: getAirframeInfo format
2hwk Mar 31, 2024
272faa7
fix: build and workflows
2hwk Mar 31, 2024
f748ac6
Merge remote-tracking branch 'upstream/master' into efb-panel-cfg-ove…
2hwk Apr 2, 2024
626677f
refactor: main/upper deck selector overhaul with redux
2hwk Apr 2, 2024
1e62d57
feat: VFS config for payload
2hwk Apr 2, 2024
c38d8d5
chore: updated json5
2hwk Apr 2, 2024
06212bb
Merge remote-tracking branch 'origin/HEAD' into efb-panel-cfg-overhaul
2hwk Apr 3, 2024
b74c630
chore: changelog.md
2hwk Apr 3, 2024
34bacb0
fix: diff
2hwk Apr 3, 2024
dae6215
refactor: EFB flight widget and overview
2hwk Apr 3, 2024
94d4993
refactor: flypad config
2hwk Apr 4, 2024
27d8a3e
refactor: payload page
2hwk Apr 4, 2024
556a53b
refactor: port gsx fixes to big payload
2hwk Apr 4, 2024
e1410a0
refactor: services page use airframeInfo
2hwk Apr 4, 2024
cd119e3
refactor: pushback page
2hwk Apr 4, 2024
9d71780
refactor: throttle config page
2hwk Apr 4, 2024
4c79885
refactor: remove L:A32NX_AIRCRAFT_TYPE var
2hwk Apr 5, 2024
67c1c69
refactor: panel.cfg and updated comments for 'TITLE' Simvar
2hwk Apr 5, 2024
183fadd
refactor: simbrief ID, developer key in airframe.json, numberofAxis k…
2hwk Apr 6, 2024
9f10e40
refactor: move more efb items into fbw-common, remove code bandaid fo…
2hwk Apr 6, 2024
ebe9bba
chore: comments
2hwk Apr 6, 2024
0a48f30
refactor: pushback page, flypad -> airframe dimensions , cleanup
2hwk Apr 6, 2024
df19736
Merge master into efb-panel-cfg-overhaul
2hwk Apr 6, 2024
46152e2
Merge remote-tracking branch 'origin/master' into efb-panel-cfg-overhaul
2hwk Apr 6, 2024
6ad6cb0
fix: remove old checklist json5
2hwk Apr 6, 2024
f3a6b68
chore: fix diff
2hwk Apr 6, 2024
6a36f3b
fix: lint
2hwk Apr 6, 2024
1222dc7
fix: build
2hwk Apr 6, 2024
747ae72
refactor: readme for updated version numbers, json5 and more
2hwk Apr 6, 2024
a3b911a
chore: comment
2hwk Apr 6, 2024
204418e
chore: comments
2hwk Apr 6, 2024
ed70017
Merge remote-tracking branch 'origin/master' into efb-panel-cfg-overhaul
2hwk Apr 15, 2024
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
4 changes: 3 additions & 1 deletion .github/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@
1. [FLIGHTMODEL] Fixes some crosswind issues - @donstim (donbikes)
1. [LIGHTS] Movement of landing lights now requires power and position is output into LVAR - @Maximilian-Reuter
1. [CDU] Fix auto weight and balance import on INIT B during GSX boarding not using the target values - @Maximilian-Reuter
2. [FAC] Improve sideslip estimation - @lukecologne (luke)
1. [FAC] Improve sideslip estimation - @lukecologne (luke)
1. [FWC] Implement overspeed VMO/MMO warning - @tracernz (Mike)
1. [MISC] Fixed wrong msfs plane acceleration during reverser use causing autobrake wrong brake inputs - @Crocket63 (crocket)

## 0.11.0

Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/a380x-exp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ jobs:
FBW_PRODUCTION_BUILD: 1
A32NX_INSTRUMENTS_BUILD_WORKERS: 2
BUILD_DIR_NAME: a380x-experimental-a32nx
AIRCRAFT_PROJECT_PREFIX: a32nx
AIRCRAFT_VARIANT: a320-251n
steps:
- name: Checkout source
uses: actions/checkout@v4
Expand All @@ -29,6 +31,8 @@ jobs:
echo CLIENT_SECRET=\"${{ secrets.NAVIGRAPH_CLIENT_SECRET }}\" >> fbw-a32nx/.env
echo CHARTFOX_SECRET=\"${{ secrets.CHARTFOX_SECRET }}\" >> fbw-a32nx/.env
echo SENTRY_DSN=\"${{ secrets.SENTRY_DSN }}\" >> fbw-a32nx/.env
echo AIRCRAFT_PROJECT_PREFIX=${{ env.AIRCRAFT_PROJECT_PREFIX }} >> fbw-a32nx/.env
echo AIRCRAFT_VARIANT=${{ env.AIRCRAFT_VARIANT }} >> fbw-a32nx/.env
echo BUILD_DIR_NAME=${{ env.BUILD_DIR_NAME }} >> .env
echo LOCALAZY_READ_KEY=${{ secrets.LOCALAZY_READ_KEY }} >> .env
echo VITE_BUILD=false >> .env
Expand Down Expand Up @@ -66,6 +70,8 @@ jobs:
env:
FBW_PRODUCTION_BUILD: 1
BUILD_DIR_NAME: a380x-experimental-a380x
AIRCRAFT_PROJECT_PREFIX: a380x
AIRCRAFT_VARIANT: a380-842
steps:
- name: Checkout source
uses: actions/checkout@v4
Expand All @@ -78,6 +84,8 @@ jobs:
echo CLIENT_SECRET=\"${{ secrets.NAVIGRAPH_CLIENT_SECRET_A380X }}\" >> fbw-a380x/.env
echo CHARTFOX_SECRET=\"${{ secrets.CHARTFOX_SECRET }}\" >> fbw-a380x/.env
echo SENTRY_DSN=\"${{ secrets.SENTRY_DSN }}\" >> fbw-a380x/.env
echo AIRCRAFT_PROJECT_PREFIX=${{ env.AIRCRAFT_PROJECT_PREFIX }} >> fbw-a380x/.env
echo AIRCRAFT_VARIANT=${{ env.AIRCRAFT_VARIANT }} >> fbw-a380x/.env
echo BUILD_DIR_NAME=${{ env.BUILD_DIR_NAME }} >> .env
echo LOCALAZY_READ_KEY=${{ secrets.LOCALAZY_READ_KEY }} >> .env
echo VITE_BUILD=false >> .env
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ jobs:
VMASTER_PRE_RELEASE_ID: 32243965
VMASTER_PRE_RELEASE_TAG: vmaster
BUILD_DIR_NAME: master-a32nx
AIRCRAFT_PROJECT_PREFIX: a32nx
AIRCRAFT_VARIANT: a320-251n
steps:
- name: Checkout source
uses: actions/checkout@v4
Expand All @@ -34,6 +36,8 @@ jobs:
echo CLIENT_SECRET=\"${{ secrets.NAVIGRAPH_CLIENT_SECRET }}\" >> fbw-a32nx/.env
echo CHARTFOX_SECRET=\"${{ secrets.CHARTFOX_SECRET }}\" >> fbw-a32nx/.env
echo SENTRY_DSN=\"${{ secrets.SENTRY_DSN }}\" >> fbw-a32nx/.env
echo AIRCRAFT_PROJECT_PREFIX=\"${{ env.AIRCRAFT_PROJECT_PREFIX }}\" >> fbw-a32nx/.env
echo AIRCRAFT_VARIANT=${{ env.AIRCRAFT_VARIANT }} >> fbw-a32nx/.env
echo BUILD_DIR_NAME=${{ env.BUILD_DIR_NAME }} >> .env
echo LOCALAZY_READ_KEY=${{ secrets.LOCALAZY_READ_KEY }} >> .env
echo VITE_BUILD=false >> .env
Expand Down Expand Up @@ -100,6 +104,8 @@ jobs:
VMASTER_PRE_RELEASE_ID: 32243965
VMASTER_PRE_RELEASE_TAG: vmaster
BUILD_DIR_NAME: master-a380x
AIRCRAFT_PROJECT_PREFIX: a380x
AIRCRAFT_VARIANT: a380-842
steps:
- name: Checkout source
uses: actions/checkout@v4
Expand All @@ -112,6 +118,8 @@ jobs:
echo CLIENT_SECRET=\"${{ secrets.NAVIGRAPH_CLIENT_SECRET_A380X }}\" >> fbw-a380x/.env
echo CHARTFOX_SECRET=\"${{ secrets.CHARTFOX_SECRET }}\" >> fbw-a380x/.env
echo SENTRY_DSN=\"${{ secrets.SENTRY_DSN }}\" >> fbw-a380x/.env
echo AIRCRAFT_PROJECT_PREFIX=\"${{ env.AIRCRAFT_PROJECT_PREFIX }}\" >> fbw-a380x/.env
echo AIRCRAFT_VARIANT=\"${{ env.AIRCRAFT_VARIANT }}\" >> fbw-a380x/.env
echo BUILD_DIR_NAME=${{ env.BUILD_DIR_NAME }} >> .env
echo LOCALAZY_READ_KEY=${{ secrets.LOCALAZY_READ_KEY }} >> .env
echo VITE_BUILD=false >> .env
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ jobs:
if: github.event.pull_request.draft == false
env:
FBW_PRODUCTION_BUILD: 1
AIRCRAFT_PROJECT_PREFIX: a32nx
AIRCRAFT_VARIANT: a320-251n
steps:
- name: Checkout source
uses: actions/checkout@v4
Expand All @@ -60,6 +62,8 @@ jobs:
echo CLIENT_SECRET=\"${{ secrets.NAVIGRAPH_CLIENT_SECRET_A380X }}\" >> fbw-a32nx/.env
echo CHARTFOX_SECRET=\"${{ secrets.CHARTFOX_SECRET }}\" >> fbw-a32nx/.env
echo SENTRY_DSN=\"${{ secrets.SENTRY_DSN }}\" >> fbw-a32nx/.env
echo AIRCRAFT_PROJECT_PREFIX=\"${{ env.AIRCRAFT_PROJECT_PREFIX }}\" >> fbw-a32nx/.env
echo AIRCRAFT_VARIANT=\"${{ env.AIRCRAFT_VARIANT }}\" >> fbw-a32nx/.env
echo LOCALAZY_READ_KEY=${{ secrets.LOCALAZY_READ_KEY }} >> .env
echo VITE_BUILD=false >> .env
cat fbw-a32nx/.env
Expand Down Expand Up @@ -90,6 +94,8 @@ jobs:
if: github.event.pull_request.draft == false
env:
FBW_PRODUCTION_BUILD: 1
AIRCRAFT_PROJECT_PREFIX: a380x
AIRCRAFT_VARIANT: a380-842
steps:
- name: Checkout source
uses: actions/checkout@v4
Expand All @@ -102,6 +108,8 @@ jobs:
echo CHARTFOX_SECRET=\"${{ secrets.CHARTFOX_SECRET }}\" >> fbw-a380x/.env
echo SENTRY_DSN=\"${{ secrets.SENTRY_DSN }}\" >> fbw-a380x/.env
echo LOCALAZY_READ_KEY=${{ secrets.LOCALAZY_READ_KEY }} >> .env
echo AIRCRAFT_PROJECT_PREFIX=\"${{ env.AIRCRAFT_PROJECT_PREFIX }}\" >> fbw-a380x/.env
echo AIRCRAFT_VARIANT=\"${{ env.AIRCRAFT_VARIANT }}\" >> fbw-a380x/.env
echo VITE_BUILD=false >> .env
cat fbw-a380x/.env
- name: Install dependencies
Expand All @@ -124,4 +132,4 @@ jobs:
if: github.event.pull_request.auto_merge == false
with:
name: flybywire-aircraft-a380-842
path: ./fbw-a380x/out/flybywire-aircraft-a380-842/
path: ./fbw-a380x/out/flybywire-aircraft-a380-842/
4 changes: 4 additions & 0 deletions .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ jobs:
FBW_PRODUCTION_BUILD: 1
RELEASE_ZIP_NAME: A32NX-stable.7z
BUILD_DIR_NAME: stable
AIRCRAFT_PROJECT_PREFIX: a32nx
AIRCRAFT_VARIANT: a320-251n
steps:
- name: Checkout source
uses: actions/checkout@v2
Expand All @@ -23,6 +25,8 @@ jobs:
echo CHARTFOX_SECRET=\"${{ secrets.CHARTFOX_SECRET }}\" >> fbw-a32nx/.env
echo SENTRY_DSN=\"${{ secrets.SENTRY_DSN }}\" >> fbw-a32nx/.env
echo BUILD_DIR_NAME=${{ env.BUILD_DIR_NAME }} >> .env
echo AIRCRAFT_PROJECT_PREFIX=${{ env.AIRCRAFT_PROJECT_PREFIX }} >> fbw-a32nx/.env
echo AIRCRAFT_VARIANT=${{ env.AIRCRAFT_VARIANT }} >> fbw-a32nx/.env
echo LOCALAZY_READ_KEY=${{ secrets.LOCALAZY_READ_KEY }} >> .env
echo VITE_BUILD=false >> .env
- name: Build A32NX
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ jobs:
STABLE_PRE_RELEASE_TAG: assets/stable
STABLE_ZIP_NAME: A32NX-stable.7z
BUILD_DIR_NAME: stable
AIRCRAFT_PROJECT_PREFIX: a32nx
AIRCRAFT_VARIANT: a320-251n
steps:
- name: Checkout source
uses: actions/checkout@v2
Expand All @@ -25,6 +27,8 @@ jobs:
echo CLIENT_SECRET=\"${{ secrets.NAVIGRAPH_CLIENT_SECRET }}\" >> fbw-a32nx/.env
echo CHARTFOX_SECRET=\"${{ secrets.CHARTFOX_SECRET }}\" >> fbw-a32nx/.env
echo SENTRY_DSN=\"${{ secrets.SENTRY_DSN }}\" >> fbw-a32nx/.env
echo AIRCRAFT_PROJECT_PREFIX=${{ env.AIRCRAFT_PROJECT_PREFIX }} >> fbw-a32nx/.env
echo AIRCRAFT_VARIANT=${{ env.AIRCRAFT_VARIANT }} >> fbw-a32nx/.env
echo BUILD_DIR_NAME=${{ env.BUILD_DIR_NAME }} >> .env
echo LOCALAZY_READ_KEY=${{ secrets.LOCALAZY_READ_KEY }} >> .env
echo VITE_BUILD=false >> .env
Expand Down
2 changes: 2 additions & 0 deletions fbw-a32nx/.env
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ NODE_ENV=production
CLIENT_SECRET=""
CLIENT_ID=""
SENTRY_DSN=""
AIRCRAFT_PROJECT_PREFIX="a32nx"
AIRCRAFT_VARIANT="a320-251n"
57 changes: 47 additions & 10 deletions fbw-a32nx/docs/a320-simvars.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,15 @@

## Uncategorized

- A32NX_AIRCRAFT_TYPE
- Enum
- Indicates the aircraft type
Aircraft | Value
--- | ---
Unknown | 0
A320_251N | 1
A380_842 | 2

- A32NX_IS_READY
- Bool
- Indicates that the JavaScript part is ready
Expand All @@ -42,16 +51,16 @@
- A32NX_START_STATE
- Enum
- Indicates the state in which MSFS started
- State | Value
--- | ---
Hangar | 1
Apron | 2
Taxi | 3
Runway | 4
Climb | 5
Cruise | 6
Approach | 7
Final | 8
State | Value
--- | ---
Hangar | 1
Apron | 2
Taxi | 3
Runway | 4
Climb | 5
Cruise | 6
Approach | 7
Final | 8

- A32NX_NO_SMOKING_MEMO
- Boolean that determines whether the NO SMOKING memo should be visible on the upper ECAM
Expand Down Expand Up @@ -1640,6 +1649,10 @@ In the variables below, {number} should be replaced with one item in the set: {
- Arinc429Word<Knots>
- The computed airspeed (CAS).

- A32NX_ADIRS_ADR_{number}_MAX_AIRSPEED
- Arinc429Word<Knots>
- The max allowable airspeed (CAS), considering VMO and MMO.

- A32NX_ADIRS_ADR_{number}_MACH
- Arinc429Word<Mach>
- The Mach number (M).
Expand All @@ -1664,6 +1677,30 @@ In the variables below, {number} should be replaced with one item in the set: {
- Arinc429Word<Degrees>
- The angle of attack (α) of the aircraft

- A32NX_ADIRS_ADR_{number}_DISCRETE_WORD_1
- Arinc429Word<flags>
- Indicates state of the ADR
Bit | Meaning
--- | ---
0 | ICING_DETECTOR_HEAT (not yet implemented)
1 | PITOT_HEAT (not yet implemented)
2 | ADR_FAULT
3 | RIGHT_STATIC_HEAT (not yet implemented)
4 | LEFT_STATIC_HEAT (not yet implemented)
5 | TAT_HEAT (not yet implemented)
6 | AOA_SENSOR_1_FAULT (not yet implemented)
7 | AOA_SENSOR_2_FAULT (not yet implemented)
8 | OVERSPEED_WARNING
10 | AOA_UNIQUE (not yet implemented)
11 | VMO_MMO_1 (not yet implemented)
12 | VMO_MMO_2 (not yet implemented)
13 | VMO_MMO_3 (not yet implemented)
14 | VMO_MMO_4 (not yet implemented)
15 | ALTERNATE_SSEC_A (not yet implemented)
16 | ALTERNATE_SSEC_B (not yet implemented)
17 | BARO_PORT_A (not yet implemented)
18 | ZERO_MACH_IGNORE_SSEC (not yet implemented)

- A32NX_ADIRS_IR_{number}_PITCH
- Arinc429Word<Degrees>
- The pitch angle of the aircraft.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ model = "" ; model folder
panel = "" ; panel folder
sound = "" ; sound folder
texture = "" ; texture folder
kb_checklists = "Boeing747-400_check" ; Procedures/Checklist sibling file name
kb_reference = "Boeing747-400_ref" ; Reference information sibling file name
kb_checklists = "" ; Procedures/Checklist sibling file name
kb_reference = "" ; Reference information sibling file name
description = "TT:AIRCRAFT.DESCRIPTION" ; Variation description.
wip_indicator = 0 ; know if the variation is good to go or still WIP : -1=Disabled, 0=Rough, 1=1st Pass, 2=Finished
ui_manufacturer = "FlyByWire Simulations" ; e.g. Boeing, Cessna
Expand All @@ -86,11 +86,10 @@ ui_certified_ceiling = 39800 ; service ceiling / max certified operating altitud
ui_max_range = 3500 ; max distance the aircraft can fly between take-off and landing in (NM)
ui_autonomy = 7 ; max duration the aircraft can fly between take-off and landing in (Hrs)
ui_fuel_burn_rate = 5300 ; average fuel consumption per hour (lbs/hr) - reminder: fuel density is ~6.7lbs per US gallon
atc_id = "ASX320" ; tail number
atc_id_enable = 0 ; enable tail number
atc_airline = "" ; airline name
atc_flight_number = "1123" ; flight number
atc_heavy = 1 ; heavy?
atc_id = "FBW320" ; tail number
atc_airline = "Fly By Wire" ; airline name
atc_flight_number = "320" ; flight number
atc_heavy = 0 ;
atc_parking_types = "GATE,RAMP,CARGO" ; "ANY" / "RAMP" / "CARGO" / "MIL_CARGO" / "MIL_COMBAT" / "GATE" / "DOCK"
atc_parking_codes = "" ; Comma separated and may be as small as one character each
atc_id_color = "" ; color for the tail number : i.e. "#ffff00ff"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ size_mm = 1430,1000
pixel_size = 1430,1000
texture = $EFB

htmlgauge00 = A32NX/EFB/efb.html?Airframe=A320_251N, 0,0,1430,1000
htmlgauge00 = A32NX/EFB/efb.html, 0,0,1430,1000

[VCockpit17]
size_mm = 0,0
Expand All @@ -149,7 +149,7 @@ pixel_size = 0,0
texture = NO_TEXTURE
background_color = 0,0,0

htmlgauge00 = A32NX/ExtrasHost/extras-host.html,0,0,1,1
htmlgauge00 = A32NX/ExtrasHost/extras-host.html?Airframe=A320_251N,0,0,1,1

[VPainting01]
size_mm = 2048,512
Expand Down
Loading