Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(a32nx/fws): Fix AP disconnection via 3D model inst. disc. push button #9695

Merged
merged 8 commits into from
Jan 10, 2025
+5 −6
Merged

fix(a32nx/fws): Fix AP disconnection via 3D model inst. disc. push button #9695

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6bf113d
fix(a32nx/fws): Fix AP disconnection via 3D model inst. disc. push bu…
flogross89 Dec 31, 2024
998be42
keep AUTOPILOT_OFF event
flogross89 Jan 3, 2025
18c4a6c
Merge branch 'master' into fix-a32nx-inst-disc-pb-model
flogross89 Jan 3, 2025
06b71d1
fix changelog
flogross89 Jan 3, 2025
d29909a
Merge branch 'master' into fix-a32nx-inst-disc-pb-model
flogross89 Jan 6, 2025
7786bde
Merge branch 'master' into fix-a32nx-inst-disc-pb-model
flogross89 Jan 8, 2025
6cf7af1
changelog
flogross89 Jan 10, 2025
905dc8d
Merge branch 'master' into fix-a32nx-inst-disc-pb-model
flogross89 Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@
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)
1. [A380X/FLIGHT MODEL] Fix pitchup and unrecoverable stall - - @donstim (donbikes#4084)
1. [A32NX/FWS] Fix autopilot instinctive disconnect button logic for 3D model - @flogross89 (floridude)
1. [ATC/TCAS] Fixed TCAS failure on baro corrected altitude going invalid - @tracernz (Mike)
1. [ATC/TCAS] Fixed TCAS slant range computation - @tracernz (Mike)
1. [A380X] Add baro unit (hPa/in.Hg) auto selection - @tracernz (Mike)
Expand Down
1 change: 1 addition & 0 deletions fbw-a32nx/src/behavior/src/A32NX_Interior_Misc.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion fbw-a32nx/src/wasm/fbw_a320/src/FlyByWireInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 2 additions & 5 deletions ...cts/AirPlanes/FlyByWire_A380_842/model/behaviour/legacy/generated/A32NX_Interior_Misc.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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#)
tracernz marked this conversation as resolved.
Show resolved Hide resolved
</LEFT_SINGLE_CODE>
<LEFT_LEAVE_CODE>
0 (&gt;L:A32NX_PRIORITY_TAKEOVER:#ID#)
Expand Down
Loading