Merge branch 'master' into feat-a380x-fmc-reset

flybywiresim · Jan 10, 2025 · 3a83b7e · 3a83b7e
2 parents b5362ee + 2958590
commit 3a83b7e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -115,6 +115,8 @@
 1. [A380X/MFD] Fixed the altitude prediction not rounding to the nearest 10 on the FPLN page - @bulenteroglu (senolitam)
 1. [A380X/MFD] Use slashed zero as default font for FMS pages - @bulenteroglu (senolitam)
 1. [A380X/ND] Remove leading zeros from terrain elevation display - @BravoMike99 (bruno_pt99)
+1. [A32NX/FWS] Fix autopilot instinctive disconnect button logic for 3D model - @flogross89 (floridude)
+1. [A380X/EFIS] Fix VV pb indicator not turning on when TRK-FPA mode is selected - @heclak (Heclak)
 
 ## 0.12.0
 

diff --git a/fbw-a32nx/src/behavior/src/A32NX_Interior_Misc.xml b/fbw-a32nx/src/behavior/src/A32NX_Interior_Misc.xml
@@ -368,6 +368,7 @@
             <UseTemplate Name="ASOBO_GT_Push_Button_Held">
                 <TOOLTIPID>%((L:A32NX_AUTOPILOT_ACTIVE, Bool))%{if}Disc. Autopilot%{else}Take priority%{end}</TOOLTIPID>
                 <LEFT_SINGLE_CODE>
+                    (&gt;K:AUTOPILOT_OFF)
                     1 (&gt;L:A32NX_PRIORITY_TAKEOVER:#ID#)
                 </LEFT_SINGLE_CODE>
                 <LEFT_LEAVE_CODE>

diff --git a/fbw-a32nx/src/wasm/fbw_a320/src/FlyByWireInterface.cpp b/fbw-a32nx/src/wasm/fbw_a320/src/FlyByWireInterface.cpp
@@ -1736,7 +1736,7 @@ bool FlyByWireInterface::updateFmgc(double sampleTime, int fmgcIndex) {
   fmgcs[fmgcIndex].modelInputs.in.sim_data.tailstrike_protection_on = tailstrikeProtectionEnabled;
 
   bool athr_instinctive_disc = simConnectInterface.getSimInputThrottles().ATHR_disconnect || idAutothrustDisconnect->get() == 1;
-  bool ap_instinctive_disc = simInputAutopilot.AP_disconnect || idCaptPriorityButtonPressed->get() || idFoPriorityButtonPressed->get();
+  bool ap_instinctive_disc = simInputAutopilot.AP_disconnect;
 
   fmgcs[fmgcIndex].modelInputs.in.discrete_inputs.is_unit_1 = fmgcIndex == 0;
   fmgcs[fmgcIndex].modelInputs.in.discrete_inputs.athr_opp_engaged = fmgcsDiscreteOutputs[oppFmgcIndex].athr_own_engaged;

diff --git a/...ire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/behaviour/efis-cp.xml b/...ire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/behaviour/efis-cp.xml
@@ -67,7 +67,8 @@
             <!-- VV -->
             <UseTemplate Name="FBW_A380X_BacklightIndicator_Button_Template">
                 <NODE_ID>PUSH_EFIS_#SIDE_NODE_GROUP#_VV</NODE_ID>
-                <TOGGLE_SIMVAR>L:A380X_EFIS_#SIDE_SIMVAR_GROUP#_VV_BUTTON_IS_ON</TOGGLE_SIMVAR>
+                <BUTTON_CODE>(L:A380X_EFIS_#SIDE_SIMVAR_GROUP#_VV_BUTTON_IS_ON, Boolean) ! (&gt;L:A380X_EFIS_#SIDE_SIMVAR_GROUP#_VV_BUTTON_IS_ON, Boolean)</BUTTON_CODE>
+                <INDICATOR_CODE>(L:A380X_EFIS_#SIDE_SIMVAR_GROUP#_VV_BUTTON_IS_ON) (L:A32NX_TRK_FPA_MODE_ACTIVE) or</INDICATOR_CODE>
                 <TOOLTIPID>TOGGLE VELOCITY VECTOR ON EFIS</TOOLTIPID>
 
                 <NODE_IS_INDICATOR />

diff --git a/...cts/AirPlanes/FlyByWire_A380_842/model/behaviour/legacy/generated/A32NX_Interior_Misc.xml b/...cts/AirPlanes/FlyByWire_A380_842/model/behaviour/legacy/generated/A32NX_Interior_Misc.xml
@@ -382,11 +382,8 @@
             <UseTemplate Name="ASOBO_GT_Push_Button_Held">
                 <TOOLTIPID>%((L:A32NX_AUTOPILOT_ACTIVE, Bool))%{if}Disc. Autopilot%{else}Take priority%{end}</TOOLTIPID>
                 <LEFT_SINGLE_CODE>
-                    (L:A32NX_AUTOPILOT_ACTIVE, Bool) if{
-                        (&gt;K:AUTOPILOT_OFF)
-                    } els{
-                        1 (&gt;L:A32NX_PRIORITY_TAKEOVER:#ID#)
-                    }
+                    (&gt;K:AUTOPILOT_OFF)
+                    1 (&gt;L:A32NX_PRIORITY_TAKEOVER:#ID#)
                 </LEFT_SINGLE_CODE>
                 <LEFT_LEAVE_CODE>
                     0 (&gt;L:A32NX_PRIORITY_TAKEOVER:#ID#)