feat(a380x/fws): ECAM abnormal procedures: Iteration 2

.github/CHANGELOG.md

@@ -100,6 +100,7 @@
 1. [ELEC] Improved elec system startup behaviour - @Gurgel100 (Pascal) - @saschl
 1. [A380X] Improve pilot and copilot camera positions - @heclak (Heclak)
 1. [A380X/EFIS] Illuminate ND range and mode selectors during light test - @BravoMike99 (bruno_pt99)
+1. [A380X/FWS] Add support for deferred procedures, abnormal (non-)sensed procedures - @flogross89 (floridude)
 1. [A380/PFD] Add DISCONNECT AP FOR LDG FMA message - @BravoMike99 (bruno_pt99)
 1. [A380X/ENG] Adjust climb thrust to be more accurate - @BlueberryKing (BlueberryKing)
 1. [A380X/EWD] Show THR limit in EWD instead of N1 - @flogross89 (floridude)

fbw-a380x/README.md

@@ -86,13 +86,10 @@ This list is divided into standardized ATA chapters, if there are no noteworthy
 - Vertical Display: Only fixed vertical range (until FL240) w/o FMS trajectory
 - Independent QNH
 - KCCU soft keyboard
-- ECAM abnormal sensed: No navigation up/down, only CLEAR selectable for manual completion
-- ECAM: Abnormal non-sensed procedures
-- ECAM Deferred procedures
-- ECAM ABN secondary failures
 - ECAM: Completely accurate STS page implementation
 - ECAM: AUTO RCL
 - ECAM: Correct behavior of RCL / RCL LAST
+- ECAM: Time limited failures
 - Video: ETACS due to sim limitation
 - Latest FMA indications for landing modes (e.g. LAND3 instead of CAT3)
 - SD VIDEO page

fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/A380_COCKPIT.xml

@@ -35,6 +35,7 @@
         <Include RelativeFile="behaviour\overhead\cargo-air-cond.xml" />
         <Include RelativeFile="behaviour\overhead\fire.xml" />
         <Include RelativeFile="behaviour\overhead\flight-control.xml" />
+        <Include RelativeFile="behaviour\overhead\reset.xml" />
         <Include RelativeFile="behaviour\pedestal\pedestal-inputs.xml" />
         <Include RelativeFile="behaviour\door_animations.xml" />
         <Include RelativeFile="behaviour\efis-cp.xml" />
@@ -4979,6 +4980,15 @@
                         <SEQ2_CODE_DRIVES_VISIBILITY>False</SEQ2_CODE_DRIVES_VISIBILITY>
                     </UseTemplate>
                 </Component>
+
+                <Component ID="Overhead_Reset_Left">
+                    <UseTemplate Name="FBW_Airbus_RESET_PANEL_BUTTON">
+                        <COMPONENT>FWS1</COMPONENT>
+                    </UseTemplate>
+                    <UseTemplate Name="FBW_Airbus_RESET_PANEL_BUTTON">
+                        <COMPONENT>FWS2</COMPONENT>
+                    </UseTemplate>
+                </Component>
             </Component>
 
             <CameraTitle>OverheadLower</CameraTitle>

fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/behaviour/ecam-cp.xml

@@ -27,10 +27,12 @@
             <SEQ1_CODE_DRIVES_VISIBILITY>False</SEQ1_CODE_DRIVES_VISIBILITY>
             <SEQ1_POWERED>(L:A32NX_ELEC_DC_1_BUS_IS_POWERED, Bool)</SEQ1_POWERED>
             <POTENTIOMETER_SEQ1>85</POTENTIOMETER_SEQ1>
+            <SEQ1_EMISSIVE_CODE>(L:A32NX_ELEC_DC_1_BUS_IS_POWERED, Bool)</SEQ1_EMISSIVE_CODE>
 
             <SEQ2_EMISSIVE_DRIVES_VISIBILITY>False</SEQ2_EMISSIVE_DRIVES_VISIBILITY>
             <SEQ2_CODE_DRIVES_VISIBILITY>False</SEQ2_CODE_DRIVES_VISIBILITY>
             <SEQ2_POWERED>(L:A32NX_ELEC_DC_ESS_BUS_IS_POWERED, Bool)</SEQ2_POWERED>
+            <SEQ2_EMISSIVE_CODE>(L:A32NX_ELEC_DC_ESS_BUS_IS_POWERED, Bool)</SEQ2_EMISSIVE_CODE>
 
             <!-- Internal -->
             <STATE_SIMVAR>L:A32NX_ECAM_SD_CURRENT_PAGE_INDEX</STATE_SIMVAR>
@@ -39,6 +41,10 @@
         <UseTemplate Name="ASOBO_GT_Push_Button_Airliner">
             <ANIM_NAME>#NODE_ID#</ANIM_NAME>
             <LEFT_SINGLE_CODE>
+                (L:A32NX_FWS_ECP_FAILED, Bool) #STATE_ID# 14 != and if{
+                    quit
+                }
+
                 (#STATE_SIMVAR#) #STATE_ID# != if{
                     #STATE_ID# (&gt;#STATE_SIMVAR#)
                 } els{
@@ -54,18 +60,26 @@
     <Template Name="FBW_ECAM_BUTTON_SubTemplate">
         <DefaultTemplateParameters>
             <NODE_ID>PUSH_ECAM_#BASE_NAME#</NODE_ID>
-            <ANIM_NAME_BUTTON>PUSH_ECAM_#BASE_NAME#</ANIM_NAME_BUTTON>
-            <BACKLIGHT_NODE_ID>PUSH_ECAM_#BASE_NAME#_SEQ1</BACKLIGHT_NODE_ID>
             <WWISE_EVENT_1>mcdubuttons</WWISE_EVENT_1>
-            <NORMALIZED_TIME_1>0.1</NORMALIZED_TIME_1>
             <WWISE_EVENT_2>mcdubuttons</WWISE_EVENT_2>
+            <NORMALIZED_TIME_1>0.1</NORMALIZED_TIME_1>
             <NORMALIZED_TIME_2>0.5</NORMALIZED_TIME_2>
-            <SEQ2_POWERED>1</SEQ2_POWERED>
+
+            <SEQ1_EMISSIVE_DRIVES_VISIBILITY>False</SEQ1_EMISSIVE_DRIVES_VISIBILITY>
+            <SEQ1_CODE_DRIVES_VISIBILITY>False</SEQ1_CODE_DRIVES_VISIBILITY>
+            <SEQ1_POWERED>(L:A32NX_ELEC_DC_1_BUS_IS_POWERED, Bool)</SEQ1_POWERED>
+            <POTENTIOMETER_SEQ1>85</POTENTIOMETER_SEQ1>
+            <SEQ1_EMISSIVE_CODE>(L:A32NX_ELEC_DC_1_BUS_IS_POWERED, Bool)</SEQ1_EMISSIVE_CODE>
+
+            <SEQ2_EMISSIVE_DRIVES_VISIBILITY>False</SEQ2_EMISSIVE_DRIVES_VISIBILITY>
+            <SEQ2_CODE_DRIVES_VISIBILITY>False</SEQ2_CODE_DRIVES_VISIBILITY>
+            <SEQ2_POWERED>(L:A32NX_ELEC_DC_ESS_BUS_IS_POWERED, Bool)</SEQ2_POWERED>
+            <SEQ2_EMISSIVE_CODE>(L:A32NX_ELEC_DC_ESS_BUS_IS_POWERED, Bool)</SEQ2_EMISSIVE_CODE>
         </DefaultTemplateParameters>
 
         <Component ID="#NODE_ID#" Node="#NODE_ID#">
-            <UseTemplate Name="ASOBO_GT_Push_Button_Held">
-                <ANIM_NAME>#ANIM_NAME_BUTTON#</ANIM_NAME>
+            <UseTemplate Name="ASOBO_GT_Push_Button_Airliner">
+                <ANIM_NAME>#NODE_ID#</ANIM_NAME>
                 <Condition NotEmpty="SIMVAR">
                     <True>
                         <LEFT_SINGLE_CODE>
@@ -86,16 +100,6 @@
                 </Condition>
             </UseTemplate>
         </Component>
-
-        <Condition Check="POTENTIOMETER">
-            <True>
-                <Component ID="#BACKLIGHT_NODE_ID#" Node="#BACKLIGHT_NODE_ID#">
-                    <UseTemplate Name="ASOBO_GT_Emissive_Potentiometer">
-                        <EMISSIVE_CODE>#SEQ2_POWERED#</EMISSIVE_CODE>
-                    </UseTemplate>
-                </Component>
-            </True>
-        </Condition>
     </Template>
 
     <Template Name="FBW_ECAM_BUTTON_Template">
@@ -112,49 +116,68 @@
         <DefaultTemplateParameters>
             <BASE_NAME>UNKNOWN</BASE_NAME>
             <NODE_ID>PUSH_ECAM_#BASE_NAME#</NODE_ID>
-            <ANIM_NAME_BUTTON>PUSH_ECAM_#BASE_NAME#</ANIM_NAME_BUTTON>
-            <LED_NODE_ID>PUSH_ECAM_#BASE_NAME#_SEQ2</LED_NODE_ID>
-            <BACKLIGHT_NODE_ID>PUSH_ECAM_#BASE_NAME#_SEQ1</BACKLIGHT_NODE_ID>
             <WWISE_EVENT_1>mcdubuttons</WWISE_EVENT_1>
-            <NORMALIZED_TIME_1>0.1</NORMALIZED_TIME_1>
             <WWISE_EVENT_2>mcdubuttons</WWISE_EVENT_2>
+            <NORMALIZED_TIME_1>0.1</NORMALIZED_TIME_1>
             <NORMALIZED_TIME_2>0.5</NORMALIZED_TIME_2>
-            <SEQ1_POWERED>1</SEQ1_POWERED>
-            <SEQ2_POWERED>1</SEQ2_POWERED>
+
+            <SEQ1_EMISSIVE_DRIVES_VISIBILITY>False</SEQ1_EMISSIVE_DRIVES_VISIBILITY>
+            <SEQ1_CODE_DRIVES_VISIBILITY>False</SEQ1_CODE_DRIVES_VISIBILITY>
+            <SEQ1_POWERED>(L:A32NX_ELEC_DC_1_BUS_IS_POWERED, Bool)</SEQ1_POWERED>
+            <POTENTIOMETER_SEQ1>85</POTENTIOMETER_SEQ1>
+            <SEQ1_EMISSIVE_CODE>(L:A32NX_ELEC_DC_1_BUS_IS_POWERED, Bool)</SEQ1_EMISSIVE_CODE>
+
+            <SEQ2_EMISSIVE_DRIVES_VISIBILITY>False</SEQ2_EMISSIVE_DRIVES_VISIBILITY>
+            <SEQ2_CODE_DRIVES_VISIBILITY>False</SEQ2_CODE_DRIVES_VISIBILITY>
+            <SEQ2_POWERED>(L:A32NX_ELEC_DC_ESS_BUS_IS_POWERED, Bool)</SEQ2_POWERED>
         </DefaultTemplateParameters>
 
         <Component ID="#NODE_ID#" Node="#NODE_ID#">
-            <UseTemplate Name="ASOBO_GT_Push_Button_Held">
+            <UseTemplate Name="ASOBO_GT_Push_Button_Airliner">
                 <ANIM_NAME>#ANIM_NAME_BUTTON#</ANIM_NAME>
                 <LEFT_SINGLE_CODE>
                     1 (&gt;L:#SIMVAR#)
                 </LEFT_SINGLE_CODE>
                 <LEFT_LEAVE_CODE>
                     0 (&gt;L:#SIMVAR#)
                 </LEFT_LEAVE_CODE>
+                <SEQ2_EMISSIVE_CODE>(L:A32NX_ECAM_SFAIL) -1 &gt; #SEQ2_POWERED# and</SEQ2_EMISSIVE_CODE>
             </UseTemplate>
         </Component>
+    </Template>
 
+    <Template Name="A32NX_ECAM_MORE_BUTTON_Template">
+        <DefaultTemplateParameters>
+            <BASE_NAME>UNKNOWN</BASE_NAME>
+            <NODE_ID>PUSH_ECAM_#BASE_NAME#</NODE_ID>
+            <WWISE_EVENT_1>mcdubuttons</WWISE_EVENT_1>
+            <WWISE_EVENT_2>mcdubuttons</WWISE_EVENT_2>
+            <NORMALIZED_TIME_1>0.1</NORMALIZED_TIME_1>
+            <NORMALIZED_TIME_2>0.5</NORMALIZED_TIME_2>
 
-        <Component ID="#LED_NODE_ID#" Node="#LED_NODE_ID#">
-            <UseTemplate Name="ASOBO_GT_Emissive_Gauge">
-                <EMISSIVE_CODE>
-                    (L:A32NX_ECAM_SFAIL) -1 &gt;
-                    (L:A32NX_OVHD_INTLT_ANN) 0 == (L:A32NX_ELEC_DC_ESS_BUS_IS_POWERED, Bool) and or
-                    #SEQ1_POWERED# and
-                </EMISSIVE_CODE>
+            <SEQ1_EMISSIVE_DRIVES_VISIBILITY>False</SEQ1_EMISSIVE_DRIVES_VISIBILITY>
+            <SEQ1_CODE_DRIVES_VISIBILITY>False</SEQ1_CODE_DRIVES_VISIBILITY>
+            <SEQ1_POWERED>(L:A32NX_ELEC_DC_1_BUS_IS_POWERED, Bool)</SEQ1_POWERED>
+            <POTENTIOMETER_SEQ1>85</POTENTIOMETER_SEQ1>
+            <SEQ1_EMISSIVE_CODE>(L:A32NX_ELEC_DC_1_BUS_IS_POWERED, Bool)</SEQ1_EMISSIVE_CODE>
+
+            <SEQ2_EMISSIVE_DRIVES_VISIBILITY>False</SEQ2_EMISSIVE_DRIVES_VISIBILITY>
+            <SEQ2_CODE_DRIVES_VISIBILITY>False</SEQ2_CODE_DRIVES_VISIBILITY>
+            <SEQ2_POWERED>(L:A32NX_ELEC_DC_ESS_BUS_IS_POWERED, Bool)</SEQ2_POWERED>
+        </DefaultTemplateParameters>
+
+        <Component ID="#NODE_ID#" Node="#NODE_ID#">
+            <UseTemplate Name="ASOBO_GT_Push_Button_Airliner">
+                <ANIM_NAME>#ANIM_NAME_BUTTON#</ANIM_NAME>
+                <LEFT_SINGLE_CODE>
+                    1 (&gt;L:#SIMVAR#)
+                </LEFT_SINGLE_CODE>
+                <LEFT_LEAVE_CODE>
+                    0 (&gt;L:#SIMVAR#)
+                </LEFT_LEAVE_CODE>
+                <SEQ2_EMISSIVE_CODE>(L:A32NX_SD_MORE_SHOWN, Bool) #SEQ2_POWERED# and</SEQ2_EMISSIVE_CODE>
             </UseTemplate>
         </Component>
-
-        <Condition Check="POTENTIOMETER">
-            <True>
-                <Component ID="#BACKLIGHT_NODE_ID#" Node="#BACKLIGHT_NODE_ID#">
-                    <UseTemplate Name="ASOBO_GT_Emissive_Potentiometer">
-                        <EMISSIVE_CODE>#SEQ2_POWERED#</EMISSIVE_CODE>
-                    </UseTemplate>
-                </Component>
-            </True>
-        </Condition>
     </Template>
 
     <Template Name="FBW_A380X_Components_ECAM_CP">
@@ -438,7 +461,7 @@
         <!-- ECAM MORE -->
         <UseTemplate Name="FBW_Anim_Interactions">
             <ANIM_TYPE>BUTTON</ANIM_TYPE>
-            <ANIM_TEMPLATE>FBW_ECAM_BUTTON_Template</ANIM_TEMPLATE>
+            <ANIM_TEMPLATE>A32NX_ECAM_MORE_BUTTON_Template</ANIM_TEMPLATE>
             <BASE_NAME>MORE</BASE_NAME>
             <PART_ID>ECAM_MORE</PART_ID>
             <TOOLTIPID>ECAM MORE...</TOOLTIPID>

fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/behaviour/kccu.xml

@@ -10,7 +10,6 @@
             <NORMALIZED_TIME_1>0.1</NORMALIZED_TIME_1>
             <NORMALIZED_TIME_2>0.5</NORMALIZED_TIME_2>
             <SEQ1_POWERED>1</SEQ1_POWERED>
-            <!-- TODO change to A380X as soon as systems use new prefix -->
             <PLANE_NAME>A32NX</PLANE_NAME>
         </DefaultTemplateParameters>
 
@@ -20,6 +19,7 @@
             <POTENTIOMETER_SEQ1>85</POTENTIOMETER_SEQ1>
             <ANIM_NAME>PUSH_KCCU#SIDE#_#KEY#_ANIM</ANIM_NAME>
             <SEQ1_POWERED>(L:A32NX_ELEC_DC_1_BUS_IS_POWERED, Bool)</SEQ1_POWERED>
+            <SEQ1_EMISSIVE_CODE>(L:A32NX_ELEC_DC_1_BUS_IS_POWERED, Bool)</SEQ1_EMISSIVE_CODE>
             <NO_SEQ2/>
             <LEFT_SINGLE_CODE>(&gt;H:#PLANE_NAME#_KCCU_#SIDE#_#KEY#)</LEFT_SINGLE_CODE>
         </UseTemplate>

fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/behaviour/overhead/reset.xml

@@ -0,0 +1,17 @@
+<!-- Copyright (c) 2024 FlyByWire Simulations -->
+<!-- SPDX-License-Identifier: GPL-3.0 -->
+
+<ModelBehaviors>
+    <Template Name="FBW_Airbus_RESET_PANEL_BUTTON">
+    <DefaultTemplateParameters>
+        <NODE_ID>CB_#COMPONENT#</NODE_ID>
+        <DISABLE_SEQ1 />
+        <DISABLE_SEQ2 />
+        <ROUND />
+    </DefaultTemplateParameters>
+
+    <UseTemplate Name="FBW_Push_Toggle">
+        <TOGGLE_SIMVAR>L:A32NX_RESET_PANEL_#COMPONENT#</TOGGLE_SIMVAR>
+    </UseTemplate>
+    </Template>
+</ModelBehaviors>