From 4f2a7c4ee537e52f859bdf668bff03a8293dbe97 Mon Sep 17 00:00:00 2001
From: Michael Corcoran <tracer@outlook.co.nz>
Date: Sun, 12 Feb 2023 01:23:13 +1300
Subject: [PATCH] fix(lg): nose gear park brake light

---
 .../FlyByWire_A320_NEO/model/A320_NEO.xml     | 10 +++++++
 .../model/A320_NEO_INTERIOR.xml               |  7 -----
 fbw-a32nx/src/behavior/src/A32NX_Exterior.xml | 25 ++++++++++++++++++
 .../behavior/src/A32NX_Interior_Generics.xml  | 26 -------------------
 4 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/fbw-a32nx/src/base/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/model/A320_NEO.xml b/fbw-a32nx/src/base/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/model/A320_NEO.xml
index 9149db698f3..a477ed94e40 100644
--- a/fbw-a32nx/src/base/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/model/A320_NEO.xml
+++ b/fbw-a32nx/src/base/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/model/A320_NEO.xml
@@ -222,6 +222,16 @@
                 <ANIM_CODE>(L:A32NX_NOSE_WHEEL_POSITION)</ANIM_CODE>
                 <ANIM_LENGTH>1</ANIM_LENGTH>
             </UseTemplate>
+            <!-- PARK BRK EXT LT -->
+            <Component ID="Ext_Park_Brake_Light">
+                <UseTemplate Name="FBW_Potentiometer_Toggle">
+                    <!-- FIXME should also get a discrete from the hydraulic valve limit switch -->
+                    <TOGGLE_CONDITION>(L:A32NX_PARK_BRAKE_LEVER_POS, bool) 1 ==</TOGGLE_CONDITION>
+                    <!-- C/B 70GG (121VU M36) fed from 601PP -->
+                    <TOGGLE_REQUISITE>(L:A32NX_ELEC_DC_GND_FLT_SVC_BUS_IS_POWERED, Bool)</TOGGLE_REQUISITE>
+                    <POTENTIOMETER>99</POTENTIOMETER>
+                </UseTemplate>
+            </Component>
         </Component>
         <Component ID="ENGINE">
             <UseTemplate Name="A32NX_ENGINE_Turbine_Template">
diff --git a/fbw-a32nx/src/base/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/model/A320_NEO_INTERIOR.xml b/fbw-a32nx/src/base/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/model/A320_NEO_INTERIOR.xml
index c913401601d..a4e72e093fd 100644
--- a/fbw-a32nx/src/base/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/model/A320_NEO_INTERIOR.xml
+++ b/fbw-a32nx/src/base/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/model/A320_NEO_INTERIOR.xml
@@ -2142,13 +2142,6 @@
                     </UseTemplate>
                 </Component>
 
-                <!-- PARK BRK EXT LT -->
-                <UseTemplate Name="FBW_Potentiometer_Toggle">
-                    <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>
-
                 <!-- CPT DOME LT -->
                 <UseTemplate Name="ASOBO_LIGHTING_Cabin_Emissive_Template">
                     <NODE_ID>LIGHTS_Overhead_L</NODE_ID>
diff --git a/fbw-a32nx/src/behavior/src/A32NX_Exterior.xml b/fbw-a32nx/src/behavior/src/A32NX_Exterior.xml
index be4cfc23668..0d44d391b0c 100644
--- a/fbw-a32nx/src/behavior/src/A32NX_Exterior.xml
+++ b/fbw-a32nx/src/behavior/src/A32NX_Exterior.xml
@@ -268,4 +268,29 @@
         </Component>
     </Template>
 
+    <!--
+    Template for toggling of light potentiometers that not are bound to a specific lightdef.Type.
+    Needs a condition, requisite and a potentiometer to toggle.
+
+    Main Parameters:
+            - SYNC_FREQUENCY        Default: 1          Speed of update loop, N per second.
+            - TOGGLE_CONDITION      <Boolean>           The condition to trigger a toggle.
+            - TOGGLE_REQUISITE      <Boolean>           The required powered BUS for potentiometer.
+            - POTENTIOMETER         <Number>            The potentiometer index # to toggle.
+    -->
+    <Template Name="FBW_Potentiometer_Toggle">
+        <DefaultTemplateParameters>
+            <SYNC_FREQUENCY>1</SYNC_FREQUENCY>
+            <TOGGLE_REQUISITE></TOGGLE_REQUISITE>
+            <TOGGLE_CONDITION></TOGGLE_CONDITION>
+        </DefaultTemplateParameters>
+
+        <UseTemplate Name="ASOBO_GT_Update">
+            <FREQUENCY>#SYNC_FREQUENCY#</FREQUENCY>
+            <UPDATE_CODE>
+                #TOGGLE_REQUISITE# #TOGGLE_CONDITION# and 100 * #POTENTIOMETER# (&gt;K:2:LIGHT_POTENTIOMETER_SET)
+            </UPDATE_CODE>
+        </UseTemplate>
+    </Template>
+
 </ModelBehaviors>
diff --git a/fbw-a32nx/src/behavior/src/A32NX_Interior_Generics.xml b/fbw-a32nx/src/behavior/src/A32NX_Interior_Generics.xml
index 29f9267016e..ab74d2cc3ba 100644
--- a/fbw-a32nx/src/behavior/src/A32NX_Interior_Generics.xml
+++ b/fbw-a32nx/src/behavior/src/A32NX_Interior_Generics.xml
@@ -751,32 +751,6 @@
     </Template>
 
 
-    <!--
-    Template for toggling of light potentiometers that not are bound to a specific lightdef.Type.
-    Needs a condition, requisite and a potentiometer to toggle.
-
-    Main Parameters:
-            - SYNC_FREQUENCY        Default: 1          Speed of update loop, N per second.
-            - TOGGLE_CONDITION      <Boolean>           The condition to trigger a toggle.
-            - TOGGLE_REQUISITE      <Boolean>           The required powered BUS for potentiometer.
-            - POTENTIOMETER         <Number>            The potentiometer index # to toggle.
-    -->
-    <Template Name="FBW_Potentiometer_Toggle">
-        <DefaultTemplateParameters>
-            <SYNC_FREQUENCY>1</SYNC_FREQUENCY>
-            <TOGGLE_REQUISITE></TOGGLE_REQUISITE>
-            <TOGGLE_CONDITION></TOGGLE_CONDITION>
-        </DefaultTemplateParameters>
-
-        <UseTemplate Name="ASOBO_GT_Update">
-            <FREQUENCY>#SYNC_FREQUENCY#</FREQUENCY>
-            <UPDATE_CODE>
-                #TOGGLE_REQUISITE# #TOGGLE_CONDITION# and 100 * #POTENTIOMETER# (&gt;K:2:LIGHT_POTENTIOMETER_SET)
-            </UPDATE_CODE>
-        </UseTemplate>
-    </Template>
-
-
     <!--
     Wrapper utility template for animation interaction speeds allowing
     for control of all button, switches and korry's from one place.