Skip to content

Commit e97709b

Browse files
MaverickwoeMaverickwoe
authored
Merge branch 'master' into a32nx-RandomFailures
2 parents 6d6cb4c + f2a0765 commit e97709b

File tree

60 files changed

+781
-514
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+781
-514
lines changed

‎.github/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
1. [FLIGHTMODEL] Fix outer to inner tank transfer valve closure - @donstim (donbikes)
2828
1. [SD] Corrected thickness and position of lower ECAM fuel page lines - @robertxing2004 (robeet)
2929
1. [SD] Corrected position of outer tank fuel quantity values - @robertxing2004 (robeet)
30+
1. [ISIS] Fixed the ISIS alt tape order for negative altitudes - @aweissoertel (Alex)
3031

3132
## 0.10.0
3233

‎.github/ISSUE_TEMPLATE/bug_report_beta.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ body:
1313
options:
1414
- Stable
1515
- Development
16-
- Experimental
1716
validations:
1817
required: true
1918
- type: textarea

‎fbw-a32nx/src/base/flybywire-aircraft-a320-neo/html_ui/Pages/A32NX_Core/A32NX_ATSU.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ const getSimBriefOfp = (mcdu, updateView, callback = () => {}) => {
7272
mcdu.simbrief["costIndex"] = data.general.costindex;
7373
mcdu.simbrief["navlog"] = data.navlog.fix;
7474
mcdu.simbrief["callsign"] = data.atc.callsign;
75-
mcdu.simbrief["alternateIcao"] = data.alternate.icao_code;
7675
let alternate = data.alternate;
7776
if (Array.isArray(data.alternate)) {
7877
alternate = data.alternate[0];

‎fbw-a32nx/src/base/flybywire-aircraft-a320-neo/html_ui/Pages/VCockpit/Instruments/Airliners/FlyByWire_A320_Neo/CDU/A320_Neo_CDU_WindPage.js

Lines changed: 38 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -112,17 +112,23 @@ class CDUWindPage {
112112
requestButton = "REQUEST [color]amber";
113113
}
114114

115-
let alternateCell = "[ ]°/[ ][color]cyan";
116-
117-
if (mcdu.winds.alternate != null) {
118-
alternateCell = `${CDUWindPage.FormatNumber(mcdu.winds.alternate.direction)}°/${CDUWindPage.FormatNumber(mcdu.winds.alternate.speed)}[color]cyan`;
115+
let alternateHeader = "";
116+
let alternateCell = "";
117+
let altFLightlevel = "";
118+
119+
if (mcdu.altDestination) {
120+
alternateHeader = "ALTN WIND";
121+
alternateCell = "[ ]°/[ ][color]cyan";
122+
altFLightlevel = "{green}{small}FL100{end}{end}";
123+
if (mcdu.winds.alternate != null) {
124+
alternateCell = `${CDUWindPage.FormatNumber(mcdu.winds.alternate.direction)}°/${CDUWindPage.FormatNumber(mcdu.winds.alternate.speed)}[color]cyan`;
125+
}
119126
}
120-
121127
const template = [
122128
["DESCENT WIND"],
123-
["TRU WIND/ALT", "ALTN WIND"],
129+
["TRU WIND/ALT", alternateHeader],
124130
["", alternateCell],
125-
["", "{green}{small}FL100{end}{end}"],
131+
["", altFLightlevel],
126132
["", ""],
127133
["", "WIND{sp}[color]amber"],
128134
["", requestButton],
@@ -136,21 +142,23 @@ class CDUWindPage {
136142

137143
mcdu.setTemplate(CDUWindPage.ShowWinds(template, mcdu, CDUWindPage.ShowDESPage, mcdu.winds.des, offset, 5));
138144

139-
mcdu.onRightInput[0] = (value, scratchpadCallback) => {
140-
if (value == FMCMainDisplay.clrValue) {
141-
mcdu.winds.alternate = null;
142-
CDUWindPage.ShowDESPage(mcdu, offset);
143-
return;
144-
}
145-
const wind = CDUWindPage.ParseWind(value);
146-
if (wind == null) {
147-
mcdu.setScratchpadMessage(NXSystemMessages.formatError);
148-
scratchpadCallback();
149-
} else {
150-
mcdu.winds.alternate = wind;
151-
CDUWindPage.ShowDESPage(mcdu, offset);
152-
}
153-
};
145+
if (mcdu.altDestination) {
146+
mcdu.onRightInput[0] = (value, scratchpadCallback) => {
147+
if (value == FMCMainDisplay.clrValue) {
148+
mcdu.winds.alternate = null;
149+
CDUWindPage.ShowDESPage(mcdu, offset);
150+
return;
151+
}
152+
const wind = CDUWindPage.ParseWind(value);
153+
if (wind == null) {
154+
mcdu.setScratchpadMessage(NXSystemMessages.formatError);
155+
scratchpadCallback();
156+
} else {
157+
mcdu.winds.alternate = wind;
158+
CDUWindPage.ShowDESPage(mcdu, offset);
159+
}
160+
};
161+
}
154162

155163
mcdu.onRightInput[3] = () => {
156164
CDUWindPage.ShowCRZPage(mcdu);
@@ -369,11 +377,14 @@ class CDUWindPage {
369377
const tod = mcdu.simbrief.navlog.find((val) => val.ident === "TOD");
370378
const desWpts = [tod, ...mcdu.simbrief.navlog.filter((val) => val.stage === stage)];
371379

372-
mcdu.winds.alternate = {
373-
direction: mcdu.simbrief.alternateAvgWindDir,
374-
speed: mcdu.simbrief.alternateAvgWindSpd,
375-
};
376-
380+
if (isFinite(mcdu.simbrief.alternateAvgWindDir) && isFinite(mcdu.simbrief.alternateAvgWindSpd)) {
381+
mcdu.winds.alternate = {
382+
direction: mcdu.simbrief.alternateAvgWindDir,
383+
speed: mcdu.simbrief.alternateAvgWindSpd,
384+
};
385+
} else {
386+
mcdu.winds.alternate = null;
387+
}
377388
// iterate through each clbWpt grabbing the wind data
378389
windData = [];
379390
lastAltitude = 45000;

‎fbw-a32nx/src/base/flybywire-aircraft-a320-neo/html_ui/Pages/VCockpit/Instruments/Airliners/FlyByWire_A320_Neo/FMC/A32NX_FMCMainDisplay.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2129,7 +2129,7 @@ class FMCMainDisplay extends BaseAirliners {
21292129
}
21302130

21312131
async tryUpdateAltDestination(altDestIdent) {
2132-
if (altDestIdent === "NONE" || altDestIdent === FMCMainDisplay.clrValue) {
2132+
if (!altDestIdent || altDestIdent === "NONE" || altDestIdent === FMCMainDisplay.clrValue) {
21332133
this.atsu.resetAtisAutoUpdate();
21342134
this.altDestination = undefined;
21352135
this._DistanceToAlt = 0;

‎fbw-a32nx/src/localization/flypad/cs.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -586,11 +586,11 @@
586586
"ConfigureEnd": "Horní hranice",
587587
"ConfigureStart": "Spodní hranice",
588588
"CurrentValue": "Aktuální hodnota",
589-
"Deadband": "Rozsah",
589+
"Deadband": "Mrtvá zóna",
590590
"ErrorOverlapMsg": "se překrývá s",
591591
"IndependentAxis": "Nezávislé osy",
592592
"LoadFromFile": "Načíst ze souboru",
593-
"PleaseEnterAValidDeadzone": "Prosím zadejte platný rozsah",
593+
"PleaseEnterAValidDeadzone": "Prosím zadejte platnou mrtvou zónu",
594594
"ResetToDefaults": "Obnovit výchozí",
595595
"ReverseFull": "Reverse Full",
596596
"ReverseIdle": "Reverse Idle",

‎fbw-a32nx/src/localization/flypad/da-DK.json

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,11 @@
151151
"BoardingTime": "Boarding tid",
152152
"Cargo": "Cargo",
153153
"Current": "Current",
154-
"DeboardConfirmationBody": "Please confirm deboarding all passengers",
154+
"DeboardConfirmationBody": "Bekræft venligst deboarding af alle passagerer",
155155
"DeboardConfirmationCancel": "Annuller",
156156
"DeboardConfirmationConfirm": "Deboard",
157-
"DeboardConfirmationTitle": "Deboard all Passengers?",
158-
"EstimatedDurationUnit": "minutes",
157+
"DeboardConfirmationTitle": "Skal alle passagerer afmønstre?",
158+
"EstimatedDurationUnit": "minutter",
159159
"GW": "GW",
160160
"GWCG": "GW CG",
161161
"LoadingTime": "Loading Time",
@@ -165,15 +165,15 @@
165165
"AircraftMustBeColdAndDarkToChangeBoardingTimes": "Aircraft Must Be On the Ground and Have Engines Shutdown to Change Boarding Duration",
166166
"FillPayloadFromSimbrief": "Fill Payload Information from Simbrief",
167167
"MaxCargo": "Max Cargo",
168-
"MaxGW": "Maximum GW",
169-
"MaxGWCG": "Maximum GW CG",
168+
"MaxGW": "Maksimal GW",
169+
"MaxGWCG": "Maksimal GW CG",
170170
"MaxPassengers": "Maksimal antal passagerer",
171171
"MaxZFW": "Maximum ZFW",
172172
"MaxZFWCG": "Maximum ZFWCG",
173173
"PerPaxBagWeight": "Per Passenger Bag Weight",
174174
"PerPaxWeight": "Per Passenger Weight",
175175
"StartBoarding": "Begin Boarding",
176-
"StartDeboarding": "Begin Deboarding"
176+
"StartDeboarding": "Begynd deboarding"
177177
},
178178
"Title": "Payload",
179179
"ZFW": "ZFW",
@@ -370,7 +370,7 @@
370370
"ConfirmationDialogMsg": "Bekræft indlæsning af forudindstillet.",
371371
"CurrentProcedureStep": "Nuværende Procedure Trin",
372372
"PleaseConfirmLoadingOfPreset": "Bekræft indlæsning af forudindstillet.",
373-
"Powered": "Powered",
373+
"Powered": "Drevet",
374374
"ReadyPushback": "Klar til Pushback",
375375
"ReadyTakeoff": "Klar til afgang ",
376376
"ReadyTaxi": "Klar til taxi",
@@ -453,23 +453,23 @@
453453
"UseControllerInput": "Brug controller input"
454454
},
455455
"QuickControls": {
456-
"AlignAdirs": "Align ADIRS",
457-
"FinishBoarding": "Finish Boarding",
458-
"OnScreenKeyboard": "OnScreen Keyboard",
456+
"AlignAdirs": "Juster ADIRS",
457+
"FinishBoarding": "Afslut boarding",
458+
"OnScreenKeyboard": "Skærmtastatur",
459459
"SimBridge": "SimBridge",
460-
"SimBridgeConnected": "Connected",
461-
"SimBridgeConnecting": "Connecting...",
460+
"SimBridgeConnected": "Tilsluttet",
461+
"SimBridgeConnecting": "Tilslutning...",
462462
"SimBridgeOff": "Fra",
463-
"SimBridgeOffline": "Not Available",
463+
"SimBridgeOffline": "Ikke tilgængelig",
464464
"TT": {
465-
"AlignAdirs": "Instantly align ADIRS",
466-
"AutoBrightness": "Turn Auto Brightness On/Off",
467-
"Brightness": "Set flyPad brightness",
468-
"FinishBoarding": "Instantly finish boarding",
469-
"OnScreenKeyboard": "Turn OnScreen Keyboard On/Off",
470-
"PowerButton": "Power Off",
471-
"Settings": "Go to flyPad Settings page",
472-
"SimBridge": "Control SimBridge Connection",
465+
"AlignAdirs": "Juster øjeblikkeligt ADIRS",
466+
"AutoBrightness": "Slå automatisk lysstyrke til/fra",
467+
"Brightness": "Indstil flyPad lysstyrke",
468+
"FinishBoarding": "Afslut ombordstigning øjeblikkeligt",
469+
"OnScreenKeyboard": "Slå skærmtastatur til/fra",
470+
"PowerButton": "Sluk",
471+
"Settings": "Gå til siden med flyPad-indstillinger",
472+
"SimBridge": "Styring af SimBridge-forbindelse",
473473
"Sleep": "Standby"
474474
},
475475
"Title": "Quick Controls"
@@ -546,10 +546,10 @@
546546
"SimOptions": {
547547
"Active": "Aktiv",
548548
"Auto": "Automatisk",
549-
"Both": "Synchronized",
549+
"Both": "Synkroniseret",
550550
"Calibrate": "Kalibrering",
551-
"Captain": "Captain",
552-
"CockpitSeatUsedToControl": "Cockpit Seat Used To Control",
551+
"Captain": "Kaptajn",
552+
"CockpitSeatUsedToControl": "Cockpitsæde bruges til at styre",
553553
"ConesEnabled": "Sikkerhed kegler",
554554
"Copilot": "Copilot",
555555
"DefaultBarometerUnit": "Standard Barometer enhed",
@@ -564,7 +564,7 @@
564564
"Off": "Fra",
565565
"Save": "Gem",
566566
"Side": "Side",
567-
"SimBridgeIp": "External SimBridge Host Address",
567+
"SimBridgeIp": "Ekstern SimBridge-værtsadresse",
568568
"SimBridgePort": "Ekstern SimBridge serverport",
569569
"SyncMsfsFlightPlan": "Synkroniser MSFS-flyveplan",
570570
"ThrottleDetents": "Gashåndtagspositioner",
@@ -574,9 +574,9 @@
574574
"inHg": "inHg"
575575
},
576576
"ThirdPartyOptions": {
577-
"GsxFuelEnabled": "GSX Fueling Synchronization",
578-
"GsxPayloadEnabled": "GSX Payload Synchronization",
579-
"Title": "3rd Party Options"
577+
"GsxFuelEnabled": "GSX Brændstofsynkronisering",
578+
"GsxPayloadEnabled": "GSX nyttelast synkronisering",
579+
"Title": "Optioner fra tredjepart"
580580
},
581581
"ThrottleConfig": {
582582
"Apply": "Anvend",
@@ -645,21 +645,21 @@
645645
"Brightness": "Click to change Brightness",
646646
"ConnectedToLocalApi": "Tilsluttet til SimBridge",
647647
"DisconnectedFromLocalApi": "Afbrudt fra SimBridge",
648-
"QuickControls": "Click to open Quick Controls",
648+
"QuickControls": "Klik for at åbne Quick Controls",
649649
"TurnOffOrShutdownEfb": "Slå EFB fra eller luk ned"
650650
},
651651
"Thu": "Tor",
652652
"Tue": "Tir",
653653
"Wed": "Ons"
654654
},
655655
"VersionCheck": {
656-
"CurrentVersionText": "You are using the $edition edition with version:",
657-
"LatestVersionText": "Latest $edition version is",
658-
"RecommendationText": "Please update your aircraft using the FlyByWire Installer.",
659-
"StatusBarWarning": "Outdated Aircraft Version",
656+
"CurrentVersionText": "Du bruger $edition-udgaven med version:",
657+
"LatestVersionText": "Seneste $edition version er",
658+
"RecommendationText": "Opdater venligst dit fly ved hjælp af FlyByWire Installer.",
659+
"StatusBarWarning": "Forældet flyversion",
660660
"TT": {
661-
"StatusBarWarning": "Please update your aircraft using the FlyByWire Installer."
661+
"StatusBarWarning": "Opdater venligst dit fly ved hjælp af FlyByWire Installer."
662662
},
663-
"Title": "New Version Available"
663+
"Title": "Ny version tilgængelig"
664664
}
665665
}

‎fbw-a32nx/src/localization/flypad/es.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@
165165
"AircraftMustBeColdAndDarkToChangeBoardingTimes": "Aircraft Must Be On the Ground and Have Engines Shutdown to Change Boarding Duration",
166166
"FillPayloadFromSimbrief": "Fill Payload Information from Simbrief",
167167
"MaxCargo": "Max Cargo",
168-
"MaxGW": "Maximum GW",
169-
"MaxGWCG": "Maximum GW CG",
168+
"MaxGW": "GW máximo",
169+
"MaxGWCG": "Máximo GW CG",
170170
"MaxPassengers": "Máximo de pasajeros",
171171
"MaxZFW": "Maximum ZFW",
172172
"MaxZFWCG": "Maximum ZFWCG",

0 commit comments

Comments
 (0)