Skip to content

Commit d063672

Browse files
Revyn112Revyn112
committed
fix(fws): Sound scheduling for FWS, triple click on capability downgrade
FBW PR 9555
1 parent eeccb24 commit d063672

File tree

4 files changed

+36
-5
lines changed
  • hdw-a339x/src
    • base/headwindsim-aircraft-a330-900/SimObjects/Airplanes/Headwind_A330neo/sound
    • systems/instruments/src/Common
  • hdw-su95x/src
    • base/headwindsim-aircraft-su100-95/SimObjects/Airplanes/Headwind_SU95/sound
    • systems/instruments/src/Common

4 files changed

+36
-5
lines changed

‎hdw-a339x/src/base/headwindsim-aircraft-a330-900/SimObjects/Airplanes/Headwind_A330neo/sound/sound.xml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1894,7 +1894,7 @@
18941894

18951895
<!-- CRC and Caution ========================================================================================-->
18961896

1897-
<Sound WwiseData="true" WwiseEvent="CRC" NodeName="WIPER_BASE_L" ViewPoint="Inside" LocalVar="A32NX_MASTER_WARNING">
1897+
<Sound WwiseData="true" WwiseEvent="CRC" NodeName="WIPER_BASE_L" ViewPoint="Inside" LocalVar="A32NX_FWC_CRC">
18981898
<Range LowerBound="0.5" />
18991899
</Sound>
19001900

@@ -2017,8 +2017,11 @@
20172017
<WwiseRTPC LocalVar="A32NX_SOUND_ANNOUNCEMENTS_ENABLED" Units="number" Index="0" RTPCName="LOCALVAR_A32NX_ANNOUNCEMENT_TOGGLE" />
20182018
</Sound>
20192019

2020-
<Sound WwiseData="true" WwiseEvent="improved_tone_caution" NodeName="PEDALS_LEFT" ViewPoint="Inside" LocalVar="A32NX_MASTER_CAUTION" Continuous="false">
2020+
<!-- Cavalry charge ===============================================================================-->
2021+
2022+
<Sound WwiseData="true" WwiseEvent="cavcharge" NodeName="Wiper_Base_l" ViewPoint="Inside" LocalVar="A32NX_FWC_CAVALRY_CHARGE" Continuous="true">
20212023
<Range LowerBound="0.5" />
2024+
<WwiseRTPC LocalVar="A32NX_FWS_AUDIO_VOLUME" Units="number" Index="0" RTPCName="LOCALVAR_FWC_VOLUME" />
20222025
</Sound>
20232026

20242027
<!-- Altitude deviation warning =====================================================================-->
@@ -2057,6 +2060,14 @@
20572060
<Range LowerBound="1"/>
20582061
</Sound>
20592062

2063+
<Sound WwiseEvent="autobrake_off" WwiseData="true" NodeName="Wiper_Base_l" LocalVar="A32NX_AUDIO_AUTOBRAKE_OFF" Continuous="false">
2064+
<Range LowerBound="1"/>
2065+
</Sound>
2066+
2067+
<Sound WwiseData="true" WwiseEvent="improved_tone_caution" NodeName="PEDALS_LEFT" ViewPoint="Inside" LocalVar="A32NX_FWC_SC" Continuous="false">
2068+
<Range LowerBound="0.5" />
2069+
</Sound>
2070+
20602071
</SimVarSounds>
20612072

20622073
<!-- AvionicSounds ========================================================================================== -->
@@ -2328,4 +2339,4 @@
23282339

23292340
</AnimationSounds>
23302341

2331-
</SoundInfo>
2342+
</SoundInfo>

‎hdw-a339x/src/systems/instruments/src/Common/EWDMessages.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,11 @@ const EWDMessages = {
193193
'216330503': '\x1b<4m -FWD CAB TRIM VALVE',
194194
'216330504': '\x1b<4m -AFT CAB TRIM VALVE',
195195
'216330505': '\x1b<4m -TRIM AIR HI PR',
196+
'220000001': '\x1b<2mAP OFF',
197+
'220000002': '\x1b<4mA/THR OFF',
198+
'220800001': '\x1b<2m\x1b4mAUTO FLT\x1bm AP OFF',
199+
'220800004': '\x1b<4m\x1b4mAUTO FLT\x1bm A/THR OFF',
200+
'220800005': '\x1b<5m -THR LEVERS........MOVE',
196201
'220020201': '\x1b<4m\x1b4mAUTO FLT\x1bm FCU 1+2 FAULT',
197202
'220020202': '\x1b<5m -PFD BARO REF: STD ONLY',
198203
'220021001': '\x1b<4m\x1b4mAUTO FLT\x1bm FCU 1 FAULT',

‎hdw-su95x/src/base/headwindsim-aircraft-su100-95/SimObjects/Airplanes/Headwind_SU95/sound/sound.xml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1841,7 +1841,7 @@
18411841

18421842
<!-- CRC and Caution ========================================================================================-->
18431843

1844-
<Sound WwiseData="true" WwiseEvent="CRC" NodeName="KNOB_EFIS_CS_LOUDSPKR" ViewPoint="Inside" LocalVar="A32NX_MASTER_WARNING">
1844+
<Sound WwiseData="true" WwiseEvent="CRC" NodeName="KNOB_EFIS_CS_LOUDSPKR" ViewPoint="Inside" LocalVar="A32NX_FWC_CRC">
18451845
<Range LowerBound="0.5" />
18461846
</Sound>
18471847

@@ -1964,9 +1964,11 @@
19641964
<WwiseRTPC LocalVar="A32NX_SOUND_ANNOUNCEMENTS_ENABLED" Units="number" Index="0" RTPCName="LOCALVAR_A32NX_ANNOUNCEMENT_TOGGLE" />
19651965
</Sound>
19661966

1967+
<!-- Cavalry charge ===============================================================================-->
19671968

1968-
<Sound WwiseData="true" WwiseEvent="improved_tone_caution" NodeName="PEDALS_LEFT" ViewPoint="Inside" LocalVar="A32NX_MASTER_CAUTION" Continuous="false">
1969+
<Sound WwiseData="true" WwiseEvent="cavcharge" NodeName="Wiper_Base_l" ViewPoint="Inside" LocalVar="A32NX_FWC_CAVALRY_CHARGE" Continuous="true">
19691970
<Range LowerBound="0.5" />
1971+
<WwiseRTPC LocalVar="A32NX_FWS_AUDIO_VOLUME" Units="number" Index="0" RTPCName="LOCALVAR_FWC_VOLUME" />
19701972
</Sound>
19711973

19721974
<!-- Altitude deviation warning =====================================================================-->
@@ -2005,6 +2007,14 @@
20052007
<Range LowerBound="1"/>
20062008
</Sound>
20072009

2010+
<Sound WwiseEvent="autobrake_off" WwiseData="true" NodeName="Wiper_Base_l" LocalVar="A32NX_AUDIO_AUTOBRAKE_OFF" Continuous="false">
2011+
<Range LowerBound="1"/>
2012+
</Sound>
2013+
2014+
<Sound WwiseData="true" WwiseEvent="improved_tone_caution" NodeName="PEDALS_LEFT" ViewPoint="Inside" LocalVar="A32NX_FWC_SC" Continuous="false">
2015+
<Range LowerBound="0.5" />
2016+
</Sound>
2017+
20082018
</SimVarSounds>
20092019

20102020
<!-- AvionicSounds ========================================================================================== -->

‎hdw-su95x/src/systems/instruments/src/Common/EWDMessages.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,11 @@ const EWDMessages = {
193193
'216330503': '\x1b<4m -FWD CAB TRIM VALVE',
194194
'216330504': '\x1b<4m -AFT CAB TRIM VALVE',
195195
'216330505': '\x1b<4m -TRIM AIR HI PR',
196+
'220000001': '\x1b<2mAP OFF',
197+
'220000002': '\x1b<4mA/THR OFF',
198+
'220800001': '\x1b<2m\x1b4mAUTO FLT\x1bm AP OFF',
199+
'220800004': '\x1b<4m\x1b4mAUTO FLT\x1bm A/THR OFF',
200+
'220800005': '\x1b<5m -THR LEVERS........MOVE',
196201
'220020201': '\x1b<4m\x1b4mAUTO FLT\x1bm FCU 1+2 FAULT',
197202
'220020202': '\x1b<5m -PFD BARO REF: STD ONLY',
198203
'220021001': '\x1b<4m\x1b4mAUTO FLT\x1bm FCU 1 FAULT',

0 commit comments

Comments
 (0)