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(fmgc): multiple FMGC fixes and small additions #9652

Merged
merged 7 commits into from
Feb 6, 2025
+1,493 −1,393
Merged

fix(fmgc): multiple FMGC fixes and small additions #9652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e734a41
fix(fmgc): fix mode sync for EXP, add mode reset at engine start
lukecologne Dec 12, 2024
202aabc
fix(fmgc): CAT 1 when no RA is NO
lukecologne Dec 26, 2024
9c24213
feat(fmgc): add FM RNAV selected input
lukecologne Dec 26, 2024
f255b2b
fix(fmgc): use abs for temporary capture condition
lukecologne Dec 26, 2024
9713daf
fix(fmgc): raise default RA value to 2500f to enable LOC engagement
lukecologne Dec 27, 2024
d6da1ad
Merge remote-tracking branch 'upstream/master' into pr/9652
tracernz Feb 6, 2025
073663b
Merge remote-tracking branch 'upstream/master' into pr/9652
tracernz Feb 6, 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
5 changes: 3 additions & 2 deletions 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 @@ -1780,14 +1780,15 @@ bool FlyByWireInterface::updateFmgc(double sampleTime, int fmgcIndex) {

fmgcs[fmgcIndex].modelInputs.in.fms_inputs.fm_valid = true;
fmgcs[fmgcIndex].modelInputs.in.fms_inputs.fms_flight_phase = static_cast<fmgc_flight_phase>(idFmgcFlightPhase->get());
fmgcs[fmgcIndex].modelInputs.in.fms_inputs.selected_approach_type = fmgc_approach_type::None;
fmgcs[fmgcIndex].modelInputs.in.fms_inputs.selected_approach_type =
idFmRnavAppSelected->get() ? fmgc_approach_type::RNAV : fmgc_approach_type::ILS;
fmgcs[fmgcIndex].modelInputs.in.fms_inputs.backbeam_selected = idFm1BackbeamSelected->get();
fmgcs[fmgcIndex].modelInputs.in.fms_inputs.fms_loc_distance = (simData.nav_dme_valid != 0) ? simData.nav_dme_nmi : 0;
fmgcs[fmgcIndex].modelInputs.in.fms_inputs.fms_unrealistic_gs_angle_deg = (simData.nav_gs_valid != 0) ? -simData.nav_gs_deg : 0;
fmgcs[fmgcIndex].modelInputs.in.fms_inputs.fms_weight_lbs = simData.total_weight_kg * 2.205;
fmgcs[fmgcIndex].modelInputs.in.fms_inputs.fms_cg_percent = simData.CG_percent_MAC;
fmgcs[fmgcIndex].modelInputs.in.fms_inputs.lateral_flight_plan_valid = idFlightGuidanceAvailable->get();
fmgcs[fmgcIndex].modelInputs.in.fms_inputs.nav_capture_condition = idFlightGuidanceCrossTrackError->get() < 1;
fmgcs[fmgcIndex].modelInputs.in.fms_inputs.nav_capture_condition = std::abs(idFlightGuidanceCrossTrackError->get()) < 1;
fmgcs[fmgcIndex].modelInputs.in.fms_inputs.phi_c_deg = idFlightGuidancePhiCommand->get();
fmgcs[fmgcIndex].modelInputs.in.fms_inputs.xtk_nmi = idFlightGuidanceCrossTrackError->get();
fmgcs[fmgcIndex].modelInputs.in.fms_inputs.tke_deg = idFlightGuidanceTrackAngleError->get();
Expand Down
Loading