fix: FCU knobs sound and minor emissive fixes (flybywiresim#3295)

* fix: FCU knobs sound fixes * fix: FCU speed button sound fix * fix: add sound to altitude increment selector * Update CHANGELOG.md * fix: alt increment and FO throttle decal emissive fix Co-authored-by: Tyler Knox <[email protected]> Co-authored-by: pepperoni505 <[email protected]> Co-authored-by: Will Pine <[email protected]> Co-authored-by: KO Zone <[email protected]>
Mickepilot · Feb 6, 2021 · 1ec7e64 · 1ec7e64
1 parent cb2f637
commit 1ec7e64
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 11 deletions.
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -72,6 +72,7 @@
 1. [FLIGHTMODEL] Updated landing gear contact point values to closer match reality - @wpine215 (Iceman) and @donstim (donbikes#4084)
 1. [TEXTURE] Various cockpit decal texture fixes and updates - @ImenesFBW (Imenes)
 1. [MCDU] Rework PERF TAKE OFF page - @beheh (Benedict Etzel)
+1. [SOUND] Fixed FCU knobs sounds - @ImenesFBW (Imenes)
 
 ## 0.5.2
 1. [CDU] Changing CRZ/DES speed to acknowledge any speed restriction - @Watsi01 (RogePete)

diff --git a/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/model/A320_NEO_INTERIOR.xml b/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/model/A320_NEO_INTERIOR.xml
@@ -585,6 +585,11 @@
                 <NODE_ID>DECAL_THROTTLE_01</NODE_ID>
                 <POTENTIOMETER>85</POTENTIOMETER>
             </UseTemplate>
+
+            <UseTemplate Name="ASOBO_GT_Component_Emissive_Gauge">
+                <NODE_ID>DECAL_THROTTLE_02</NODE_ID>
+                <POTENTIOMETER>85</POTENTIOMETER>
+            </UseTemplate>
 
             <CameraTitle>PedestalFwd</CameraTitle>
         </Component>
@@ -2972,7 +2977,13 @@
             <UseTemplate Name="ASOBO_AUTOPILOT_Switch_Altitude_Increment_Template">
                 <NODE_ID>KNOB_AUTOPILOT_SELECTOR_ALT</NODE_ID>
                 <ANIM_NAME>KNOB_AUTOPILOT_SELECTOR_ALT</ANIM_NAME>
-
+                <WWISE_EVENT_1>lswitch</WWISE_EVENT_1>
+                <WWISE_EVENT_2>lswitch</WWISE_EVENT_2>
+            </UseTemplate>
+
+            <UseTemplate Name="ASOBO_LIGHTING_Panel_Emissive_Template">
+                <NODE_ID>KNOB_AUTOPILOT_SELECTOR_ALT</NODE_ID>
+                <EMISSIVE_CODE>0</EMISSIVE_CODE>
             </UseTemplate>
 
             <UseTemplate Name="FBW_Airbus_FCU_Altitude_Knob">

diff --git a/src/behavior/src/A32NX_Interior_Autopilot.xml b/src/behavior/src/A32NX_Interior_Autopilot.xml
@@ -180,8 +180,8 @@
 						<PUSH_CODE>
 							(&gt;H:A320_Neo_CDU_MODE_MANAGED_SPEED)
 						</PUSH_CODE>
-						<WWISE_EVENT_1>autopilot_knob_push_button_on</WWISE_EVENT_1>
-						<WWISE_EVENT_2>autopilot_knob_push_button_off</WWISE_EVENT_2>
+						<WWISE_EVENT_1>QNHknob</WWISE_EVENT_1>
+						<WWISE_EVENT_2>QNHknob</WWISE_EVENT_2>
 						<!--<ANIMTIP_0_ON_CURSOR>TurnLeft</ANIMTIP_0_ON_CURSOR>
 						<ANIMTIP_1_ON_CURSOR>TurnRight</ANIMTIP_1_ON_CURSOR> -->
 						<ANIMTIP_2_ON_CURSOR>UpArrow</ANIMTIP_2_ON_CURSOR>

diff --git a/src/behavior/src/A32NX_Interior_FCU.xml b/src/behavior/src/A32NX_Interior_FCU.xml
@@ -93,8 +93,8 @@
                         (O:_PushAnimVar) ?
                 </OVERRIDE_PUSH_ANIM_CODE>
                 <WWISE_EVENT>QNHknob</WWISE_EVENT>
-                <WWISE_EVENT_1>autopilot_knob_push_button_on</WWISE_EVENT_1>
-                <WWISE_EVENT_2>autopilot_knob_push_button_off</WWISE_EVENT_2>
+                <WWISE_EVENT_1>QNHknob</WWISE_EVENT_1>
+                <WWISE_EVENT_2>QNHknob</WWISE_EVENT_2>
             </UseTemplate>
             <!--Disables FCU baro knob emissive-->
             <UseTemplate Name="ASOBO_GT_Emissive_Gauge">
@@ -148,8 +148,8 @@
                 <CENTER_RADIUS>0</CENTER_RADIUS>
                 <COUNT>36</COUNT>
                 <WWISE_EVENT>QNHknob</WWISE_EVENT>
-                <WWISE_EVENT_1>autopilot_knob_push_button_on</WWISE_EVENT_1>
-                <WWISE_EVENT_2>autopilot_knob_push_button_off</WWISE_EVENT_2>
+                <WWISE_EVENT_1>QNHknob</WWISE_EVENT_1>
+                <WWISE_EVENT_2>QNHknob</WWISE_EVENT_2>
             </UseTemplate>
         </Component>
     </Template>
@@ -200,7 +200,7 @@
             <NORMALIZED_TIME_1>0.1</NORMALIZED_TIME_1>
             <WWISE_EVENT_2>autopilot_knob_push_button_off</WWISE_EVENT_2>
             <NORMALIZED_TIME_2>0.5</NORMALIZED_TIME_2>
-            <WWISE_EVENT>autopilot_heading_knob</WWISE_EVENT>
+            <WWISE_EVENT>QNHknob</WWISE_EVENT>
             <COUNT>36</COUNT>
 
             <ANIMTIP_3>TT:COCKPIT.TOOLTIPS.AUTOPILOT_PANEL_HDG_PUSH</ANIMTIP_3>
@@ -239,8 +239,8 @@
                     (&gt;H:A320_Neo_FCU_MODE_MANAGED_HEADING)
                 </PUSH_CODE>
                 <CENTER_RADIUS>0</CENTER_RADIUS>
-                <WWISE_EVENT_1>autopilot_knob_push_button_on</WWISE_EVENT_1>
-                <WWISE_EVENT_2>autopilot_knob_push_button_off</WWISE_EVENT_2>
+                <WWISE_EVENT_1>QNHknob</WWISE_EVENT_1>
+                <WWISE_EVENT_2>QNHknob</WWISE_EVENT_2>
             </UseTemplate>
         </Component>
     </Template>
@@ -261,7 +261,7 @@
             <ANIM_NAME>AUTOPILOT_Knob_VerticalSpeed#SUFFIX_ID#</ANIM_NAME>
             <ANIM_NAME_PUSHPULL>AUTOPILOT_Knob_VerticalSpeed_PushPull#SUFFIX_ID#</ANIM_NAME_PUSHPULL>
             <PART_ID>AUTOPILOT_Knob_VerticalSpeed</PART_ID>
-            <WWISE_EVENT>autopilot_verticalspeed_knob</WWISE_EVENT>
+            <WWISE_EVENT>QNHknob</WWISE_EVENT>
             <COUNT>36</COUNT>
             <CLOCKWISE_DIR>DEC</CLOCKWISE_DIR>
             <ANTICLOCKWISE_DIR>INC</ANTICLOCKWISE_DIR>
@@ -306,6 +306,8 @@
                     (&gt;H:A320_Neo_FCU_VS_ZERO)
                 </PUSH_CODE>
                 <CENTER_RADIUS>0</CENTER_RADIUS>
+                <WWISE_EVENT_1>QNHknob</WWISE_EVENT_1>
+                <WWISE_EVENT_2>QNHknob</WWISE_EVENT_2>
             </UseTemplate>
         </Component>
     </Template>