From 7db9163ddf3f81e0788c48b5f44bfb54c4a20200 Mon Sep 17 00:00:00 2001
From: Michael Corcoran <tracer@outlook.co.nz>
Date: Sun, 4 Dec 2022 02:23:15 +1300
Subject: [PATCH 01/15] feat(adiru): polar heading/track

---
 Cargo.lock                                  |   1 +
 docs/a320-simvars.md                        |  10 +-
 src/systems/systems/Cargo.toml              |   1 +
 src/systems/systems/src/navigation/adirs.rs | 205 ++++++++++++++++++--
 4 files changed, 199 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 793f28bc77c..9f683563b4a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -944,6 +944,7 @@ dependencies = [
 name = "systems"
 version = "0.1.0"
 dependencies = [
+ "bitflags",
  "bounded-vec-deque",
  "fxhash",
  "nalgebra",
diff --git a/docs/a320-simvars.md b/docs/a320-simvars.md
index 4f6e4920011..00044bb5282 100644
--- a/docs/a320-simvars.md
+++ b/docs/a320-simvars.md
@@ -1431,6 +1431,7 @@ In the variables below, {number} should be replaced with one item in the set: {
     - 0 is CAPT, 1 is NORM, 2 is F/O
 
 - A32NX_ADIRS_ADIRU_{number}_STATE
+    - TODO delete
     - Enum
     - The Inertial Reference alignment state.
       Description | Value
@@ -1440,6 +1441,7 @@ In the variables below, {number} should be replaced with one item in the set: {
       Aligned | 2
 
 - A32NX_ADIRS_REMAINING_IR_ALIGNMENT_TIME
+    - TODO delete
     - Seconds
     - The remaining alignment duration. Zero seconds when the system is aligned or the system is not aligning.
 
@@ -1493,7 +1495,7 @@ In the variables below, {number} should be replaced with one item in the set: {
 
 - A32NX_ADIRS_IR_{number}_HEADING
     - Arinc429Word<Degrees>
-    - The inertial heading of the aircraft.
+    - The magnetic heading of the aircraft (true in polar region).
 
 - A32NX_ADIRS_IR_{number}_TRUE_HEADING
     - Arinc429Word<Degrees>
@@ -1501,7 +1503,7 @@ In the variables below, {number} should be replaced with one item in the set: {
 
 - A32NX_ADIRS_IR_{number}_TRACK
     - Arinc429Word<Degrees>
-    - The inertial track of the aircraft.
+    - The magnetic track of the aircraft (true in polar region).
 
 - A32NX_ADIRS_IR_{number}_TRUE_TRACK
     - Arinc429Word<Degrees>
@@ -1587,6 +1589,10 @@ In the variables below, {number} should be replaced with one item in the set: {
     - Arinc429Word<Degrees per second>
     - The roll rate (φ^dot) of the aircraft
 
+- A32NX_ADIRS_IR_{number}_MAINT_WORD
+    - Arinc429Word<flags>
+    - TODO flag table
+
 - A32NX_ADIRS_USES_GPS_AS_PRIMARY
     - Bool
     - Whether or not the GPS is used as the primary means of navigation/position determination.
diff --git a/src/systems/systems/Cargo.toml b/src/systems/systems/Cargo.toml
index 83ee08a0c1f..f85ca38a212 100644
--- a/src/systems/systems/Cargo.toml
+++ b/src/systems/systems/Cargo.toml
@@ -14,6 +14,7 @@ num-traits = "0.2.14"
 nalgebra = "0.25.0"
 bounded-vec-deque = "0.1.1"
 fxhash = "0.2.1"
+bitflags = "1.3.2"
 
 [dev-dependencies]
 rstest = "0.10.0"
diff --git a/src/systems/systems/src/navigation/adirs.rs b/src/systems/systems/src/navigation/adirs.rs
index e578174f4d3..7d96b3d8195 100644
--- a/src/systems/systems/src/navigation/adirs.rs
+++ b/src/systems/systems/src/navigation/adirs.rs
@@ -12,6 +12,7 @@ use crate::{
     },
 };
 use nalgebra::{Rotation2, Vector2};
+use bitflags::bitflags;
 use std::{fmt::Display, time::Duration};
 use uom::si::acceleration::meter_per_second_squared;
 use uom::si::{
@@ -931,6 +932,35 @@ impl From<f64> for AlignTime {
     }
 }
 
+bitflags! {
+    #[derive(Default)]
+    struct IrMaintFlags: u32 {
+        const AlignmentNotReady = 0b0000000000000000001;
+        const RevAttMode = 0b0000000000000000010;
+        const NavMode = 0b0000000000000000100;
+        const ValidSetHeading = 0b0000000000000001000;
+        const AttitudeInvalid = 0b0000000000000010000;
+        const DcFail = 0b0000000000000100000;
+        const OnDc = 0b0000000000001000000;
+        const AdrFault = 0b0000000000010000000;
+        const IrFault = 0b0000000000100000000;
+        const DcFailOnDc = 0b0000000001000000000;
+        const AlignFault = 0b0000000010000000000;
+        const NoIrsInitial = 0b0000000100000000000;
+        const ExcessMotionError = 0b0000001000000000000;
+        const AdrIrFault = 0b0000010000000000000;
+        const ExtremeLatitude = 0b0000100000000000000;
+        const Align710Minutes = 0b0111000000000000000;
+        const Align6Minutes = 0b0110000000000000000;
+        const Align5Minutes = 0b0101000000000000000;
+        const Align4Minutes = 0b0100000000000000000;
+        const Align3Minutes = 0b0011000000000000000;
+        const Align2Minutes = 0b0010000000000000000;
+        const Align1Minutes = 0b0001000000000000000;
+        const ComputedLatitudeMiscompare = 0b1000000000000000000;
+    }
+}
+
 struct InertialReference {
     number: usize,
     is_on: bool,
@@ -940,6 +970,7 @@ struct InertialReference {
     ir_fault_flash_duration: Option<Duration>,
     remaining_attitude_initialisation_duration: Option<Duration>,
     wind_velocity: LowPassFilter<Vector2<f64>>,
+    extreme_latitude: bool,
 
     pitch: AdirsData<Angle>,
     roll: AdirsData<Angle>,
@@ -970,6 +1001,7 @@ struct InertialReference {
     wind_direction_bnr: AdirsData<Angle>,
     latitude: AdirsData<Angle>,
     longitude: AdirsData<Angle>,
+    maint_word: AdirsData<u32>,
 }
 impl InertialReference {
     const FAST_ALIGNMENT_TIME_IN_SECS: f64 = 90.;
@@ -1000,6 +1032,7 @@ impl InertialReference {
     const WIND_SPEED_BNR: &'static str = "WIND_SPEED_BNR";
     const LATITUDE: &'static str = "LATITUDE";
     const LONGITUDE: &'static str = "LONGITUDE";
+    const MAINT_WORD: &'static str = "MAINT_WORD";
     const MINIMUM_TRUE_AIRSPEED_FOR_WIND_DETERMINATION_KNOTS: f64 = 100.;
     const MINIMUM_GROUND_SPEED_FOR_TRACK_KNOTS: f64 = 50.;
 
@@ -1016,6 +1049,7 @@ impl InertialReference {
             // Start fully initialised.
             remaining_attitude_initialisation_duration: Some(Duration::from_secs(0)),
             wind_velocity: LowPassFilter::new(Self::WIND_VELOCITY_TIME_CONSTANT),
+            extreme_latitude: false,
 
             pitch: AdirsData::new_ir(context, number, Self::PITCH),
             roll: AdirsData::new_ir(context, number, Self::ROLL),
@@ -1042,6 +1076,8 @@ impl InertialReference {
             wind_speed_bnr: AdirsData::new_ir(context, number, Self::WIND_SPEED_BNR),
             latitude: AdirsData::new_ir(context, number, Self::LATITUDE),
             longitude: AdirsData::new_ir(context, number, Self::LONGITUDE),
+            /// label 270
+            maint_word: AdirsData::new_ir(context, number, Self::MAINT_WORD),
         }
     }
 
@@ -1064,9 +1100,11 @@ impl InertialReference {
             simulator_data,
         );
 
+        self.update_latitude(simulator_data);
         self.update_attitude_values(context, simulator_data);
         self.update_heading_values(overhead, simulator_data);
         self.update_non_attitude_values(context, true_airspeed_source, overhead, simulator_data);
+        self.update_maint_word(context, overhead);
     }
 
     fn update_fault_flash_duration(
@@ -1118,6 +1156,19 @@ impl InertialReference {
         };
     }
 
+    fn update_latitude(&mut self, simulator_data: AdirsSimulatorData) {
+        let latitude = simulator_data.latitude.get::<degree>();
+        let longitude = simulator_data.longitude.get::<degree>();
+
+        let hysteresis_sign = if self.extreme_latitude { 1. } else { -1. };
+
+        self.extreme_latitude = !((-60. + hysteresis_sign * 0.5) <= latitude
+            && (latitude <= (73. - hysteresis_sign * 0.5)
+                || (latitude <= (82. - hysteresis_sign * 0.5)
+                    && (longitude <= (-120. - hysteresis_sign * 2.5)
+                        || longitude >= (-90. + hysteresis_sign * 2.5)))))
+    }
+
     fn update_attitude_values(
         &mut self,
         context: &UpdateContext,
@@ -1171,31 +1222,43 @@ impl InertialReference {
         overhead: &AirDataInertialReferenceSystemOverheadPanel,
         simulator_data: AdirsSimulatorData,
     ) {
-        let ssm = if self.is_on
-            && (self.is_fully_aligned()
-                || (overhead.mode_of(self.number) == InertialReferenceMode::Attitude
-                    && self.is_attitude_aligned()))
-        {
-            SignStatus::NormalOperation
-        } else {
-            SignStatus::NoComputedData
-        };
+        // TODO BNR labels (that most things use) are actually +/- 180
 
-        let true_heading_ssm = if self.is_on
+        // TODO tests for when should be mag or true in mag labels
+
+        let heading_available = self.is_on
             && (self.is_fully_aligned()
                 || (overhead.mode_of(self.number) == InertialReferenceMode::Navigation
                     && self
                         .remaining_align_duration
-                        .map_or(false, |duration| duration.as_secs() < 120)))
-        {
+                        .map_or(false, |duration| duration.as_secs() < 120)));
+
+        let true_heading_ssm = if heading_available {
             SignStatus::NormalOperation
         } else {
             SignStatus::NoComputedData
         };
-
         self.true_heading
             .set_value(simulator_data.true_heading, true_heading_ssm);
-        self.heading.set_value(simulator_data.heading, ssm);
+
+        // TODO in ATT mode NCD until heading initialised on MCDU
+        let magnetic_heading_ssm = if self.is_on
+            && (heading_available
+                || (overhead.mode_of(self.number) == InertialReferenceMode::Attitude
+                    && self.is_attitude_aligned()))
+        {
+            SignStatus::NormalOperation
+        } else {
+            SignStatus::NoComputedData
+        };
+        self.heading.set_value(
+            if self.has_magnetic_data() {
+                simulator_data.heading
+            } else {
+                simulator_data.true_heading
+            },
+            magnetic_heading_ssm,
+        );
     }
 
     fn update_wind_velocity(
@@ -1315,9 +1378,17 @@ impl InertialReference {
 
         self.track.set_value(
             if ground_speed_above_minimum_threshold {
-                simulator_data.track
+                if self.has_magnetic_data() {
+                    simulator_data.track
+                } else {
+                    simulator_data.true_track
+                }
             } else {
-                simulator_data.heading
+                if self.has_magnetic_data() {
+                    simulator_data.heading
+                } else {
+                    simulator_data.true_heading
+                }
             },
             ssm,
         );
@@ -1365,6 +1436,103 @@ impl InertialReference {
         self.update_wind_velocity(context, true_airspeed_source, overhead, simulator_data);
     }
 
+    fn update_maint_word(
+        &mut self,
+        context: &UpdateContext,
+        overhead: &AirDataInertialReferenceSystemOverheadPanel,
+    ) {
+        // TODO check status of these during mode transitions (first need to implement mode FSM)
+        let mut maint_word: IrMaintFlags = IrMaintFlags::default();
+
+        if !self.is_on {
+            // FIXME should be no transmission (can we just do this at a higher level...)
+            self.maint_word
+                .set_value(maint_word.bits(), SignStatus::FailureWarning);
+            return;
+        }
+
+        if !self.is_fully_aligned() {
+            maint_word |= IrMaintFlags::AlignmentNotReady
+        }
+
+        if overhead.mode_of(self.number) == InertialReferenceMode::Attitude {
+            maint_word |= IrMaintFlags::RevAttMode;
+        }
+
+        if self.is_fully_aligned() {
+            maint_word |= IrMaintFlags::NavMode;
+        }
+
+        // TODO request heading setting in att mode if not set
+
+        // TODO attitude invalid fault
+
+        // TODO dc < 18 V
+
+        // TODO on DC (re-implement ON BAT light properly at the same time)
+
+        // TODO ADR input data fault
+
+        // TODO unimportant nav fault
+
+        // TODO DC fault during DC operation last power up
+
+        // TODO align fault
+
+        // TODO No IRS initial pos
+
+        // TODO excess motion during align
+
+        // TODO ADR data not received or parity error
+
+        if self.extreme_latitude {
+            maint_word |= IrMaintFlags::ExtremeLatitude;
+        }
+
+        if self.is_aligning() {
+            if self
+                .remaining_align_duration()
+                .map_or(false, |duration| duration.as_secs() <= 60)
+            {
+                maint_word |= IrMaintFlags::Align1Minutes;
+            } else if self
+                .remaining_align_duration()
+                .map_or(false, |duration| duration.as_secs() <= 120)
+            {
+                maint_word |= IrMaintFlags::Align2Minutes;
+            } else if self
+                .remaining_align_duration()
+                .map_or(false, |duration| duration.as_secs() <= 180)
+            {
+                maint_word |= IrMaintFlags::Align3Minutes;
+            } else if self
+                .remaining_align_duration()
+                .map_or(false, |duration| duration.as_secs() <= 240)
+            {
+                maint_word |= IrMaintFlags::Align4Minutes;
+            } else if self
+                .remaining_align_duration()
+                .map_or(false, |duration| duration.as_secs() <= 300)
+            {
+                maint_word |= IrMaintFlags::Align5Minutes;
+            } else if self
+                .remaining_align_duration()
+                .map_or(false, |duration| duration.as_secs() <= 360)
+            {
+                maint_word |= IrMaintFlags::Align6Minutes;
+            } else {
+                maint_word |= IrMaintFlags::Align710Minutes;
+            }
+        }
+
+        // TODO sin/cos test discrepancy
+
+        self.maint_word
+            .set_value(maint_word.bits(), SignStatus::NormalOperation);
+
+        // TODO tests!
+    }
+
     fn alignment_starting(&self, selected_mode: InertialReferenceMode) -> bool {
         selected_mode != InertialReferenceMode::Off
             && self.remaining_attitude_initialisation_duration.is_none()
@@ -1404,6 +1572,10 @@ impl InertialReference {
     fn has_fault(&self) -> bool {
         self.ir_fault_flash_duration.is_some()
     }
+
+    fn has_magnetic_data(&self) -> bool {
+        !self.extreme_latitude
+    }
 }
 impl SimulationElement for InertialReference {
     fn write(&self, writer: &mut SimulatorWriter) {
@@ -1442,6 +1614,7 @@ impl SimulationElement for InertialReference {
         self.wind_speed_bnr.write_to(writer);
         self.latitude.write_to(writer);
         self.longitude.write_to(writer);
+        self.maint_word.write_to(writer);
     }
 }
 impl GroundSpeed for InertialReference {

From dc707ef34eca16ac283df92f0d9fd31770ff671f Mon Sep 17 00:00:00 2001
From: Michael Corcoran <tracer@outlook.co.nz>
Date: Mon, 5 Dec 2022 22:41:23 +1300
Subject: [PATCH 02/15] feat(font): diamond for eis font

---
 .../html_ui/Fonts/ECAMFontRegular.ttf         | Bin 13796 -> 13924 bytes
 src/fonts/ECAMFontRegular_Source.sfd          |  81 +++++++++++++-----
 2 files changed, 58 insertions(+), 23 deletions(-)

diff --git a/flybywire-aircraft-a320-neo/html_ui/Fonts/ECAMFontRegular.ttf b/flybywire-aircraft-a320-neo/html_ui/Fonts/ECAMFontRegular.ttf
index 3f6607411e8e8d4006f3fd2d77b4650bb89a670f..0d701898a9a1c47b0cf66be8ceef75947f9e001f 100644
GIT binary patch
delta 1234
zcmaEo{UoQJfsuiMfsdhqftew}%`L=t#+5%m85qnwfTA+)F0O72>WoW)d<7t1%|BS*
zsAIv}*9;7d89;tQa&BUQ$=b6u3=Aw67#LWClFLdI7&^F=7#O%zfbuNqiNyu~{{u~C
zFp~iCInr|~)5Mv)q8J!>H5eFVr(~oi)~BeJO}7C`z5!yh44{a3E4LBQ0+0bJ8M!4D
zj`adhf&3E;49sjf`N@gL+s>^6S^zYFnISi^qJZ%j!$P3E2T;92USe+Qn!s273=CR(
z7#Nr)7UUO~Y?DY%WMI$@0NQ^H>{+0PWmP9e#`D{JWsnyV0P164xErPt2cqw9l9Zh+
zz-Y@@KiQ8lmht%HHH<46FKrHEDrXAZ3sL~`3>eFR&0=8o0P;XVD8s<QtOKOE7&sW1
z7?>C<RTrwRS3M5&J`f<-w{PD*cY8Zf2NwgwW+B#ztn~$KYuLHiE7-TOKj9GL*u(LL
zQ-U*#a{=c*&VO8bTuoeuxV5+|ctm*2cuIKI@ciI);w|A_LMr6bzy<4ZNl;BZfDa$6
z$0tb#xq7^=qrC$L%>N~PGx$z1Fm0CO&E#Rd^#3QP<m4Vn4Q2+GZ<Du6Dlz?9IQgce
zEYs%)o4-j03nVcy?EU|T(||{dL6|`tnBB~b&BPhSL`B#c*_4&k8P&|q%sH7^mM9tM
zD>ENcQu<@9WMHWH$4ZfrNsdMA&mCqpW)<!qhKxqPCK$T78UC7RV8B{n;O(Z(BK*7J
zcR5QtFgLhsZDV4r-~3PK4-*sPrp>?f=dr4>m*!;}nL3+;G7$qKFf%cMGaC<(C&nNL
Q<}otXP2OUv!ve~>0Miu^H~;_u

delta 1104
zcmaEo^CY{TfsuiMfsdhqftew}%`L=t+Giyj1_sj;Kv5ZY7gsk1b;cz?{sJIh%|BS*
zsAIv}%M1*R89;tQa&BV5OZ|^?85mg3Ffg!sC6|>bFm!M!F)(mR0OeWI6N?M}{|B1P
zU^)ZH=Sa_~O#7qMwu*s)SB8N>RwpAhu|7q4%AR_l<QpJ1%K(aqw{jZ+El>gSRWfo*
zDjbvqo&xzm2Qjnc<R>Q{^V+upXaUdwrhmDK6$Ok(85RQNJ%H*J@)C1X*95-uXJF6*
z@|h+U<QJD{$1?n5V9>b(w0{rSvp^5?2rJjd^V@u7kQWjF>SJKI8>SKmrZ3nfOcr3Y
zWvrX*#~91Fe)1Z|m5fH4!<fpMT!9V%Dgj{`usICO4nQ6#_+%JZm_hF407539TPjr-
zs;&om90*{n+qZ9@1FGfNEXO*LwLXt+6*~ue8T%IYM;sy?yEtBPig9Le&g0y}`G-q~
ztAXnPw+43^j}VUuPZ7^5o^QMkyhXf=NQHcAxL`dl395<v@!^B@_$28dSC7|qw0FRO
z`M-#78Zb>VZPwz=<Y6`X|C6I~@(f80W&@V6$%iGCCO?;y-OMHxEU<a6))pqly3Iwp
pf0#BG7|de@W;O;!V1i}>CwCqoPmDnh%wuG%oor&J!*UmxaR4K!=^Ow6

diff --git a/src/fonts/ECAMFontRegular_Source.sfd b/src/fonts/ECAMFontRegular_Source.sfd
index c3abe91931d..ceaca3ab1c7 100644
--- a/src/fonts/ECAMFontRegular_Source.sfd
+++ b/src/fonts/ECAMFontRegular_Source.sfd
@@ -22,7 +22,7 @@ OS2Version: 4
 OS2_WeightWidthSlopeOnly: 0
 OS2_UseTypoMetrics: 1
 CreationTime: 1630565342
-ModificationTime: 1634010783
+ModificationTime: 1670146205
 PfmFamily: 17
 TTFWeight: 400
 TTFWidth: 5
@@ -89,8 +89,15 @@ NameList: AGL For New Fonts
 DisplaySize: -48
 AntiAlias: 1
 FitToEm: 0
-WinInfo: 0 29 12
-BeginChars: 65538 382
+WinInfo: 9541 29 12
+Grid
+-4096 3112.08334351 m 0
+ 8192 3112.08334351 l 1024
+  Named: "top"
+-4053.02087402 5324 m 0
+ -4053.02087402 -2868 l 1024
+EndSplineSet
+BeginChars: 65538 383
 
 StartChar: .notdef
 Encoding: 65536 -1 0
@@ -537,7 +544,7 @@ StartChar: period
 Encoding: 46 46 11
 Width: 2568
 GlyphClass: 2
-Flags: WO
+Flags: W
 LayerCount: 2
 Fore
 SplineSet
@@ -2497,24 +2504,24 @@ Flags: W
 LayerCount: 2
 Fore
 SplineSet
-120 2969 m 2,0,1
- 120 3028 120 3028 161.5 3070 c 128,-1,2
- 203 3112 203 3112 263 3112 c 2,3,-1
- 1949 3112 l 2,4,5
- 2008 3112 2008 3112 2050 3070.5 c 128,-1,6
- 2092 3029 2092 3029 2092 2969 c 2,7,-1
- 2092 144 l 2,8,9
- 2092 85 2092 85 2050 43 c 128,-1,10
- 2008 1 2008 1 1949 1 c 2,11,-1
- 263 1 l 2,12,13
- 204 1 204 1 162 43 c 128,-1,14
- 120 85 120 85 120 144 c 2,15,-1
- 120 2969 l 2,0,1
-402 2829 m 1,16,-1
- 402 284 l 1,17,-1
- 1809 284 l 1,18,-1
- 1809 2829 l 1,19,-1
- 402 2829 l 1,16,-1
+120 2969 m 6,0,1
+ 120 3028 120 3028 161.5 3070 c 132,-1,2
+ 203 3112 203 3112 263 3112 c 6,3,-1
+ 1949 3112 l 6,4,5
+ 2008 3112 2008 3112 2050 3070.5 c 132,-1,6
+ 2092 3029 2092 3029 2092 2969 c 6,7,-1
+ 2092 144 l 6,8,9
+ 2092 85 2092 85 2050 43 c 132,-1,10
+ 2008 1 2008 1 1949 1 c 6,11,-1
+ 263 1 l 6,12,13
+ 204 1 204 1 162 43 c 132,-1,14
+ 120 85 120 85 120 144 c 6,15,-1
+ 120 2969 l 6,0,1
+402 2829 m 5,16,-1
+ 402 284 l 5,17,-1
+ 1809 284 l 5,18,-1
+ 1809 2829 l 5,19,-1
+ 402 2829 l 5,16,-1
 EndSplineSet
 Validated: 1
 EndChar
@@ -2946,7 +2953,7 @@ EndChar
 StartChar: at
 Encoding: 64 64 98
 Width: 2568
-Flags: WO
+Flags: W
 LayerCount: 2
 Fore
 SplineSet
@@ -5521,5 +5528,33 @@ LayerCount: 2
 Fore
 Validated: 1
 EndChar
+
+StartChar: uni25C7
+Encoding: 9671 9671 382
+Width: 2568
+Flags: WO
+LayerCount: 2
+Fore
+SplineSet
+1188.15136719 3063.99804688 m 2,0,1
+ 1221.84960938 3112.5625 1221.84960938 3112.5625 1269.76855469 3113.11035156 c 0,2,3
+ 1317.45019531 3113.72949219 1317.45019531 3113.72949219 1351.95898438 3063.99804688 c 2,4,-1
+ 2317.62597656 1672.34667969 l 2,5,6
+ 2351.64257812 1623.06738281 2351.64257812 1623.06738281 2351.70605469 1554.72460938 c 0,7,8
+ 2351.64257812 1485.29980469 2351.64257812 1485.29980469 2317.62597656 1436.27734375 c 2,9,-1
+ 1352.53222656 45.453125 l 2,10,11
+ 1318.89257812 -3.001953125 1318.89257812 -3.001953125 1270.51660156 -3.0849609375 c 0,12,13
+ 1222.34667969 -3.001953125 1222.34667969 -3.001953125 1188.72363281 45.453125 c 2,14,-1
+ 223.056640625 1437.10449219 l 2,15,16
+ 189.584960938 1485.33984375 189.584960938 1485.33984375 191.372070312 1560.03125 c 0,17,18
+ 192.993164062 1630.0703125 192.993164062 1630.0703125 223.056640625 1673.17285156 c 2,19,-1
+ 1188.15136719 3063.99804688 l 2,0,1
+1269.48242188 2715.67285156 m 1,20,-1
+ 464.759765625 1555.96386719 l 1,21,-1
+ 1270.62792969 394.603515625 l 1,22,-1
+ 2075.35058594 1554.31347656 l 1,23,-1
+ 1269.48242188 2715.67285156 l 1,20,-1
+EndSplineSet
+EndChar
 EndChars
 EndSplineFont

From c67cbf5651e03366ab9347bf56cc5a0847e77051 Mon Sep 17 00:00:00 2001
From: Michael Corcoran <tracer@outlook.co.nz>
Date: Mon, 5 Dec 2022 22:44:29 +1300
Subject: [PATCH 03/15] feat(nd): true ref

Still work to be done around radio nav indications.
---
 src/fmgc/src/guidance/lnav/LnavDriver.ts      |  5 +-
 src/instruments/src/Common/utils.tsx          |  6 +-
 .../src/ND/elements/ApproachMessage.tsx       | 26 -------
 .../src/ND/elements/RadioNavInfo.tsx          |  2 +
 .../src/ND/elements/ToWaypointIndicator.tsx   |  8 +-
 .../src/ND/elements/TopMessages.tsx           | 76 +++++++++++++++++++
 src/instruments/src/ND/pages/ArcMode.tsx      | 40 +++++-----
 src/instruments/src/ND/pages/PlanMode.tsx     | 16 ++--
 src/instruments/src/ND/pages/RoseMode.tsx     | 44 ++++++-----
 src/instruments/src/ND/styles.scss            |  8 +-
 10 files changed, 153 insertions(+), 78 deletions(-)
 delete mode 100644 src/instruments/src/ND/elements/ApproachMessage.tsx
 create mode 100644 src/instruments/src/ND/elements/TopMessages.tsx

diff --git a/src/fmgc/src/guidance/lnav/LnavDriver.ts b/src/fmgc/src/guidance/lnav/LnavDriver.ts
index 104bba241d3..2ca914590aa 100644
--- a/src/fmgc/src/guidance/lnav/LnavDriver.ts
+++ b/src/fmgc/src/guidance/lnav/LnavDriver.ts
@@ -411,8 +411,9 @@ export class LnavDriver implements GuidanceComponent {
     private updateEfisData(activeLeg: Leg, gs: Knots) {
         const termination = activeLeg instanceof XFLeg ? activeLeg.fix.infos.coordinates : activeLeg.getPathEndPoint();
 
+        const efisTrueBearing = termination ? Avionics.Utils.computeGreatCircleHeading(this.ppos, termination) : -1;
         const efisBearing = termination ? A32NX_Util.trueToMagnetic(
-            Avionics.Utils.computeGreatCircleHeading(this.ppos, termination),
+            efisTrueBearing,
             Facilities.getMagVar(this.ppos.lat, this.ppos.long),
         ) : -1;
 
@@ -423,10 +424,12 @@ export class LnavDriver implements GuidanceComponent {
         // FIXME should be NCD if no FM position
 
         SimVar.SetSimVarValue('L:A32NX_EFIS_L_TO_WPT_BEARING', 'Degrees', efisBearing);
+        SimVar.SetSimVarValue('L:A32NX_EFIS_L_TO_WPT_TRUE_BEARING', 'Degrees', efisTrueBearing);
         SimVar.SetSimVarValue('L:A32NX_EFIS_L_TO_WPT_DISTANCE', 'Number', efisDistance);
         SimVar.SetSimVarValue('L:A32NX_EFIS_L_TO_WPT_ETA', 'Seconds', efisEta);
 
         SimVar.SetSimVarValue('L:A32NX_EFIS_R_TO_WPT_BEARING', 'Degrees', efisBearing);
+        SimVar.SetSimVarValue('L:A32NX_EFIS_R_TO_WPT_TRUE_BEARING', 'Degrees', efisTrueBearing);
         SimVar.SetSimVarValue('L:A32NX_EFIS_R_TO_WPT_DISTANCE', 'Number', efisDistance);
         SimVar.SetSimVarValue('L:A32NX_EFIS_R_TO_WPT_ETA', 'Seconds', efisEta);
     }
diff --git a/src/instruments/src/Common/utils.tsx b/src/instruments/src/Common/utils.tsx
index bfaa693e404..b9d07f44784 100644
--- a/src/instruments/src/Common/utils.tsx
+++ b/src/instruments/src/Common/utils.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 
-export type LayerProps = { x: number, y: number, id?: string, className?: string }
+export type LayerProps = { x: number, y: number, id?: string, className?: string, visibility?: string }
 
-export const Layer: React.FC<LayerProps> = ({ x = 0, y = 0, id, className, children }) => (
-    <g transform={`translate(${x}, ${y})`} id={id} className={className}>
+export const Layer: React.FC<LayerProps> = ({ x = 0, y = 0, id, className, children, visibility = 'visible' }) => (
+    <g transform={`translate(${x}, ${y})`} id={id} visibility={visibility} className={className}>
         {children}
     </g>
 );
diff --git a/src/instruments/src/ND/elements/ApproachMessage.tsx b/src/instruments/src/ND/elements/ApproachMessage.tsx
deleted file mode 100644
index 7bdcdea63e9..00000000000
--- a/src/instruments/src/ND/elements/ApproachMessage.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import React from 'react';
-import { Layer } from '@instruments/common/utils';
-import { useSimVar } from '@instruments/common/simVars';
-import { SimVarString } from '@shared/simvar';
-import { EfisSide } from '@shared/NavigationDisplay';
-
-type ApproachMessageProps = {
-    side: EfisSide,
-}
-
-export const ApproachMessage: React.FC<ApproachMessageProps> = ({ side }) => {
-    const [apprMsg0] = useSimVar(`L:A32NX_EFIS_${side}_APPR_MSG_0`, 'number', 5000);
-    const [apprMsg1] = useSimVar(`L:A32NX_EFIS_${side}_APPR_MSG_1`, 'number', 5000);
-
-    const apprMsg = SimVarString.unpack([apprMsg0, apprMsg1]);
-
-    if (apprMsg.length < 1) {
-        return null;
-    }
-
-    return (
-        <Layer x={384} y={28}>
-            <text x={0} y={0} fontSize={25} className="Green" textAnchor="middle">{apprMsg}</text>
-        </Layer>
-    );
-};
diff --git a/src/instruments/src/ND/elements/RadioNavInfo.tsx b/src/instruments/src/ND/elements/RadioNavInfo.tsx
index 31439bcd2bc..a1cb64f9a05 100644
--- a/src/instruments/src/ND/elements/RadioNavInfo.tsx
+++ b/src/instruments/src/ND/elements/RadioNavInfo.tsx
@@ -9,6 +9,8 @@ export enum NavAidMode {
     VOR,
 }
 
+// TODO true ref
+
 export type RadioNavInfoProps = { index: 1 | 2, side: EfisSide }
 
 const TuningModeIndicator: React.FC<{ index: 1 | 2, frequency: number }> = ({ index, frequency }) => {
diff --git a/src/instruments/src/ND/elements/ToWaypointIndicator.tsx b/src/instruments/src/ND/elements/ToWaypointIndicator.tsx
index 1d11831fa80..e6f8d7f96b9 100644
--- a/src/instruments/src/ND/elements/ToWaypointIndicator.tsx
+++ b/src/instruments/src/ND/elements/ToWaypointIndicator.tsx
@@ -6,15 +6,17 @@ import { SimVarString } from '@shared/simvar';
 
 export type ToWaypointIndicatorProps = {
     side: EfisSide,
+    trueRef: boolean,
 }
 
-export const ToWaypointIndicator: FC<ToWaypointIndicatorProps> = memo(({ side }) => {
+export const ToWaypointIndicator: FC<ToWaypointIndicatorProps> = memo(({ side, trueRef }) => {
     // TODO replace with appropriate ARINC 429 labels
 
     const [ident, setIdent] = useState<string | null>(null);
     const [ident0] = useSimVar(`L:A32NX_EFIS_${side}_TO_WPT_IDENT_0`, 'number', 500);
     const [ident1] = useSimVar(`L:A32NX_EFIS_${side}_TO_WPT_IDENT_1`, 'number', 500);
     const [bearing] = useSimVar(`L:A32NX_EFIS_${side}_TO_WPT_BEARING`, 'Degrees');
+    const [trueBearing] = useSimVar(`L:A32NX_EFIS_${side}_TO_WPT_TRUE_BEARING`, 'Degrees');
     const [distance] = useSimVar(`L:A32NX_EFIS_${side}_TO_WPT_DISTANCE`, 'Number');
     const [eta] = useSimVar(`L:A32NX_EFIS_${side}_TO_WPT_ETA`, 'Seconds');
 
@@ -55,8 +57,8 @@ export const ToWaypointIndicator: FC<ToWaypointIndicatorProps> = memo(({ side })
 
             {bearing && bearing !== -1 && Number.isFinite(bearing) && (
                 <>
-                    <text x={54} y={0} fontSize={25} className="Green" textAnchor="end">{(Math.round(bearing)).toString().padStart(3, '0')}</text>
-                    <text x={73} y={2} fontSize={25} className="Cyan" textAnchor="end">&deg;</text>
+                    <text x={54} y={0} fontSize={25} className="Green" textAnchor="end">{(Math.round(trueRef ? trueBearing : bearing)).toString().padStart(3, '0')}</text>
+                    <text x={73} y={trueRef ? 0 : 2} fontSize={25} className="Cyan" textAnchor="end">{trueRef ? 'T' : '°'}</text>
                 </>
             )}
 
diff --git a/src/instruments/src/ND/elements/TopMessages.tsx b/src/instruments/src/ND/elements/TopMessages.tsx
new file mode 100644
index 00000000000..f049413256c
--- /dev/null
+++ b/src/instruments/src/ND/elements/TopMessages.tsx
@@ -0,0 +1,76 @@
+import React, { useEffect, useState } from 'react';
+import { Layer } from '@instruments/common/utils';
+import { EfisSide } from '@shared/NavigationDisplay';
+import { Arinc429Word } from '@shared/arinc429';
+import { SimVarString } from '@shared/simvar';
+import { useSimVar } from '@instruments/common/simVars';
+
+type TopMessagesProps = {
+    side: EfisSide,
+    ppos: LatLongData,
+    trueTrack: Arinc429Word,
+    trueRef: boolean,
+}
+
+type GridTrackProps = {
+    gridTrack: number,
+};
+
+const GridTrack: React.FC<GridTrackProps> = ({ gridTrack }) => (
+    <>
+        <rect x={0} width={87} y={-20} height={22} className="White" strokeWidth={1.5} />
+        <text x={44} fontSize={22} textAnchor="middle">
+            <tspan className="Green">
+                ◇
+                {gridTrack?.toFixed(0).padStart(3, '0') ?? ''}
+            </tspan>
+            <tspan className="Cyan">°G</tspan>
+        </text>
+    </>
+);
+
+type TrueFlagProps = {
+    xOffset?: number,
+    box: boolean,
+};
+
+const TrueFlag: React.FC<TrueFlagProps> = ({ xOffset = 0, box }) => (
+    <>
+        <rect x={-30 + xOffset} width={60} y={-20} height={22} className="Cyan" strokeWidth={1.5} visibility={box ? 'visible' : 'hidden'} />
+        <text x={xOffset} fontSize={22} className="Cyan" textAnchor="middle">TRUE</text>
+    </>
+);
+
+export const TopMessages: React.FC<TopMessagesProps> = ({ side, ppos, trueTrack, trueRef }) => {
+    const [apprMsg0] = useSimVar(`L:A32NX_EFIS_${side}_APPR_MSG_0`, 'number', 5000);
+    const [apprMsg1] = useSimVar(`L:A32NX_EFIS_${side}_APPR_MSG_1`, 'number', 5000);
+    const [apprMsg, setApprMsg] = useState<string | null>(null);
+
+    const [gridTrack, setGridTrack] = useState<number | null>(null);
+    useEffect(() => {
+        if (trueTrack.isNormalOperation() && Math.abs(ppos.lat) > 65) {
+            setGridTrack(Math.round(Avionics.Utils.clampAngle(trueTrack.value - Math.sign(ppos.lat) * ppos.long)) % 360);
+        } else {
+            setGridTrack(null);
+        }
+    }, [ppos.lat.toFixed(0), ppos.long.toFixed(1), trueTrack.value.toFixed(0), trueTrack.ssm]);
+
+    useEffect(() => {
+        const msg = SimVarString.unpack([apprMsg0, apprMsg1]);
+        setApprMsg(msg.length > 0 ? msg : null);
+    }, [apprMsg0, apprMsg1]);
+
+    return (
+        <>
+            <Layer x={384} y={28} visibility={apprMsg === null ? 'hidden' : 'visible'}>
+                <text x={0} y={0} fontSize={25} className="Green" textAnchor="middle">{apprMsg ?? ''}</text>
+            </Layer>
+            <Layer x={384} y={56} visibility={trueRef ? 'visible' : 'hidden'}>
+                <TrueFlag xOffset={apprMsg === null && gridTrack !== null ? -40 : 0} box={apprMsg === null} />
+                <Layer x={0} y={0} visibility={apprMsg === null && gridTrack !== null ? 'visible' : 'hidden'}>
+                    <GridTrack gridTrack={gridTrack ?? 0} />
+                </Layer>
+            </Layer>
+        </>
+    );
+};
diff --git a/src/instruments/src/ND/pages/ArcMode.tsx b/src/instruments/src/ND/pages/ArcMode.tsx
index 83f9c8ee327..25041deeeb4 100644
--- a/src/instruments/src/ND/pages/ArcMode.tsx
+++ b/src/instruments/src/ND/pages/ArcMode.tsx
@@ -2,14 +2,14 @@ import React, { memo, useEffect, useState } from 'react';
 import { useSimVar } from '@instruments/common/simVars';
 import { getSmallestAngle } from '@instruments/common/utils';
 import { MathUtils } from '@shared/MathUtils';
-import { LatLongData } from '@typings/fs-base-ui/html_ui/JS/Types';
 import { RangeSetting, Mode, EfisSide, NdSymbol } from '@shared/NavigationDisplay';
 import { ArmedLateralMode, isArmed, LateralMode } from '@shared/autopilot';
+import { useArinc429Var } from '@instruments/common/arinc429';
+import { TopMessages } from '../elements/TopMessages';
 import { FlightPlan } from '../elements/FlightPlan';
 import { MapParameters } from '../utils/MapParameters';
 import { RadioNeedle } from '../elements/RadioNeedles';
 import { ToWaypointIndicator } from '../elements/ToWaypointIndicator';
-import { ApproachMessage } from '../elements/ApproachMessage';
 import { CrossTrack } from '../elements/CrossTrack';
 import { TrackLine } from '../elements/TrackLine';
 import { Traffic } from '../elements/Traffic';
@@ -25,36 +25,38 @@ export interface ArcModeProps {
 }
 
 export const ArcMode: React.FC<ArcModeProps> = ({ symbols, adirsAlign, rangeSetting, side, ppos, mapHidden }) => {
-    const [magHeading] = useSimVar('PLANE HEADING DEGREES MAGNETIC', 'degrees');
-    const [magTrack] = useSimVar('GPS GROUND MAGNETIC TRACK', 'degrees');
-    const [trueHeading] = useSimVar('PLANE HEADING DEGREES TRUE', 'degrees');
+    // TODO arinc var selector
+    const magHeading = useArinc429Var('L:A32NX_ADIRS_IR_1_HEADING');
+    const magTrack = useArinc429Var('L:A32NX_ADIRS_IR_1_TRACK');
+    const trueHeading = useArinc429Var('L:A32NX_ADIRS_IR_1_TRUE_HEADING');
+    const trueTrack = useArinc429Var('L:A32NX_ADIRS_IR_1_TRUE_TRACK');
     const [tcasMode] = useSimVar('L:A32NX_SWITCH_TCAS_Position', 'number');
     const [selectedHeading] = useSimVar('L:A32NX_AUTOPILOT_HEADING_SELECTED', 'degrees');
     const [lsCourse] = useSimVar('L:A32NX_FM_LS_COURSE', 'number');
     const [lsDisplayed] = useSimVar(`L:BTN_LS_${side === 'L' ? 1 : 2}_FILTER_ACTIVE`, 'bool'); // TODO rename simvar
     const [fmaLatMode] = useSimVar('L:A32NX_FMA_LATERAL_MODE', 'enum', 200);
     const [armedLateralBitmask] = useSimVar('L:A32NX_FMA_LATERAL_ARMED', 'enum', 200);
-    const [groundSpeed] = useSimVar('GPS GROUND SPEED', 'Meters per second', 200);
+    const irMaint = useArinc429Var('L:A32NX_ADIRS_IR_1_MAINT_WORD');
+    const [trueRefPb] = useSimVar('L:A32NX_PUSH_TRUE_REF', 'bool');
+    const [trueRef, setTrueRef] = useState(false);
 
-    const heading = Number(MathUtils.fastToFixed(magHeading, 2));
-    let track = Number(MathUtils.fastToFixed(magTrack, 2));
-
-    // Workaround for bug with gps ground track simvar
-    if (groundSpeed < 40) {
-        track = (0.025 * groundSpeed + 0.00005) * track + (1 - (0.025 * groundSpeed + 0.00005)) * heading;
-        track = Number(MathUtils.fastToFixed(track, 2));
-    }
+    const heading = Number(MathUtils.fastToFixed((trueRef ? trueHeading.value : magHeading.value), 2));
+    const track = Number(MathUtils.fastToFixed((trueRef ? trueTrack.value : magTrack.value), 2));
 
     const [mapParams] = useState(() => {
         const params = new MapParameters();
-        params.compute(ppos, rangeSetting, 492, trueHeading);
+        params.compute(ppos, rangeSetting, 492, trueHeading.value);
 
         return params;
     });
 
     useEffect(() => {
-        mapParams.compute(ppos, rangeSetting, 492, trueHeading);
-    }, [ppos.lat, ppos.long, trueHeading, rangeSetting].map((n) => MathUtils.fastToFixed(n, 6)));
+        mapParams.compute(ppos, rangeSetting, 492, trueHeading.value);
+    }, [ppos.lat, ppos.long, trueHeading.value, rangeSetting].map((n) => MathUtils.fastToFixed(n, 6)));
+
+    useEffect(() => {
+        setTrueRef((irMaint.getBitValueOr(15, false) || trueRefPb) && !irMaint.getBitValueOr(2, false));
+    }, [irMaint.value, trueRefPb]);
 
     if (adirsAlign) {
         return (
@@ -89,9 +91,9 @@ export const ArcMode: React.FC<ArcModeProps> = ({ symbols, adirsAlign, rangeSett
                     <RadioNeedle index={2} side={side} displayMode={Mode.ARC} centreHeight={620} />
                 </g>
 
-                <ToWaypointIndicator side={side} />
+                <ToWaypointIndicator side={side} trueRef={trueRef} />
 
-                <ApproachMessage side={side} />
+                <TopMessages side={side} ppos={ppos} trueTrack={trueTrack} trueRef={trueRef} />
                 <TrackBug heading={heading} track={track} />
                 { lsDisplayed && <LsCourseBug heading={heading} lsCourse={lsCourse} /> }
                 <SelectedHeadingBug heading={heading} selected={selectedHeading} />
diff --git a/src/instruments/src/ND/pages/PlanMode.tsx b/src/instruments/src/ND/pages/PlanMode.tsx
index bd54e210bd8..ef47849f436 100644
--- a/src/instruments/src/ND/pages/PlanMode.tsx
+++ b/src/instruments/src/ND/pages/PlanMode.tsx
@@ -2,6 +2,7 @@ import React, { FC, memo, useEffect, useState } from 'react';
 import { useSimVar } from '@instruments/common/simVars';
 import { Coordinates } from '@fmgc/flightplanning/data/geo';
 import { EfisSide, NdSymbol } from '@shared/NavigationDisplay';
+import { useArinc429Var } from '@instruments/common/arinc429';
 import { CrossTrack } from '../elements/CrossTrack';
 import { ToWaypointIndicator } from '../elements/ToWaypointIndicator';
 import { FlightPlan } from '../elements/FlightPlan';
@@ -19,15 +20,20 @@ export interface PlanModeProps {
 export const PlanMode: FC<PlanModeProps> = ({ side, symbols, adirsAlign, rangeSetting, ppos, mapHidden }) => {
     const [planCentreLat] = useSimVar('L:A32NX_SELECTED_WAYPOINT_LAT', 'Degrees');
     const [planCentreLong] = useSimVar('L:A32NX_SELECTED_WAYPOINT_LONG', 'Degrees');
-
-    const [trueHeading] = useSimVar('PLANE HEADING DEGREES TRUE', 'degrees');
-
+    const trueHeading = useArinc429Var('L:A32NX_ADIRS_IR_1_TRUE_HEADING');
+    const irMaint = useArinc429Var('L:A32NX_ADIRS_IR_1_MAINT_WORD');
+    const [trueRefPb] = useSimVar('L:A32NX_PUSH_TRUE_REF', 'bool');
+    const [trueRef, setTrueRef] = useState(false);
     const [mapParams] = useState<MapParameters>(new MapParameters());
 
     useEffect(() => {
         mapParams.compute({ lat: planCentreLat, long: planCentreLong }, rangeSetting / 2, 250, 0);
     }, [planCentreLat, planCentreLong, rangeSetting]);
 
+    useEffect(() => {
+        setTrueRef((irMaint.getBitValueOr(15, false) || trueRefPb) && !irMaint.getBitValueOr(2, false));
+    }, [irMaint.value, trueRefPb]);
+
     return (
         <>
             <Overlay rangeSetting={rangeSetting} />
@@ -46,10 +52,10 @@ export const PlanMode: FC<PlanModeProps> = ({ side, symbols, adirsAlign, rangeSe
             </g>
 
             {adirsAlign && !mapHidden && mapParams.valid && (
-                <Plane location={ppos} heading={trueHeading} mapParams={mapParams} />
+                <Plane location={ppos} heading={trueHeading.value} mapParams={mapParams} />
             )}
 
-            <ToWaypointIndicator side={side} />
+            <ToWaypointIndicator side={side} trueRef={trueRef} />
 
             <CrossTrack x={44} y={690} side={side} isPlanMode />
         </>
diff --git a/src/instruments/src/ND/pages/RoseMode.tsx b/src/instruments/src/ND/pages/RoseMode.tsx
index cda40cec103..e6b2f8558f3 100644
--- a/src/instruments/src/ND/pages/RoseMode.tsx
+++ b/src/instruments/src/ND/pages/RoseMode.tsx
@@ -5,11 +5,12 @@ import { MathUtils } from '@shared/MathUtils';
 import { TuningMode } from '@fmgc/radionav';
 import { Mode, EfisSide, NdSymbol } from '@shared/NavigationDisplay';
 import { ArmedLateralMode, isArmed, LateralMode } from '@shared/autopilot';
+import { useArinc429Var } from '@instruments/common/arinc429';
+import { TopMessages } from '../elements/TopMessages';
 import { ToWaypointIndicator } from '../elements/ToWaypointIndicator';
 import { FlightPlan } from '../elements/FlightPlan';
 import { MapParameters } from '../utils/MapParameters';
 import { RadioNeedle } from '../elements/RadioNeedles';
-import { ApproachMessage } from '../elements/ApproachMessage';
 import { CrossTrack } from '../elements/CrossTrack';
 import { TrackLine } from '../elements/TrackLine';
 import { Traffic } from '../elements/Traffic';
@@ -26,35 +27,37 @@ export interface RoseModeProps {
 }
 
 export const RoseMode: FC<RoseModeProps> = ({ symbols, adirsAlign, rangeSetting, mode, side, ppos, mapHidden }) => {
-    const [magHeading] = useSimVar('PLANE HEADING DEGREES MAGNETIC', 'degrees');
-    const [magTrack] = useSimVar('GPS GROUND MAGNETIC TRACK', 'degrees');
-    const [trueHeading] = useSimVar('PLANE HEADING DEGREES TRUE', 'degrees');
+    const magHeading = useArinc429Var('L:A32NX_ADIRS_IR_1_HEADING');
+    const magTrack = useArinc429Var('L:A32NX_ADIRS_IR_1_TRACK');
+    const trueHeading = useArinc429Var('L:A32NX_ADIRS_IR_1_TRUE_HEADING');
+    const trueTrack = useArinc429Var('L:A32NX_ADIRS_IR_1_TRUE_TRACK');
     const [tcasMode] = useSimVar('L:A32NX_SWITCH_TCAS_Position', 'number');
     const [selectedHeading] = useSimVar('L:A32NX_AUTOPILOT_HEADING_SELECTED', 'degrees');
     const [lsCourse] = useSimVar('L:A32NX_FM_LS_COURSE', 'number');
     const [lsDisplayed] = useSimVar(`L:BTN_LS_${side === 'L' ? 1 : 2}_FILTER_ACTIVE`, 'bool'); // TODO rename simvar
     const [fmaLatMode] = useSimVar('L:A32NX_FMA_LATERAL_MODE', 'enum', 200);
     const [armedLateralBitmask] = useSimVar('L:A32NX_FMA_LATERAL_ARMED', 'enum', 200);
-    const [groundSpeed] = useSimVar('GPS GROUND SPEED', 'Meters per second', 200);
+    const irMaint = useArinc429Var('L:A32NX_ADIRS_IR_1_MAINT_WORD');
+    const [trueRefPb] = useSimVar('L:A32NX_PUSH_TRUE_REF', 'bool');
+    const [trueRef, setTrueRef] = useState(false);
 
-    const heading = Math.round(Number(MathUtils.fastToFixed(magHeading, 1)) * 1000) / 1000;
-    let track = Math.round(Number(MathUtils.fastToFixed(magTrack, 1)) * 1000) / 1000;
-
-    // Workaround for bug with gps ground track simvar
-    if (groundSpeed < 40) {
-        track = (0.025 * groundSpeed + 0.00005) * track + (1 - (0.025 * groundSpeed + 0.00005)) * heading;
-    }
+    const heading = Number(MathUtils.fastToFixed((trueRef ? trueHeading.value : magHeading.value), 2));
+    const track = Number(MathUtils.fastToFixed((trueRef ? trueTrack.value : magTrack.value), 2));
 
     const [mapParams] = useState(() => {
         const params = new MapParameters();
-        params.compute(ppos, rangeSetting / 2, 250, trueHeading);
+        params.compute(ppos, rangeSetting / 2, 250, trueHeading.value);
 
         return params;
     });
 
     useEffect(() => {
-        mapParams.compute(ppos, rangeSetting / 2, 250, trueHeading);
-    }, [ppos.lat, ppos.long, trueHeading, rangeSetting].map((n) => MathUtils.fastToFixed(n, 6)));
+        mapParams.compute(ppos, rangeSetting / 2, 250, trueHeading.value);
+    }, [ppos.lat, ppos.long, trueHeading.value, rangeSetting].map((n) => MathUtils.fastToFixed(n, 6)));
+
+    useEffect(() => {
+        setTrueRef((irMaint.getBitValueOr(15, false) || trueRefPb) && !irMaint.getBitValueOr(2, false));
+    }, [irMaint.value, trueRefPb]);
 
     if (adirsAlign) {
         return (
@@ -89,15 +92,15 @@ export const RoseMode: FC<RoseModeProps> = ({ symbols, adirsAlign, rangeSetting,
                     <RadioNeedle index={2} side={side} displayMode={mode} centreHeight={384} />
                 </g>
 
-                { mode === Mode.ROSE_VOR && <VorCaptureOverlay heading={magHeading} side={side} /> }
+                { mode === Mode.ROSE_VOR && <VorCaptureOverlay heading={heading} side={side} /> }
 
-                { mode === Mode.ROSE_ILS && <IlsCaptureOverlay heading={magHeading} _side={side} /> }
+                { mode === Mode.ROSE_ILS && <IlsCaptureOverlay heading={heading} _side={side} /> }
 
-                { mode === Mode.ROSE_NAV && <ToWaypointIndicator side={side} /> }
+                { mode === Mode.ROSE_NAV && <ToWaypointIndicator side={side} trueRef={trueRef} /> }
                 { mode === Mode.ROSE_VOR && <VorInfo side={side} /> }
                 { mode === Mode.ROSE_ILS && <IlsInfo /> }
 
-                <ApproachMessage side={side} />
+                <TopMessages side={side} ppos={ppos} trueTrack={trueTrack} trueRef={trueRef} />
                 <TrackBug heading={heading} track={track} />
                 { mode === Mode.ROSE_NAV && lsDisplayed && <LsCourseBug heading={heading} lsCourse={lsCourse} /> }
                 <SelectedHeadingBug heading={heading} selected={selectedHeading} />
@@ -548,6 +551,7 @@ const MapFailOverlay: FC<Pick<OverlayProps, 'rangeSetting'>> = memo(({ rangeSett
     </>
 ));
 
+// TODO true ref
 const VorCaptureOverlay: React.FC<{
     heading: number,
     side: EfisSide,
@@ -628,6 +632,7 @@ const VorCaptureOverlay: React.FC<{
     );
 };
 
+// TODO true ref
 const IlsCaptureOverlay: React.FC<{
     heading: number,
     _side: EfisSide,
@@ -713,6 +718,7 @@ const TrackBug: React.FC<{heading: number, track: number}> = memo(({ heading, tr
     );
 });
 
+// TODO true ref
 const LsCourseBug: React.FC<{heading: number, lsCourse: number}> = ({ heading, lsCourse }) => {
     if (lsCourse < 0) {
         return null;
diff --git a/src/instruments/src/ND/styles.scss b/src/instruments/src/ND/styles.scss
index a545f0acda7..432be1ff60a 100644
--- a/src/instruments/src/ND/styles.scss
+++ b/src/instruments/src/ND/styles.scss
@@ -49,7 +49,9 @@ text.Magenta {
 }
 
 .Cyan text,
-text.Cyan {
+text.Cyan,
+.Cyan tspan,
+tspan.Cyan {
   fill: $display-cyan;
   stroke: none;
 }
@@ -86,7 +88,9 @@ text.White {
 }
 
 .Green text,
-text.Green {
+text.Green,
+.Green tspan,
+tspan.Green {
   fill: $display-green;
   stroke: none;
 }

From 3a1caad8f3ca8500d503dbe4a84377f2c3dd84e8 Mon Sep 17 00:00:00 2001
From: Michael Corcoran <tracer@outlook.co.nz>
Date: Mon, 5 Dec 2022 22:46:57 +1300
Subject: [PATCH 04/15] feat(pfd): true ref

Still QFU dagger to be done (I think)
---
 .../src/PFD/AttitudeIndicatorHorizon.tsx      |  5 +-
 src/instruments/src/PFD/HeadingIndicator.tsx  | 34 ++++++++--
 src/instruments/src/PFD/HorizontalTape.tsx    |  5 +-
 .../src/PFD/LandingSystemIndicator.tsx        |  1 +
 src/instruments/src/PFD/PFD.svg               | 39 +++++++++--
 src/instruments/src/PFD/PFD.tsx               |  5 +-
 src/instruments/src/PFD/instrument.tsx        | 15 +++--
 .../src/PFD/shared/AdirsValueProvider.tsx     |  7 +-
 .../src/PFD/shared/ArincValueProvider.ts      | 31 ++++++---
 .../PFD/shared/DisplayManagementComputer.tsx  | 66 +++++++++++++++++++
 .../src/PFD/shared/PFDSimvarPublisher.tsx     | 30 +++++----
 11 files changed, 195 insertions(+), 43 deletions(-)
 create mode 100644 src/instruments/src/PFD/shared/DisplayManagementComputer.tsx

diff --git a/src/instruments/src/PFD/AttitudeIndicatorHorizon.tsx b/src/instruments/src/PFD/AttitudeIndicatorHorizon.tsx
index bed75bfc199..3d03ab482d0 100644
--- 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
index f7d00bf78c5..8f2d09b41cb 100644
--- 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
index 07bba69d261..72cd6f08a05 100644
--- 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
index 96c87d480d7..08822d2acb4 100644
--- 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
index e3624420549..e99d3577ad3 100644
--- a/src/instruments/src/PFD/PFD.svg
+++ b/src/instruments/src/PFD/PFD.svg
@@ -13,7 +13,7 @@
    version="1.1"
    id="svg1876"
    sodipodi:docname="PFD.svg"
-   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15, custom)">
   <style
      id="style1190" />
   <metadata
@@ -37,17 +37,17 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
+     inkscape:window-width="3840"
+     inkscape:window-height="2097"
      id="namedview1878"
      showgrid="false"
-     inkscape:zoom="2.2221152"
-     inkscape:cx="180.95724"
-     inkscape:cy="408.57902"
+     inkscape:zoom="25.140364"
+     inkscape:cx="273.24929"
+     inkscape:cy="522.16444"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:current-layer="LSInfoGroup"
+     inkscape:current-layer="HeadingOfftapeGroup"
      units="mm"
      inkscape:document-rotation="0"
      inkscape:document-units="mm"
@@ -2490,6 +2490,25 @@
              sodipodi:role="line"
              style="font-size:6px;stroke-width:0.185208;stroke-miterlimit:4;stroke-dasharray:none">270</tspan></text>
       </g>
+      <g
+         id="TrueRefFlag">
+        <path
+           d="m 62.594561,134.78189 h 12.62369 v 4.27439 h -12.62369 z"
+           style="fill:none;stroke:#000000;stroke-width:0.185208;stroke-miterlimit:4;stroke-dasharray:none"
+           id="path1440-6"
+           sodipodi:nodetypes="ccccc" />
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-weight:normal;font-size:5px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+           x="62.758335"
+           y="138.81908"
+           id="text1140"><tspan
+             sodipodi:role="line"
+             id="tspan1138"
+             x="62.758335"
+             y="138.81908"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5px;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';stroke-width:0.264583">TRUE</tspan></text>
+      </g>
     </g>
     <text
        xml:space="preserve"
@@ -2911,6 +2930,12 @@
            y="115.03627"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6px;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:end;text-anchor:end;stroke-width:0.264583">S</tspan></text>
     </g>
+    <path
+       d="m 62.478333,138.30504 v -0.17929 -3.69361 h 24.403406 v 3.69361 0.17929"
+       style="fill:none;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
+       id="HeadingTapeOutline-9"
+       sodipodi:nodetypes="cccccc"
+       inkscape:label="HeadingTapeOutline" />
   </g>
   <desc
      id="desc1874">PFD.dxf - scale = 1.000000, origin = (0.000000, 0.000000), method = file</desc>
diff --git a/src/instruments/src/PFD/PFD.tsx b/src/instruments/src/PFD/PFD.tsx
index 5ed3fa96f2a..6c75cc3246b 100644
--- 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
index 4fe0a880975..5331200e470 100644
--- 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
index a8cde60aaa0..04a57ebf5b1 100644
--- 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
index b4c8a0970df..a58115d14f7 100644
--- 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>) {
diff --git a/src/instruments/src/PFD/shared/DisplayManagementComputer.tsx b/src/instruments/src/PFD/shared/DisplayManagementComputer.tsx
new file mode 100644
index 00000000000..a0abd2515c4
--- /dev/null
+++ b/src/instruments/src/PFD/shared/DisplayManagementComputer.tsx
@@ -0,0 +1,66 @@
+import { Arinc429Word } from '@shared/arinc429';
+import { Arinc429Values } from 'instruments/src/PFD/shared/ArincValueProvider';
+import { PFDSimvars } from 'instruments/src/PFD/shared/PFDSimvarPublisher';
+import { EventBus, Subject } from 'msfssdk';
+
+export interface DisplayManagementComputerEvents {
+    trueRefActive: boolean,
+    heading: Arinc429Word,
+    track: Arinc429Word,
+}
+
+export class DisplayManagementComputer {
+    private readonly irMaintWord = Subject.create(new Arinc429Word(0));
+
+    private readonly magHeading = Subject.create(new Arinc429Word(0));
+
+    private readonly trueHeading = Subject.create(new Arinc429Word(0));
+
+    private readonly magTrack = Subject.create(new Arinc429Word(0));
+
+    private readonly trueTrack = Subject.create(new Arinc429Word(0));
+
+    private readonly trueRefPb = Subject.create(false);
+
+    private readonly trueRefActive = Subject.create(false);
+
+    constructor(private bus: EventBus) {}
+
+    init(): void {
+        const pub = this.bus.getPublisher<DisplayManagementComputerEvents>();
+
+        this.trueRefActive.sub((v) => pub.pub('trueRefActive', v), true);
+
+        const sub = this.bus.getSubscriber<Arinc429Values & PFDSimvars>();
+
+        this.irMaintWord.sub(this.handleTrueRef.bind(this));
+        this.trueRefPb.sub(this.handleTrueRef.bind(this), true);
+
+        this.magHeading.sub(this.handleHeading.bind(this));
+        this.magTrack.sub(this.handleHeading.bind(this));
+        this.trueHeading.sub(this.handleHeading.bind(this));
+        this.trueTrack.sub(this.handleHeading.bind(this));
+
+        sub.on('irMaintWord').whenChanged().handle((v) => this.irMaintWord.set(v));
+        sub.on('trueRefPushbutton').whenChanged().handle((v) => this.trueRefPb.set(v > 0));
+        sub.on('magHeading').whenChanged().handle((v) => this.magHeading.set(v));
+        sub.on('magTrack').whenChanged().handle((v) => this.magTrack.set(v));
+        sub.on('trueHeading').whenChanged().handle((v) => this.trueHeading.set(v));
+        sub.on('trueTrack').whenChanged().handle((v) => this.trueTrack.set(v));
+    }
+
+    private handleTrueRef(): void {
+        // true ref is active when the PB is pressed or the ADIRU is at an extreme latitude
+        // and the ADIRU must not be in ATT reversion mode
+        const trueRequested = this.irMaintWord.get().getBitValueOr(15, false) || this.trueRefPb.get();
+        this.trueRefActive.set(trueRequested && !this.irMaintWord.get().getBitValueOr(2, false));
+        this.handleHeading();
+    }
+
+    private handleHeading(): void {
+        const pub = this.bus.getPublisher<DisplayManagementComputerEvents>();
+
+        pub.pub('heading', this.trueRefActive ? this.trueHeading.get() : this.magHeading.get());
+        pub.pub('track', this.trueRefActive ? this.trueTrack.get() : this.magTrack.get());
+    }
+}
diff --git a/src/instruments/src/PFD/shared/PFDSimvarPublisher.tsx b/src/instruments/src/PFD/shared/PFDSimvarPublisher.tsx
index 356c160789d..80762033d62 100644
--- a/src/instruments/src/PFD/shared/PFDSimvarPublisher.tsx
+++ b/src/instruments/src/PFD/shared/PFDSimvarPublisher.tsx
@@ -8,7 +8,7 @@ export interface PFDSimvars {
     potentiometerFo: number;
     pitch: number;
     roll: number;
-    heading: number;
+    magHeadingRaw: number;
     altitude: number;
     speed: number;
     noseGearCompressed: boolean;
@@ -59,13 +59,11 @@ export interface PFDSimvars {
     flapHandleIndex: number;
     transAlt: number;
     transAltAppr: number;
-    groundTrack: number;
+    magTrackRaw: number;
     showSelectedHeading: number;
     altConstraint: number;
     trkFpaActive: boolean;
     aoa: number;
-    groundHeadingTrue: number;
-    groundTrackTrue: number;
     selectedFpa: number;
     ilsCourse: number;
     metricAltToggle: boolean;
@@ -144,6 +142,10 @@ export interface PFDSimvars {
     fac2EstimatedBetaRaw: number;
     fac1BetaTargetRaw: number;
     fac2BetaTargetRaw: number;
+    trueRefPushbutton: number;
+    irMaintWordRaw: number;
+    trueHeadingRaw: number;
+    trueTrackRaw: number;
   }
 
 export enum PFDVars {
@@ -154,7 +156,7 @@ export enum PFDVars {
     potentiometerFo = 'LIGHT POTENTIOMETER:90',
     pitch = 'L:A32NX_ADIRS_IR_1_PITCH',
     roll = 'L:A32NX_ADIRS_IR_1_ROLL',
-    heading = 'L:A32NX_ADIRS_IR_1_HEADING',
+    magHeadingRaw = 'L:A32NX_ADIRS_IR_1_HEADING',
     altitude = 'L:A32NX_ADIRS_ADR_1_ALTITUDE',
     speed = 'L:A32NX_ADIRS_ADR_1_COMPUTED_AIRSPEED',
     noseGearCompressed = 'L:A32NX_LGCIU_1_NOSE_GEAR_COMPRESSED',
@@ -205,13 +207,11 @@ export enum PFDVars {
     flapHandleIndex = 'L:A32NX_FLAPS_HANDLE_INDEX',
     transAlt = 'L:AIRLINER_TRANS_ALT',
     transAltAppr = 'L:AIRLINER_APPR_TRANS_ALT',
-    groundTrack = 'L:A32NX_ADIRS_IR_1_TRACK',
+    magTrackRaw = 'L:A32NX_ADIRS_IR_1_TRACK',
     showSelectedHeading = 'L:A320_FCU_SHOW_SELECTED_HEADING',
     altConstraint = 'L:A32NX_FG_ALTITUDE_CONSTRAINT',
     trkFpaActive = 'L:A32NX_TRK_FPA_MODE_ACTIVE',
     aoa = 'INCIDENCE ALPHA',
-    groundHeadingTrue = 'GPS GROUND TRUE HEADING',
-    groundTrackTrue = 'GPS GROUND TRUE TRACK',
     selectedFpa = 'L:A32NX_AUTOPILOT_FPA_SELECTED',
     ilsCourse = 'L:A32NX_FM_LS_COURSE',
     metricAltToggle = 'L:A32NX_METRIC_ALT_TOGGLE',
@@ -289,6 +289,10 @@ export enum PFDVars {
     fac2EstimatedBetaRaw = 'L:A32NX_FAC_2_ESTIMATED_SIDESLIP',
     fac1BetaTargetRaw = 'L:A32NX_FAC_1_SIDESLIP_TARGET',
     fac2BetaTargetRaw = 'L:A32NX_FAC_2_SIDESLIP_TARGET',
+    trueRefPushbutton = 'L:A32NX_PUSH_TRUE_REF',
+    irMaintWordRaw = 'L:A32NX_ADIRS_IR_1_MAINT_WORD',
+    trueHeadingRaw = 'L:A32NX_ADIRS_IR_1_TRUE_HEADING',
+    trueTrackRaw = 'L:A32NX_ADIRS_IR_1_TRUE_TRACK',
   }
 
 /** A publisher to poll and publish nav/com simvars. */
@@ -301,7 +305,7 @@ export class PFDSimvarPublisher extends SimVarPublisher<PFDSimvars> {
         ['potentiometerFo', { name: PFDVars.potentiometerFo, type: SimVarValueType.Number }],
         ['pitch', { name: PFDVars.pitch, type: SimVarValueType.Number }],
         ['roll', { name: PFDVars.roll, type: SimVarValueType.Number }],
-        ['heading', { name: PFDVars.heading, type: SimVarValueType.Number }],
+        ['magHeadingRaw', { name: PFDVars.magHeadingRaw, type: SimVarValueType.Number }],
         ['altitude', { name: PFDVars.altitude, type: SimVarValueType.Number }],
         ['speed', { name: PFDVars.speed, type: SimVarValueType.Number }],
         ['noseGearCompressed', { name: PFDVars.noseGearCompressed, type: SimVarValueType.Bool }],
@@ -352,13 +356,11 @@ export class PFDSimvarPublisher extends SimVarPublisher<PFDSimvars> {
         ['flapHandleIndex', { name: PFDVars.flapHandleIndex, type: SimVarValueType.Number }],
         ['transAlt', { name: PFDVars.transAlt, type: SimVarValueType.Number }],
         ['transAltAppr', { name: PFDVars.transAltAppr, type: SimVarValueType.Number }],
-        ['groundTrack', { name: PFDVars.groundTrack, type: SimVarValueType.Number }],
+        ['magTrackRaw', { name: PFDVars.magTrackRaw, type: SimVarValueType.Number }],
         ['showSelectedHeading', { name: PFDVars.showSelectedHeading, type: SimVarValueType.Number }],
         ['altConstraint', { name: PFDVars.altConstraint, type: SimVarValueType.Feet }],
         ['trkFpaActive', { name: PFDVars.trkFpaActive, type: SimVarValueType.Bool }],
         ['aoa', { name: PFDVars.aoa, type: SimVarValueType.Degree }],
-        ['groundHeadingTrue', { name: PFDVars.groundHeadingTrue, type: SimVarValueType.Degree }],
-        ['groundTrackTrue', { name: PFDVars.groundTrackTrue, type: SimVarValueType.Degree }],
         ['selectedFpa', { name: PFDVars.selectedFpa, type: SimVarValueType.Degree }],
         ['ilsCourse', { name: PFDVars.ilsCourse, type: SimVarValueType.Number }],
         ['metricAltToggle', { name: PFDVars.metricAltToggle, type: SimVarValueType.Bool }],
@@ -436,6 +438,10 @@ export class PFDSimvarPublisher extends SimVarPublisher<PFDSimvars> {
         ['fac2EstimatedBetaRaw', { name: PFDVars.fac2EstimatedBetaRaw, type: SimVarValueType.Number }],
         ['fac1BetaTargetRaw', { name: PFDVars.fac1BetaTargetRaw, type: SimVarValueType.Number }],
         ['fac2BetaTargetRaw', { name: PFDVars.fac2BetaTargetRaw, type: SimVarValueType.Number }],
+        ['trueRefPushbutton', { name: PFDVars.trueRefPushbutton, type: SimVarValueType.Bool }],
+        ['irMaintWordRaw', { name: PFDVars.irMaintWordRaw, type: SimVarValueType.Number }],
+        ['trueHeadingRaw', { name: PFDVars.trueHeadingRaw, type: SimVarValueType.Number }],
+        ['trueTrackRaw', { name: PFDVars.trueTrackRaw, type: SimVarValueType.Number }],
     ])
 
     public constructor(bus: EventBus) {

From 7db3ba68e282e7b404363f6641d4577f830309f5 Mon Sep 17 00:00:00 2001
From: Michael Corcoran <tracer@outlook.co.nz>
Date: Mon, 5 Dec 2022 23:02:02 +1300
Subject: [PATCH 05/15] fix(nd): rect vis

---
 src/instruments/src/ND/elements/TopMessages.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/instruments/src/ND/elements/TopMessages.tsx b/src/instruments/src/ND/elements/TopMessages.tsx
index f049413256c..bd937395308 100644
--- a/src/instruments/src/ND/elements/TopMessages.tsx
+++ b/src/instruments/src/ND/elements/TopMessages.tsx
@@ -36,7 +36,7 @@ type TrueFlagProps = {
 
 const TrueFlag: React.FC<TrueFlagProps> = ({ xOffset = 0, box }) => (
     <>
-        <rect x={-30 + xOffset} width={60} y={-20} height={22} className="Cyan" strokeWidth={1.5} visibility={box ? 'visible' : 'hidden'} />
+        <rect x={-30 + xOffset} width={60} y={-20} height={22} className="Cyan" strokeWidth={1.5} visibility={box ? 'inherit' : 'hidden'} />
         <text x={xOffset} fontSize={22} className="Cyan" textAnchor="middle">TRUE</text>
     </>
 );

From 9756890cf2aa62d2bfc96ebbf959b707dc088d0a Mon Sep 17 00:00:00 2001
From: Michael Corcoran <tracer@outlook.co.nz>
Date: Tue, 6 Dec 2022 22:37:24 +1300
Subject: [PATCH 06/15] fix(pfd): true flag flashes at slat extension

---
 src/instruments/src/PFD/HeadingIndicator.tsx  | 22 +++++++++++++++++--
 src/instruments/src/PFD/animations.scss       |  6 +++++
 src/instruments/src/PFD/instrument.tsx        |  1 +
 .../PFD/shared/DisplayManagementComputer.tsx  | 10 +++++----
 .../src/PFD/shared/PFDSimvarPublisher.tsx     |  3 +++
 5 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/src/instruments/src/PFD/HeadingIndicator.tsx b/src/instruments/src/PFD/HeadingIndicator.tsx
index 8f2d09b41cb..c4879642b6b 100644
--- a/src/instruments/src/PFD/HeadingIndicator.tsx
+++ b/src/instruments/src/PFD/HeadingIndicator.tsx
@@ -347,18 +347,36 @@ interface TrueFlagProps {
 }
 
 class TrueFlag extends DisplayComponent<TrueFlagProps> {
-    private trueRefActive = Subject.create(false);
+    private readonly trueRefActive = Subject.create(false);
+
+    private readonly slatsExtended = Subject.create(false);
+
+    private readonly slatsExtendedWithTrue = Subject.create(false);
+
+    private readonly trueFlagRef = FSComponent.createRef<SVGGElement>();
 
     /** @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));
+        // FIXME this should be 127-11 from FWC
+        this.props.bus.getSubscriber<PFDSimvars>().on('slatPosLeft').withPrecision(0.25).handle((v) => this.slatsExtended.set(v > 0.4));
+
+        this.trueRefActive.sub((trueRef) => this.trueFlagRef.instance.classList.toggle('HiddenElement', !trueRef), true);
+
+        this.trueRefActive.sub(this.handleSlatsTrue.bind(this));
+        this.slatsExtended.sub(this.handleSlatsTrue.bind(this));
+        this.slatsExtendedWithTrue.sub((flash) => this.trueFlagRef.instance.classList.toggle('Blink10Seconds', flash));
+    }
+
+    private handleSlatsTrue(): void {
+        this.slatsExtendedWithTrue.set(this.trueRefActive.get() && this.slatsExtended.get());
     }
 
     /** @inheritdoc */
     render(): VNode {
         return (
-            <g id="TrueRefFlag" visibility={this.trueRefActive ? 'visible' : 'hidden'}>
+            <g id="TrueRefFlag" ref={this.trueFlagRef}>
                 <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/animations.scss b/src/instruments/src/PFD/animations.scss
index 97f9bd61f66..1a2f5c3f992 100644
--- a/src/instruments/src/PFD/animations.scss
+++ b/src/instruments/src/PFD/animations.scss
@@ -54,6 +54,12 @@
   animation-iteration-count: 9;
 }
 
+.Blink10Seconds {
+  animation-name: blinking;
+  animation-duration: 1s;
+  animation-iteration-count: 10;
+}
+
 .OuterMarkerBlink {
   animation-name: OuterMarkerAnim;
   animation-duration: 460ms;
diff --git a/src/instruments/src/PFD/instrument.tsx b/src/instruments/src/PFD/instrument.tsx
index 5331200e470..6ce3d047355 100644
--- a/src/instruments/src/PFD/instrument.tsx
+++ b/src/instruments/src/PFD/instrument.tsx
@@ -221,6 +221,7 @@ class A32NX_PFD extends BaseInstrument {
         this.simVarPublisher.subscribe('irMaintWordRaw');
         this.simVarPublisher.subscribe('trueHeadingRaw');
         this.simVarPublisher.subscribe('trueTrackRaw');
+        this.simVarPublisher.subscribe('slatPosLeft');
 
         FSComponent.render(<PFDComponent bus={this.bus} instrument={this} />, document.getElementById('PFD_CONTENT'));
     }
diff --git a/src/instruments/src/PFD/shared/DisplayManagementComputer.tsx b/src/instruments/src/PFD/shared/DisplayManagementComputer.tsx
index a0abd2515c4..d959417b778 100644
--- a/src/instruments/src/PFD/shared/DisplayManagementComputer.tsx
+++ b/src/instruments/src/PFD/shared/DisplayManagementComputer.tsx
@@ -29,7 +29,10 @@ export class DisplayManagementComputer {
     init(): void {
         const pub = this.bus.getPublisher<DisplayManagementComputerEvents>();
 
-        this.trueRefActive.sub((v) => pub.pub('trueRefActive', v), true);
+        this.trueRefActive.sub((v) => {
+            pub.pub('trueRefActive', v);
+            this.handleHeading();
+        }, true);
 
         const sub = this.bus.getSubscriber<Arinc429Values & PFDSimvars>();
 
@@ -54,13 +57,12 @@ export class DisplayManagementComputer {
         // and the ADIRU must not be in ATT reversion mode
         const trueRequested = this.irMaintWord.get().getBitValueOr(15, false) || this.trueRefPb.get();
         this.trueRefActive.set(trueRequested && !this.irMaintWord.get().getBitValueOr(2, false));
-        this.handleHeading();
     }
 
     private handleHeading(): void {
         const pub = this.bus.getPublisher<DisplayManagementComputerEvents>();
 
-        pub.pub('heading', this.trueRefActive ? this.trueHeading.get() : this.magHeading.get());
-        pub.pub('track', this.trueRefActive ? this.trueTrack.get() : this.magTrack.get());
+        pub.pub('heading', this.trueRefActive.get() ? this.trueHeading.get() : this.magHeading.get());
+        pub.pub('track', this.trueRefActive.get() ? this.trueTrack.get() : this.magTrack.get());
     }
 }
diff --git a/src/instruments/src/PFD/shared/PFDSimvarPublisher.tsx b/src/instruments/src/PFD/shared/PFDSimvarPublisher.tsx
index 80762033d62..acddbcb7b46 100644
--- a/src/instruments/src/PFD/shared/PFDSimvarPublisher.tsx
+++ b/src/instruments/src/PFD/shared/PFDSimvarPublisher.tsx
@@ -146,6 +146,7 @@ export interface PFDSimvars {
     irMaintWordRaw: number;
     trueHeadingRaw: number;
     trueTrackRaw: number;
+    slatPosLeft: number;
   }
 
 export enum PFDVars {
@@ -293,6 +294,7 @@ export enum PFDVars {
     irMaintWordRaw = 'L:A32NX_ADIRS_IR_1_MAINT_WORD',
     trueHeadingRaw = 'L:A32NX_ADIRS_IR_1_TRUE_HEADING',
     trueTrackRaw = 'L:A32NX_ADIRS_IR_1_TRUE_TRACK',
+    slatPosLeft = 'L:A32NX_LEFT_SLATS_ANGLE',
   }
 
 /** A publisher to poll and publish nav/com simvars. */
@@ -442,6 +444,7 @@ export class PFDSimvarPublisher extends SimVarPublisher<PFDSimvars> {
         ['irMaintWordRaw', { name: PFDVars.irMaintWordRaw, type: SimVarValueType.Number }],
         ['trueHeadingRaw', { name: PFDVars.trueHeadingRaw, type: SimVarValueType.Number }],
         ['trueTrackRaw', { name: PFDVars.trueTrackRaw, type: SimVarValueType.Number }],
+        ['slatPosLeft', { name: PFDVars.slatPosLeft, type: SimVarValueType.Number }],
     ])
 
     public constructor(bus: EventBus) {

From 4e39c35b4876dc0c4c45d7f7cbb84d0015d555fb Mon Sep 17 00:00:00 2001
From: Michael Corcoran <tracer@outlook.co.nz>
Date: Wed, 7 Dec 2022 21:52:39 +1300
Subject: [PATCH 07/15] feat(nd): true ref for navaids

---
 .../src/ND/elements/RadioNavInfo.tsx          | 64 +++++++++++++------
 .../src/ND/elements/RadioNeedles.tsx          | 30 +++++----
 src/instruments/src/ND/index.tsx              | 14 +++-
 src/instruments/src/ND/pages/ArcMode.tsx      | 14 ++--
 src/instruments/src/ND/pages/RoseMode.tsx     | 14 ++--
 5 files changed, 82 insertions(+), 54 deletions(-)

diff --git a/src/instruments/src/ND/elements/RadioNavInfo.tsx b/src/instruments/src/ND/elements/RadioNavInfo.tsx
index a1cb64f9a05..7a46d465a73 100644
--- a/src/instruments/src/ND/elements/RadioNavInfo.tsx
+++ b/src/instruments/src/ND/elements/RadioNavInfo.tsx
@@ -1,7 +1,7 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import { useSimVar } from '@instruments/common/simVars';
 import { TuningMode } from '@fmgc/radionav';
-import { EfisSide } from '@shared/NavigationDisplay';
+import { EfisSide, Mode } from '@shared/NavigationDisplay';
 
 export enum NavAidMode {
     Off = 0,
@@ -9,9 +9,12 @@ export enum NavAidMode {
     VOR,
 }
 
-// TODO true ref
-
-export type RadioNavInfoProps = { index: 1 | 2, side: EfisSide }
+export type RadioNavInfoProps = {
+    index: 1 | 2,
+    side: EfisSide,
+    trueRef: boolean,
+    mode: Mode,
+}
 
 const TuningModeIndicator: React.FC<{ index: 1 | 2, frequency: number }> = ({ index, frequency }) => {
     const [tuningMode] = useSimVar(`L:A32NX_FMGC_RADIONAV_${index}_TUNING_MODE`, 'enum');
@@ -23,12 +26,28 @@ const TuningModeIndicator: React.FC<{ index: 1 | 2, frequency: number }> = ({ in
     );
 };
 
-const VorInfo: React.FC<{index: 1 | 2}> = ({ index }) => {
+const VorInfo: React.FC<{index: 1 | 2, trueRef: boolean, mode: Mode }> = ({ index, trueRef, mode }) => {
     const [vorIdent] = useSimVar(`NAV IDENT:${index}`, 'string');
     const [vorFrequency] = useSimVar(`NAV ACTIVE FREQUENCY:${index}`, 'megahertz');
     const [vorHasDme] = useSimVar(`NAV HAS DME:${index}`, 'bool');
     const [dmeDistance] = useSimVar(`NAV DME:${index}`, 'nautical miles');
     const [vorAvailable] = useSimVar(`NAV HAS NAV:${index}`, 'boolean');
+    const [stationDeclination] = useSimVar(`NAV MAGVAR:${index}`, 'degrees');
+    const [stationLocation] = useSimVar(`NAV VOR LATLONALT:${index}`, 'latlonalt');
+    const [stationRefTrue, setStationRefTrue] = useState(false);
+    const [corrected, setCorrected] = useState(false);
+    const [magWarning, setMagWarning] = useState(false);
+    const [trueWarning, setTrueWarning] = useState(false);
+
+    useEffect(() => {
+        setStationRefTrue(stationLocation.lat > 75 && stationDeclination < Number.EPSILON);
+    }, [stationDeclination, stationLocation.lat]);
+
+    useEffect(() => {
+        setCorrected(vorAvailable && !!(trueRef) !== stationRefTrue && mode !== Mode.ROSE_VOR && mode !== Mode.ROSE_ILS);
+        setMagWarning(vorAvailable && !!(trueRef) && !stationRefTrue && (mode === Mode.ROSE_VOR || mode === Mode.ROSE_ILS));
+        setTrueWarning(vorAvailable && !(trueRef) && stationRefTrue && (mode === Mode.ROSE_VOR || mode === Mode.ROSE_ILS));
+    }, [trueRef, stationRefTrue, mode, vorAvailable]);
 
     const x = index === 1 ? 37 : 668;
 
@@ -60,21 +79,24 @@ const VorInfo: React.FC<{index: 1 | 2}> = ({ index }) => {
 
     return (
         <g className="GtLayer">
-            {(vorAvailable && (
-                <path
-                    d={path}
-                    strokeWidth={2}
-                    className="White"
-                    strokeLinejoin="round"
-                    strokeLinecap="round"
-                />
-            ))}
+            <path
+                d={path}
+                strokeWidth={2}
+                className={vorAvailable && !!(trueRef) !== stationRefTrue && (mode === Mode.ARC || mode === Mode.ROSE_NAV) ? 'Magenta' : 'White'}
+                strokeLinejoin="round"
+                strokeLinecap="round"
+            />
             <text x={x} y={692} fontSize={24} className="White">
                 VOR
                 {index}
             </text>
             {(vorAvailable || vorHasDme) && vorFrequency > 1 && (
-                <text x={x} y={722} fontSize={24} className="White">{vorIdent}</text>
+                <>
+                    <text x={x} y={722} fontSize={24} className="White">{vorIdent}</text>
+                    <text x={index === 2 ? x - 52 : x + 69} y={692} fontSize={18} className="Magenta" visibility={corrected ? 'inherit' : 'hidden'}>CORR</text>
+                    <text x={index === 2 ? x - 52 : x + 81} y={692} fontSize={18} className="Amber" visibility={magWarning ? 'inherit' : 'hidden'}>MAG</text>
+                    <text x={index === 2 ? x - 52 : x + 69} y={692} fontSize={18} className="Amber" visibility={trueWarning ? 'inherit' : 'hidden'}>TRUE</text>
+                </>
             )}
             {!(vorAvailable || vorHasDme) && vorFrequency > 1 && (
                 <text x={index === 2 ? x - 26 : x} y={722} fontSize={24} className="White">{freqText}</text>
@@ -122,13 +144,13 @@ const AdfInfo: React.FC<{index: 1 | 2}> = ({ index }) => {
     );
 };
 
-export const RadioNavInfo: React.FC<RadioNavInfoProps> = ({ index, side }) => {
-    const [mode] = useSimVar(`L:A32NX_EFIS_${side}_NAVAID_${index}_MODE`, 'enum');
+export const RadioNavInfo: React.FC<RadioNavInfoProps> = ({ index, side, trueRef, mode }) => {
+    const [navaidMode] = useSimVar(`L:A32NX_EFIS_${side}_NAVAID_${index}_MODE`, 'enum');
 
-    if (mode === NavAidMode.VOR) {
-        return <VorInfo index={index} />;
+    if (navaidMode === NavAidMode.VOR) {
+        return <VorInfo index={index} trueRef={trueRef} mode={mode} />;
     }
-    if (mode === NavAidMode.ADF) {
+    if (navaidMode === NavAidMode.ADF) {
         return <AdfInfo index={index} />;
     }
     return <></>;
diff --git a/src/instruments/src/ND/elements/RadioNeedles.tsx b/src/instruments/src/ND/elements/RadioNeedles.tsx
index 201ae0b4972..2bb57d303c1 100644
--- a/src/instruments/src/ND/elements/RadioNeedles.tsx
+++ b/src/instruments/src/ND/elements/RadioNeedles.tsx
@@ -1,9 +1,9 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import { useSimVar } from '@instruments/common/simVars';
 import { Mode, EfisSide } from '@shared/NavigationDisplay';
 import { NavAidMode } from './RadioNavInfo';
 
-type RadioNavPointerProps = { index: 1 | 2, side: EfisSide, displayMode: Mode, centreHeight: number };
+type RadioNavPointerProps = { index: 1 | 2, side: EfisSide, displayMode: Mode, centreHeight: number, trueRef: boolean };
 
 const AdfNeedle: React.FC<Omit<RadioNavPointerProps, 'side'>> = ({ index, displayMode, centreHeight }) => {
     const [relativeBearing] = useSimVar(`ADF RADIAL:${index}`, 'degrees');
@@ -36,20 +36,28 @@ const AdfNeedle: React.FC<Omit<RadioNavPointerProps, 'side'>> = ({ index, displa
             <path
                 d={paths[index - 1]}
                 strokeWidth={3.7}
-                className="shadow rounded"
+                className="rounded shadow"
             />
             <path
                 d={paths[index - 1]}
                 strokeWidth={3.2}
-                className="Green rounded"
+                className="rounded Green"
             />
         </g>
     );
 };
 
-const VorNeedle: React.FC<Omit<RadioNavPointerProps, 'side'>> = ({ index, displayMode, centreHeight }) => {
+const VorNeedle: React.FC<Omit<RadioNavPointerProps, 'side'>> = ({ index, displayMode, centreHeight, trueRef }) => {
     const [relativeBearing] = useSimVar(`NAV RELATIVE BEARING TO STATION:${index}`, 'degrees');
     const [available] = useSimVar(`NAV HAS NAV:${index}`, 'number');
+    const [isLoc] = useSimVar(`NAV HAS LOCALIZER:${index}`, 'number');
+    const [stationDeclination] = useSimVar(`NAV MAGVAR:${index}`, 'degrees');
+    const [stationLocation] = useSimVar(`NAV VOR LATLONALT:${index}`, 'latlonalt');
+    const [stationRefTrue, setStationRefTrue] = useState(false);
+
+    useEffect(() => {
+        setStationRefTrue(stationLocation.lat > 75 && stationDeclination < Number.EPSILON);
+    }, [stationDeclination, stationLocation.lat]);
 
     let paths: Array<string>;
 
@@ -73,30 +81,30 @@ const VorNeedle: React.FC<Omit<RadioNavPointerProps, 'side'>> = ({ index, displa
         return null;
     }
 
-    return available && (
+    return available && !isLoc && (
         <g transform={`rotate(${relativeBearing} 384 ${centreHeight})`}>
             <path
                 d={paths[index - 1]}
                 strokeWidth={3.7}
-                className="shadow rounded"
+                className="rounded shadow"
             />
             <path
                 d={paths[index - 1]}
                 strokeWidth={3.2}
-                className="White rounded"
+                className={`rounded ${!!(trueRef) !== stationRefTrue ? 'Magenta' : 'White'}`}
             />
         </g>
     );
 };
 
-export const RadioNeedle: React.FC<RadioNavPointerProps> = ({ index, side, displayMode, centreHeight }) => {
+export const RadioNeedle: React.FC<RadioNavPointerProps> = ({ index, side, displayMode, centreHeight, trueRef }) => {
     const [mode] = useSimVar(`L:A32NX_EFIS_${side}_NAVAID_${index}_MODE`, 'enum');
 
     switch (mode) {
     case NavAidMode.ADF:
-        return <AdfNeedle index={index} displayMode={displayMode} centreHeight={centreHeight} />;
+        return <AdfNeedle index={index} displayMode={displayMode} centreHeight={centreHeight} trueRef={trueRef} />;
     case NavAidMode.VOR:
-        return <VorNeedle index={index} displayMode={displayMode} centreHeight={centreHeight} />;
+        return <VorNeedle index={index} displayMode={displayMode} centreHeight={centreHeight} trueRef={trueRef} />;
     case NavAidMode.Off:
     default:
         return null;
diff --git a/src/instruments/src/ND/index.tsx b/src/instruments/src/ND/index.tsx
index 0bbd9e46c14..8889ac467fd 100644
--- a/src/instruments/src/ND/index.tsx
+++ b/src/instruments/src/ND/index.tsx
@@ -98,6 +98,14 @@ const NavigationDisplay: React.FC = () => {
         }
     }, []));
 
+    const irMaint = useArinc429Var('L:A32NX_ADIRS_IR_1_MAINT_WORD');
+    const [trueRefPb] = useSimVar('L:A32NX_PUSH_TRUE_REF', 'bool');
+    const [trueRef, setTrueRef] = useState(false);
+
+    useEffect(() => {
+        setTrueRef((irMaint.getBitValueOr(15, false) || trueRefPb) && !irMaint.getBitValueOr(2, false));
+    }, [irMaint.value, trueRefPb]);
+
     return (
         <DisplayUnit
             electricitySimvar={displayIndex === 1 ? 'L:A32NX_ELEC_AC_ESS_BUS_IS_POWERED' : 'L:A32NX_ELEC_AC_2_BUS_IS_POWERED'}
@@ -131,6 +139,7 @@ const NavigationDisplay: React.FC = () => {
                             side={side}
                             ppos={ppos}
                             mapHidden={modeChangeShown || rangeChangeShown}
+                            trueRef={trueRef}
                         />
                     )}
                     {(modeIndex === Mode.ROSE_ILS || modeIndex === Mode.ROSE_VOR || modeIndex === Mode.ROSE_NAV)
@@ -143,6 +152,7 @@ const NavigationDisplay: React.FC = () => {
                             ppos={ppos}
                             mode={modeIndex}
                             mapHidden={modeChangeShown || rangeChangeShown}
+                            trueRef={trueRef}
                         />
                     )}
 
@@ -151,8 +161,8 @@ const NavigationDisplay: React.FC = () => {
                     <NavigationDisplayMessages adirsAlign={adirsAlign} mode={modeIndex} modeChangeShown={modeChangeShown} rangeChangeShown={rangeChangeShown} />
                     {(adirsAlign && modeIndex !== Mode.PLAN) && (
                         <>
-                            <RadioNavInfo index={1} side={side} />
-                            <RadioNavInfo index={2} side={side} />
+                            <RadioNavInfo index={1} side={side} trueRef={trueRef} mode={modeIndex} />
+                            <RadioNavInfo index={2} side={side} trueRef={trueRef} mode={modeIndex} />
                         </>
                     )}
                     <TcasWxrMessages modeIndex={modeIndex} />
diff --git a/src/instruments/src/ND/pages/ArcMode.tsx b/src/instruments/src/ND/pages/ArcMode.tsx
index 25041deeeb4..9bce9db9658 100644
--- a/src/instruments/src/ND/pages/ArcMode.tsx
+++ b/src/instruments/src/ND/pages/ArcMode.tsx
@@ -22,9 +22,10 @@ export interface ArcModeProps {
     side: EfisSide,
     ppos: LatLongData,
     mapHidden: boolean,
+    trueRef: boolean,
 }
 
-export const ArcMode: React.FC<ArcModeProps> = ({ symbols, adirsAlign, rangeSetting, side, ppos, mapHidden }) => {
+export const ArcMode: React.FC<ArcModeProps> = ({ symbols, adirsAlign, rangeSetting, side, ppos, mapHidden, trueRef }) => {
     // TODO arinc var selector
     const magHeading = useArinc429Var('L:A32NX_ADIRS_IR_1_HEADING');
     const magTrack = useArinc429Var('L:A32NX_ADIRS_IR_1_TRACK');
@@ -36,9 +37,6 @@ export const ArcMode: React.FC<ArcModeProps> = ({ symbols, adirsAlign, rangeSett
     const [lsDisplayed] = useSimVar(`L:BTN_LS_${side === 'L' ? 1 : 2}_FILTER_ACTIVE`, 'bool'); // TODO rename simvar
     const [fmaLatMode] = useSimVar('L:A32NX_FMA_LATERAL_MODE', 'enum', 200);
     const [armedLateralBitmask] = useSimVar('L:A32NX_FMA_LATERAL_ARMED', 'enum', 200);
-    const irMaint = useArinc429Var('L:A32NX_ADIRS_IR_1_MAINT_WORD');
-    const [trueRefPb] = useSimVar('L:A32NX_PUSH_TRUE_REF', 'bool');
-    const [trueRef, setTrueRef] = useState(false);
 
     const heading = Number(MathUtils.fastToFixed((trueRef ? trueHeading.value : magHeading.value), 2));
     const track = Number(MathUtils.fastToFixed((trueRef ? trueTrack.value : magTrack.value), 2));
@@ -54,10 +52,6 @@ export const ArcMode: React.FC<ArcModeProps> = ({ symbols, adirsAlign, rangeSett
         mapParams.compute(ppos, rangeSetting, 492, trueHeading.value);
     }, [ppos.lat, ppos.long, trueHeading.value, rangeSetting].map((n) => MathUtils.fastToFixed(n, 6)));
 
-    useEffect(() => {
-        setTrueRef((irMaint.getBitValueOr(15, false) || trueRefPb) && !irMaint.getBitValueOr(2, false));
-    }, [irMaint.value, trueRefPb]);
-
     if (adirsAlign) {
         return (
             <>
@@ -87,8 +81,8 @@ export const ArcMode: React.FC<ArcModeProps> = ({ symbols, adirsAlign, rangeSett
                             <TrackLine x={384} y={620} heading={heading} track={track} />
                         )}
                     </g>
-                    <RadioNeedle index={1} side={side} displayMode={Mode.ARC} centreHeight={620} />
-                    <RadioNeedle index={2} side={side} displayMode={Mode.ARC} centreHeight={620} />
+                    <RadioNeedle index={1} side={side} displayMode={Mode.ARC} centreHeight={620} trueRef={trueRef} />
+                    <RadioNeedle index={2} side={side} displayMode={Mode.ARC} centreHeight={620} trueRef={trueRef} />
                 </g>
 
                 <ToWaypointIndicator side={side} trueRef={trueRef} />
diff --git a/src/instruments/src/ND/pages/RoseMode.tsx b/src/instruments/src/ND/pages/RoseMode.tsx
index e6b2f8558f3..00b6800328d 100644
--- a/src/instruments/src/ND/pages/RoseMode.tsx
+++ b/src/instruments/src/ND/pages/RoseMode.tsx
@@ -24,9 +24,10 @@ export interface RoseModeProps {
     side: EfisSide,
     ppos: LatLongData,
     mapHidden: boolean,
+    trueRef: boolean,
 }
 
-export const RoseMode: FC<RoseModeProps> = ({ symbols, adirsAlign, rangeSetting, mode, side, ppos, mapHidden }) => {
+export const RoseMode: FC<RoseModeProps> = ({ symbols, adirsAlign, rangeSetting, mode, side, ppos, mapHidden, trueRef }) => {
     const magHeading = useArinc429Var('L:A32NX_ADIRS_IR_1_HEADING');
     const magTrack = useArinc429Var('L:A32NX_ADIRS_IR_1_TRACK');
     const trueHeading = useArinc429Var('L:A32NX_ADIRS_IR_1_TRUE_HEADING');
@@ -37,9 +38,6 @@ export const RoseMode: FC<RoseModeProps> = ({ symbols, adirsAlign, rangeSetting,
     const [lsDisplayed] = useSimVar(`L:BTN_LS_${side === 'L' ? 1 : 2}_FILTER_ACTIVE`, 'bool'); // TODO rename simvar
     const [fmaLatMode] = useSimVar('L:A32NX_FMA_LATERAL_MODE', 'enum', 200);
     const [armedLateralBitmask] = useSimVar('L:A32NX_FMA_LATERAL_ARMED', 'enum', 200);
-    const irMaint = useArinc429Var('L:A32NX_ADIRS_IR_1_MAINT_WORD');
-    const [trueRefPb] = useSimVar('L:A32NX_PUSH_TRUE_REF', 'bool');
-    const [trueRef, setTrueRef] = useState(false);
 
     const heading = Number(MathUtils.fastToFixed((trueRef ? trueHeading.value : magHeading.value), 2));
     const track = Number(MathUtils.fastToFixed((trueRef ? trueTrack.value : magTrack.value), 2));
@@ -55,10 +53,6 @@ export const RoseMode: FC<RoseModeProps> = ({ symbols, adirsAlign, rangeSetting,
         mapParams.compute(ppos, rangeSetting / 2, 250, trueHeading.value);
     }, [ppos.lat, ppos.long, trueHeading.value, rangeSetting].map((n) => MathUtils.fastToFixed(n, 6)));
 
-    useEffect(() => {
-        setTrueRef((irMaint.getBitValueOr(15, false) || trueRefPb) && !irMaint.getBitValueOr(2, false));
-    }, [irMaint.value, trueRefPb]);
-
     if (adirsAlign) {
         return (
             <>
@@ -88,8 +82,8 @@ export const RoseMode: FC<RoseModeProps> = ({ symbols, adirsAlign, rangeSetting,
                             )}
                         </g>
                     )}
-                    <RadioNeedle index={1} side={side} displayMode={mode} centreHeight={384} />
-                    <RadioNeedle index={2} side={side} displayMode={mode} centreHeight={384} />
+                    <RadioNeedle index={1} side={side} displayMode={mode} centreHeight={384} trueRef={trueRef} />
+                    <RadioNeedle index={2} side={side} displayMode={mode} centreHeight={384} trueRef={trueRef} />
                 </g>
 
                 { mode === Mode.ROSE_VOR && <VorCaptureOverlay heading={heading} side={side} /> }

From f104d5a6af870837dcb6fb2d41405d9ee3435d35 Mon Sep 17 00:00:00 2001
From: Michael Corcoran <tracer@outlook.co.nz>
Date: Wed, 7 Dec 2022 22:43:47 +1300
Subject: [PATCH 08/15] fix(nd): svg vis attr always gets me

---
 src/instruments/src/ND/elements/TopMessages.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/instruments/src/ND/elements/TopMessages.tsx b/src/instruments/src/ND/elements/TopMessages.tsx
index bd937395308..44fc29afa05 100644
--- a/src/instruments/src/ND/elements/TopMessages.tsx
+++ b/src/instruments/src/ND/elements/TopMessages.tsx
@@ -67,7 +67,7 @@ export const TopMessages: React.FC<TopMessagesProps> = ({ side, ppos, trueTrack,
             </Layer>
             <Layer x={384} y={56} visibility={trueRef ? 'visible' : 'hidden'}>
                 <TrueFlag xOffset={apprMsg === null && gridTrack !== null ? -40 : 0} box={apprMsg === null} />
-                <Layer x={0} y={0} visibility={apprMsg === null && gridTrack !== null ? 'visible' : 'hidden'}>
+                <Layer x={0} y={0} visibility={apprMsg === null && gridTrack !== null ? 'inherit' : 'hidden'}>
                     <GridTrack gridTrack={gridTrack ?? 0} />
                 </Layer>
             </Layer>

From 2d7d386a56d1702cc244d5071012509d0c4e2117 Mon Sep 17 00:00:00 2001
From: Michael Corcoran <tracer@outlook.co.nz>
Date: Thu, 8 Dec 2022 21:45:12 +1300
Subject: [PATCH 09/15] doc: changelog and pb simvar

---
 .github/CHANGELOG.md | 1 +
 docs/a320-simvars.md | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
index e77f1843389..d9b47fcaa3c 100644
--- a/.github/CHANGELOG.md
+++ b/.github/CHANGELOG.md
@@ -14,6 +14,7 @@
 1. [HYD] Trimmable physical assemblies - @Crocket63 (crocket)
 1. [HYD] Simulation of the rudder mechanical assembly and yaw dampers - @Crocket63 (crocket)
 1. [FLIGHTMODEL] Reduced flap induced drag - @donstim (donbikes#4084)
+1. [ADIRU/ND/PFD] Initial support for polar navigation - @tracernz (Mike)
 
 ## 0.9.0
 
diff --git a/docs/a320-simvars.md b/docs/a320-simvars.md
index 00044bb5282..0f577bfdd88 100644
--- a/docs/a320-simvars.md
+++ b/docs/a320-simvars.md
@@ -1594,9 +1594,14 @@ In the variables below, {number} should be replaced with one item in the set: {
     - TODO flag table
 
 - A32NX_ADIRS_USES_GPS_AS_PRIMARY
+    - TODO delete (this is an FM function, not ADIRU)
     - Bool
     - Whether or not the GPS is used as the primary means of navigation/position determination.
 
+- A32NX_PUSH_TRUE_REF
+    - Bool
+    - True reference pushbutton status
+
 ## Radio Receivers
 
 - A32NX_RADIO_RECEIVER_USAGE_ENABLED

From e5a3565bfae80d0fecf59a43ef9d5cbc6c70a918 Mon Sep 17 00:00:00 2001
From: Michael Corcoran <tracer@outlook.co.nz>
Date: Thu, 8 Dec 2022 22:03:39 +1300
Subject: [PATCH 10/15] fix(nd): adjust to 320 ref

---
 src/instruments/src/ND/elements/ToWaypointIndicator.tsx | 2 +-
 src/instruments/src/ND/elements/TopMessages.tsx         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/instruments/src/ND/elements/ToWaypointIndicator.tsx b/src/instruments/src/ND/elements/ToWaypointIndicator.tsx
index e6f8d7f96b9..2cfae4ba834 100644
--- a/src/instruments/src/ND/elements/ToWaypointIndicator.tsx
+++ b/src/instruments/src/ND/elements/ToWaypointIndicator.tsx
@@ -58,7 +58,7 @@ export const ToWaypointIndicator: FC<ToWaypointIndicatorProps> = memo(({ side, t
             {bearing && bearing !== -1 && Number.isFinite(bearing) && (
                 <>
                     <text x={54} y={0} fontSize={25} className="Green" textAnchor="end">{(Math.round(trueRef ? trueBearing : bearing)).toString().padStart(3, '0')}</text>
-                    <text x={73} y={trueRef ? 0 : 2} fontSize={25} className="Cyan" textAnchor="end">{trueRef ? 'T' : '°'}</text>
+                    <text x={73} y={trueRef ? -3 : 2} fontSize={trueRef ? 21 : 25} className="Cyan" textAnchor="end">{trueRef ? 'T' : '°'}</text>
                 </>
             )}
 
diff --git a/src/instruments/src/ND/elements/TopMessages.tsx b/src/instruments/src/ND/elements/TopMessages.tsx
index 44fc29afa05..906bc14e7cf 100644
--- a/src/instruments/src/ND/elements/TopMessages.tsx
+++ b/src/instruments/src/ND/elements/TopMessages.tsx
@@ -65,7 +65,7 @@ export const TopMessages: React.FC<TopMessagesProps> = ({ side, ppos, trueTrack,
             <Layer x={384} y={28} visibility={apprMsg === null ? 'hidden' : 'visible'}>
                 <text x={0} y={0} fontSize={25} className="Green" textAnchor="middle">{apprMsg ?? ''}</text>
             </Layer>
-            <Layer x={384} y={56} visibility={trueRef ? 'visible' : 'hidden'}>
+            <Layer x={384} y={apprMsg === null ? 36 : 56} visibility={trueRef ? 'visible' : 'hidden'}>
                 <TrueFlag xOffset={apprMsg === null && gridTrack !== null ? -40 : 0} box={apprMsg === null} />
                 <Layer x={0} y={0} visibility={apprMsg === null && gridTrack !== null ? 'inherit' : 'hidden'}>
                     <GridTrack gridTrack={gridTrack ?? 0} />

From ab90e3c24df3891564324e1f884dbb685fc70a1d Mon Sep 17 00:00:00 2001
From: Michael Corcoran <tracer@outlook.co.nz>
Date: Fri, 9 Dec 2022 19:52:09 +1300
Subject: [PATCH 11/15] fix(adiru): add new tests and fix old tests

---
 .vscode/launch.json                           |  12 +
 .vscode/tasks.json                            |  13 +
 src/systems/systems/src/navigation/adirs.rs   | 304 +++++++++++++++---
 src/systems/systems/src/pneumatic/mod.rs      |   3 +-
 src/systems/systems/src/pneumatic/valve.rs    |   9 +-
 src/systems/systems/src/simulation/test.rs    |   9 +
 .../systems/src/simulation/update_context.rs  |  10 +
 7 files changed, 304 insertions(+), 56 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index ccffc7571e3..f56365c72cc 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -44,6 +44,18 @@
                 "y:/external/src/": "${workspaceFolder}/src/",
                 "z:/external/src/": "${workspaceFolder}/src/",
             }
+        },
+        {
+            "name": "Rust Test Debugger",
+            "type": "cppvsdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/target/debug/",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [],
+            "externalConsole": true,
+            "preLaunchTask": "cargo test build",
         }
     ]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index ac6e2eef097..4bf778ed782 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -36,6 +36,19 @@
         "kind": "build",
         "isDefault": true
       }
+    },
+    {
+      "label": "Build Rust Tests",
+      "type": "shell",
+      "command": "cargo test build",
+      "options": {
+        "cwd": "${workspaceFolder}"
+      },
+      "problemMatcher": [],
+      "group": {
+        "kind": "build",
+        "isDefault": false
+      }
     }
   ]
 }
diff --git a/src/systems/systems/src/navigation/adirs.rs b/src/systems/systems/src/navigation/adirs.rs
index 7d96b3d8195..10cc9b3e8c4 100644
--- a/src/systems/systems/src/navigation/adirs.rs
+++ b/src/systems/systems/src/navigation/adirs.rs
@@ -11,8 +11,8 @@ use crate::{
         SimulatorWriter, UpdateContext, Write, Writer,
     },
 };
-use nalgebra::{Rotation2, Vector2};
 use bitflags::bitflags;
+use nalgebra::{Rotation2, Vector2};
 use std::{fmt::Display, time::Duration};
 use uom::si::acceleration::meter_per_second_squared;
 use uom::si::{
@@ -935,29 +935,29 @@ impl From<f64> for AlignTime {
 bitflags! {
     #[derive(Default)]
     struct IrMaintFlags: u32 {
-        const AlignmentNotReady = 0b0000000000000000001;
-        const RevAttMode = 0b0000000000000000010;
-        const NavMode = 0b0000000000000000100;
-        const ValidSetHeading = 0b0000000000000001000;
-        const AttitudeInvalid = 0b0000000000000010000;
-        const DcFail = 0b0000000000000100000;
-        const OnDc = 0b0000000000001000000;
-        const AdrFault = 0b0000000000010000000;
-        const IrFault = 0b0000000000100000000;
-        const DcFailOnDc = 0b0000000001000000000;
-        const AlignFault = 0b0000000010000000000;
-        const NoIrsInitial = 0b0000000100000000000;
-        const ExcessMotionError = 0b0000001000000000000;
-        const AdrIrFault = 0b0000010000000000000;
-        const ExtremeLatitude = 0b0000100000000000000;
-        const Align710Minutes = 0b0111000000000000000;
-        const Align6Minutes = 0b0110000000000000000;
-        const Align5Minutes = 0b0101000000000000000;
-        const Align4Minutes = 0b0100000000000000000;
-        const Align3Minutes = 0b0011000000000000000;
-        const Align2Minutes = 0b0010000000000000000;
-        const Align1Minutes = 0b0001000000000000000;
-        const ComputedLatitudeMiscompare = 0b1000000000000000000;
+        const ALIGNMENT_NOT_READY = 0b0000000000000000001;
+        const REV_ATT_MODE = 0b0000000000000000010;
+        const NAV_MODE = 0b0000000000000000100;
+        const VALID_SET_HEADING = 0b0000000000000001000;
+        const ATTITUDE_INVALID = 0b0000000000000010000;
+        const DC_FAIL = 0b0000000000000100000;
+        const ON_DC = 0b0000000000001000000;
+        const ADR_FAULT = 0b0000000000010000000;
+        const IR_FAULT = 0b0000000000100000000;
+        const DC_FAIL_ON_DC = 0b0000000001000000000;
+        const ALIGN_FAULT = 0b0000000010000000000;
+        const NO_IRS_INITIAL = 0b0000000100000000000;
+        const EXCESS_MOTION_ERROR = 0b0000001000000000000;
+        const ADR_IR_FAULT = 0b0000010000000000000;
+        const EXTREME_LATITUDE = 0b0000100000000000000;
+        const ALIGN_7_10_MINUTES = 0b0111000000000000000;
+        const ALIGN_6_MINUTES = 0b0110000000000000000;
+        const ALIGN_5_MINUTES = 0b0101000000000000000;
+        const ALIGN_4_MINUTES = 0b0100000000000000000;
+        const ALIGN_3_MINUTES = 0b0011000000000000000;
+        const ALIGN_2_MINUTES = 0b0010000000000000000;
+        const ALIGN_1_MINUTES = 0b0001000000000000000;
+        const COMPUTED_LATITUDE_MISCOMPARE = 0b1000000000000000000;
     }
 }
 
@@ -1104,7 +1104,7 @@ impl InertialReference {
         self.update_attitude_values(context, simulator_data);
         self.update_heading_values(overhead, simulator_data);
         self.update_non_attitude_values(context, true_airspeed_source, overhead, simulator_data);
-        self.update_maint_word(context, overhead);
+        self.update_maint_word(overhead);
     }
 
     fn update_fault_flash_duration(
@@ -1376,19 +1376,23 @@ impl InertialReference {
         let ground_speed_above_minimum_threshold = simulator_data.ground_speed
             >= Velocity::new::<knot>(Self::MINIMUM_GROUND_SPEED_FOR_TRACK_KNOTS);
 
+        let track = if self.has_magnetic_data() {
+            simulator_data.track
+        } else {
+            simulator_data.true_track
+        };
+
+        let heading = if self.has_magnetic_data() {
+            simulator_data.heading
+        } else {
+            simulator_data.true_heading
+        };
+
         self.track.set_value(
             if ground_speed_above_minimum_threshold {
-                if self.has_magnetic_data() {
-                    simulator_data.track
-                } else {
-                    simulator_data.true_track
-                }
+                track
             } else {
-                if self.has_magnetic_data() {
-                    simulator_data.heading
-                } else {
-                    simulator_data.true_heading
-                }
+                heading
             },
             ssm,
         );
@@ -1436,11 +1440,7 @@ impl InertialReference {
         self.update_wind_velocity(context, true_airspeed_source, overhead, simulator_data);
     }
 
-    fn update_maint_word(
-        &mut self,
-        context: &UpdateContext,
-        overhead: &AirDataInertialReferenceSystemOverheadPanel,
-    ) {
+    fn update_maint_word(&mut self, overhead: &AirDataInertialReferenceSystemOverheadPanel) {
         // TODO check status of these during mode transitions (first need to implement mode FSM)
         let mut maint_word: IrMaintFlags = IrMaintFlags::default();
 
@@ -1452,15 +1452,15 @@ impl InertialReference {
         }
 
         if !self.is_fully_aligned() {
-            maint_word |= IrMaintFlags::AlignmentNotReady
+            maint_word |= IrMaintFlags::ALIGNMENT_NOT_READY;
         }
 
         if overhead.mode_of(self.number) == InertialReferenceMode::Attitude {
-            maint_word |= IrMaintFlags::RevAttMode;
+            maint_word |= IrMaintFlags::REV_ATT_MODE;
         }
 
         if self.is_fully_aligned() {
-            maint_word |= IrMaintFlags::NavMode;
+            maint_word |= IrMaintFlags::NAV_MODE;
         }
 
         // TODO request heading setting in att mode if not set
@@ -1486,7 +1486,7 @@ impl InertialReference {
         // TODO ADR data not received or parity error
 
         if self.extreme_latitude {
-            maint_word |= IrMaintFlags::ExtremeLatitude;
+            maint_word |= IrMaintFlags::EXTREME_LATITUDE;
         }
 
         if self.is_aligning() {
@@ -1494,34 +1494,34 @@ impl InertialReference {
                 .remaining_align_duration()
                 .map_or(false, |duration| duration.as_secs() <= 60)
             {
-                maint_word |= IrMaintFlags::Align1Minutes;
+                maint_word |= IrMaintFlags::ALIGN_1_MINUTES;
             } else if self
                 .remaining_align_duration()
                 .map_or(false, |duration| duration.as_secs() <= 120)
             {
-                maint_word |= IrMaintFlags::Align2Minutes;
+                maint_word |= IrMaintFlags::ALIGN_2_MINUTES;
             } else if self
                 .remaining_align_duration()
                 .map_or(false, |duration| duration.as_secs() <= 180)
             {
-                maint_word |= IrMaintFlags::Align3Minutes;
+                maint_word |= IrMaintFlags::ALIGN_3_MINUTES;
             } else if self
                 .remaining_align_duration()
                 .map_or(false, |duration| duration.as_secs() <= 240)
             {
-                maint_word |= IrMaintFlags::Align4Minutes;
+                maint_word |= IrMaintFlags::ALIGN_4_MINUTES;
             } else if self
                 .remaining_align_duration()
                 .map_or(false, |duration| duration.as_secs() <= 300)
             {
-                maint_word |= IrMaintFlags::Align5Minutes;
+                maint_word |= IrMaintFlags::ALIGN_5_MINUTES;
             } else if self
                 .remaining_align_duration()
                 .map_or(false, |duration| duration.as_secs() <= 360)
             {
-                maint_word |= IrMaintFlags::Align6Minutes;
+                maint_word |= IrMaintFlags::ALIGN_6_MINUTES;
             } else {
-                maint_word |= IrMaintFlags::Align710Minutes;
+                maint_word |= IrMaintFlags::ALIGN_7_10_MINUTES;
             }
         }
 
@@ -2257,6 +2257,14 @@ mod tests {
             ))
         }
 
+        fn maint_word(&mut self, adiru_number: usize) -> Arinc429Word<u32> {
+            self.read_arinc429_by_name(&output_data_id(
+                OutputDataType::Ir,
+                adiru_number,
+                InertialReference::MAINT_WORD,
+            ))
+        }
+
         fn uses_gps_as_primary(&mut self) -> bool {
             self.read_by_name(AirDataInertialReferenceSystem::USES_GPS_AS_PRIMARY_KEY)
         }
@@ -2310,6 +2318,7 @@ mod tests {
 
         fn assert_ir_heading_data_available(&mut self, available: bool, adiru_number: usize) {
             assert_eq!(self.heading(adiru_number).is_normal_operation(), available);
+            // assert_eq!(self.true_heading(adiru_number).is_normal_operation(), available);
         }
 
         fn assert_ir_non_attitude_data_available(&mut self, available: bool, adiru_number: usize) {
@@ -2476,6 +2485,11 @@ mod tests {
         test_bed.run();
 
         assert!(test_bed.is_aligned(adiru_number));
+        let maint_word_flags = IrMaintFlags::from_bits(test_bed.maint_word(adiru_number).value());
+        assert_eq!(
+            maint_word_flags.unwrap() & IrMaintFlags::NAV_MODE,
+            IrMaintFlags::NAV_MODE
+        );
     }
 
     #[rstest]
@@ -2492,6 +2506,11 @@ mod tests {
 
         assert!(!test_bed.is_aligned(adiru_number));
         assert!(!test_bed.is_aligning(adiru_number));
+        let maint_word_flags = IrMaintFlags::from_bits(test_bed.maint_word(adiru_number).value());
+        assert_eq!(
+            maint_word_flags.unwrap() & IrMaintFlags::ALIGNMENT_NOT_READY,
+            IrMaintFlags::ALIGNMENT_NOT_READY
+        );
     }
 
     #[rstest]
@@ -2509,6 +2528,11 @@ mod tests {
         test_bed.run_with_delta(Duration::from_secs(0));
 
         assert!(test_bed.is_aligned(adiru_number));
+        let maint_word_flags = IrMaintFlags::from_bits(test_bed.maint_word(adiru_number).value());
+        assert_eq!(
+            maint_word_flags.unwrap() & IrMaintFlags::NAV_MODE,
+            IrMaintFlags::NAV_MODE
+        );
     }
 
     #[rstest]
@@ -2530,9 +2554,19 @@ mod tests {
             InertialReference::FAST_ALIGNMENT_TIME_IN_SECS - 1.,
         ));
         assert!(test_bed.is_aligning(adiru_number));
+        let maint_word_flags = IrMaintFlags::from_bits(test_bed.maint_word(adiru_number).value());
+        assert_eq!(
+            maint_word_flags.unwrap() & IrMaintFlags::ALIGNMENT_NOT_READY,
+            IrMaintFlags::ALIGNMENT_NOT_READY
+        );
 
         test_bed.run_with_delta(Duration::from_secs(1));
         assert!(test_bed.is_aligned(adiru_number));
+        let maint_word_flags = IrMaintFlags::from_bits(test_bed.maint_word(adiru_number).value());
+        assert_eq!(
+            maint_word_flags.unwrap() & IrMaintFlags::NAV_MODE,
+            IrMaintFlags::NAV_MODE
+        );
     }
 
     #[rstest]
@@ -3069,8 +3103,7 @@ mod tests {
                 .ir_mode_selector_set_to(adiru_number, InertialReferenceMode::Navigation);
 
             while test_bed.align_state(adiru_number) != AlignState::Aligned {
-                // As the attitude data will become available at some point, we're not checking it here.
-                test_bed.assert_ir_heading_data_available(false, adiru_number);
+                // As the attitude and heading data will become available at some point, we're not checking it here.
                 test_bed.assert_ir_non_attitude_data_available(false, adiru_number);
                 test_bed.run();
             }
@@ -3164,6 +3197,13 @@ mod tests {
             test_bed.run_with_delta(Duration::from_millis(1));
             test_bed.assert_ir_attitude_data_available(true, adiru_number);
             test_bed.assert_ir_heading_data_available(true, adiru_number);
+
+            let maint_word_flags =
+                IrMaintFlags::from_bits(test_bed.maint_word(adiru_number).value());
+            assert_eq!(
+                maint_word_flags.unwrap() & IrMaintFlags::REV_ATT_MODE,
+                IrMaintFlags::REV_ATT_MODE
+            );
         }
 
         #[rstest]
@@ -3390,6 +3430,106 @@ mod tests {
             assert!(!test_bed.true_heading(adiru_number).is_normal_operation());
         }
 
+        #[rstest]
+        #[case(1)]
+        #[case(2)]
+        #[case(3)]
+        fn magnetic_heading_is_supplied_and_equal_to_true_heading_when_in_polar_region(
+            #[case] adiru_number: usize,
+        ) {
+            let true_heading = Angle::new::<degree>(160.);
+            let mag_heading = Angle::new::<degree>(142.);
+            let polar_latitude = Angle::new::<degree>(83.);
+
+            let mut test_bed = all_adirus_aligned_test_bed_with()
+                .true_heading_of(true_heading)
+                .heading_of(mag_heading)
+                .latitude_of(polar_latitude);
+            test_bed.run();
+
+            assert!(test_bed.true_heading(adiru_number).is_normal_operation());
+            assert!(test_bed.heading(adiru_number).is_normal_operation());
+            assert_about_eq!(
+                test_bed.true_heading(adiru_number).value().get::<degree>(),
+                test_bed.heading(adiru_number).value().get::<degree>()
+            );
+        }
+
+        #[rstest]
+        #[case(1)]
+        #[case(2)]
+        #[case(3)]
+        fn magnetic_heading_is_supplied_and_not_equal_to_true_heading_when_left_polar_region(
+            #[case] adiru_number: usize,
+        ) {
+            let true_heading = Angle::new::<degree>(160.);
+            let mag_heading = Angle::new::<degree>(142.);
+            let polar_latitude = Angle::new::<degree>(83.);
+            let non_polar_latitude = Angle::new::<degree>(80.);
+
+            let mut test_bed = all_adirus_aligned_test_bed_with()
+                .true_heading_of(true_heading)
+                .heading_of(mag_heading)
+                .latitude_of(polar_latitude);
+            test_bed.run();
+
+            test_bed.set_latitude(non_polar_latitude);
+            test_bed.run();
+
+            assert!(test_bed.true_heading(adiru_number).is_normal_operation());
+            assert!(test_bed.heading(adiru_number).is_normal_operation());
+            assert_about_eq!(
+                test_bed.true_heading(adiru_number).value().get::<degree>(),
+                true_heading.get::<degree>()
+            );
+            assert_about_eq!(
+                test_bed.heading(adiru_number).value().get::<degree>(),
+                mag_heading.get::<degree>()
+            );
+        }
+
+        #[rstest]
+        #[case(1)]
+        #[case(2)]
+        #[case(3)]
+        fn extreme_latitude_flag_is_set_in_polar_region(#[case] adiru_number: usize) {
+            let polar_latitude = Angle::new::<degree>(83.);
+
+            let mut test_bed = all_adirus_aligned_test_bed_with().latitude_of(polar_latitude);
+            test_bed.run();
+
+            assert!(test_bed.maint_word(adiru_number).is_normal_operation());
+            let maint_word_flags =
+                IrMaintFlags::from_bits(test_bed.maint_word(adiru_number).value());
+            assert_eq!(
+                maint_word_flags.unwrap() & IrMaintFlags::EXTREME_LATITUDE,
+                IrMaintFlags::EXTREME_LATITUDE
+            );
+        }
+
+        #[rstest]
+        #[case(1)]
+        #[case(2)]
+        #[case(3)]
+        fn extreme_latitude_flag_is_unset_when_left_polar_region(#[case] adiru_number: usize) {
+            let polar_latitude = Angle::new::<degree>(83.);
+            let non_polar_latitude = Angle::new::<degree>(80.);
+
+            let mut test_bed = all_adirus_aligned_test_bed_with().latitude_of(polar_latitude);
+            test_bed.run();
+
+            test_bed.set_latitude(non_polar_latitude);
+            test_bed.run();
+
+            assert!(test_bed.maint_word(adiru_number).is_normal_operation());
+            let maint_word_flags =
+                IrMaintFlags::from_bits(test_bed.maint_word(adiru_number).value());
+            assert_eq!(
+                maint_word_flags.unwrap() & IrMaintFlags::EXTREME_LATITUDE,
+                IrMaintFlags::default()
+            );
+        }
+
         #[rstest]
         #[case(1)]
         #[case(2)]
@@ -3470,6 +3610,64 @@ mod tests {
             );
         }
 
+        #[rstest]
+        #[case(1)]
+        #[case(2)]
+        #[case(3)]
+        fn magnetic_track_is_supplied_and_equal_to_true_track_when_in_polar_region(
+            #[case] adiru_number: usize,
+        ) {
+            let true_track = Angle::new::<degree>(160.);
+            let mag_track = Angle::new::<degree>(142.);
+            let polar_latitude = Angle::new::<degree>(83.);
+
+            let mut test_bed = all_adirus_aligned_test_bed_with()
+                .true_track_of(true_track)
+                .track_of(mag_track)
+                .latitude_of(polar_latitude);
+            test_bed.run();
+
+            assert!(test_bed.true_track(adiru_number).is_normal_operation());
+            assert!(test_bed.track(adiru_number).is_normal_operation());
+            assert_about_eq!(
+                test_bed.true_track(adiru_number).value().get::<degree>(),
+                test_bed.track(adiru_number).value().get::<degree>()
+            );
+        }
+
+        #[rstest]
+        #[case(1)]
+        #[case(2)]
+        #[case(3)]
+        fn magnetic_track_is_supplied_and_not_equal_to_true_track_when_left_polar_region(
+            #[case] adiru_number: usize,
+        ) {
+            let true_track = Angle::new::<degree>(160.);
+            let mag_track = Angle::new::<degree>(142.);
+            let polar_latitude = Angle::new::<degree>(83.);
+            let non_polar_latitude = Angle::new::<degree>(80.);
+
+            let mut test_bed = all_adirus_aligned_test_bed_with()
+                .true_heading_of(true_track)
+                .heading_of(mag_track)
+                .latitude_of(polar_latitude);
+            test_bed.run();
+
+            test_bed.set_latitude(non_polar_latitude);
+            test_bed.run();
+
+            assert!(test_bed.true_track(adiru_number).is_normal_operation());
+            assert!(test_bed.track(adiru_number).is_normal_operation());
+            assert_about_eq!(
+                test_bed.true_track(adiru_number).value().get::<degree>(),
+                true_track.get::<degree>()
+            );
+            assert_about_eq!(
+                test_bed.track(adiru_number).value().get::<degree>(),
+                mag_track.get::<degree>()
+            );
+        }
+
         #[rstest]
         #[case(1)]
         #[case(2)]
diff --git a/src/systems/systems/src/pneumatic/mod.rs b/src/systems/systems/src/pneumatic/mod.rs
index 1b2ae3899ff..2351245266b 100644
--- a/src/systems/systems/src/pneumatic/mod.rs
+++ b/src/systems/systems/src/pneumatic/mod.rs
@@ -794,7 +794,7 @@ mod tests {
 
     use uom::si::{
         acceleration::foot_per_second_squared,
-        angle::radian,
+        angle::{degree, radian},
         length::foot,
         thermodynamic_temperature::degree_celsius,
         velocity::knot,
@@ -884,6 +884,7 @@ mod tests {
             Angle::new::<radian>(0.),
             Angle::new::<radian>(0.),
             MachNumber(0.),
+            Angle::new::<degree>(0.),
         )
     }
 
diff --git a/src/systems/systems/src/pneumatic/valve.rs b/src/systems/systems/src/pneumatic/valve.rs
index 6fa731e9205..03426a559d3 100644
--- a/src/systems/systems/src/pneumatic/valve.rs
+++ b/src/systems/systems/src/pneumatic/valve.rs
@@ -432,8 +432,12 @@ mod tests {
 
     use std::time::Duration;
     use uom::si::{
-        acceleration::foot_per_second_squared, angle::radian, length::foot,
-        mass_rate::kilogram_per_second, thermodynamic_temperature::degree_celsius, velocity::knot,
+        acceleration::foot_per_second_squared,
+        angle::{degree, radian},
+        length::foot,
+        mass_rate::kilogram_per_second,
+        thermodynamic_temperature::degree_celsius,
+        velocity::knot,
         volume::cubic_meter,
     };
 
@@ -494,6 +498,7 @@ mod tests {
             Angle::new::<radian>(0.),
             Angle::new::<radian>(0.),
             MachNumber(0.),
+            Angle::new::<degree>(0.),
         )
     }
 
diff --git a/src/systems/systems/src/simulation/test.rs b/src/systems/systems/src/simulation/test.rs
index 47a97b9c2d5..642192c047a 100644
--- a/src/systems/systems/src/simulation/test.rs
+++ b/src/systems/systems/src/simulation/test.rs
@@ -3,6 +3,7 @@ use rand::Rng;
 use std::{cell::Ref, time::Duration};
 use uom::si::{
     acceleration::foot_per_second_squared,
+    angle::degree,
     f64::*,
     length::foot,
     pressure::inch_of_mercury,
@@ -90,6 +91,10 @@ pub trait TestBed {
         self.test_bed_mut().set_lat_acceleration(acc);
     }
 
+    fn set_latitude(&mut self, lat: Angle) {
+        self.test_bed_mut().set_latitude(lat);
+    }
+
     fn set_norm_acc(&mut self, acc: Acceleration) {
         self.test_bed_mut().set_normal_acceleration(acc);
     }
@@ -404,6 +409,10 @@ impl<T: Aircraft> SimulationTestBed<T> {
         );
     }
 
+    pub fn set_latitude(&mut self, lat: Angle) {
+        self.write_by_name(UpdateContext::LATITUDE_KEY, lat.get::<degree>());
+    }
+
     pub fn set_normal_acceleration(&mut self, accel: Acceleration) {
         self.write_by_name(
             UpdateContext::ACCEL_BODY_Y_KEY,
diff --git a/src/systems/systems/src/simulation/update_context.rs b/src/systems/systems/src/simulation/update_context.rs
index 9fabc753a96..8fac4db0c5b 100644
--- a/src/systems/systems/src/simulation/update_context.rs
+++ b/src/systems/systems/src/simulation/update_context.rs
@@ -160,6 +160,7 @@ pub struct UpdateContext {
     plane_true_heading_id: VariableIdentifier,
     mach_number_id: VariableIdentifier,
     plane_height_id: VariableIdentifier,
+    latitude_id: VariableIdentifier,
 
     delta: Delta,
     simulation_time: f64,
@@ -183,6 +184,7 @@ pub struct UpdateContext {
     air_density: MassDensity,
     true_heading: Angle,
     plane_height_over_ground: Length,
+    latitude: Angle,
 }
 impl UpdateContext {
     pub(crate) const IS_READY_KEY: &'static str = "IS_READY";
@@ -208,6 +210,7 @@ impl UpdateContext {
     pub(crate) const LOCAL_LONGITUDINAL_SPEED_KEY: &'static str = "VELOCITY BODY Z";
     pub(crate) const LOCAL_VERTICAL_SPEED_KEY: &'static str = "VELOCITY BODY Y";
     pub(crate) const ALT_ABOVE_GROUND_KEY: &'static str = "PLANE ALT ABOVE GROUND";
+    pub(crate) const LATITUDE_KEY: &'static str = "PLANE LATITUDE";
 
     // Plane accelerations can become crazy with msfs collision handling.
     // Having such filtering limits high frequencies transients in accelerations used for physics
@@ -231,6 +234,7 @@ impl UpdateContext {
         pitch: Angle,
         bank: Angle,
         mach_number: MachNumber,
+        latitude: Angle,
     ) -> UpdateContext {
         UpdateContext {
             is_ready_id: context.get_identifier(Self::IS_READY_KEY.to_owned()),
@@ -260,6 +264,7 @@ impl UpdateContext {
             plane_true_heading_id: context.get_identifier(Self::TRUE_HEADING_KEY.to_owned()),
             mach_number_id: context.get_identifier(Self::MACH_NUMBER_KEY.to_owned()),
             plane_height_id: context.get_identifier(Self::ALT_ABOVE_GROUND_KEY.to_owned()),
+            latitude_id: context.get_identifier(Self::LATITUDE_KEY.to_owned()),
 
             delta: delta.into(),
             simulation_time,
@@ -301,6 +306,7 @@ impl UpdateContext {
             air_density: MassDensity::new::<kilogram_per_cubic_meter>(1.22),
             true_heading: Default::default(),
             plane_height_over_ground: Length::default(),
+            latitude,
         }
     }
 
@@ -329,6 +335,7 @@ impl UpdateContext {
             plane_true_heading_id: context.get_identifier("PLANE HEADING DEGREES TRUE".to_owned()),
             mach_number_id: context.get_identifier("AIRSPEED MACH".to_owned()),
             plane_height_id: context.get_identifier("PLANE ALT ABOVE GROUND".to_owned()),
+            latitude_id: context.get_identifier("PLANE LATITUDE".to_owned()),
 
             delta: Default::default(),
             simulation_time: Default::default(),
@@ -368,6 +375,7 @@ impl UpdateContext {
             air_density: MassDensity::new::<kilogram_per_cubic_meter>(1.22),
             true_heading: Default::default(),
             plane_height_over_ground: Length::default(),
+            latitude: Default::default(),
         }
     }
 
@@ -423,6 +431,8 @@ impl UpdateContext {
 
         self.plane_height_over_ground = reader.read(&self.plane_height_id);
 
+        self.latitude = reader.read(&self.latitude_id);
+
         self.update_relative_wind();
 
         self.update_local_acceleration_plane_reference(delta);

From e745f46c94497ed4646f2b4caf05446200bce3a9 Mon Sep 17 00:00:00 2001
From: Michael Corcoran <tracer@outlook.co.nz>
Date: Wed, 21 Dec 2022 22:03:15 +1300
Subject: [PATCH 12/15] fix(ND): adjust true indications based on new refs

---
 src/instruments/src/ND/elements/RadioNavInfo.tsx |  7 ++++---
 src/instruments/src/ND/elements/TopMessages.tsx  | 15 +++++++++------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/instruments/src/ND/elements/RadioNavInfo.tsx b/src/instruments/src/ND/elements/RadioNavInfo.tsx
index 7a46d465a73..3c312aca485 100644
--- a/src/instruments/src/ND/elements/RadioNavInfo.tsx
+++ b/src/instruments/src/ND/elements/RadioNavInfo.tsx
@@ -32,6 +32,7 @@ const VorInfo: React.FC<{index: 1 | 2, trueRef: boolean, mode: Mode }> = ({ inde
     const [vorHasDme] = useSimVar(`NAV HAS DME:${index}`, 'bool');
     const [dmeDistance] = useSimVar(`NAV DME:${index}`, 'nautical miles');
     const [vorAvailable] = useSimVar(`NAV HAS NAV:${index}`, 'boolean');
+    // FIXME should be database magvar, not just when received
     const [stationDeclination] = useSimVar(`NAV MAGVAR:${index}`, 'degrees');
     const [stationLocation] = useSimVar(`NAV VOR LATLONALT:${index}`, 'latlonalt');
     const [stationRefTrue, setStationRefTrue] = useState(false);
@@ -93,9 +94,9 @@ const VorInfo: React.FC<{index: 1 | 2, trueRef: boolean, mode: Mode }> = ({ inde
             {(vorAvailable || vorHasDme) && vorFrequency > 1 && (
                 <>
                     <text x={x} y={722} fontSize={24} className="White">{vorIdent}</text>
-                    <text x={index === 2 ? x - 52 : x + 69} y={692} fontSize={18} className="Magenta" visibility={corrected ? 'inherit' : 'hidden'}>CORR</text>
-                    <text x={index === 2 ? x - 52 : x + 81} y={692} fontSize={18} className="Amber" visibility={magWarning ? 'inherit' : 'hidden'}>MAG</text>
-                    <text x={index === 2 ? x - 52 : x + 69} y={692} fontSize={18} className="Amber" visibility={trueWarning ? 'inherit' : 'hidden'}>TRUE</text>
+                    <text x={index === 2 ? x - 54 : x + 61} y={692} fontSize={20} className="Magenta" visibility={corrected ? 'inherit' : 'hidden'}>CORR</text>
+                    <text x={index === 2 ? x - 54 : x + 73} y={692} fontSize={20} className="Amber" visibility={magWarning ? 'inherit' : 'hidden'}>MAG</text>
+                    <text x={index === 2 ? x - 54 : x + 61} y={692} fontSize={20} className="Amber" visibility={trueWarning ? 'inherit' : 'hidden'}>TRUE</text>
                 </>
             )}
             {!(vorAvailable || vorHasDme) && vorFrequency > 1 && (
diff --git a/src/instruments/src/ND/elements/TopMessages.tsx b/src/instruments/src/ND/elements/TopMessages.tsx
index 906bc14e7cf..cb9f7110c2c 100644
--- a/src/instruments/src/ND/elements/TopMessages.tsx
+++ b/src/instruments/src/ND/elements/TopMessages.tsx
@@ -18,13 +18,16 @@ type GridTrackProps = {
 
 const GridTrack: React.FC<GridTrackProps> = ({ gridTrack }) => (
     <>
-        <rect x={0} width={87} y={-20} height={22} className="White" strokeWidth={1.5} />
-        <text x={44} fontSize={22} textAnchor="middle">
+        <rect x={0} width={94} y={-20} height={23} className="White" strokeWidth={1.5} />
+        <text x={45} fontSize={22} textAnchor="middle">
             <tspan className="Green">
                 ◇
                 {gridTrack?.toFixed(0).padStart(3, '0') ?? ''}
             </tspan>
-            <tspan className="Cyan">°G</tspan>
+            <tspan className="Cyan">
+                <tspan dx="-5" dy="8" fontSize={28}>°</tspan>
+                <tspan dy="-8">G</tspan>
+            </tspan>
         </text>
     </>
 );
@@ -36,8 +39,8 @@ type TrueFlagProps = {
 
 const TrueFlag: React.FC<TrueFlagProps> = ({ xOffset = 0, box }) => (
     <>
-        <rect x={-30 + xOffset} width={60} y={-20} height={22} className="Cyan" strokeWidth={1.5} visibility={box ? 'inherit' : 'hidden'} />
-        <text x={xOffset} fontSize={22} className="Cyan" textAnchor="middle">TRUE</text>
+        <rect x={-30 + xOffset} width={68} y={-20} height={23} className="Cyan" strokeWidth={1.5} visibility={box ? 'inherit' : 'hidden'} />
+        <text x={4 + xOffset} fontSize={22} className="Cyan" textAnchor="middle">TRUE</text>
     </>
 );
 
@@ -66,7 +69,7 @@ export const TopMessages: React.FC<TopMessagesProps> = ({ side, ppos, trueTrack,
                 <text x={0} y={0} fontSize={25} className="Green" textAnchor="middle">{apprMsg ?? ''}</text>
             </Layer>
             <Layer x={384} y={apprMsg === null ? 36 : 56} visibility={trueRef ? 'visible' : 'hidden'}>
-                <TrueFlag xOffset={apprMsg === null && gridTrack !== null ? -40 : 0} box={apprMsg === null} />
+                <TrueFlag xOffset={apprMsg === null && gridTrack !== null ? -54 : 0} box={apprMsg === null} />
                 <Layer x={0} y={0} visibility={apprMsg === null && gridTrack !== null ? 'inherit' : 'hidden'}>
                     <GridTrack gridTrack={gridTrack ?? 0} />
                 </Layer>

From 22212d6f6b4f33dc515b464f3116adcd3ce867f3 Mon Sep 17 00:00:00 2001
From: Michael Corcoran <tracer@outlook.co.nz>
Date: Wed, 21 Dec 2022 23:17:17 +1300
Subject: [PATCH 13/15] fix(fcu): awful hack for AP in hdg/trk when changing
 true ref

---
 .../FlyByWire_A320_Neo/FCU/A320_Neo_FCU.js    | 26 +++++++++++++----
 src/fmgc/src/components/FcuSync.ts            | 28 +++++++++++++++++++
 src/fmgc/src/components/index.ts              |  2 ++
 src/fmgc/src/guidance/lnav/LnavDriver.ts      |  2 +-
 src/instruments/src/ND/pages/ArcMode.tsx      |  2 +-
 src/instruments/src/ND/pages/RoseMode.tsx     |  2 +-
 .../src/PFD/AttitudeIndicatorHorizon.tsx      |  3 +-
 src/instruments/src/PFD/HeadingIndicator.tsx  |  5 +---
 src/instruments/src/PFD/instrument.tsx        |  1 +
 .../src/PFD/shared/PFDSimvarPublisher.tsx     |  3 ++
 .../src/PFD/shared/SimplaneValueProvider.ts   |  3 --
 11 files changed, 60 insertions(+), 17 deletions(-)
 create mode 100644 src/fmgc/src/components/FcuSync.ts

diff --git a/flybywire-aircraft-a320-neo/html_ui/Pages/VCockpit/Instruments/Airliners/FlyByWire_A320_Neo/FCU/A320_Neo_FCU.js b/flybywire-aircraft-a320-neo/html_ui/Pages/VCockpit/Instruments/Airliners/FlyByWire_A320_Neo/FCU/A320_Neo_FCU.js
index 6088877509e..57e4056cf21 100644
--- a/flybywire-aircraft-a320-neo/html_ui/Pages/VCockpit/Instruments/Airliners/FlyByWire_A320_Neo/FCU/A320_Neo_FCU.js
+++ b/flybywire-aircraft-a320-neo/html_ui/Pages/VCockpit/Instruments/Airliners/FlyByWire_A320_Neo/FCU/A320_Neo_FCU.js
@@ -517,6 +517,7 @@ class A320_Neo_FCU_Heading extends A320_Neo_FCU_Component {
         super(...arguments);
         this.backToIdleTimeout = 45000;
         this.inSelection = false;
+        this.trueRef = false;
 
         this._rotaryEncoderCurrentSpeed = 1;
         this._rotaryEncoderMaximumSpeed = 5;
@@ -574,11 +575,13 @@ class A320_Neo_FCU_Heading extends A320_Neo_FCU_Component {
     }
 
     getCurrentHeading() {
-        return ((Math.round(SimVar.GetSimVarValue("PLANE HEADING DEGREES MAGNETIC", "degree")) % 360) + 360) % 360;
+        const heading = SimVar.GetSimVarValue(this.trueRef ? "PLANE HEADING DEGREES TRUE" : "PLANE HEADING DEGREES MAGNETIC", "degree");
+        return ((Math.round(heading) % 360) + 360) % 360;
     }
 
     getCurrentTrack() {
-        return ((Math.round(SimVar.GetSimVarValue("GPS GROUND MAGNETIC TRACK", "degree")) % 360) + 360) % 360;
+        const track = SimVar.GetSimVarValue(this.trueRef ? "GPS GROUND TRUE TRACK" : "GPS GROUND MAGNETIC TRACK", "degree");
+        return ((Math.round(track) % 360) + 360) % 360;
     }
 
     onPush() {
@@ -621,8 +624,11 @@ class A320_Neo_FCU_Heading extends A320_Neo_FCU_Component {
         const isManagedArmed = this.isManagedModeArmed(lateralArmed);
         const showSelectedValue = (this.isSelectedValueActive || this.inSelection || this.isPreselectionModeActive);
 
-        const isHeadingSync = SimVar.GetSimVarValue("L:A32NX_FCU_HEADING_SYNC", "Number");
+        this.trueRef = SimVar.GetSimVarValue('L:A32NX_FMGC_TRUE_REF', 'boolean');
+
+        const isHeadingSync = SimVar.GetSimVarValue("L:A32NX_FCU_HEADING_SYNC", "Number") || SimVar.GetSimVarValue("L:A32NX_FM_HEADING_SYNC", "boolean");
         if (!this.wasHeadingSync && isHeadingSync) {
+            console.log('Sync heading', this.selectedValue);
             if (isTRKMode) {
                 this.selectedValue = this.getCurrentTrack();
             } else {
@@ -630,6 +636,7 @@ class A320_Neo_FCU_Heading extends A320_Neo_FCU_Component {
             }
             this.isSelectedValueActive = true;
             this.onRotate();
+            SimVar.SetSimVarValue("L:A32NX_FM_HEADING_SYNC", "boolean", false);
         }
         this.wasHeadingSync = isHeadingSync;
 
@@ -679,10 +686,19 @@ class A320_Neo_FCU_Heading extends A320_Neo_FCU_Component {
                     }
                 }
             }
+
+            // ugly hack because the FG doesn't understand true heading
+            // FIXME teach the FG about true/mag
+            const correctedHeading = this.trueRef ? (_value - SimVar.GetSimVarValue('MAGVAR', 'degree')) % 360 : _value;
+
             SimVar.SetSimVarValue("L:A320_FCU_SHOW_SELECTED_HEADING", "number", _showSelectedHeading == true ? 1 : 0);
             if (_value !== this.currentValue) {
-                SimVar.SetSimVarValue("L:A32NX_AUTOPILOT_HEADING_SELECTED", "Degrees", _value);
-                Coherent.call("HEADING_BUG_SET", 1, Math.max(0, _value)).catch(console.error);
+                SimVar.SetSimVarValue("L:A32NX_FCU_HEADING_SELECTED", "Degrees", _value);
+                SimVar.SetSimVarValue("L:A32NX_AUTOPILOT_HEADING_SELECTED", "Degrees", correctedHeading);
+                Coherent.call("HEADING_BUG_SET", 1, Math.max(0, correctedHeading)).catch(console.error);
+            } else if (this.trueRef) {
+                SimVar.SetSimVarValue("L:A32NX_AUTOPILOT_HEADING_SELECTED", "Degrees", correctedHeading);
+                Coherent.call("HEADING_BUG_SET", 1, Math.max(0, correctedHeading)).catch(console.error);
             }
             this.isActive = _isActive;
             this.isManagedActive = _isManagedActive;
diff --git a/src/fmgc/src/components/FcuSync.ts b/src/fmgc/src/components/FcuSync.ts
new file mode 100644
index 00000000000..912ca1465b7
--- /dev/null
+++ b/src/fmgc/src/components/FcuSync.ts
@@ -0,0 +1,28 @@
+import { Arinc429Word } from '@shared/arinc429';
+import { LateralMode } from '@shared/autopilot';
+import { FmgcComponent } from './FmgcComponent';
+
+// Note the logic for this is different on A330/350/380
+
+export class FcuSync implements FmgcComponent {
+    private trueRef = false;
+
+    // eslint-disable-next-line no-empty-function
+    init(): void {}
+
+    update(_deltaTime: number): void {
+        const irMaint = Arinc429Word.fromSimVarValue('L:A32NX_ADIRS_IR_1_MAINT_WORD');
+        const trueRefPb = SimVar.GetSimVarValue('L:A32NX_PUSH_TRUE_REF', 'bool');
+
+        const trueRef = (irMaint.getBitValueOr(15, false) || trueRefPb) && !irMaint.getBitValueOr(2, false);
+
+        if (trueRef !== this.trueRef) {
+            this.trueRef = trueRef;
+            SimVar.SetSimVarValue('L:A32NX_FMGC_TRUE_REF', 'boolean', trueRef);
+            const activeMode = SimVar.GetSimVarValue('L:A32NX_FMA_LATERAL_MODE', 'number');
+            if (activeMode === LateralMode.HDG || activeMode === LateralMode.TRACK) {
+                SimVar.SetSimVarValue('L:A32NX_FM_HEADING_SYNC', 'boolean', true);
+            }
+        }
+    }
+}
diff --git a/src/fmgc/src/components/index.ts b/src/fmgc/src/components/index.ts
index 15fab9a004e..61eae3fa8e8 100644
--- a/src/fmgc/src/components/index.ts
+++ b/src/fmgc/src/components/index.ts
@@ -1,3 +1,4 @@
+import { FcuSync } from '@fmgc/components/FcuSync';
 import { ReadySignal } from '@fmgc/components/ReadySignal';
 import { FlightPlanManager } from '@fmgc/wtsdk';
 import { EfisLabels } from './EfisLabels';
@@ -10,6 +11,7 @@ const components: FmgcComponent[] = [
     fmsMessages,
     new EfisLabels(),
     new ReadySignal(),
+    new FcuSync(),
 ];
 
 export function initComponents(baseInstrument: BaseInstrument, flightPlanManager: FlightPlanManager): void {
diff --git a/src/fmgc/src/guidance/lnav/LnavDriver.ts b/src/fmgc/src/guidance/lnav/LnavDriver.ts
index 2ca914590aa..b49b60d0bd7 100644
--- a/src/fmgc/src/guidance/lnav/LnavDriver.ts
+++ b/src/fmgc/src/guidance/lnav/LnavDriver.ts
@@ -484,7 +484,7 @@ export class LnavDriver implements GuidanceComponent {
         if (lateralModel === LateralMode.NAV) {
             // Set HDG (current heading)
             SimVar.SetSimVarValue('H:A320_Neo_FCU_HDG_PULL', 'number', 0);
-            SimVar.SetSimVarValue('L:A32NX_AUTOPILOT_HEADING_SELECTED', 'number', Simplane.getHeadingMagnetic());
+            SimVar.SetSimVarValue('L:A32NX_FM_HEADING_SYNC', 'boolean', true);
             reverted = true;
         }
 
diff --git a/src/instruments/src/ND/pages/ArcMode.tsx b/src/instruments/src/ND/pages/ArcMode.tsx
index 9bce9db9658..37eb65c112a 100644
--- a/src/instruments/src/ND/pages/ArcMode.tsx
+++ b/src/instruments/src/ND/pages/ArcMode.tsx
@@ -32,7 +32,7 @@ export const ArcMode: React.FC<ArcModeProps> = ({ symbols, adirsAlign, rangeSett
     const trueHeading = useArinc429Var('L:A32NX_ADIRS_IR_1_TRUE_HEADING');
     const trueTrack = useArinc429Var('L:A32NX_ADIRS_IR_1_TRUE_TRACK');
     const [tcasMode] = useSimVar('L:A32NX_SWITCH_TCAS_Position', 'number');
-    const [selectedHeading] = useSimVar('L:A32NX_AUTOPILOT_HEADING_SELECTED', 'degrees');
+    const [selectedHeading] = useSimVar('L:A32NX_FCU_HEADING_SELECTED', 'degrees');
     const [lsCourse] = useSimVar('L:A32NX_FM_LS_COURSE', 'number');
     const [lsDisplayed] = useSimVar(`L:BTN_LS_${side === 'L' ? 1 : 2}_FILTER_ACTIVE`, 'bool'); // TODO rename simvar
     const [fmaLatMode] = useSimVar('L:A32NX_FMA_LATERAL_MODE', 'enum', 200);
diff --git a/src/instruments/src/ND/pages/RoseMode.tsx b/src/instruments/src/ND/pages/RoseMode.tsx
index 00b6800328d..19fba895db8 100644
--- a/src/instruments/src/ND/pages/RoseMode.tsx
+++ b/src/instruments/src/ND/pages/RoseMode.tsx
@@ -33,7 +33,7 @@ export const RoseMode: FC<RoseModeProps> = ({ symbols, adirsAlign, rangeSetting,
     const trueHeading = useArinc429Var('L:A32NX_ADIRS_IR_1_TRUE_HEADING');
     const trueTrack = useArinc429Var('L:A32NX_ADIRS_IR_1_TRUE_TRACK');
     const [tcasMode] = useSimVar('L:A32NX_SWITCH_TCAS_Position', 'number');
-    const [selectedHeading] = useSimVar('L:A32NX_AUTOPILOT_HEADING_SELECTED', 'degrees');
+    const [selectedHeading] = useSimVar('L:A32NX_FCU_HEADING_SELECTED', 'degrees');
     const [lsCourse] = useSimVar('L:A32NX_FM_LS_COURSE', 'number');
     const [lsDisplayed] = useSimVar(`L:BTN_LS_${side === 'L' ? 1 : 2}_FILTER_ACTIVE`, 'bool'); // TODO rename simvar
     const [fmaLatMode] = useSimVar('L:A32NX_FMA_LATERAL_MODE', 'enum', 200);
diff --git a/src/instruments/src/PFD/AttitudeIndicatorHorizon.tsx b/src/instruments/src/PFD/AttitudeIndicatorHorizon.tsx
index 3d03ab482d0..1d99e4e5531 100644
--- a/src/instruments/src/PFD/AttitudeIndicatorHorizon.tsx
+++ b/src/instruments/src/PFD/AttitudeIndicatorHorizon.tsx
@@ -11,7 +11,6 @@ import {
 import { PFDSimvars } from './shared/PFDSimvarPublisher';
 import { Arinc429Values } from './shared/ArincValueProvider';
 import { HorizontalTape } from './HorizontalTape';
-import { SimplaneValues } from './shared/SimplaneValueProvider';
 import { getDisplayIndex } from './PFD';
 
 const DisplayRange = 35;
@@ -45,7 +44,7 @@ class HeadingBug extends DisplayComponent<{bus: EventBus, isCaptainSide: boolean
     onAfterRender(node: VNode): void {
         super.onAfterRender(node);
 
-        const sub = this.props.bus.getSubscriber<DisplayManagementComputerEvents & PFDSimvars & SimplaneValues & Arinc429Values>();
+        const sub = this.props.bus.getSubscriber<DisplayManagementComputerEvents & PFDSimvars & Arinc429Values>();
 
         sub.on('selectedHeading').whenChanged().handle((s) => {
             this.selectedHeading = s;
diff --git a/src/instruments/src/PFD/HeadingIndicator.tsx b/src/instruments/src/PFD/HeadingIndicator.tsx
index c4879642b6b..4b7c77e6df4 100644
--- a/src/instruments/src/PFD/HeadingIndicator.tsx
+++ b/src/instruments/src/PFD/HeadingIndicator.tsx
@@ -4,7 +4,6 @@ import { HorizontalTape } from './HorizontalTape';
 import { getSmallestAngle } from './PFDUtils';
 import { PFDSimvars } from './shared/PFDSimvarPublisher';
 import { Arinc429Values } from './shared/ArincValueProvider';
-import { SimplaneValues } from './shared/SimplaneValueProvider';
 import { getDisplayIndex } from './PFD';
 
 const DisplayRange = 24;
@@ -130,9 +129,7 @@ class SelectedHeading extends DisplayComponent<SelectedHeadingProps> {
 
         const sub = this.props.bus.getSubscriber<PFDSimvars>();
 
-        const spsub = this.props.bus.getSubscriber<SimplaneValues>();
-
-        spsub.on('selectedHeading').whenChanged().handle((h) => {
+        sub.on('selectedHeading').whenChanged().handle((h) => {
             if (this.showSelectedHeading === 1) {
                 this.selectedHeading = h;
                 this.handleDelta(this.props.heading.get(), this.selectedHeading);
diff --git a/src/instruments/src/PFD/instrument.tsx b/src/instruments/src/PFD/instrument.tsx
index 6ce3d047355..9e11695de20 100644
--- a/src/instruments/src/PFD/instrument.tsx
+++ b/src/instruments/src/PFD/instrument.tsx
@@ -128,6 +128,7 @@ class A32NX_PFD extends BaseInstrument {
         this.simVarPublisher.subscribe('transAltAppr');
 
         this.simVarPublisher.subscribe('magTrackRaw');
+        this.simVarPublisher.subscribe('selectedHeading');
         this.simVarPublisher.subscribe('showSelectedHeading');
         this.simVarPublisher.subscribe('altConstraint');
         this.simVarPublisher.subscribe('trkFpaActive');
diff --git a/src/instruments/src/PFD/shared/PFDSimvarPublisher.tsx b/src/instruments/src/PFD/shared/PFDSimvarPublisher.tsx
index acddbcb7b46..3244af19d80 100644
--- a/src/instruments/src/PFD/shared/PFDSimvarPublisher.tsx
+++ b/src/instruments/src/PFD/shared/PFDSimvarPublisher.tsx
@@ -60,6 +60,7 @@ export interface PFDSimvars {
     transAlt: number;
     transAltAppr: number;
     magTrackRaw: number;
+    selectedHeading: number;
     showSelectedHeading: number;
     altConstraint: number;
     trkFpaActive: boolean;
@@ -209,6 +210,7 @@ export enum PFDVars {
     transAlt = 'L:AIRLINER_TRANS_ALT',
     transAltAppr = 'L:AIRLINER_APPR_TRANS_ALT',
     magTrackRaw = 'L:A32NX_ADIRS_IR_1_TRACK',
+    selectedHeading = 'L:A32NX_FCU_HEADING_SELECTED',
     showSelectedHeading = 'L:A320_FCU_SHOW_SELECTED_HEADING',
     altConstraint = 'L:A32NX_FG_ALTITUDE_CONSTRAINT',
     trkFpaActive = 'L:A32NX_TRK_FPA_MODE_ACTIVE',
@@ -359,6 +361,7 @@ export class PFDSimvarPublisher extends SimVarPublisher<PFDSimvars> {
         ['transAlt', { name: PFDVars.transAlt, type: SimVarValueType.Number }],
         ['transAltAppr', { name: PFDVars.transAltAppr, type: SimVarValueType.Number }],
         ['magTrackRaw', { name: PFDVars.magTrackRaw, type: SimVarValueType.Number }],
+        ['selectedHeading', { name: PFDVars.selectedHeading, type: SimVarValueType.Degree }],
         ['showSelectedHeading', { name: PFDVars.showSelectedHeading, type: SimVarValueType.Number }],
         ['altConstraint', { name: PFDVars.altConstraint, type: SimVarValueType.Feet }],
         ['trkFpaActive', { name: PFDVars.trkFpaActive, type: SimVarValueType.Bool }],
diff --git a/src/instruments/src/PFD/shared/SimplaneValueProvider.ts b/src/instruments/src/PFD/shared/SimplaneValueProvider.ts
index 36bded688da..0004cc9fc3e 100644
--- a/src/instruments/src/PFD/shared/SimplaneValueProvider.ts
+++ b/src/instruments/src/PFD/shared/SimplaneValueProvider.ts
@@ -7,7 +7,6 @@ export interface SimplaneValues {
     holdValue: number;
     airSpeedHoldValue: number;
     isSelectedSpeed: boolean;
-    selectedHeading: number;
     selectedAltitude: number;
     baroMode: 'QNH' | 'QFE' | 'STD';
 
@@ -24,7 +23,6 @@ export class SimplaneValueProvider {
         const pressure = Simplane.getPressureValue(units);
         const isSelected = Simplane.getAutoPilotAirspeedSelected();
         const isMach = Simplane.getAutoPilotMachModeActive();
-        const selectedHeading = Simplane.getAutoPilotSelectedHeadingLockValue(false) || 0;
         const selectedAltitude = Simplane.getAutoPilotDisplayedAltitudeLockValue();
         const holdValue = isMach ? Simplane.getAutoPilotMachHoldValue() : Simplane.getAutoPilotAirspeedHoldValue();
         const baroMode = Simplane.getPressureSelectedMode(Aircraft.A320_NEO) as 'QNH' | 'QFE' | 'STD';
@@ -34,7 +32,6 @@ export class SimplaneValueProvider {
         this.publisher.pub('isSelectedSpeed', isSelected);
         this.publisher.pub('machActive', isMach);
         this.publisher.pub('holdValue', holdValue);
-        this.publisher.pub('selectedHeading', selectedHeading);
         this.publisher.pub('selectedAltitude', selectedAltitude);
         this.publisher.pub('baroMode', baroMode);
     }

From 1e22a0492fa14b771ddf64a7dc7da9407804710f Mon Sep 17 00:00:00 2001
From: Michael Corcoran <tracer@outlook.co.nz>
Date: Thu, 22 Dec 2022 23:02:48 +1300
Subject: [PATCH 14/15] fix: review feedback

Co-authored-by: David Walschots <davidwalschots@users.noreply.github.com>
---
 src/systems/systems/src/navigation/adirs.rs | 49 ++++++---------------
 1 file changed, 13 insertions(+), 36 deletions(-)

diff --git a/src/systems/systems/src/navigation/adirs.rs b/src/systems/systems/src/navigation/adirs.rs
index 10cc9b3e8c4..f0891e85009 100644
--- a/src/systems/systems/src/navigation/adirs.rs
+++ b/src/systems/systems/src/navigation/adirs.rs
@@ -1489,41 +1489,19 @@ impl InertialReference {
             maint_word |= IrMaintFlags::EXTREME_LATITUDE;
         }
 
-        if self.is_aligning() {
-            if self
-                .remaining_align_duration()
-                .map_or(false, |duration| duration.as_secs() <= 60)
-            {
-                maint_word |= IrMaintFlags::ALIGN_1_MINUTES;
-            } else if self
-                .remaining_align_duration()
-                .map_or(false, |duration| duration.as_secs() <= 120)
-            {
-                maint_word |= IrMaintFlags::ALIGN_2_MINUTES;
-            } else if self
-                .remaining_align_duration()
-                .map_or(false, |duration| duration.as_secs() <= 180)
-            {
-                maint_word |= IrMaintFlags::ALIGN_3_MINUTES;
-            } else if self
-                .remaining_align_duration()
-                .map_or(false, |duration| duration.as_secs() <= 240)
-            {
-                maint_word |= IrMaintFlags::ALIGN_4_MINUTES;
-            } else if self
-                .remaining_align_duration()
-                .map_or(false, |duration| duration.as_secs() <= 300)
-            {
-                maint_word |= IrMaintFlags::ALIGN_5_MINUTES;
-            } else if self
-                .remaining_align_duration()
-                .map_or(false, |duration| duration.as_secs() <= 360)
-            {
-                maint_word |= IrMaintFlags::ALIGN_6_MINUTES;
-            } else {
-                maint_word |= IrMaintFlags::ALIGN_7_10_MINUTES;
-            }
-        }
+        maint_word |= match self
+            .remaining_align_duration()
+            .map(|duration| duration.as_secs())
+        {
+            Some(1..=60) => IrMaintFlags::ALIGN_1_MINUTES,
+            Some(61..=120) => IrMaintFlags::ALIGN_2_MINUTES,
+            Some(121..=180) => IrMaintFlags::ALIGN_3_MINUTES,
+            Some(181..=240) => IrMaintFlags::ALIGN_4_MINUTES,
+            Some(241..=300) => IrMaintFlags::ALIGN_5_MINUTES,
+            Some(301..=360) => IrMaintFlags::ALIGN_6_MINUTES,
+            Some(361..) => IrMaintFlags::ALIGN_7_10_MINUTES,
+            Some(0) | None => IrMaintFlags::default(),
+        };
 
         // TODO sin/cos test discrepancy
 
@@ -2318,7 +2296,6 @@ mod tests {
 
         fn assert_ir_heading_data_available(&mut self, available: bool, adiru_number: usize) {
             assert_eq!(self.heading(adiru_number).is_normal_operation(), available);
-            // assert_eq!(self.true_heading(adiru_number).is_normal_operation(), available);
         }
 
         fn assert_ir_non_attitude_data_available(&mut self, available: bool, adiru_number: usize) {

From 2d51cdf7fb9fcdd23297a847b129b429c5ba8894 Mon Sep 17 00:00:00 2001
From: Michael Corcoran <tracer@outlook.co.nz>
Date: Tue, 3 Jan 2023 02:45:23 +1300
Subject: [PATCH 15/15] doc: simvars

---
 docs/a320-simvars.md | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/docs/a320-simvars.md b/docs/a320-simvars.md
index 0f577bfdd88..82bb81b609d 100644
--- a/docs/a320-simvars.md
+++ b/docs/a320-simvars.md
@@ -1431,7 +1431,7 @@ In the variables below, {number} should be replaced with one item in the set: {
     - 0 is CAPT, 1 is NORM, 2 is F/O
 
 - A32NX_ADIRS_ADIRU_{number}_STATE
-    - TODO delete
+    - Deprecated: use A32NX_ADIRS_IR_{number}_MAINT_WORD instead.
     - Enum
     - The Inertial Reference alignment state.
       Description | Value
@@ -1441,7 +1441,7 @@ In the variables below, {number} should be replaced with one item in the set: {
       Aligned | 2
 
 - A32NX_ADIRS_REMAINING_IR_ALIGNMENT_TIME
-    - TODO delete
+    - Deprecated: use A32NX_ADIRS_IR_{number}_MAINT_WORD instead.
     - Seconds
     - The remaining alignment duration. Zero seconds when the system is aligned or the system is not aligning.
 
@@ -1591,10 +1591,35 @@ In the variables below, {number} should be replaced with one item in the set: {
 
 - A32NX_ADIRS_IR_{number}_MAINT_WORD
     - Arinc429Word<flags>
-    - TODO flag table
+    - Indicates state of the IR
+      Bit | Meaning
+      --- | ---
+        0 | ALIGNMENT_NOT_READY
+        1 | REV_ATT_MODE
+        2 | NAV_MODE
+        3 | VALID_SET_HEADING
+        4 | ATTITUDE_INVALID
+        5 | DC_FAIL
+        6 | ON_DC
+        7 | ADR_FAULT
+        8 | IR_FAULT
+        9 | DC_FAIL_ON_DC
+       10 | ALIGN_FAULT
+       11 | NO_IRS_INITIAL
+       12 | EXCESS_MOTION_ERROR
+       13 | ADR_IR_FAULT
+       14 | EXTREME_LATITUDE
+       15,16,17 | ALIGN_7_10_MINUTES
+       16,17 | ALIGN_6_MINUTES
+       15,17 | ALIGN_5_MINUTES
+       16 | ALIGN_4_MINUTES
+       15,16 | ALIGN_3_MINUTES
+       16 | ALIGN_2_MINUTES
+       15 | ALIGN_1_MINUTES
+       18 | COMPUTED_LATITUDE_MISCOMPARE
 
 - A32NX_ADIRS_USES_GPS_AS_PRIMARY
-    - TODO delete (this is an FM function, not ADIRU)
+    - Deprecated, this is an FM function, not ADIRU
     - Bool
     - Whether or not the GPS is used as the primary means of navigation/position determination.