feat(pfd): true ref

Still QFU dagger to be done (I think)
flybywiresim · Dec 7, 2022 · 21ad292 · 21ad292
1 parent 9a69586
commit 21ad292
Show file tree

Hide file tree

Showing 11 changed files with 195 additions and 43 deletions.
diff --git a/src/instruments/src/PFD/AttitudeIndicatorHorizon.tsx b/src/instruments/src/PFD/AttitudeIndicatorHorizon.tsx
@@ -1,6 +1,7 @@
 import { ClockEvents, DisplayComponent, EventBus, FSComponent, Subject, Subscribable, VNode } from 'msfssdk';
 import { Arinc429Word } from '@shared/arinc429';
 
+import { DisplayManagementComputerEvents } from 'instruments/src/PFD/shared/DisplayManagementComputer';
 import {
     calculateHorizonOffsetFromPitch,
     calculateVerticalOffsetFromRoll,
@@ -44,7 +45,7 @@ class HeadingBug extends DisplayComponent<{bus: EventBus, isCaptainSide: boolean
     onAfterRender(node: VNode): void {
         super.onAfterRender(node);
 
-        const sub = this.props.bus.getSubscriber<PFDSimvars & SimplaneValues & Arinc429Values>();
+        const sub = this.props.bus.getSubscriber<DisplayManagementComputerEvents & PFDSimvars & SimplaneValues & Arinc429Values>();
 
         sub.on('selectedHeading').whenChanged().handle((s) => {
             this.selectedHeading = s;
@@ -53,7 +54,7 @@ class HeadingBug extends DisplayComponent<{bus: EventBus, isCaptainSide: boolean
             }
         });
 
-        sub.on('headingAr').handle((h) => {
+        sub.on('heading').handle((h) => {
             this.heading = h;
             if (this.isActive) {
                 this.calculateAndSetOffset();

diff --git a/src/instruments/src/PFD/HeadingIndicator.tsx b/src/instruments/src/PFD/HeadingIndicator.tsx
@@ -1,4 +1,5 @@
 import { DisplayComponent, EventBus, FSComponent, HEvent, Subject, Subscribable, VNode } from 'msfssdk';
+import { DisplayManagementComputerEvents } from 'instruments/src/PFD/shared/DisplayManagementComputer';
 import { HorizontalTape } from './HorizontalTape';
 import { getSmallestAngle } from './PFDUtils';
 import { PFDSimvars } from './shared/PFDSimvarPublisher';
@@ -60,9 +61,9 @@ export class HeadingOfftape extends DisplayComponent<{ bus: EventBus, failed: Su
     onAfterRender(node: VNode): void {
         super.onAfterRender(node);
 
-        const sub = this.props.bus.getSubscriber<PFDSimvars & Arinc429Values & HEvent>();
+        const sub = this.props.bus.getSubscriber<DisplayManagementComputerEvents & PFDSimvars & Arinc429Values & HEvent>();
 
-        sub.on('headingAr').handle((h) => {
+        sub.on('heading').handle((h) => {
             this.heading.set(h.value);
 
             if (h.isNormalOperation()) {
@@ -99,6 +100,7 @@ export class HeadingOfftape extends DisplayComponent<{ bus: EventBus, failed: Su
                     <QFUIndicator heading={this.heading} ILSCourse={this.ILSCourse} lsPressed={this.lsPressed} />
                     <path class="Fill Yellow" d="m69.61 147.31h-1.5119v-8.0635h1.5119z" />
                     <GroundTrackBug bus={this.props.bus} heading={this.heading} />
+                    <TrueFlag bus={this.props.bus} />
                 </g>
             </>
         );
@@ -207,9 +209,9 @@ class GroundTrackBug extends DisplayComponent<GroundTrackBugProps> {
     onAfterRender(node: VNode): void {
         super.onAfterRender(node);
 
-        const sub = this.props.bus.getSubscriber<Arinc429Values>();
+        const sub = this.props.bus.getSubscriber<DisplayManagementComputerEvents>();
 
-        sub.on('groundTrackAr').handle((groundTrack) => {
+        sub.on('track').handle((groundTrack) => {
             //  if (groundTrack.isNormalOperation()) {
             const offset = getSmallestAngle(groundTrack.value, this.props.heading.get()) * DistanceSpacing / ValueSpacing;
             this.trackIndicator.instance.style.display = 'inline';
@@ -339,3 +341,27 @@ class QFUIndicator extends DisplayComponent<{ ILSCourse: Subscribable<number>, h
         );
     }
 }
+
+interface TrueFlagProps {
+    bus: EventBus;
+}
+
+class TrueFlag extends DisplayComponent<TrueFlagProps> {
+    private trueRefActive = Subject.create(false);
+
+    /** @inheritdoc */
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    onAfterRender(node: VNode): void {
+        this.props.bus.getSubscriber<DisplayManagementComputerEvents>().on('trueRefActive').whenChanged().handle((v) => this.trueRefActive.set(v));
+    }
+
+    /** @inheritdoc */
+    render(): VNode {
+        return (
+            <g id="TrueRefFlag" visibility={this.trueRefActive ? 'visible' : 'hidden'}>
+                <rect x="62.439" y="134.468" width="12.935" height="4.575" class="Cyan NormalStroke" />
+                <text x="68.9065" y="137.008" text-anchor="middle" alignment-baseline="middle" class="FontSmallest Cyan">TRUE</text>
+            </g>
+        );
+    }
+}
diff --git a/src/instruments/src/PFD/HorizontalTape.tsx b/src/instruments/src/PFD/HorizontalTape.tsx
@@ -1,3 +1,4 @@
+import { DisplayManagementComputerEvents } from 'instruments/src/PFD/shared/DisplayManagementComputer';
 import { EventBus, DisplayComponent, FSComponent, NodeReference, VNode, Subscribable } from 'msfssdk';
 import { Arinc429Values } from './shared/ArincValueProvider';
 
@@ -118,14 +119,14 @@ export class HorizontalTape extends DisplayComponent<HorizontalTapeProps> {
     onAfterRender(node: VNode): void {
         super.onAfterRender(node);
 
-        const pf = this.props.bus.getSubscriber<Arinc429Values>();
+        const pf = this.props.bus.getSubscriber<Arinc429Values & DisplayManagementComputerEvents>();
 
         this.props.yOffset?.sub((yOffset) => {
             this.yOffset = yOffset;
             this.refElement.instance.style.transform = `translate3d(${this.tapeOffset}px, ${yOffset}px, 0px)`;
         });
 
-        pf.on('headingAr').handle((newVal) => {
+        pf.on('heading').handle((newVal) => {
             const multiplier = 100;
             const currentValueAtPrecision = Math.round(newVal.value * multiplier) / multiplier;
             const tapeOffset = -currentValueAtPrecision % 10 * this.props.distanceSpacing / this.props.valueSpacing;

diff --git a/src/instruments/src/PFD/LandingSystemIndicator.tsx b/src/instruments/src/PFD/LandingSystemIndicator.tsx
@@ -5,6 +5,7 @@ import { Arinc429Values } from './shared/ArincValueProvider';
 import { PFDSimvars } from './shared/PFDSimvarPublisher';
 import { LagFilter } from './PFDUtils';
 
+// TODO true ref
 export class LandingSystem extends DisplayComponent<{ bus: EventBus, instrument: BaseInstrument }> {
     private lsButtonPressedVisibility = false;
 

diff --git a/src/instruments/src/PFD/PFD.svg b/src/instruments/src/PFD/PFD.svg
diff --git a/src/instruments/src/PFD/PFD.tsx b/src/instruments/src/PFD/PFD.tsx
@@ -2,6 +2,7 @@ import { A320Failure, FailuresConsumer } from '@flybywiresim/failures';
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 import { ClockEvents, ComponentProps, DisplayComponent, EventBus, FSComponent, Subject, VNode } from 'msfssdk';
 import { Arinc429Word } from '@shared/arinc429';
+import { DisplayManagementComputerEvents } from 'instruments/src/PFD/shared/DisplayManagementComputer';
 import { LagFilter } from './PFDUtils';
 import { Arinc429Values } from './shared/ArincValueProvider';
 import { DisplayUnit } from './shared/displayUnit';
@@ -54,9 +55,9 @@ export class PFDComponent extends DisplayComponent<PFDProps> {
 
         this.failuresConsumer.register(getDisplayIndex() === 1 ? A320Failure.LeftPfdDisplay : A320Failure.RightPfdDisplay);
 
-        const sub = this.props.bus.getSubscriber<Arinc429Values & ClockEvents>();
+        const sub = this.props.bus.getSubscriber<Arinc429Values & ClockEvents & DisplayManagementComputerEvents>();
 
-        sub.on('headingAr').handle((h) => {
+        sub.on('heading').handle((h) => {
             if (this.headingFailed.get() !== h.isNormalOperation()) {
                 this.headingFailed.set(!h.isNormalOperation());
             }

diff --git a/src/instruments/src/PFD/instrument.tsx b/src/instruments/src/PFD/instrument.tsx
@@ -1,3 +1,4 @@
+import { DisplayManagementComputer } from 'instruments/src/PFD/shared/DisplayManagementComputer';
 import { Clock, FSComponent, EventBus, HEventPublisher } from 'msfssdk';
 import { PFDComponent } from './PFD';
 import { AdirsValueProvider } from './shared/AdirsValueProvider';
@@ -22,6 +23,8 @@ class A32NX_PFD extends BaseInstrument {
 
     private readonly adirsValueProvider: AdirsValueProvider;
 
+    private readonly displayManagementComputer: DisplayManagementComputer;
+
     /**
      * "mainmenu" = 0
      * "loading" = 1
@@ -39,6 +42,7 @@ class A32NX_PFD extends BaseInstrument {
         this.simplaneValueProvider = new SimplaneValueProvider(this.bus);
         this.clock = new Clock(this.bus);
         this.adirsValueProvider = new AdirsValueProvider(this.bus, this.simVarPublisher);
+        this.displayManagementComputer = new DisplayManagementComputer(this.bus);
     }
 
     get templateID(): string {
@@ -58,6 +62,7 @@ class A32NX_PFD extends BaseInstrument {
 
         this.arincProvider.init();
         this.clock.init();
+        this.displayManagementComputer.init();
 
         this.simVarPublisher.subscribe('elec');
         this.simVarPublisher.subscribe('elecFo');
@@ -67,7 +72,7 @@ class A32NX_PFD extends BaseInstrument {
         this.simVarPublisher.subscribe('potentiometerFo');
         this.simVarPublisher.subscribe('pitch');
         this.simVarPublisher.subscribe('roll');
-        this.simVarPublisher.subscribe('heading');
+        this.simVarPublisher.subscribe('magHeadingRaw');
         this.simVarPublisher.subscribe('altitude');
         this.simVarPublisher.subscribe('speed');
         this.simVarPublisher.subscribe('noseGearCompressed');
@@ -122,13 +127,11 @@ class A32NX_PFD extends BaseInstrument {
         this.simVarPublisher.subscribe('transAlt');
         this.simVarPublisher.subscribe('transAltAppr');
 
-        this.simVarPublisher.subscribe('groundTrack');
+        this.simVarPublisher.subscribe('magTrackRaw');
         this.simVarPublisher.subscribe('showSelectedHeading');
         this.simVarPublisher.subscribe('altConstraint');
         this.simVarPublisher.subscribe('trkFpaActive');
         this.simVarPublisher.subscribe('aoa');
-        this.simVarPublisher.subscribe('groundHeadingTrue');
-        this.simVarPublisher.subscribe('groundTrackTrue');
 
         this.simVarPublisher.subscribe('selectedFpa');
         this.simVarPublisher.subscribe('targetSpeedManaged');
@@ -214,6 +217,10 @@ class A32NX_PFD extends BaseInstrument {
         this.simVarPublisher.subscribe('fac2EstimatedBetaRaw');
         this.simVarPublisher.subscribe('fac1BetaTargetRaw');
         this.simVarPublisher.subscribe('fac2BetaTargetRaw');
+        this.simVarPublisher.subscribe('trueRefPushbutton');
+        this.simVarPublisher.subscribe('irMaintWordRaw');
+        this.simVarPublisher.subscribe('trueHeadingRaw');
+        this.simVarPublisher.subscribe('trueTrackRaw');
 
         FSComponent.render(<PFDComponent bus={this.bus} instrument={this} />, document.getElementById('PFD_CONTENT'));
     }

diff --git a/src/instruments/src/PFD/shared/AdirsValueProvider.tsx b/src/instruments/src/PFD/shared/AdirsValueProvider.tsx
@@ -16,11 +16,14 @@ export class AdirsValueProvider {
             this.pfdSimvar.updateSimVarSource('vsInert', { name: `L:A32NX_ADIRS_IR_${inertialSource}_VERTICAL_SPEED`, type: SimVarValueType.Number });
             this.pfdSimvar.updateSimVarSource('pitch', { name: `L:A32NX_ADIRS_IR_${inertialSource}_PITCH`, type: SimVarValueType.Number });
             this.pfdSimvar.updateSimVarSource('roll', { name: `L:A32NX_ADIRS_IR_${inertialSource}_ROLL`, type: SimVarValueType.Number });
-            this.pfdSimvar.updateSimVarSource('heading', { name: `L:A32NX_ADIRS_IR_${inertialSource}_HEADING`, type: SimVarValueType.Number });
-            this.pfdSimvar.updateSimVarSource('groundTrack', { name: `L:A32NX_ADIRS_IR_${inertialSource}_TRACK`, type: SimVarValueType.Number });
+            this.pfdSimvar.updateSimVarSource('magHeadingRaw', { name: `L:A32NX_ADIRS_IR_${inertialSource}_HEADING`, type: SimVarValueType.Number });
+            this.pfdSimvar.updateSimVarSource('magTrackRaw', { name: `L:A32NX_ADIRS_IR_${inertialSource}_TRACK`, type: SimVarValueType.Number });
             this.pfdSimvar.updateSimVarSource('fpaRaw', { name: `L:A32NX_ADIRS_IR_${inertialSource}_FLIGHT_PATH_ANGLE`, type: SimVarValueType.Number });
             this.pfdSimvar.updateSimVarSource('daRaw', { name: `L:A32NX_ADIRS_IR_${inertialSource}_DRIFT_ANGLE`, type: SimVarValueType.Number });
             this.pfdSimvar.updateSimVarSource('latAccRaw', { name: `L:A32NX_ADIRS_IR_${inertialSource}_BODY_LATERAL_ACC`, type: SimVarValueType.Number });
+            this.pfdSimvar.updateSimVarSource('irMaintWordRaw', { name: `L:A32NX_ADIRS_IR_${inertialSource}_MAINT_WORD`, type: SimVarValueType.Number });
+            this.pfdSimvar.updateSimVarSource('trueHeadingRaw', { name: `L:A32NX_ADIRS_IR_${inertialSource}_TRUE_HEADING`, type: SimVarValueType.Number });
+            this.pfdSimvar.updateSimVarSource('trueTrackRaw', { name: `L:A32NX_ADIRS_IR_${inertialSource}_TRUE_TRACK`, type: SimVarValueType.Number });
         });
 
         sub.on('airKnob').whenChanged().handle((a) => {

diff --git a/src/instruments/src/PFD/shared/ArincValueProvider.ts b/src/instruments/src/PFD/shared/ArincValueProvider.ts
@@ -7,8 +7,8 @@ export interface Arinc429Values {
     pitchAr: Arinc429Word;
     rollAr: Arinc429Word;
     altitudeAr: Arinc429Word;
-    groundTrackAr: Arinc429Word;
-    headingAr: Arinc429Word;
+    magTrack: Arinc429Word;
+    magHeading: Arinc429Word;
     speedAr: Arinc429Word;
     machAr: Arinc429Word;
     vs: Arinc429Word;
@@ -40,13 +40,16 @@ export interface Arinc429Values {
     vLs: Arinc429Word;
     estimatedBeta: Arinc429Word;
     betaTarget: Arinc429Word;
+    irMaintWord: Arinc429Word;
+    trueHeading: Arinc429Word;
+    trueTrack: Arinc429Word;
 }
 export class ArincValueProvider {
     private roll = new Arinc429Word(0);
 
     private pitch = new Arinc429Word(0);
 
-    private groundTrack = new Arinc429Word(0);
+    private magTrack = new Arinc429Word(0);
 
     private heading = new Arinc429Word(0);
 
@@ -112,13 +115,13 @@ export class ArincValueProvider {
             this.roll = new Arinc429Word(p);
             publisher.pub('rollAr', this.roll);
         });
-        subscriber.on('groundTrack').handle((gt) => {
-            this.groundTrack = new Arinc429Word(gt);
-            publisher.pub('groundTrackAr', this.groundTrack);
+        subscriber.on('magTrackRaw').handle((gt) => {
+            this.magTrack = new Arinc429Word(gt);
+            publisher.pub('magTrack', this.magTrack);
         });
-        subscriber.on('heading').handle((h) => {
+        subscriber.on('magHeadingRaw').handle((h) => {
             this.heading = new Arinc429Word(h);
-            publisher.pub('headingAr', this.heading);
+            publisher.pub('magHeading', this.heading);
         });
 
         subscriber.on('speed').handle((s) => {
@@ -482,6 +485,18 @@ export class ArincValueProvider {
                 publisher.pub('betaTarget', new Arinc429Word(word));
             }
         });
+
+        subscriber.on('irMaintWordRaw').handle((word) => {
+            publisher.pub('irMaintWord', new Arinc429Word(word));
+        });
+
+        subscriber.on('trueHeadingRaw').handle((word) => {
+            publisher.pub('trueHeading', new Arinc429Word(word));
+        });
+
+        subscriber.on('trueTrackRaw').handle((word) => {
+            publisher.pub('trueTrack', new Arinc429Word(word));
+        });
     }
 
     private determineAndPublishChosenRadioAltitude(publisher: Publisher<Arinc429Values>) {