Skip to content

Commit

Permalink
refactor: env.AIRCRAFT_PREFIX -> env.AIRCRAFT_PROJECT_PREFIX
Browse files Browse the repository at this point in the history
  • Loading branch information
2hwk committed Mar 31, 2024
1 parent 8622166 commit 9f4e119
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 70 deletions.
68 changes: 35 additions & 33 deletions fbw-a32nx/src/base/flybywire-aircraft-a320-neo/a32nx/aircraft.json
Original file line number Diff line number Diff line change
Expand Up @@ -580,39 +580,41 @@
]
},
"efb": {
"throttleAxisOptions": [
1,
2
],
"pushback": {
"turnIndicatorTuningDefault": 1.35,
"aircraftWheelBase": 12.64,
"aircraftLengthMeter": 37.57
},
"payload": {
"type": 1,
"chartLimits": {
"weight": {
"min": 35000,
"max": 80000,
"lines": 9,
"scale": 5000,
"values": [ 80, 70, 60, 50, 40 ]
},
"cg": {
"angleRad": 0.014025,
"min": 12,
"max": 47,
"overlap": 32,
"highlight": 5,
"lines": 35,
"scale": 1,
"values": [ 15, 20, 25, 30, 35, 40 ]
},
"labels": {
"mtow": { "x1": 0.65, "x2": 0.22, "y": 0.02 },
"mlw": { "x1": 0.65, "x2": 0.22, "y": 0.22 },
"mzfw": { "x1": 0.65, "x2": 0.22, "y": 0.29 }
"flypad": {
"throttleAxisOptions": [
1,
2
],
"pushback": {
"turnIndicatorTuningDefault": 1.35,
"aircraftWheelBase": 12.64,
"aircraftLengthMeter": 37.57
},
"payload": {
"type": 1,
"chartLimits": {
"weight": {
"min": 35000,
"max": 80000,
"lines": 9,
"scale": 5000,
"values": [ 80, 70, 60, 50, 40 ]
},
"cg": {
"angleRad": 0.014025,
"min": 12,
"max": 47,
"overlap": 32,
"highlight": 5,
"lines": 35,
"scale": 1,
"values": [ 15, 20, 25, 30, 35, 40 ]
},
"labels": {
"mtow": { "x1": 0.65, "x2": 0.22, "y": 0.02 },
"mlw": { "x1": 0.65, "x2": 0.22, "y": 0.22 },
"mzfw": { "x1": 0.65, "x2": 0.22, "y": 0.29 }
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ flyPad and other components to other aircraft.

Currently, there is config and hardcoded values spreadout across the repo, sometimes in various configuration (.json, .h, .toml, etc.) files.

The solution to this takes on (at the moment) the form of a VFS stored .json markup file ``<aircraft_prefix>/aircraft.json`` that has a format that currently is being decided and iterated upon.
The solution to this takes on (at the moment) the form of a VFS stored .json markup file ``<env.AIRCRAFT_PROJECT_PREFIX>/aircraft.json`` that has a format that currently is being decided and iterated upon.

This will (eventually) allow for deep, per-livery/tail number configuration i.e. dynamic passenger seating configurations and cargo loading by providing an override file (based on ATC ID/tailnumber),
i.e. ``<aircraft_prefix>/<tail_num>-aircraft.json``
i.e. ``<env.AIRCRAFT_PROJECT_PREFIX>/<tail_num>-aircraft.json``

This consists of several components and will be expanded upon in stages to facilitate and aid our code review and refactoring processes.

Expand Down
70 changes: 36 additions & 34 deletions fbw-a380x/src/base/flybywire-aircraft-a380-842/a380x/aircraft.json
Original file line number Diff line number Diff line change
Expand Up @@ -1333,40 +1333,42 @@
]
},
"efb": {
"throttleAxisOptions": [
1,
2,
4
],
"pushback": {
"turnIndicatorTuningDefault": 1.35,
"aircraftWheelBase": 31.9,
"aircraftLengthMeter": 72.72
},
"payload": {
"type": 2,
"chartLimits": {
"weight": {
"min": 235000,
"max": 550000,
"lines": 9,
"scale": 35000,
"values": [ 550, 480, 410, 340, 270 ]
},
"cg": {
"angleRad": 0.014025,
"min": 24,
"max": 54,
"overlap": 32,
"highlight": 5,
"lines": 30,
"scale": 1,
"values": [ 25, 30, 35, 40, 45, 50 ]
},
"labels": {
"mtow": { "x1": 0.75, "x2": 0.3, "y": 0.1 },
"mlw": { "x1": 0.75, "x2": 0.12, "y": 0.47 },
"mzfw": { "x1": 0.75, "x2": 0.12, "y": 0.57 }
"flypad": {
"throttleAxisOptions": [
1,
2,
4
],
"pushback": {
"turnIndicatorTuningDefault": 1.35,
"aircraftWheelBase": 31.9,
"aircraftLengthMeter": 72.72
},
"payload": {
"type": 2,
"chartLimits": {
"weight": {
"min": 235000,
"max": 550000,
"lines": 9,
"scale": 35000,
"values": [ 550, 480, 410, 340, 270 ]
},
"cg": {
"angleRad": 0.014025,
"min": 24,
"max": 54,
"overlap": 32,
"highlight": 5,
"lines": 30,
"scale": 1,
"values": [ 25, 30, 35, 40, 45, 50 ]
},
"labels": {
"mtow": { "x1": 0.75, "x2": 0.3, "y": 0.1 },
"mlw": { "x1": 0.75, "x2": 0.12, "y": 0.47 },
"mzfw": { "x1": 0.75, "x2": 0.12, "y": 0.57 }
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-3.0

import React, { useEffect, useState } from 'react';
import { usePersistentProperty, useSessionStorage, AircraftGithubVersionChecker, BuildInfo, SentryConsentState, SENTRY_CONSENT_KEY, useSimVar, AircraftInfo } from '@flybywiresim/fbw-sdk';
import { usePersistentProperty, useSessionStorage, AircraftGithubVersionChecker, BuildInfo, SentryConsentState, SENTRY_CONSENT_KEY, AircraftInfo } from '@flybywiresim/fbw-sdk';
import { t } from '@flybywiresim/flypad';
import { SettingsPage } from '../Settings';
// @ts-ignore
Expand Down

0 comments on commit 9f4e119

Please sign in to comment.