From 4a7fe3ee281e1a73f50eebf664b7fc2b3e9a422b Mon Sep 17 00:00:00 2001
From: Saschl <sascharudolf46@gmail.com>
Date: Fri, 2 Dec 2022 22:59:33 +0100
Subject: [PATCH] feat(hyd): changed gear lever mechanism / added gear door
 drag #7390 @d3aeb55

---
 .github/CHANGELOG.md                          |   1 +
 docs/a320-simvars.md                          |  12 ++
 .../FlyByWire_A320_NEO/Checklist/Library.xml  |  10 +-
 .../AirPlanes/FlyByWire_A320_NEO/Climb.flt    |   1 +
 .../AirPlanes/FlyByWire_A320_NEO/approach.FLT |   1 +
 .../AirPlanes/FlyByWire_A320_NEO/apron.FLT    |   1 +
 .../AirPlanes/FlyByWire_A320_NEO/cruise.FLT   |   1 +
 .../AirPlanes/FlyByWire_A320_NEO/final.FLT    |   1 +
 .../AirPlanes/FlyByWire_A320_NEO/hangar.flt   |   1 +
 .../model/A320_NEO_INTERIOR.xml               |  10 +-
 .../AirPlanes/FlyByWire_A320_NEO/runway.FLT   |   1 +
 .../FlyByWire_A320_NEO/sound/sound.xml        |   4 +-
 .../AirPlanes/FlyByWire_A320_NEO/taxi.flt     |   1 +
 .../Pages/A32NX_Core/A32NX_BrakeTemp.js       |   4 +-
 .../Pages/A32NX_Core/A32NX_LocalVarUpdater.js |   2 +-
 .../NavSystems/A320_Neo/A32NX_NavSystem.js    |   2 +-
 src/behavior/src/A32NX_Interior_Handling.xml  |  41 +++++
 src/behavior/src/A32NX_Interior_Misc.xml      |  46 ------
 .../src/EFB/Ground/Pages/Payload/Payload.tsx  |   8 +-
 .../src/EWD/elements/PseudoFWC.tsx            |   2 +-
 src/systems/a320_systems/src/hydraulic/mod.rs |   3 +-
 src/systems/a320_systems_wasm/src/gear.rs     |  49 ++++--
 src/systems/systems/src/landing_gear/mod.rs   | 155 ++++++++++++++----
 23 files changed, 239 insertions(+), 118 deletions(-)

diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
index 29991bdbd4c6..15a555c80191 100644
--- a/.github/CHANGELOG.md
+++ b/.github/CHANGELOG.md
@@ -65,6 +65,7 @@
 1. [FMGC] Fix inbound leg time for holds - @tracernz (Mike)
 1. [MCDU] Improved visuals of Init-A and Init-B page - @derl30n (Leon)
 1. [MODEL] Added new animated gear gravity extension handle- @tyler58546 (tyler58546), @MoreRightRudder (Mike), @Crocket63 (crocket), @Lantarius
+1. [HYD] Custom Lvar for gear lever to fix ground collision bug - @Crocket63 (crocket)
 1. [HYD] Randomised per actuator flow restrictions at plane init - @Crocket63 (crocket)
 1. [MCDU] Hide stored elements on A/C Status when there are none - @tracernz (Mike)
 1. [FMGC] Fix ident for CD legs - @tracernz (Mike)
diff --git a/docs/a320-simvars.md b/docs/a320-simvars.md
index 185e21f94117..b14a824ef5ed 100644
--- a/docs/a320-simvars.md
+++ b/docs/a320-simvars.md
@@ -3369,6 +3369,18 @@ In the variables below, {number} should be replaced with one item in the set: {
     - Indicates the position of the gear emergency extension crank handle from 0 to 300 (3 turns)
     - Percent
 
+- A32NX_GEAR_LEVER_POSITION_REQUEST
+    - Indicates that the pilot tries to move the gear lever (1=down)
+    - Boolean
+
+- A32NX_GEAR_HANDLE_POSITION
+    - Indicates the actual position of the gear handle
+    - Percent over 100
+
+- A32NX_GEAR_HANDLE_HITS_LOCK_SOUND
+    - Indicates that gear lever just hit the baulk lock mechanism
+    - Boolean
+
 ## ATC (ATA 34)
 
 - A32NX_TRANSPONDER_MODE
diff --git a/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/Checklist/Library.xml b/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/Checklist/Library.xml
index 0fcc7777f0aa..fea5b3479fcb 100644
--- a/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/Checklist/Library.xml
+++ b/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/Checklist/Library.xml
@@ -65,7 +65,7 @@
          <Instrument Id="LANDING_GEAR_Lever_Gear" />
          <Test>
             <TestValue>
-               <Val SimVarName="GEAR HANDLE POSITION" Units="Boolean"/>
+               <Val SimVarName="L:A32NX_GEAR_HANDLE_POSITION" Units="Boolean"/>
             </TestValue>
             <Action Copilot="True" Condition="TestValueFalse" Once="true" EventID="GEAR_TOGGLE"/>
          </Test>
@@ -1150,7 +1150,7 @@
          <Test>
             <TestValue>
                <Operator OpType="NOT">
-                  <Val SimVarName="GEAR HANDLE POSITION" Units="Boolean"/>
+                  <Val SimVarName="L:A32NX_GEAR_HANDLE_POSITION" Units="Boolean"/>
                </Operator>
             </TestValue>
             <Action Copilot="True" Condition="TestValueFalse" Once="true" EventID="GEAR_TOGGLE"/>
@@ -1641,7 +1641,7 @@
          <Instrument Id="LANDING_GEAR_Lever_Gear" />
          <Test>
             <TestValue>
-               <Val SimVarName="GEAR HANDLE POSITION" Units="Boolean"/>
+               <Val SimVarName="L:A32NX_GEAR_HANDLE_POSITION" Units="Boolean"/>
             </TestValue>
             <Action Copilot="True" Condition="TestValueFalse" Once="true" EventID="GEAR_TOGGLE"/>
          </Test>
@@ -1841,7 +1841,7 @@
          <Instrument Id="LANDING_GEAR_Lever_Gear" />
          <Test>
             <TestValue>
-               <Val SimVarName="GEAR HANDLE POSITION" Units="Boolean"/>
+               <Val SimVarName="L:A32NX_GEAR_HANDLE_POSITION" Units="Boolean"/>
             </TestValue>
             <Action Copilot="True" Condition="TestValueFalse" Once="true" EventID="GEAR_TOGGLE"/>
          </Test>
@@ -2381,7 +2381,7 @@
          <Test>
             <TestValue>
                <Operator OpType="NOT">
-                  <Val SimVarName="GEAR HANDLE POSITION" Units="Boolean"/>
+                  <Val SimVarName="L:A32NX_GEAR_HANDLE_POSITION" Units="Boolean"/>
                </Operator>
             </TestValue>
             <Action Copilot="True" Condition="TestValueFalse" Once="true" EventID="GEAR_TOGGLE"/>
diff --git a/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/Climb.flt b/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/Climb.flt
index fcba78061fdf..db8f8a0d8cfe 100644
--- a/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/Climb.flt
+++ b/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/Climb.flt
@@ -153,6 +153,7 @@ A32NX_SEC_2_PUSHBUTTON_PRESSED=1
 A32NX_SEC_3_PUSHBUTTON_PRESSED=1
 A32NX_FAC_1_PUSHBUTTON_PRESSED=1
 A32NX_FAC_2_PUSHBUTTON_PRESSED=1
+A32NX_GEAR_LEVER_POSITION_REQUEST = 0
 
 [Gauges.0]
 KollsmanSetting=29.921342849731445313
diff --git a/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/approach.FLT b/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/approach.FLT
index 1e81558d79be..06cde06e727f 100644
--- a/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/approach.FLT
+++ b/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/approach.FLT
@@ -263,6 +263,7 @@ A32NX_OVHD_PRESS_MODE_SEL_PB_IS_AUTO = 1
 A32NX_OVHD_PRESS_MAN_VS_CTL_SWITCH = 1
 A32NX_TRANSPONDER_MODE = 1
 A32NX_SWITCH_ATC_ALT = 1
+A32NX_GEAR_LEVER_POSITION_REQUEST = 0
 
 [Gauges.0]
 KollsmanSetting=29.921342849731445313
diff --git a/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/apron.FLT b/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/apron.FLT
index 6887dcdf6678..d19ef1cb9e15 100644
--- a/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/apron.FLT
+++ b/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/apron.FLT
@@ -272,6 +272,7 @@ A32NX_SWITCH_ATC_ALT = 1
 A32NX_GEAR_CENTER_POSITION = 100
 A32NX_GEAR_LEFT_POSITION = 100
 A32NX_GEAR_RIGHT_POSITION = 100
+A32NX_GEAR_LEVER_POSITION_REQUEST = 1
 
 [Gauges.0]
 KollsmanSetting=29.921342849731445313
diff --git a/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/cruise.FLT b/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/cruise.FLT
index 75c71e9739db..7bb6911dfa0f 100644
--- a/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/cruise.FLT
+++ b/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/cruise.FLT
@@ -263,6 +263,7 @@ A32NX_OVHD_PRESS_MODE_SEL_PB_IS_AUTO = 1
 A32NX_OVHD_PRESS_MAN_VS_CTL_SWITCH = 1
 A32NX_TRANSPONDER_MODE = 1
 A32NX_SWITCH_ATC_ALT = 1
+A32NX_GEAR_LEVER_POSITION_REQUEST = 0
 
 [Gauges.0]
 KollsmanSetting=29.921342849731445313
diff --git a/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/final.FLT b/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/final.FLT
index 20ace49e34c9..6ec52b8c5251 100644
--- a/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/final.FLT
+++ b/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/final.FLT
@@ -265,6 +265,7 @@ A32NX_SWITCH_ATC_ALT = 1
 A32NX_GEAR_CENTER_POSITION = 100
 A32NX_GEAR_LEFT_POSITION = 100
 A32NX_GEAR_RIGHT_POSITION = 100
+A32NX_GEAR_LEVER_POSITION_REQUEST = 1
 
 [Gauges.0]
 KollsmanSetting=29.921342849731445313
diff --git a/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/hangar.flt b/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/hangar.flt
index 95c1f41f7d74..47cf00778881 100644
--- a/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/hangar.flt
+++ b/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/hangar.flt
@@ -246,6 +246,7 @@ XMLVAR_A320_WeatherRadar_Sys=1
 A32NX_GEAR_CENTER_POSITION = 100
 A32NX_GEAR_LEFT_POSITION = 100
 A32NX_GEAR_RIGHT_POSITION = 100
+A32NX_GEAR_LEVER_POSITION_REQUEST = 1
 
 [Gauges.0]
 KollsmanSetting=29.921342849731445313
diff --git a/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/model/A320_NEO_INTERIOR.xml b/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/model/A320_NEO_INTERIOR.xml
index d444b54d3740..c57bba26c367 100644
--- a/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/model/A320_NEO_INTERIOR.xml
+++ b/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/model/A320_NEO_INTERIOR.xml
@@ -840,12 +840,12 @@
                 <TOOLTIPID>%((L:A32NX_BRAKE_FAN_BTN_PRESSED, Bool))%{if}Turn OFF brake fan%{else}Turn ON brake fan%{end}</TOOLTIPID>
             </UseTemplate>
 
-            <UseTemplate Name="FBW_LANDING_GEAR_Gear_Lever_Template">
+            <UseTemplate Name="FBW_HANDLING_Gear_Lever_Template">
                 <ANIM_NAME>lever_landing_gear</ANIM_NAME>
                 <NODE_ID>LEVER_LANDINGGEAR</NODE_ID>
-                <WWISE_EVENT>gearleverclick</WWISE_EVENT>
-                <NO_GEARUP_IF_LOCKED/>
+                <ANIM_LENGTH>3</ANIM_LENGTH>
             </UseTemplate>
+
             <UseTemplate Name="FBW_Airbus_LANDING_GEAR_Light_Template">
                 <NODE_ID>PUSH_AUTOBKR_LDGGEAR_1</NODE_ID>
                 <ID>1</ID>
@@ -1777,7 +1777,7 @@
                 <UseTemplate Name="ASOBO_GT_Update">
                     <FREQUENCY>5</FREQUENCY>
                     <UPDATE_CODE>
-                        (A:GEAR HANDLE POSITION, Bool) (A:GEAR POSITION, percent) 99.9 &gt; and (&gt;O:_ShouldBeConnectedToPowerGrid)
+                        (L:A32NX_LGCIU_2_NOSE_GEAR_DOWNLOCKED, Bool) 1 == (&gt;O:_ShouldBeConnectedToPowerGrid)
                         (O:_ShouldBeConnectedToPowerGrid) sp0
                         2 (&gt;A:BUS LOOKUP INDEX, Number)
                         (A:CIRCUIT CONNECTION ON:17, Bool) l0 != if{ 17 2 (&gt;K:2:ELECTRICAL_BUS_TO_CIRCUIT_CONNECTION_TOGGLE) }
@@ -1833,7 +1833,7 @@
 
                 <!-- PARK BRK EXT LT -->
                 <UseTemplate Name="FBW_Potentiometer_Toggle">
-                    <TOGGLE_CONDITION>(A:GEAR CENTER POSITION, Percent over 100) 1 == (L:A32NX_PARK_BRAKE_LEVER_POS, bool) 1 == and</TOGGLE_CONDITION>
+                    <TOGGLE_CONDITION>(L:A32NX_GEAR_CENTER_POSITION, Percent over 100) 1 == (L:A32NX_PARK_BRAKE_LEVER_POS, bool) 1 == and</TOGGLE_CONDITION>
                     <TOGGLE_REQUISITE>(L:A32NX_ELEC_DC_GND_FLT_SVC_BUS_IS_POWERED, Bool)</TOGGLE_REQUISITE>
                     <POTENTIOMETER>99</POTENTIOMETER>
                 </UseTemplate>
diff --git a/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/runway.FLT b/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/runway.FLT
index 2efba7cf4971..6458c7ecefa7 100644
--- a/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/runway.FLT
+++ b/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/runway.FLT
@@ -273,6 +273,7 @@ A32NX_SWITCH_ATC_ALT = 1
 A32NX_GEAR_CENTER_POSITION = 100
 A32NX_GEAR_LEFT_POSITION = 100
 A32NX_GEAR_RIGHT_POSITION = 100
+A32NX_GEAR_LEVER_POSITION_REQUEST = 1
 
 [Gauges.0]
 KollsmanSetting=29.921342849731445313
diff --git a/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/sound/sound.xml b/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/sound/sound.xml
index 26144679aaf3..55f6eaca4534 100644
--- a/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/sound/sound.xml
+++ b/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/sound/sound.xml
@@ -643,11 +643,11 @@
             <WwiseRTPC LocalVar="A32NX_COCKPIT_DOOR_LOCKED" Units="bool" Index="1" RTPCName="LOCALVAR_A32NX_COCKPIT_DOOR_LOCKED" />
         </Sound>
 
-        <Sound WwiseData="true" WwiseEvent="gearleverclick" Continuous="false" NodeName="PEDALS_LEFT" ViewPoint="Inside" SimVar="GEAR HANDLE POSITION" Units="BOOLEAN" Index="0">
+        <Sound WwiseData="true" WwiseEvent="gearleverclick" Continuous="false" NodeName="PEDALS_LEFT" ViewPoint="Inside" LocalVar="A32NX_GEAR_HANDLE_POSITION">
             <Range LowerBound="1" />
         </Sound>
 
-        <Sound WwiseData="true" WwiseEvent="gearleverclick" Continuous="false" NodeName="PEDALS_LEFT" ViewPoint="Inside" SimVar="GEAR HANDLE POSITION" Units="BOOLEAN" Index="0">
+        <Sound WwiseData="true" WwiseEvent="gearleverclick" Continuous="false" NodeName="PEDALS_LEFT" ViewPoint="Inside" LocalVar="A32NX_GEAR_HANDLE_POSITION">
             <Range UpperBound="0" />
         </Sound>
 
diff --git a/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/taxi.flt b/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/taxi.flt
index cff4feae742c..236c68c33027 100644
--- a/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/taxi.flt
+++ b/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/taxi.flt
@@ -256,6 +256,7 @@ A32NX_SWITCH_ATC_ALT = 1
 A32NX_GEAR_CENTER_POSITION = 100
 A32NX_GEAR_LEFT_POSITION = 100
 A32NX_GEAR_RIGHT_POSITION = 100
+A32NX_GEAR_LEVER_POSITION_REQUEST = 1
 
 [Gauges.0]
 KollsmanSetting=29.921342849731445313
diff --git a/flybywire-aircraft-a320-neo/html_ui/Pages/A32NX_Core/A32NX_BrakeTemp.js b/flybywire-aircraft-a320-neo/html_ui/Pages/A32NX_Core/A32NX_BrakeTemp.js
index 8e8aca62c1a0..e852e685e67a 100644
--- a/flybywire-aircraft-a320-neo/html_ui/Pages/A32NX_Core/A32NX_BrakeTemp.js
+++ b/flybywire-aircraft-a320-neo/html_ui/Pages/A32NX_Core/A32NX_BrakeTemp.js
@@ -82,9 +82,9 @@ class A32NX_BrakeTemp {
                 SimVar.GetSimVarValue("L:A32NX_REPORTED_BRAKE_TEMPERATURE_4", "celsius")
             ];
         }
-        const GearLeftPosition = SimVar.GetSimVarValue("GEAR LEFT POSITION", "Percent Over 100");
+        const GearLeftPosition = SimVar.GetSimVarValue("L:A32NX_GEAR_LEFT_POSITION", "Percent Over 100");
         const GearLeftExtended = GearLeftPosition >= 0.25;
-        const GearRightExtended = SimVar.GetSimVarValue("GEAR RIGHT POSITION", "Percent Over 100") >= 0.25;
+        const GearRightExtended = SimVar.GetSimVarValue("L:A32NX_GEAR_RIGHT_POSITION", "Percent Over 100") >= 0.25;
         const currentBrakeFanState = SimVar.GetSimVarValue("L:A32NX_BRAKE_FAN", "Bool");
         const brakeFanButtonIsPressed = SimVar.GetSimVarValue("L:A32NX_BRAKE_FAN_BTN_PRESSED", "Bool");
         // if the fan button is pressed down and the left main gear is down and locked, the fan is on
diff --git a/flybywire-aircraft-a320-neo/html_ui/Pages/A32NX_Core/A32NX_LocalVarUpdater.js b/flybywire-aircraft-a320-neo/html_ui/Pages/A32NX_Core/A32NX_LocalVarUpdater.js
index 7be23073f2bb..c3386c7ab73d 100644
--- a/flybywire-aircraft-a320-neo/html_ui/Pages/A32NX_Core/A32NX_LocalVarUpdater.js
+++ b/flybywire-aircraft-a320-neo/html_ui/Pages/A32NX_Core/A32NX_LocalVarUpdater.js
@@ -65,7 +65,7 @@ class A32NX_LocalVarUpdater {
     }
 
     _noSmokingMemoSelector() {
-        const gearPercent = SimVar.GetSimVarValue("GEAR CENTER POSITION", "Percent");
+        const gearPercent = SimVar.GetSimVarValue("L:A32NX_GEAR_CENTER_POSITION", "Percent");
         const noSmokingSwitch = SimVar.GetSimVarValue("L:XMLVAR_SWITCH_OVHD_INTLT_NOSMOKING_Position", "Position");
 
         // Switch is ON
diff --git a/flybywire-aircraft-a320-neo/html_ui/Pages/VCockpit/Instruments/NavSystems/A320_Neo/A32NX_NavSystem.js b/flybywire-aircraft-a320-neo/html_ui/Pages/VCockpit/Instruments/NavSystems/A320_Neo/A32NX_NavSystem.js
index 93bca47db7e4..73e07f550a5e 100644
--- a/flybywire-aircraft-a320-neo/html_ui/Pages/VCockpit/Instruments/NavSystems/A320_Neo/A32NX_NavSystem.js
+++ b/flybywire-aircraft-a320-neo/html_ui/Pages/VCockpit/Instruments/NavSystems/A320_Neo/A32NX_NavSystem.js
@@ -2824,7 +2824,7 @@ class Warnings extends NavSystemElement {
         return this.linearMultiPointsEvaluation(this.pullUp_sinkRate_Points, descentRate, height) == 2;
     }
     landingGearCallback() {
-        const gear = !SimVar.GetSimVarValue("IS GEAR RETRACTABLE", "Boolean") || SimVar.GetSimVarValue("GEAR HANDLE POSITION", "Boolean");
+        const gear = !SimVar.GetSimVarValue("IS GEAR RETRACTABLE", "Boolean") || SimVar.GetSimVarValue("L:A32NX_GEAR_HANDLE_POSITION", "Percent over 100") > 0.5;
         const throttle = SimVar.GetSimVarValue("L:A32NX_AUTOTHRUST_TLA:1", "number");
         const flaps = SimVar.GetSimVarValue("L:A32NX_FLAPS_HANDLE_INDEX", "number");
         return !gear && (flaps > 1 || (throttle == 0));
diff --git a/src/behavior/src/A32NX_Interior_Handling.xml b/src/behavior/src/A32NX_Interior_Handling.xml
index 59f425998359..004d54bf8eaa 100644
--- a/src/behavior/src/A32NX_Interior_Handling.xml
+++ b/src/behavior/src/A32NX_Interior_Handling.xml
@@ -542,6 +542,47 @@
         </Component>
     </Template>
 
+<Template Name="FBW_HANDLING_Gear_Lever_Template">
+        <DefaultTemplateParameters>
+            <TOOLTIPID>TT_Package.LANDING_GEAR_LEVER_GEAR_TITLE</TOOLTIPID>
+            <ANIM_NAME>lever_landing_gear</ANIM_NAME>
+            <NODE_ID>LEVER_LANDINGGEAR</NODE_ID>
+            <PART_ID>LEVER_LANDINGGEAR</PART_ID>
+            <ANIM_LAG>0</ANIM_LAG>
+            <DRAG_MIN_VALUE>0</DRAG_MIN_VALUE>
+            <DRAG_MAX_VALUE>100</DRAG_MAX_VALUE>
+            <DRAG_DELTA>0.001</DRAG_DELTA>
+            <DRAG_SPEED>0.03</DRAG_SPEED>
+            <LEFT_SINGLE_CODE>
+                (L:A32NX_GEAR_HANDLE_POSITION, Number) 0.95 &gt; if{
+                    (&gt;K:GEAR_UP)
+                } els{
+                    (&gt;K:GEAR_DOWN)
+                }
+            </LEFT_SINGLE_CODE>
+            <LEFT_RELEASE_CODE>
+                (L:A32NX_GEAR_LEVER_LOCKED, Boolean) 1 ==  if{
+                    (&gt;K:GEAR_DOWN)
+                }
+            </LEFT_RELEASE_CODE>
+            <DRAG_CODE>
+
+            </DRAG_CODE>
+        </DefaultTemplateParameters>
+
+        <Component ID="#NODE_ID#" Node="#NODE_ID#">
+            <UseTemplate Name="ASOBO_GT_Lever_DraggingYAxis_Code">
+                <ANIM_LENGTH>3</ANIM_LENGTH>
+                <ANIM_CODE>
+                        (L:A32NX_GEAR_HANDLE_POSITION, Percent) 3 *
+                </ANIM_CODE>
+                <UP_CODE>  (&gt;K:GEAR_UP)</UP_CODE>
+                <DOWN_CODE> (&gt;K:GEAR_DOWN)</DOWN_CODE>
+            </UseTemplate>
+        </Component>
+    </Template>
+
+
     <Template Name="FBW_HANDLING_Indicator_ElevatorTrim_Template">
 		<Parameters Type="Default">
 			<ANIM_NAME>HANDLING_Indicator_ElevatorTrim</ANIM_NAME>
diff --git a/src/behavior/src/A32NX_Interior_Misc.xml b/src/behavior/src/A32NX_Interior_Misc.xml
index a18eb4c12ed0..7dc7fa2bdc6c 100644
--- a/src/behavior/src/A32NX_Interior_Misc.xml
+++ b/src/behavior/src/A32NX_Interior_Misc.xml
@@ -188,52 +188,6 @@
         </UseTemplate>
     </Template>
 
-    <!-- GEAR LEVER CUSTOM MODEL LOCKED DOWN WITH SIMVAR FROM SYSTEM WASM -->
-    <Template Name="FBW_LANDING_GEAR_Gear_Lever_Template">
-		<Parameters Type="Default">
-			<ANIM_NAME>LANDING_GEAR_Lever_Gear</ANIM_NAME>
-			<PART_ID>LANDING_GEAR_Lever_Gear</PART_ID>
-			<NODE_ID>LANDING_GEAR_Lever_Gear</NODE_ID>
-			<LIGHT_NODE_ID>LANDING_GEAR_Lever_GearLight</LIGHT_NODE_ID>
-			<ANIM_LAG>400</ANIM_LAG>
-			<DRAG_SCALAR>10</DRAG_SCALAR>
-			<TOOLTIP_LANDING_GEAR_TITLE>@TT_Package.LANDING_GEAR_LEVER_GEAR_TITLE</TOOLTIP_LANDING_GEAR_TITLE>
-			<WWISE_EVENT>gear_lever</WWISE_EVENT>
-			<WWISE_EVENT_1>gear_lever_on</WWISE_EVENT_1>
-			<WWISE_EVENT_2>gear_lever_off</WWISE_EVENT_2>
-			<ALWAYS_USE_ANIM_LAG>True</ALWAYS_USE_ANIM_LAG> <!-- Only 2 positions so anim lag during drags is wanted -->
-		</Parameters>
-		<Parameters Type="Override">
-			<TOOLTIP_TITLE>#TOOLTIP_LANDING_GEAR_TITLE#</TOOLTIP_TITLE>
-			<TOOLTIP_ENTRY_0>LANDING_GEAR_Gear</TOOLTIP_ENTRY_0>
-			<UP_CODE>(&gt;B:LANDING_GEAR_Gear_Inc)</UP_CODE>
-			<DOWN_CODE>(&gt;B:LANDING_GEAR_Gear_Dec)</DOWN_CODE>
-		</Parameters>
-		<Parameters Type="Override">
-			<Condition Check="NO_GEARUP_IF_LOCKED">
-				<True>
-					<UP_CODE>(L:A32NX_GEAR_LEVER_LOCKED, Bool) ! if{ #UP_CODE# }</UP_CODE>
-				</True>
-			</Condition>
-		</Parameters>
-
-		<Component ID="#NODE_ID#" Node="#NODE_ID#">
-			<UseInputEvent ID="LANDING_GEAR">
-				<GEAR_ID>1</GEAR_ID>
-			</UseInputEvent>
-			<UseTemplate Name="ASOBO_GT_Lever_DraggingYAxis_Code">
-				<ANIM_CODE>(B:LANDING_GEAR_Gear) 100 *</ANIM_CODE>
-			</UseTemplate>
-		</Component>
-
-		<Condition Check="EMISSIVE_CODE">
-			<Component ID="#LIGHT_NODE_ID#" Node="#LIGHT_NODE_ID#">
-				<UseTemplate Name="ASOBO_GT_Emissive_Gauge">
-					<PART_ID>#LIGHT_NODE_ID#</PART_ID>
-				</UseTemplate>
-			</Component>
-		</Condition>
-	</Template>
 
     <Template Name="FBW_Airbus_Fuel_Pump">
         <UseTemplate Name="FBW_Push_Toggle">
diff --git a/src/instruments/src/EFB/Ground/Pages/Payload/Payload.tsx b/src/instruments/src/EFB/Ground/Pages/Payload/Payload.tsx
index 97d1f23ac694..fdc4ae4c4558 100644
--- a/src/instruments/src/EFB/Ground/Pages/Payload/Payload.tsx
+++ b/src/instruments/src/EFB/Ground/Pages/Payload/Payload.tsx
@@ -753,7 +753,7 @@ export const Payload = () => {
                                     <TooltipWrapper text={t('Ground.Payload.TT.StartBoarding')}>
                                         <button
                                             type="button"
-                                            className={`flex justify-center rounded-lg items-center ml-auto w-24 h-12 
+                                            className={`flex justify-center rounded-lg items-center ml-auto w-24 h-12
                                                         ${boardingStatusClass} bg-current`}
                                             onClick={() => setBoardingStarted(!boardingStarted)}
                                         >
@@ -767,7 +767,7 @@ export const Payload = () => {
                                     <TooltipWrapper text={t('Ground.Payload.TT.StartDeboarding')}>
                                         <button
                                             type="button"
-                                            className={`flex justify-center items-center ml-1 w-16 h-12 text-theme-highlight bg-current rounded-lg 
+                                            className={`flex justify-center items-center ml-1 w-16 h-12 text-theme-highlight bg-current rounded-lg
                                                         ${totalPax === 0 && totalCargo === 0 && 'opacity-20 pointer-events-none'}`}
                                             onClick={() => handleDeboarding()}
                                         >
@@ -789,8 +789,8 @@ export const Payload = () => {
                                 && (
                                     <TooltipWrapper text={t('Ground.Payload.TT.FillPayloadFromSimbrief')}>
                                         <div
-                                            className={`flex justify-center items-center px-2 h-auto text-theme-body 
-                                                       hover:text-theme-highlight bg-theme-highlight hover:bg-theme-body 
+                                            className={`flex justify-center items-center px-2 h-auto text-theme-body
+                                                       hover:text-theme-highlight bg-theme-highlight hover:bg-theme-body
                                                        rounded-md rounded-l-none border-2 border-theme-highlight transition duration-100`}
                                             onClick={setSimBriefValues}
                                         >
diff --git a/src/instruments/src/EWD/elements/PseudoFWC.tsx b/src/instruments/src/EWD/elements/PseudoFWC.tsx
index 9c7a53cde084..c780cc060101 100644
--- a/src/instruments/src/EWD/elements/PseudoFWC.tsx
+++ b/src/instruments/src/EWD/elements/PseudoFWC.tsx
@@ -293,7 +293,7 @@ const PseudoFWC: React.FC = () => {
     // const aircraftOnGround = left1LandingGear === 1 || right1LandingGear === 1;
     // FIXME The landing gear triggers the dual engine failure on loading
     const aircraftOnGround = SimVar.GetSimVarValue('SIM ON GROUND', 'Bool');
-    const [landingGearLeverDown] = useSimVar('GEAR HANDLE POSITION', 'bool', 500);
+    const [landingGearLeverDown] = useSimVar('L:A32NX_GEAR_HANDLE_POSITION', 'bool', 500);
     const [landingLight2Retracted] = useSimVar('L:LANDING_2_Retracted', 'bool', 500);
     const [landingLight3Retracted] = useSimVar('L:LANDING_3_Retracted', 'bool', 500);
     const [autoBrakesArmedMode] = useSimVar('L:A32NX_AUTOBRAKES_ARMED_MODE', 'enum', 500);
diff --git a/src/systems/a320_systems/src/hydraulic/mod.rs b/src/systems/a320_systems/src/hydraulic/mod.rs
index 09f58aa8efe5..1826ee74175d 100644
--- a/src/systems/a320_systems/src/hydraulic/mod.rs
+++ b/src/systems/a320_systems/src/hydraulic/mod.rs
@@ -7675,6 +7675,7 @@ mod tests {
             let mut test_bed = test_bed_on_ground_with()
                 .on_the_ground()
                 .set_cold_dark_inputs()
+                .with_worst_case_ptu()
                 .set_park_brake(false)
                 .start_eng2(Ratio::new::<percent>(80.))
                 .run_one_tick();
@@ -7687,7 +7688,7 @@ mod tests {
 
             // Yellow pressurised by engine2, green presurised from ptu we expect fault LOW press on EDP1
             assert!(test_bed.is_yellow_pressure_switch_pressurised());
-            assert!(test_bed.yellow_pressure() > Pressure::new::<psi>(2800.));
+            assert!(test_bed.yellow_pressure() > Pressure::new::<psi>(2500.));
             assert!(test_bed.is_green_pressure_switch_pressurised());
             assert!(test_bed.green_pressure() > Pressure::new::<psi>(2300.));
             assert!(test_bed.is_green_edp_press_low());
diff --git a/src/systems/a320_systems_wasm/src/gear.rs b/src/systems/a320_systems_wasm/src/gear.rs
index cebf2865ccc2..8f8a5b3a3bc7 100644
--- a/src/systems/a320_systems_wasm/src/gear.rs
+++ b/src/systems/a320_systems_wasm/src/gear.rs
@@ -4,17 +4,16 @@ use msfs::sim_connect;
 use msfs::{sim_connect::SimConnect, sim_connect::SIMCONNECT_OBJECT_ID_USER};
 
 use systems_wasm::aspects::{
-    EventToVariableMapping, MsfsAspectBuilder, ObjectWrite, VariableToEventMapping,
-    VariableToEventWriteOn, VariablesToObject,
+    EventToVariableMapping, MsfsAspectBuilder, ObjectWrite, VariablesToObject,
 };
 use systems_wasm::{set_data_on_sim_object, Variable};
 
 pub(super) fn gear(builder: &mut MsfsAspectBuilder) -> Result<(), Box<dyn Error>> {
     // Read gear demand from all sim sim events and mask them
-    let gear_set_set_event_id = builder.event_to_variable(
+    builder.event_to_variable(
         "GEAR_SET",
         EventToVariableMapping::EventDataRaw,
-        Variable::aspect("GEAR_LEVER_POSITION_REQUEST"),
+        Variable::named("GEAR_LEVER_POSITION_REQUEST"),
         |options| options.mask(),
     )?;
 
@@ -29,37 +28,30 @@ pub(super) fn gear(builder: &mut MsfsAspectBuilder) -> Result<(), Box<dyn Error>
                 }
             },
         ),
-        Variable::aspect("GEAR_LEVER_POSITION_REQUEST"),
+        Variable::named("GEAR_LEVER_POSITION_REQUEST"),
         |options| options.mask(),
     )?;
 
     builder.event_to_variable(
         "GEAR_UP",
         EventToVariableMapping::Value(0.),
-        Variable::aspect("GEAR_LEVER_POSITION_REQUEST"),
+        Variable::named("GEAR_LEVER_POSITION_REQUEST"),
         |options| options.mask(),
     )?;
 
     builder.event_to_variable(
         "GEAR_DOWN",
         EventToVariableMapping::Value(1.),
-        Variable::aspect("GEAR_LEVER_POSITION_REQUEST"),
+        Variable::named("GEAR_LEVER_POSITION_REQUEST"),
         |options| options.mask(),
     )?;
 
-    // Feedback the gear event to the sim
-    builder.variable_to_event_id(
-        Variable::aspect("GEAR_HANDLE_POSITION"),
-        VariableToEventMapping::EventDataRaw,
-        VariableToEventWriteOn::Change,
-        gear_set_set_event_id,
-    );
-
     // GEAR POSITION FEEDBACK TO SIM
     builder.variables_to_object(Box::new(GearPosition {
         nose_position: 1.,
         left_position: 1.,
         right_position: 1.,
+        gear_handle_position: 1.,
     }));
 
     Ok(())
@@ -78,6 +70,10 @@ struct GearPosition {
     #[name = "GEAR RIGHT POSITION"]
     #[unit = "Percent over 100"]
     right_position: f64,
+
+    #[name = "GEAR HANDLE POSITION"]
+    #[unit = "Percent over 100"]
+    gear_handle_position: f64,
 }
 
 impl VariablesToObject for GearPosition {
@@ -86,13 +82,30 @@ impl VariablesToObject for GearPosition {
             Variable::named("GEAR_CENTER_POSITION"),
             Variable::named("GEAR_LEFT_POSITION"),
             Variable::named("GEAR_RIGHT_POSITION"),
+            Variable::named("GEAR_DOOR_CENTER_POSITION"),
+            Variable::named("GEAR_DOOR_LEFT_POSITION"),
+            Variable::named("GEAR_DOOR_RIGHT_POSITION"),
         ]
     }
 
     fn write(&mut self, values: Vec<f64>) -> ObjectWrite {
-        self.nose_position = values[0] / 100.;
-        self.left_position = values[1] / 100.;
-        self.right_position = values[2] / 100.;
+        const GEAR_POSITION_FOR_FAKE_DOOR_DRAG: f64 = 0.10;
+
+        let gear_deployed = values[0] > 5. || values[1] > 5. || values[2] > 5.;
+        let door_opened = values[3] > 10. || values[4] > 10. || values[5] > 10.;
+
+        // If doors are deployed we fake gear going down a bit to get some door drag effect from the sim
+        if door_opened && !gear_deployed {
+            self.nose_position = (values[3] / 100.).min(GEAR_POSITION_FOR_FAKE_DOOR_DRAG);
+            self.left_position = (values[4] / 100.).min(GEAR_POSITION_FOR_FAKE_DOOR_DRAG);
+            self.right_position = (values[5] / 100.).min(GEAR_POSITION_FOR_FAKE_DOOR_DRAG);
+        } else {
+            self.nose_position = values[0] / 100.;
+            self.left_position = values[1] / 100.;
+            self.right_position = values[2] / 100.;
+        }
+
+        self.gear_handle_position = if gear_deployed { 1. } else { 0. };
 
         ObjectWrite::default()
     }
diff --git a/src/systems/systems/src/landing_gear/mod.rs b/src/systems/systems/src/landing_gear/mod.rs
index 63418d5dc7a9..e4a7eeadbd9f 100644
--- a/src/systems/systems/src/landing_gear/mod.rs
+++ b/src/systems/systems/src/landing_gear/mod.rs
@@ -329,10 +329,10 @@ struct LandingGearControlCoordinator {
     previous_gear_handle_is_down: bool,
 }
 impl LandingGearControlCoordinator {
-    fn new() -> Self {
+    fn new(context: &mut InitContext) -> Self {
         Self {
             active_lgciu_id: LgciuId::Lgciu1,
-            previous_gear_handle_is_down: true,
+            previous_gear_handle_is_down: context.start_gear_down(),
         }
     }
 
@@ -395,7 +395,7 @@ impl LandingGearControlInterfaceUnitSet {
     ) -> Self {
         Self {
             gear_handle_baulk_lock_id: context.get_identifier("GEAR_LEVER_LOCKED".to_owned()),
-            coordinator: LandingGearControlCoordinator::new(),
+            coordinator: LandingGearControlCoordinator::new(context),
             lgcius: [
                 LandingGearControlInterfaceUnit::new(context, LgciuId::Lgciu1, lgciu1_powered_by),
                 LandingGearControlInterfaceUnit::new(context, LgciuId::Lgciu2, lgciu2_powered_by),
@@ -437,6 +437,7 @@ impl LandingGearControlInterfaceUnitSet {
         );
 
         self.gear_handle_unit.update(
+            context,
             &self.lgcius[LgciuId::Lgciu1 as usize],
             &self.lgcius[LgciuId::Lgciu2 as usize],
         );
@@ -492,11 +493,22 @@ impl LandingGearHandle for LandingGearControlInterfaceUnitSet {
 struct LandingGearHandleUnit {
     gear_handle_real_position_id: VariableIdentifier,
     gear_handle_position_requested_id: VariableIdentifier,
+    gear_handle_hits_lock_sound_id: VariableIdentifier,
 
-    is_lever_down: bool,
     lever_should_lock_down: bool,
+
+    lever_position: Ratio,
+    lever_commanded_down: bool,
+
+    lever_just_hit_lock_sound: bool,
 }
 impl LandingGearHandleUnit {
+    const GEAR_LEVER_SPEED_PERCENT_PER_S: f64 = 180.;
+
+    const GEAR_LEVER_MAX_LOCK_POSITION: f64 = 0.95;
+
+    const GEAR_LEVER_UP_DOWN_DETECTION_POSITION: f64 = 0.5;
+
     fn new(context: &mut InitContext) -> Self {
         let init_gear_down = context.start_gear_down();
 
@@ -504,20 +516,71 @@ impl LandingGearHandleUnit {
             gear_handle_real_position_id: context.get_identifier("GEAR_HANDLE_POSITION".to_owned()),
             gear_handle_position_requested_id: context
                 .get_identifier("GEAR_LEVER_POSITION_REQUEST".to_owned()),
+            gear_handle_hits_lock_sound_id: context
+                .get_identifier("GEAR_HANDLE_HITS_LOCK_SOUND".to_owned()),
 
-            is_lever_down: init_gear_down,
             lever_should_lock_down: init_gear_down,
+
+            lever_position: if init_gear_down {
+                Ratio::new::<ratio>(1.)
+            } else {
+                Ratio::new::<ratio>(0.)
+            },
+
+            lever_commanded_down: init_gear_down,
+
+            lever_just_hit_lock_sound: false,
         }
     }
 
-    fn update(&mut self, lgciu1: &impl LandingGearHandle, lgciu2: &impl LandingGearHandle) {
+    fn update(
+        &mut self,
+        context: &UpdateContext,
+        lgciu1: &impl LandingGearHandle,
+        lgciu2: &impl LandingGearHandle,
+    ) {
         self.lever_should_lock_down =
-            lgciu1.gear_handle_baulk_locked() && lgciu2.gear_handle_baulk_locked()
+            lgciu1.gear_handle_baulk_locked() && lgciu2.gear_handle_baulk_locked();
+
+        self.update_position(context);
+    }
+
+    fn update_position(&mut self, context: &UpdateContext) {
+        let previous_position = self.lever_position;
+
+        if self.lever_commanded_down {
+            self.lever_position += Ratio::new::<percent>(
+                Self::GEAR_LEVER_SPEED_PERCENT_PER_S * context.delta_as_secs_f64(),
+            );
+        } else {
+            let could_hit_lock_mechanism_after_update = self.lever_position.get::<ratio>()
+                >= Self::GEAR_LEVER_MAX_LOCK_POSITION
+                && self.lever_should_lock_down;
+
+            self.lever_position -= Ratio::new::<percent>(
+                Self::GEAR_LEVER_SPEED_PERCENT_PER_S * context.delta_as_secs_f64(),
+            );
+
+            if could_hit_lock_mechanism_after_update {
+                self.lever_position = self
+                    .lever_position
+                    .max(Ratio::new::<ratio>(Self::GEAR_LEVER_MAX_LOCK_POSITION));
+            }
+        }
+
+        self.lever_position = self
+            .lever_position
+            .max(Ratio::new::<ratio>(0.))
+            .min(Ratio::new::<ratio>(1.));
+
+        self.lever_just_hit_lock_sound = previous_position.get::<ratio>()
+            > Self::GEAR_LEVER_MAX_LOCK_POSITION
+            && self.lever_position == Ratio::new::<ratio>(Self::GEAR_LEVER_MAX_LOCK_POSITION);
     }
 }
 impl LandingGearHandle for LandingGearHandleUnit {
     fn gear_handle_is_down(&self) -> bool {
-        self.is_lever_down
+        self.lever_position.get::<ratio>() >= Self::GEAR_LEVER_UP_DOWN_DETECTION_POSITION
     }
 
     fn gear_handle_baulk_locked(&self) -> bool {
@@ -526,16 +589,20 @@ impl LandingGearHandle for LandingGearHandleUnit {
 }
 impl SimulationElement for LandingGearHandleUnit {
     fn read(&mut self, reader: &mut SimulatorReader) {
-        let lever_down_raw: bool = reader.read(&self.gear_handle_position_requested_id);
-
-        self.is_lever_down = lever_down_raw || (self.lever_should_lock_down && self.is_lever_down);
+        let lever_down_req_raw: bool = reader.read(&self.gear_handle_position_requested_id);
+        self.lever_commanded_down = lever_down_req_raw;
     }
 
     fn write(&self, writer: &mut SimulatorWriter) {
-        writer.write(&self.gear_handle_real_position_id, self.is_lever_down);
+        writer.write(
+            &self.gear_handle_real_position_id,
+            self.lever_position.get::<ratio>(),
+        );
 
-        // Aligning request on demand so in sim position is always consistent with system state
-        writer.write(&self.gear_handle_position_requested_id, self.is_lever_down);
+        writer.write(
+            &self.gear_handle_hits_lock_sound_id,
+            self.lever_just_hit_lock_sound,
+        );
     }
 }
 
@@ -1301,21 +1368,25 @@ mod tests {
 
         fn in_flight(mut self) -> Self {
             self.set_on_ground(false);
+            self = self.set_gear_handle_up();
             self
         }
 
         fn on_the_ground(mut self) -> Self {
             self.set_on_ground(true);
+            self = self.set_gear_handle_down();
             self
         }
 
         fn set_gear_handle_up(mut self) -> Self {
             self.write_by_name("GEAR_LEVER_POSITION_REQUEST", 0.);
+            self.run_with_delta(Duration::from_millis(1000));
             self
         }
 
         fn set_gear_handle_down(mut self) -> Self {
             self.write_by_name("GEAR_LEVER_POSITION_REQUEST", 1.);
+            self.run_with_delta(Duration::from_millis(1000));
             self
         }
 
@@ -1324,7 +1395,12 @@ mod tests {
         }
 
         fn is_gear_handle_down(&mut self) -> bool {
-            self.read_by_name("GEAR_HANDLE_POSITION")
+            let lever_pos: f64 = self.read_by_name("GEAR_HANDLE_POSITION");
+            lever_pos >= 0.90
+        }
+
+        fn is_gear_lever_lock_makes_sound(&mut self) -> bool {
+            self.read_by_name("GEAR_HANDLE_HITS_LOCK_SOUND")
         }
 
         fn fail_hyd_pressure(&mut self) {
@@ -1404,28 +1480,38 @@ mod tests {
     }
 
     #[test]
-    fn gear_lever_up_and_locked_can_go_down_but_not_up() {
-        let mut test_bed = test_bed_in_flight_with().in_flight().run_one_tick();
+    fn gear_lever_locked_makes_locked_sound_once_when_trying_up() {
+        let mut test_bed = test_bed_on_ground_with().on_the_ground().run_one_tick();
 
-        test_bed = test_bed.set_gear_handle_up().run_one_tick();
+        assert!(test_bed.is_gear_handle_lock_down_active());
+        assert!(test_bed.is_gear_handle_down());
+        assert!(!test_bed.is_gear_lever_lock_makes_sound());
 
-        assert!(!test_bed.is_gear_handle_lock_down_active());
-        assert!(!test_bed.is_gear_handle_down());
+        test_bed = test_bed.on_the_ground().set_gear_handle_up();
 
-        test_bed = test_bed.on_the_ground().set_gear_handle_up().run_one_tick();
+        assert!(test_bed.is_gear_lever_lock_makes_sound());
 
-        assert!(test_bed.is_gear_handle_lock_down_active());
+        // Make sure next ticks sound doesn't play anymore
+        test_bed = test_bed.run_one_tick();
+        assert!(!test_bed.is_gear_lever_lock_makes_sound());
+
+        test_bed = test_bed.run_one_tick();
+        assert!(!test_bed.is_gear_lever_lock_makes_sound());
+    }
+
+    #[test]
+    fn gear_lever_up_and_locked_can_go_down_but_not_up() {
+        let mut test_bed = test_bed_in_flight_with().in_flight().run_one_tick();
+
+        assert!(!test_bed.is_gear_handle_lock_down_active());
         assert!(!test_bed.is_gear_handle_down());
 
-        test_bed = test_bed
-            .on_the_ground()
-            .set_gear_handle_down()
-            .run_one_tick();
+        test_bed = test_bed.on_the_ground().set_gear_handle_down();
 
         assert!(test_bed.is_gear_handle_lock_down_active());
         assert!(test_bed.is_gear_handle_down());
 
-        test_bed = test_bed.on_the_ground().set_gear_handle_up().run_one_tick();
+        test_bed = test_bed.on_the_ground().set_gear_handle_up();
 
         assert!(test_bed.is_gear_handle_lock_down_active());
         assert!(test_bed.is_gear_handle_down());
@@ -1438,8 +1524,6 @@ mod tests {
             .set_gear_handle_down()
             .run_one_tick();
 
-        test_bed = test_bed.run_one_tick();
-
         assert!(!test_bed.is_gear_handle_lock_down_active());
         assert!(test_bed.is_gear_handle_down());
     }
@@ -1453,7 +1537,10 @@ mod tests {
 
     #[test]
     fn gear_up_when_lever_up_down_when_lever_down() {
-        let mut test_bed = test_bed_in_flight_with().in_flight().set_gear_handle_down();
+        let mut test_bed = test_bed_in_flight_with()
+            .in_flight()
+            .set_gear_handle_down()
+            .run_one_tick();
 
         for _ in 0..2 {
             test_bed.run_without_delta();
@@ -1462,7 +1549,7 @@ mod tests {
         assert!(test_bed.query(|a| a.lgcius.gear_system_state()) == GearSystemState::AllDownLocked);
 
         println!("GEAR UP!!");
-        test_bed = test_bed.set_gear_handle_up();
+        test_bed = test_bed.set_gear_handle_up().run_one_tick();
 
         for _ in 0..30 {
             test_bed.run_without_delta();
@@ -1471,7 +1558,8 @@ mod tests {
         assert!(test_bed.query(|a| a.lgcius.gear_system_state()) == GearSystemState::AllUpLocked);
 
         // Gear DOWN
-        test_bed = test_bed.set_gear_handle_down();
+        test_bed = test_bed.set_gear_handle_down().run_one_tick();
+
         for _ in 0..30 {
             test_bed.run_without_delta();
         }
@@ -1489,12 +1577,15 @@ mod tests {
         assert!(test_bed.query(|a| a.lgcius.active_lgciu_id()) == LgciuId::Lgciu1);
 
         test_bed = test_bed.set_gear_handle_up().run_one_tick();
+
         assert!(test_bed.query(|a| a.lgcius.active_lgciu_id()) == LgciuId::Lgciu2);
 
         test_bed = test_bed.set_gear_handle_down().run_one_tick();
+
         assert!(test_bed.query(|a| a.lgcius.active_lgciu_id()) == LgciuId::Lgciu2);
 
         test_bed = test_bed.set_gear_handle_up().run_one_tick();
+
         assert!(test_bed.query(|a| a.lgcius.active_lgciu_id()) == LgciuId::Lgciu1);
     }