feat(pfd): (a380x, third try): Add vertical deviation indicator, ROW/…

…ROP/OANS warnings v3 (#8734) * linting * port LinearDeviationIndicator from a32nx PFD * add PFD warnings for ROW, ROP, OANS * add speed margins to a380x * add ROP/ROW/OANS PFD warnings to a32nx * update two-line message, fix bug in getDisplayIndex() * make RWY TOO SHORT smaller * Disable second ISIS; update colors for PFD tapes, PFD horizon, EWD THR gauges * restructure code, add A380X-only warnings * refactor Publisher structure, leave only data with existing sources * switch to data words for ROS/ROP and OANS PFD alerts * clean up * feat: add some A429 utils * fix(pfd): tidy up publishers * feat: add fwc publisher * fix(pfd): use fwc data for stall warning * A380X: GPWS PFD alerts, ROP/ROW aural alerts, A32NX: Add GPWS discrete word to GPWS, Both: warnings position update * use correct discrete word bit fields * Add ROP/ROW aural alerts to A32NX * fix lint after rebase * lint-fix * update font for IF WET RWY TOO SHORT (fix for a32nx) * lint + lint-fixes * add LS reminder for ILS, frequency of ILS information has same font size before and after decimal point * consolidate to single definitions.scss, use standard colors for thrust gauge and PFD tapes * move ISIS changes to other PR * move logic from A32NX_FWC.js to PseudoFWC * inhibit single chimes for the first two seconds after power-on * call correct gpwsUpdateDiscreteWords function in A32NX * fix: wrong speedtape failure indication * use Arinc429RegisterSubject for rowRop and oans words * disable global FBW_TYPECHECK * make compatible with RMP PR * a32nx fixes * a32nx: add stallwarningpublisher again * fix stall warning * fix: add missing setBitValue * use setBitValue as intended * inhibit master caution/warning during PseudoFWC startup * clear timer if FWC shuts down before timer elapsed * remove a32nx parts * add fonts --------- Co-authored-by: Michael Corcoran <tracer@outlook.co.nz> Co-authored-by: Saschl <sascharudolf46@gmail.com> Co-authored-by: Saschl <19493808+Saschl@users.noreply.github.com>
flybywiresim · Jul 8, 2024 · cc89848 · cc89848
1 parent 8d341ea
commit cc89848
Show file tree

Hide file tree

Showing 35 changed files with 12,732 additions and 62 deletions.
diff --git a/fbw-a32nx/docs/a320-simvars.md b/fbw-a32nx/docs/a320-simvars.md
@@ -22,6 +22,8 @@
   - [Landing Gear (ATA 32)](#landing-gear-ata-32)
   - [ATC (ATA 34)](#atc-ata-34)
   - [Radio Altimeter (ATA 34)](#radio-altimeter-ata-34)
+  - [GPWS / TAWS (ATA 34)](#gpws--taws-ata-34)
+  - [ROW / ROP / OANS (ATA 34)](#row--rop--oans-ata-34)
   - [Electronic Flight Bag (ATA 46)](#electronic-flight-bag-ata-46)
 
 ## Uncategorized
@@ -3916,6 +3918,62 @@ In the variables below, {number} should be replaced with one item in the set: {
         - 1
         - 2
 
+## GPWS / TAWS (ATA 34)
+- `A32NX_EGPWS_ALERT_{1 | 2}_DISCRETE_WORD_1`
+    - Data word for GPWS alerts. Used for displaying alerts on the PFD (on the A380) and triggering aural warnings
+    - Arinc429<Discrete>
+    - | Bit |       Description      |
+      |:---:|:----------------------:|
+      | 11  | SINKRATE               |
+      | 12  | PULL UP                |
+      | 13  | TERRAIN                |
+      | 14  | DON'T SINK             |
+      | 15  | TOO LOW GEAR           |
+      | 16  | TOO LOW FLAPS          |
+      | 17  | TOO LOW TERRAIN        |
+      | 18  | GLIDESLOPE             |
+      | 20  | TERRAIN PULL UP        |
+      | 22  | TERRAIN AHEAD PULL UP  |
+      | 27  | TERRAIN AHEAD          |
+
+- `A32NX_EGPWS_ALERT_{1 | 2}_DISCRETE_WORD_2`
+    - Data word for GPWS alerts. Used for displaying alerts on the PFD (on the A380) or on the GPWS visual indicators on the A320
+    - Arinc429<Discrete>
+    - | Bit |          Description         |
+      |:---:|:----------------------------:|
+      | 11  | G/S CANCEL                   |
+      | 12  | GPWS ALERT                   |
+      | 13  | GPWS WARNING                 |
+      | 14  | GPWS INOP                    |
+      | 15  | W/S WARNING                  |
+      | 16  | AUDIO ON                     |
+      | 22  | TERRAIN AWARENESS WARNING    |
+      | 23  | TERRAIN AWARENESS CAUTION    |
+      | 24  | TERRAIN AWARENESS INOP       |
+      | 25  | EXTERNAL FAULT               |
+      | 26  | TERRAIN AWARENESS NOT AVAIL. |
+
+## ROW / ROP / OANS (ATA 34)
+
+- A32NX_ROW_ROP_WORD_1
+    - Data word for ROW and ROP functions. Used for displaying alerts on the PFD.
+    - Arinc429<Discrete>
+    - | Bit |            Description            |
+      |:---:|:---------------------------------:|
+      | 11  | ROW/ROP operative                 |
+      | 12  | ROP: Active with autobrake        |
+      | 13  | ROP: Active with manual braking   |
+      | 14  | ROW Wet: Runway too short         |
+      | 15  | ROW Dry: Runway too short         |
+
+- A32NX_OANS_WORD_1
+    - Data word for OANS functions. Used for displaying alerts on the PFD.
+    - Arinc429<Discrete>
+    - | Bit |            Description            |
+      |:---:|:---------------------------------:|
+      | 11  | OANS: Runway ahead                |
+
+
 ## Electronic Flight Bag (ATA 46)
 
 - A32NX_PUSHBACK_SYSTEM_ENABLED

diff --git a/.../base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/sound/sound.xml b/.../base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/sound/sound.xml
@@ -1100,6 +1100,43 @@
             </Requires>
         </Sound>
 
+        <!-- Stall warning =====================================================================-->
+        <Sound WwiseEvent="aural_stall_new" WwiseData="true" NodeName="PEDALS_LEFT" LocalVar="A32NX_AUDIO_STALL_WARNING" Continuous="true">
+            <Range LowerBound="1"/>
+            <Requires SimVar="ELECTRICAL MAIN BUS VOLTAGE" Units="VOLTS" Index="1">
+                <Range LowerBound="28" />
+            </Requires>
+        </Sound>
+
+        <!-- ROP/ROW warnings =====================================================================-->
+        <Sound WwiseEvent="brake_max_braking" WwiseData="true" NodeName="Wiper_Base_l" LocalVar="A32NX_AUDIO_ROP_MAX_BRAKING" Continuous="true">
+            <Range LowerBound="1"/>
+            <Requires SimVar="ELECTRICAL MAIN BUS VOLTAGE" Units="VOLTS" Index="1">
+                <Range LowerBound="28" />
+            </Requires>
+        </Sound>
+
+        <Sound WwiseEvent="set_max_reverse" WwiseData="true" NodeName="Wiper_Base_l" LocalVar="A32NX_AUDIO_ROW_SET_MAX_REVERSE" Continuous="true">
+            <Range LowerBound="1"/>
+            <Requires SimVar="ELECTRICAL MAIN BUS VOLTAGE" Units="VOLTS" Index="1">
+                <Range LowerBound="28" />
+            </Requires>
+        </Sound>
+
+        <Sound WwiseEvent="keep_max_reverse" WwiseData="true" NodeName="Wiper_Base_l" LocalVar="A32NX_AUDIO_ROP_KEEP_MAX_REVERSE" Continuous="false">
+            <Range LowerBound="1"/>
+            <Requires SimVar="ELECTRICAL MAIN BUS VOLTAGE" Units="VOLTS" Index="1">
+                <Range LowerBound="28" />
+            </Requires>
+        </Sound>
+
+        <Sound WwiseEvent="runway_too_short" WwiseData="true" NodeName="Wiper_Base_l" LocalVar="A32NX_AUDIO_ROW_RWY_TOO_SHORT" Continuous="true">
+            <Range LowerBound="1"/>
+            <Requires SimVar="ELECTRICAL MAIN BUS VOLTAGE" Units="VOLTS" Index="1">
+                <Range LowerBound="28" />
+            </Requires>
+        </Sound>
+
     </SimVarSounds>
 
     <!-- AvionicSounds ========================================================================================== -->
@@ -1186,13 +1223,6 @@
         <Sound WwiseData="true" WwiseEvent="traffic_traffic" NodeName="WIPER_BASE_L" />
         <Sound WwiseData="true" WwiseEvent="TCAS_sys_test_OK" NodeName="WIPER_BASE_L" />
 
-        <!-- ROPS callouts ==================================================================================== -->
-
-        <Sound WwiseData="true" WwiseEvent="brake_max_braking" NodeName="WIPER_BASE_L" />
-        <Sound WwiseData="true" WwiseEvent="keep_max_reverse" NodeName="WIPER_BASE_L" />
-        <Sound WwiseData="true" WwiseEvent="runway_too_short" NodeName="WIPER_BASE_L" />
-        <Sound WwiseData="true" WwiseEvent="set_max_reverse" NodeName="WIPER_BASE_L" />
-
     </AvionicSounds>
 
     <!-- AnimationSounds ========================================================================================== -->

diff --git a/...x/src/base/flybywire-aircraft-a380-842/html_ui/Fonts/FBW-Display-EIS-A380-SlashedZero.ttf b/...x/src/base/flybywire-aircraft-a380-842/html_ui/Fonts/FBW-Display-EIS-A380-SlashedZero.ttf
diff --git a/...380-842/html_ui/Fonts/ECAMFontRegular.ttf → ...42/html_ui/Fonts/FBW-Display-EIS-A380.ttf b/...380-842/html_ui/Fonts/ECAMFontRegular.ttf → ...42/html_ui/Fonts/FBW-Display-EIS-A380.ttf