From 873e21b682b6b82a784c3181b4dffe668a2a5f89 Mon Sep 17 00:00:00 2001 From: BravoMike99 Date: Thu, 28 Sep 2023 22:01:56 +0100 Subject: [PATCH 01/23] fix(fma): add smaller font size & center CLB --- fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx | 13 +++++++++---- .../src/systems/instruments/src/PFD/style.scss | 4 ++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx index 97ba8e30897..07fab6024e0 100644 --- a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx +++ b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx @@ -888,6 +888,8 @@ class B2Cell extends DisplayComponent { private classSub = Subject.create(''); + private xposSub = Subject.create(0); + onAfterRender(node: VNode): void { super.onAfterRender(node); @@ -905,6 +907,7 @@ class B2Cell extends DisplayComponent { let color1 = 'Cyan'; if (clbArmed) { text1 = 'CLB'; + this.xposSub.set(49.921795); } else if (desArmed) { text1 = 'DES'; } else if (altCstArmed) { @@ -925,17 +928,19 @@ class B2Cell extends DisplayComponent { text2 = ''; } + // CLB armed should be centered, other modes are aligned to the left on newer DMCs + this.xposSub.set(clbArmed ? 49.921795 : 41.477474); this.text1Sub.set(text1); this.text2Sub.set(text2); - this.classSub.set(`FontMedium MiddleAlign ${color1}`); + this.classSub.set(`FontMediumSmaller MiddleAlign ${color1}`); }); } render(): VNode { return ( - {this.text1Sub} - {this.text2Sub} + {this.text1Sub} + {this.text2Sub} ); } @@ -1118,7 +1123,7 @@ class C2Cell extends DisplayComponent { render(): VNode { return ( - {this.textSub} + {this.textSub} ); } } diff --git a/fbw-a32nx/src/systems/instruments/src/PFD/style.scss b/fbw-a32nx/src/systems/instruments/src/PFD/style.scss index 252a4a9e7f5..50b824ed245 100644 --- a/fbw-a32nx/src/systems/instruments/src/PFD/style.scss +++ b/fbw-a32nx/src/systems/instruments/src/PFD/style.scss @@ -107,6 +107,10 @@ font-size: 6px; } +.FontMediumSmaller { + font-size: 5.3px; +} + .FontSmall { font-size: 5px; } From 4578574244eeac84acfe4930a98fcd3907ca732e Mon Sep 17 00:00:00 2001 From: BravoMike99 <> Date: Thu, 28 Sep 2023 23:29:27 +0100 Subject: [PATCH 02/23] fix(fma): AB font size, CLB pos --- fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx index 07fab6024e0..22064e3fa5a 100644 --- a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx +++ b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx @@ -264,7 +264,7 @@ class Row2 extends DisplayComponent<{ bus: ArincEventBus, isAttExcessive: Subscr class A2Cell extends DisplayComponent<{ bus: ArincEventBus }> { private text = Subject.create(''); - private className = Subject.create('FontMedium MiddleAlign Cyan'); + private className = Subject.create('FontMediumSmaller MiddleAlign Cyan'); private autoBrkRef = FSComponent.createRef(); @@ -577,7 +577,7 @@ class A3Cell extends DisplayComponent { private handleAutobrakeMode() { if (this.autobrakeMode === 3 && !this.AB3Message) { this.textSub.set('BRK MAX'); - this.classSub.set('FontMedium MiddleAlign Cyan'); + this.classSub.set('FontMediumSmaller MiddleAlign Cyan'); } else { this.textSub.set(''); } @@ -907,7 +907,7 @@ class B2Cell extends DisplayComponent { let color1 = 'Cyan'; if (clbArmed) { text1 = 'CLB'; - this.xposSub.set(49.921795); + this.xposSub.set(50.601795); } else if (desArmed) { text1 = 'DES'; } else if (altCstArmed) { @@ -929,7 +929,7 @@ class B2Cell extends DisplayComponent { } // CLB armed should be centered, other modes are aligned to the left on newer DMCs - this.xposSub.set(clbArmed ? 49.921795 : 41.477474); + this.xposSub.set(clbArmed ? 50.601795 : 41.477474); this.text1Sub.set(text1); this.text2Sub.set(text2); this.classSub.set(`FontMediumSmaller MiddleAlign ${color1}`); From 73f8bc0267b3cd14408ca655ef9fc364987217ff Mon Sep 17 00:00:00 2001 From: BravoMike99 <> Date: Fri, 29 Sep 2023 22:11:04 +0100 Subject: [PATCH 03/23] fix(fma): revert font back to medium Reverts fma font back to medium taking into account close up PFD pictures. Armed font should be the same size as AP/ATHR/FD status font. --- fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx index 22064e3fa5a..4369f8ced15 100644 --- a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx +++ b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx @@ -264,7 +264,7 @@ class Row2 extends DisplayComponent<{ bus: ArincEventBus, isAttExcessive: Subscr class A2Cell extends DisplayComponent<{ bus: ArincEventBus }> { private text = Subject.create(''); - private className = Subject.create('FontMediumSmaller MiddleAlign Cyan'); + private className = Subject.create('FontMedium MiddleAlign Cyan'); private autoBrkRef = FSComponent.createRef(); @@ -577,7 +577,7 @@ class A3Cell extends DisplayComponent { private handleAutobrakeMode() { if (this.autobrakeMode === 3 && !this.AB3Message) { this.textSub.set('BRK MAX'); - this.classSub.set('FontMediumSmaller MiddleAlign Cyan'); + this.classSub.set('FontMedium MiddleAlign Cyan'); } else { this.textSub.set(''); } @@ -932,7 +932,7 @@ class B2Cell extends DisplayComponent { this.xposSub.set(clbArmed ? 50.601795 : 41.477474); this.text1Sub.set(text1); this.text2Sub.set(text2); - this.classSub.set(`FontMediumSmaller MiddleAlign ${color1}`); + this.classSub.set(`FontMedium MiddleAlign ${color1}`); }); } @@ -940,7 +940,7 @@ class B2Cell extends DisplayComponent { return ( {this.text1Sub} - {this.text2Sub} + {this.text2Sub} ); } @@ -1123,7 +1123,7 @@ class C2Cell extends DisplayComponent { render(): VNode { return ( - {this.textSub} + {this.textSub} ); } } From e6329b0fc5840b8d4735665d293642005be3870e Mon Sep 17 00:00:00 2001 From: BravoMike99 <> Date: Sun, 1 Oct 2023 13:18:55 +0100 Subject: [PATCH 04/23] fix(fma): CLB alingment and armed font size Changes CLB alignment and font size according to closeup PFD refs. --- fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx | 13 ++++++------- .../src/systems/instruments/src/PFD/style.scss | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx index 4369f8ced15..4ff2992b0a0 100644 --- a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx +++ b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx @@ -264,7 +264,7 @@ class Row2 extends DisplayComponent<{ bus: ArincEventBus, isAttExcessive: Subscr class A2Cell extends DisplayComponent<{ bus: ArincEventBus }> { private text = Subject.create(''); - private className = Subject.create('FontMedium MiddleAlign Cyan'); + private className = Subject.create('FontMediumSmaller MiddleAlign Cyan'); private autoBrkRef = FSComponent.createRef(); @@ -577,7 +577,7 @@ class A3Cell extends DisplayComponent { private handleAutobrakeMode() { if (this.autobrakeMode === 3 && !this.AB3Message) { this.textSub.set('BRK MAX'); - this.classSub.set('FontMedium MiddleAlign Cyan'); + this.classSub.set('FontMediumSmaller MiddleAlign Cyan'); } else { this.textSub.set(''); } @@ -907,7 +907,6 @@ class B2Cell extends DisplayComponent { let color1 = 'Cyan'; if (clbArmed) { text1 = 'CLB'; - this.xposSub.set(50.601795); } else if (desArmed) { text1 = 'DES'; } else if (altCstArmed) { @@ -929,10 +928,10 @@ class B2Cell extends DisplayComponent { } // CLB armed should be centered, other modes are aligned to the left on newer DMCs - this.xposSub.set(clbArmed ? 50.601795 : 41.477474); + this.xposSub.set(clbArmed ? 50.801795 : 41.477474); this.text1Sub.set(text1); this.text2Sub.set(text2); - this.classSub.set(`FontMedium MiddleAlign ${color1}`); + this.classSub.set(`FontMediumSmaller MiddleAlign ${color1}`); }); } @@ -940,7 +939,7 @@ class B2Cell extends DisplayComponent { return ( {this.text1Sub} - {this.text2Sub} + {this.text2Sub} ); } @@ -1123,7 +1122,7 @@ class C2Cell extends DisplayComponent { render(): VNode { return ( - {this.textSub} + {this.textSub} ); } } diff --git a/fbw-a32nx/src/systems/instruments/src/PFD/style.scss b/fbw-a32nx/src/systems/instruments/src/PFD/style.scss index 50b824ed245..20400d5284d 100644 --- a/fbw-a32nx/src/systems/instruments/src/PFD/style.scss +++ b/fbw-a32nx/src/systems/instruments/src/PFD/style.scss @@ -108,7 +108,7 @@ } .FontMediumSmaller { - font-size: 5.3px; + font-size: 5.5px; } .FontSmall { From b437a64edaf391b44bdbbb5b2eab03d85618869d Mon Sep 17 00:00:00 2001 From: BravoMike99 <> Date: Wed, 4 Oct 2023 23:27:04 +0100 Subject: [PATCH 05/23] fix(fma): flex text box and alignments --- fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx index 4ff2992b0a0..11625e8468d 100644 --- a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx +++ b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx @@ -393,11 +393,11 @@ class A1A2Cell extends ShowForSecondsComponent { const FlexTemp = Math.round(this.flexTemp); const FlexText = FlexTemp >= 0 ? (`+${FlexTemp}`) : FlexTemp.toString(); text = ` - - MAN - - FLX - ${FlexText} + + MAN + FLX + + ${FlexText} `; From 8b78463bb7eca49d3a47e34d2f7f4be92c3c0faf Mon Sep 17 00:00:00 2001 From: BravoMike99 <> Date: Thu, 5 Oct 2023 16:10:47 +0100 Subject: [PATCH 06/23] fix(fma): MAN pos in non flex fma --- fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx index 11625e8468d..0c1169c2c09 100644 --- a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx +++ b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx @@ -376,7 +376,7 @@ class A1A2Cell extends ShowForSecondsComponent { this.displayModeChangedPath(true); text = ` - MAN + MAN TOGA `; break; @@ -384,7 +384,7 @@ class A1A2Cell extends ShowForSecondsComponent { this.displayModeChangedPath(true); text = ` - MAN + MAN GA SOFT `; break; @@ -393,11 +393,11 @@ class A1A2Cell extends ShowForSecondsComponent { const FlexTemp = Math.round(this.flexTemp); const FlexText = FlexTemp >= 0 ? (`+${FlexTemp}`) : FlexTemp.toString(); text = ` - + MAN FLX - ${FlexText} + ${FlexText} `; @@ -406,7 +406,7 @@ class A1A2Cell extends ShowForSecondsComponent { this.displayModeChangedPath(true); text = ` - MAN + MAN DTO `; break; @@ -414,7 +414,7 @@ class A1A2Cell extends ShowForSecondsComponent { this.displayModeChangedPath(true); text = ` - MAN + MAN MCT `; break; @@ -422,7 +422,7 @@ class A1A2Cell extends ShowForSecondsComponent { this.displayModeChangedPath(true); text = ` - MAN + MAN THR `; break; From c1f08bd6457f21758a6ef711dd3833b8f5085ff9 Mon Sep 17 00:00:00 2001 From: BravoMike99 <> Date: Fri, 6 Oct 2023 22:12:57 +0100 Subject: [PATCH 07/23] fix(fma): mode change box size of A1 cell --- fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx index 0c1169c2c09..587479f3b0f 100644 --- a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx +++ b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx @@ -522,7 +522,7 @@ class A1A2Cell extends ShowForSecondsComponent { render(): VNode { return ( <> - + ); From 7f08b1a4b108e65bb1829578c0467730ca094269 Mon Sep 17 00:00:00 2001 From: BravoMike99 <119708186+BravoMike99@users.noreply.github.com> Date: Fri, 6 Oct 2023 22:51:13 +0100 Subject: [PATCH 08/23] slightly reduce armed fma font size --- fbw-a32nx/src/systems/instruments/src/PFD/style.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fbw-a32nx/src/systems/instruments/src/PFD/style.scss b/fbw-a32nx/src/systems/instruments/src/PFD/style.scss index 20400d5284d..82fac194310 100644 --- a/fbw-a32nx/src/systems/instruments/src/PFD/style.scss +++ b/fbw-a32nx/src/systems/instruments/src/PFD/style.scss @@ -108,7 +108,7 @@ } .FontMediumSmaller { - font-size: 5.5px; + font-size: 5.4px; } .FontSmall { From 591e297995cf2d296cf108271c5d79d64522eac1 Mon Sep 17 00:00:00 2001 From: BravoMike99 <119708186+BravoMike99@users.noreply.github.com> Date: Sat, 7 Oct 2023 16:36:19 +0100 Subject: [PATCH 09/23] fix armed mode y pos & A3 cell --- fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx index 587479f3b0f..44c8addf7e3 100644 --- a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx +++ b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx @@ -611,7 +611,7 @@ class A3Cell extends DisplayComponent { render(): VNode { return ( - {this.textSub} + {this.textSub} ); } } @@ -938,7 +938,7 @@ class B2Cell extends DisplayComponent { render(): VNode { return ( - {this.text1Sub} + {this.text1Sub} {this.text2Sub} ); @@ -1122,7 +1122,7 @@ class C2Cell extends DisplayComponent { render(): VNode { return ( - {this.textSub} + {this.textSub} ); } } From 433e943ba0f3131d5f907f9b6d318867ce027f81 Mon Sep 17 00:00:00 2001 From: BravoMike99 <119708186+BravoMike99@users.noreply.github.com> Date: Sat, 7 Oct 2023 16:51:12 +0100 Subject: [PATCH 10/23] fix(fma): Y & X pos of vertical armed modes --- fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx index 44c8addf7e3..00cc37758d8 100644 --- a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx +++ b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx @@ -928,7 +928,7 @@ class B2Cell extends DisplayComponent { } // CLB armed should be centered, other modes are aligned to the left on newer DMCs - this.xposSub.set(clbArmed ? 50.801795 : 41.477474); + this.xposSub.set(clbArmed ? 50.801795 : 40.977474); this.text1Sub.set(text1); this.text2Sub.set(text2); this.classSub.set(`FontMediumSmaller MiddleAlign ${color1}`); @@ -939,7 +939,7 @@ class B2Cell extends DisplayComponent { return ( {this.text1Sub} - {this.text2Sub} + {this.text2Sub} ); } From f668f6822f93b8055ff0b7c5d8325d588631a8ae Mon Sep 17 00:00:00 2001 From: BravoMike99 <119708186+BravoMike99@users.noreply.github.com> Date: Sun, 8 Oct 2023 20:12:39 +0100 Subject: [PATCH 11/23] revert ATHR & AB message Y pos Fixing only the AB/ATHR messages clashes with flex/toga/mct box. --- fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx index 00cc37758d8..ec129cbd842 100644 --- a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx +++ b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx @@ -611,7 +611,7 @@ class A3Cell extends DisplayComponent { render(): VNode { return ( - {this.textSub} + {this.textSub} ); } } From c3cc0bfd719324901b672d46ea5ce4cab65d4e0b Mon Sep 17 00:00:00 2001 From: BravoMike99 <119708186+BravoMike99@users.noreply.github.com> Date: Sun, 8 Oct 2023 21:46:50 +0100 Subject: [PATCH 12/23] fix vertical armed mode X & mode change size --- fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx index ec129cbd842..164f324c556 100644 --- a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx +++ b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx @@ -801,7 +801,7 @@ class B1Cell extends ShowForSecondsComponent { this.speedProtectionPathRef.instance.setAttribute('visibility', 'hidden'); } - const boxPathString = this.activeVerticalModeSub.get() === 50 && this.tcasModeDisarmed ? 'm34.656 1.8143h29.918v13.506h-29.918z' : 'm34.656 1.8143h29.918v6.0476h-29.918z'; + const boxPathString = this.activeVerticalModeSub.get() === 50 && this.tcasModeDisarmed ? 'm36.056 1.8143h27.118v13.506h-27.118z' : 'm36.056 1.8143h27.118v6.0476h-27.118z'; this.boxPathStringSub.set(boxPathString); @@ -868,8 +868,8 @@ class B1Cell extends ShowForSecondsComponent { - - + + @@ -928,7 +928,7 @@ class B2Cell extends DisplayComponent { } // CLB armed should be centered, other modes are aligned to the left on newer DMCs - this.xposSub.set(clbArmed ? 50.801795 : 40.977474); + this.xposSub.set(clbArmed ? 50.801795 : 41.977474); this.text1Sub.set(text1); this.text2Sub.set(text2); this.classSub.set(`FontMediumSmaller MiddleAlign ${color1}`); @@ -1222,7 +1222,7 @@ const getBC3Message = ( className = 'FontMedium PulseAmber9Seconds Amber'; } else if (TCASArmed && !isAttExcessive) { text = ' TCAS '; - className = 'FontMedium Cyan'; + className = 'FontMediumSmaller Cyan'; } else if (false) { text = 'DISCONNECT AP FOR LDG'; className = 'FontMedium PulseAmber9Seconds Amber'; From 1b7181939bec870756beda40ca76c49dca44789a Mon Sep 17 00:00:00 2001 From: BravoMike99 <119708186+BravoMike99@users.noreply.github.com> Date: Fri, 13 Oct 2023 22:36:27 +0100 Subject: [PATCH 13/23] hide + sign if V/S or FPA is 0 --- fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx index 164f324c556..b01f86b4a87 100644 --- a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx +++ b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx @@ -767,14 +767,14 @@ class B1Cell extends ShowForSecondsComponent { text = 'ALT CRZ'; break; */ case VerticalMode.FPA: { - const FPAText = `${(this.FPA >= 0 ? '+' : '')}${(Math.round(this.FPA * 10) / 10).toFixed(1)}°`; + const FPAText = `${(this.FPA > 0 ? '+' : '')}${(Math.round(this.FPA * 10) / 10).toFixed(1)}°`; text = 'FPA'; additionalText = FPAText; break; } case VerticalMode.VS: { - const VSText = `${(this.selectedVS >= 0 ? '+' : '')}${Math.round(this.selectedVS).toString()}`.padStart(5, ' '); + const VSText = `${(this.selectedVS > 0 ? '+' : '')}${Math.round(this.selectedVS).toString()}`.padStart(5, ' '); text = 'V/S'; From ebb8d899869165dcf7ef85cf8ba11c3c7e974bbb Mon Sep 17 00:00:00 2001 From: BravoMike99 <119708186+BravoMike99@users.noreply.github.com> Date: Fri, 13 Oct 2023 23:03:44 +0100 Subject: [PATCH 14/23] change lateral & vertical mode change --- fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx index b01f86b4a87..a1062afae30 100644 --- a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx +++ b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx @@ -801,7 +801,7 @@ class B1Cell extends ShowForSecondsComponent { this.speedProtectionPathRef.instance.setAttribute('visibility', 'hidden'); } - const boxPathString = this.activeVerticalModeSub.get() === 50 && this.tcasModeDisarmed ? 'm36.056 1.8143h27.118v13.506h-27.118z' : 'm36.056 1.8143h27.118v6.0476h-27.118z'; + const boxPathString = this.activeVerticalModeSub.get() === 50 && this.tcasModeDisarmed ? 'm35.756 1.8143h27.918v13.506h-27.918z' : 'm35.756 1.8143h27.918v6.0476h-27.918z'; this.boxPathStringSub.set(boxPathString); @@ -868,8 +868,8 @@ class B1Cell extends ShowForSecondsComponent { - - + + @@ -1060,7 +1060,7 @@ class C1Cell extends ShowForSecondsComponent { return ( - + {this.textSub} ); From c7c42076adb98a26cfa7f2ffe58c8811a3223d37 Mon Sep 17 00:00:00 2001 From: BravoMike99 <119708186+BravoMike99@users.noreply.github.com> Date: Fri, 13 Oct 2023 23:51:57 +0100 Subject: [PATCH 15/23] adjust V/S & FPA for new mode change Adds subject to dynamically change the font size of V/S and FPA as they are smaller IRL. This way, they fit into the box. Also adds empty space when FPA is 0 --- fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx index a1062afae30..b3ece281490 100644 --- a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx +++ b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx @@ -675,6 +675,8 @@ class B1Cell extends ShowForSecondsComponent { private activeVerticalModeSub = Subject.create(0); + private activeVerticalModeClassSub = Subject.create(''); + private speedProtectionPathRef = FSComponent.createRef(); private inModeReversionPathRef = FSComponent.createRef(); @@ -767,9 +769,13 @@ class B1Cell extends ShowForSecondsComponent { text = 'ALT CRZ'; break; */ case VerticalMode.FPA: { - const FPAText = `${(this.FPA > 0 ? '+' : '')}${(Math.round(this.FPA * 10) / 10).toFixed(1)}°`; + const FPAText = `${(this.FPA > 0 ? '+' : '')}${(Math.round(this.FPA * 10) / 10).toFixed(1)}°`; // empty space when 0 to align the box text = 'FPA'; + // if FPA is 0 give it an empty space for where the '+' and '-' will be. + if (this.FPA === 0) { + text += ' '; + } additionalText = FPAText; break; } @@ -805,6 +811,11 @@ class B1Cell extends ShowForSecondsComponent { this.boxPathStringSub.set(boxPathString); + // VS FPA has a smaller font than the other active modes + const VsFPA = this.activeVerticalModeSub.get() === 14 || this.activeVerticalModeSub.get() === 15; + + this.activeVerticalModeClassSub.set(VsFPA ? 'FontMediumSmaller MiddleAlign Green' : 'FontMedium MiddleAlign Green'); + this.fmaTextRef.instance.innerHTML = `${text}${additionalText}`; return text.length > 0; @@ -871,7 +882,7 @@ class B1Cell extends ShowForSecondsComponent { - + {/* set directly via innerhtml as tspan was invisble for some reason when set here */} From a381c28260c3df0555c4634c305981769c738c9c Mon Sep 17 00:00:00 2001 From: BravoMike99 <119708186+BravoMike99@users.noreply.github.com> Date: Sat, 14 Oct 2023 00:41:40 +0100 Subject: [PATCH 16/23] improve vertical mode armed pos --- fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx index b3ece281490..9febfea7413 100644 --- a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx +++ b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx @@ -939,7 +939,7 @@ class B2Cell extends DisplayComponent { } // CLB armed should be centered, other modes are aligned to the left on newer DMCs - this.xposSub.set(clbArmed ? 50.801795 : 41.977474); + this.xposSub.set(clbArmed ? 50.801795 : 40.777474); this.text1Sub.set(text1); this.text2Sub.set(text2); this.classSub.set(`FontMediumSmaller MiddleAlign ${color1}`); @@ -950,7 +950,7 @@ class B2Cell extends DisplayComponent { return ( {this.text1Sub} - {this.text2Sub} + {this.text2Sub} ); } From 9678beb1b3c5948b464fd892b0cbce3f1bb5fff9 Mon Sep 17 00:00:00 2001 From: BravoMike99 <119708186+BravoMike99@users.noreply.github.com> Date: Sat, 14 Oct 2023 13:04:59 +0100 Subject: [PATCH 17/23] reduce font size on THR idle --- fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx index 9febfea7413..58ff1b66466 100644 --- a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx +++ b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx @@ -447,7 +447,7 @@ class A1A2Cell extends ShowForSecondsComponent { this.displayModeChangedPath(); break; case 12: - text = 'THR IDLE'; + text = 'THR IDLE'; this.displayModeChangedPath(); break; case 13: From c61360a046f483bb0661d4076912ec2d3f239cdd Mon Sep 17 00:00:00 2001 From: BravoMike99 <119708186+BravoMike99@users.noreply.github.com> Date: Sat, 14 Oct 2023 23:37:46 +0100 Subject: [PATCH 18/23] fix typo in G/S* and FINAL pos --- fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx index 58ff1b66466..723ae9147d8 100644 --- a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx +++ b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx @@ -950,7 +950,7 @@ class B2Cell extends DisplayComponent { return ( {this.text1Sub} - {this.text2Sub} + {this.text2Sub} ); } From b9c2873769e88fa3992552c9f8f1196f4591680b Mon Sep 17 00:00:00 2001 From: BravoMike99 <119708186+BravoMike99@users.noreply.github.com> Date: Sun, 15 Oct 2023 17:24:20 +0100 Subject: [PATCH 19/23] update changelog --- .github/CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index c12c4b51c23..dff0325d0d3 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -54,6 +54,12 @@ 1. [MCDU] Fixed the FMGC annunciator light not illuminating - @tracernz (Mike) 1. [COND] Add Air Conditioning systems failures - @mjuhe (Miquel Juhe) 1. [COND] Fixed Temp-Indication on CRZ page showing cockpit temperature for fwd and aft cabin - @cptnuss-ops (Lukas) +1. [PFD] Decreased font size of armed FMAs - @BravoMike99 (bruno_pt99) +1. [PFD] Changed CLB armed FMA position acoording to newer DMCs - @BravoMike99 (bruno_pt99) +1. [PFD] Corrected mode change FMA boxes length for thrust/autobrake, vertical and lateral modes - @BravoMike99 (bruno_pt99) +1. [PFD] Reworked FLX FMA & "MAN" text alignment in remaining thrust modes - @BravoMike99 (bruno_pt99) +1. [PFD] Hide '+' sign on V/S & FPA FMA if selected value is 0 - @BravoMike99 (bruno_pt99) +1. [PFD] Decreased font size of THR IDLE, V/S & FPA FMA - @BravoMike99 (bruno_pt99) ## 0.10.0 From 3cfef090a840102bf3264a46fa7b3a280a1afedc Mon Sep 17 00:00:00 2001 From: BravoMike99 <119708186+BravoMike99@users.noreply.github.com> Date: Mon, 16 Oct 2023 23:15:49 +0100 Subject: [PATCH 20/23] remove leftover comment --- fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx index 723ae9147d8..a8b8efac7c1 100644 --- a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx +++ b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx @@ -769,7 +769,7 @@ class B1Cell extends ShowForSecondsComponent { text = 'ALT CRZ'; break; */ case VerticalMode.FPA: { - const FPAText = `${(this.FPA > 0 ? '+' : '')}${(Math.round(this.FPA * 10) / 10).toFixed(1)}°`; // empty space when 0 to align the box + const FPAText = `${(this.FPA > 0 ? '+' : '')}${(Math.round(this.FPA * 10) / 10).toFixed(1)}°`; text = 'FPA'; // if FPA is 0 give it an empty space for where the '+' and '-' will be. From e2b4aad9c6efa5d35e1dd3b629b113b473de88f9 Mon Sep 17 00:00:00 2001 From: BravoMike99 <119708186+BravoMike99@users.noreply.github.com> Date: Thu, 23 Nov 2023 20:38:53 +0000 Subject: [PATCH 21/23] use whitespaces for CLB armed pos --- fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx index b4af7bf7837..24e9d612626 100644 --- a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx +++ b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx @@ -906,8 +906,6 @@ class B2Cell extends DisplayComponent { private classSub = Subject.create(''); - private xposSub = Subject.create(0); - onAfterRender(node: VNode): void { super.onAfterRender(node); @@ -924,7 +922,7 @@ class B2Cell extends DisplayComponent { let text1: string; let color1 = 'Cyan'; if (clbArmed) { - text1 = 'CLB'; + text1 = ' CLB'; // spaces added to center armed FMA as per newer DMC stnadards } else if (desArmed) { text1 = 'DES'; } else if (altCstArmed) { @@ -945,8 +943,6 @@ class B2Cell extends DisplayComponent { text2 = ''; } - // CLB armed should be centered, other modes are aligned to the left on newer DMCs - this.xposSub.set(clbArmed ? 50.801795 : 40.777474); this.text1Sub.set(text1); this.text2Sub.set(text2); this.classSub.set(`FontMediumSmaller MiddleAlign ${color1}`); @@ -956,7 +952,7 @@ class B2Cell extends DisplayComponent { render(): VNode { return ( - {this.text1Sub} + {this.text1Sub} {this.text2Sub} ); From 8767b1737a1d93dcfe88a24b694d468a4c4cb57c Mon Sep 17 00:00:00 2001 From: lukecologne Date: Fri, 24 Nov 2023 18:47:50 +0100 Subject: [PATCH 22/23] fix: fix TCAS armed position after font size change --- fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx index 24e9d612626..71f8f398985 100644 --- a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx +++ b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx @@ -1236,7 +1236,7 @@ const getBC3Message = ( text = 'FOR GA: SET TOGA'; className = 'FontMedium PulseAmber9Seconds Amber'; } else if (TCASArmed && !isAttExcessive) { - text = ' TCAS '; + text = ' TCAS '; className = 'FontMediumSmaller Cyan'; } else if (false) { text = 'DISCONNECT AP FOR LDG'; From e4d8a3cf9fb26ee74be4cda07ed5303fc9491762 Mon Sep 17 00:00:00 2001 From: lukecologne Date: Sat, 25 Nov 2023 16:28:41 +0100 Subject: [PATCH 23/23] fix(fma): center TCAS armed position --- fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx index 71f8f398985..efd6d69c20d 100644 --- a/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx +++ b/fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx @@ -1236,7 +1236,7 @@ const getBC3Message = ( text = 'FOR GA: SET TOGA'; className = 'FontMedium PulseAmber9Seconds Amber'; } else if (TCASArmed && !isAttExcessive) { - text = ' TCAS '; + text = 'TCAS '; className = 'FontMediumSmaller Cyan'; } else if (false) { text = 'DISCONNECT AP FOR LDG';