From d4e8d5af5dfa58c628cbfa73a64ae7ecb52c8b1e Mon Sep 17 00:00:00 2001 From: Lukas Michels Date: Fri, 27 Dec 2024 15:36:38 +0100 Subject: [PATCH] fix(fmgc): raise default RA value to 2500f to enable LOC engagement --- .../wasm/fbw_a320/src/model/FmgcComputer.cpp | 2 +- .../fbw_a320/src/model/FmgcComputer_types.h | 80 +++++++++---------- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/fbw-a32nx/src/wasm/fbw_a320/src/model/FmgcComputer.cpp b/fbw-a32nx/src/wasm/fbw_a320/src/model/FmgcComputer.cpp index b98f09508ef..e86c444757f 100644 --- a/fbw-a32nx/src/wasm/fbw_a320/src/model/FmgcComputer.cpp +++ b/fbw-a32nx/src/wasm/fbw_a320/src/model/FmgcComputer.cpp @@ -1148,7 +1148,7 @@ void FmgcComputer::step() rtb_raComputationData_radio_height_ft_Data = FmgcComputer_U.in.bus_inputs.ra_own_bus.radio_height_ft.Data; } else { rtb_raComputationData_radio_height_ft_SSM = FmgcComputer_U.in.bus_inputs.ra_own_bus.radio_height_ft.SSM; - rtb_raComputationData_radio_height_ft_Data = 250.0F; + rtb_raComputationData_radio_height_ft_Data = 2500.0F; } raOwnInvalid = (raOwnInvalid && raOppInvalid); diff --git a/fbw-a32nx/src/wasm/fbw_a320/src/model/FmgcComputer_types.h b/fbw-a32nx/src/wasm/fbw_a320/src/model/FmgcComputer_types.h index 3c131cebe34..1861bc393d1 100644 --- a/fbw-a32nx/src/wasm/fbw_a320/src/model/FmgcComputer_types.h +++ b/fbw-a32nx/src/wasm/fbw_a320/src/model/FmgcComputer_types.h @@ -81,46 +81,6 @@ struct base_arinc_429 #endif -#ifndef DEFINED_TYPEDEF_FOR_base_fmgc_b_bus_ -#define DEFINED_TYPEDEF_FOR_base_fmgc_b_bus_ - -struct base_fmgc_b_bus -{ - base_arinc_429 fac_weight_lbs; - base_arinc_429 fm_weight_lbs; - base_arinc_429 fac_cg_percent; - base_arinc_429 fm_cg_percent; - base_arinc_429 fg_radio_height_ft; - base_arinc_429 discrete_word_4; - base_arinc_429 ats_discrete_word; - base_arinc_429 discrete_word_3; - base_arinc_429 discrete_word_1; - base_arinc_429 discrete_word_2; - base_arinc_429 approach_spd_target_kn; - base_arinc_429 delta_p_ail_cmd_deg; - base_arinc_429 delta_p_splr_cmd_deg; - base_arinc_429 delta_r_cmd_deg; - base_arinc_429 delta_nose_wheel_cmd_deg; - base_arinc_429 delta_q_cmd_deg; - base_arinc_429 n1_left_percent; - base_arinc_429 n1_right_percent; -}; - -#endif - -#ifndef DEFINED_TYPEDEF_FOR_base_ils_bus_ -#define DEFINED_TYPEDEF_FOR_base_ils_bus_ - -struct base_ils_bus -{ - base_arinc_429 runway_heading_deg; - base_arinc_429 ils_frequency_mhz; - base_arinc_429 localizer_deviation_deg; - base_arinc_429 glideslope_deviation_deg; -}; - -#endif - #ifndef DEFINED_TYPEDEF_FOR_base_fmgc_discrete_inputs_ #define DEFINED_TYPEDEF_FOR_base_fmgc_discrete_inputs_ @@ -165,6 +125,46 @@ struct base_fmgc_discrete_inputs #endif +#ifndef DEFINED_TYPEDEF_FOR_base_fmgc_b_bus_ +#define DEFINED_TYPEDEF_FOR_base_fmgc_b_bus_ + +struct base_fmgc_b_bus +{ + base_arinc_429 fac_weight_lbs; + base_arinc_429 fm_weight_lbs; + base_arinc_429 fac_cg_percent; + base_arinc_429 fm_cg_percent; + base_arinc_429 fg_radio_height_ft; + base_arinc_429 discrete_word_4; + base_arinc_429 ats_discrete_word; + base_arinc_429 discrete_word_3; + base_arinc_429 discrete_word_1; + base_arinc_429 discrete_word_2; + base_arinc_429 approach_spd_target_kn; + base_arinc_429 delta_p_ail_cmd_deg; + base_arinc_429 delta_p_splr_cmd_deg; + base_arinc_429 delta_r_cmd_deg; + base_arinc_429 delta_nose_wheel_cmd_deg; + base_arinc_429 delta_q_cmd_deg; + base_arinc_429 n1_left_percent; + base_arinc_429 n1_right_percent; +}; + +#endif + +#ifndef DEFINED_TYPEDEF_FOR_base_ils_bus_ +#define DEFINED_TYPEDEF_FOR_base_ils_bus_ + +struct base_ils_bus +{ + base_arinc_429 runway_heading_deg; + base_arinc_429 ils_frequency_mhz; + base_arinc_429 localizer_deviation_deg; + base_arinc_429 glideslope_deviation_deg; +}; + +#endif + #ifndef DEFINED_TYPEDEF_FOR_base_fmgc_a_bus_ #define DEFINED_TYPEDEF_FOR_base_fmgc_a_bus_