feat(afs): Add FMGC and FCU computer implementation

FBW PR 7587

fix

Author: Revyn112

flybywire

@@ -420,10 +420,10 @@ void PitchAlternateLaw::reset(void)
   PitchAlternateLaw_DWork.icLoad = true;
   PitchAlternateLaw_DWork.is_active_c9_PitchAlternateLaw = 0U;
   PitchAlternateLaw_DWork.is_c9_PitchAlternateLaw = PitchAlternateLaw_IN_NO_ACTIVE_CHILD;
-  PitchAlternateLaw_DWork.is_active_c7_PitchAlternateLaw = 0U;
-  PitchAlternateLaw_DWork.is_c7_PitchAlternateLaw = PitchAlternateLaw_IN_NO_ACTIVE_CHILD;
   rtb_nz_limit_up_g = 0.0;
   rtb_nz_limit_lo_g = 0.0;
+  PitchAlternateLaw_DWork.is_active_c7_PitchAlternateLaw = 0U;
+  PitchAlternateLaw_DWork.is_c7_PitchAlternateLaw = PitchAlternateLaw_IN_NO_ACTIVE_CHILD;
   PitchAlternateLaw_RateLimiter_Reset(&PitchAlternateLaw_DWork.sf_RateLimiter);
   PitchAlternateLaw_LagFilter_Reset(&PitchAlternateLaw_DWork.sf_LagFilter_g3);
   PitchAlternateLaw_WashoutFilter_Reset(&PitchAlternateLaw_DWork.sf_WashoutFilter_c);
@@ -474,7 +474,7 @@ void PitchAlternateLaw::step(const real_T *rtu_In_time_dt, const real_T *rtu_In_
   int32_T tmp;
   boolean_T rtb_NOT;
   boolean_T rtb_eta_trim_deg_should_freeze;
-  if (PitchAlternateLaw_DWork.is_active_c9_PitchAlternateLaw == 0U) {
+  if (PitchAlternateLaw_DWork.is_active_c9_PitchAlternateLaw == 0) {
     PitchAlternateLaw_DWork.is_active_c9_PitchAlternateLaw = 1U;
     PitchAlternateLaw_DWork.is_c9_PitchAlternateLaw = PitchAlternateLaw_IN_running;
     rtb_eta_trim_deg_should_freeze = false;
@@ -512,7 +512,7 @@ void PitchAlternateLaw::step(const real_T *rtu_In_time_dt, const real_T *rtu_In_
   }
 
   rtb_Gain5 = PitchAlternateLaw_rtP.Gain5_Gain * rtb_Switch_c;
-  if (PitchAlternateLaw_DWork.is_active_c7_PitchAlternateLaw == 0U) {
+  if (PitchAlternateLaw_DWork.is_active_c7_PitchAlternateLaw == 0) {
     PitchAlternateLaw_DWork.is_active_c7_PitchAlternateLaw = 1U;
     PitchAlternateLaw_DWork.is_c7_PitchAlternateLaw = PitchAlternateLaw_IN_ground;
     rtb_eta_trim_deg_rate_limit_up_deg_s = 0.7;
@@ -853,7 +853,7 @@ void PitchAlternateLaw::step(const real_T *rtu_In_time_dt, const real_T *rtu_In_
     rty_Out_eta_deg, &PitchAlternateLaw_DWork.sf_RateLimiter_b);
   *rty_Out_eta_trim_limit_up = PitchAlternateLaw_rtP.Constant2_Value;
   *rty_Out_eta_trim_limit_lo = PitchAlternateLaw_rtP.Constant3_Value_j;
-  if (PitchAlternateLaw_DWork.is_active_c8_PitchAlternateLaw == 0U) {
+  if (PitchAlternateLaw_DWork.is_active_c8_PitchAlternateLaw == 0) {
     PitchAlternateLaw_DWork.is_active_c8_PitchAlternateLaw = 1U;
     PitchAlternateLaw_DWork.is_c8_PitchAlternateLaw = PitchAlternateLaw_IN_manual;
   } else {

hdw-a333x/src/wasm/fbw_a330/src/model/PitchAlternateLaw.cpp

@@ -1,5 +1,5 @@
-#ifndef RTW_HEADER_PitchAlternateLaw_h_
-#define RTW_HEADER_PitchAlternateLaw_h_
+#ifndef PitchAlternateLaw_h_
+#define PitchAlternateLaw_h_
 #include "rtwtypes.h"
 #include "PitchAlternateLaw_types.h"
 #include <cstring>
@@ -228,4 +228,3 @@ class PitchAlternateLaw final
 extern PitchAlternateLaw::Parameters_PitchAlternateLaw_T PitchAlternateLaw_rtP;
 
 #endif
-

hdw-a333x/src/wasm/fbw_a330/src/model/PitchAlternateLaw.h

@@ -1,5 +1,5 @@
-#ifndef RTW_HEADER_PitchDirectLaw_h_
-#define RTW_HEADER_PitchDirectLaw_h_
+#ifndef PitchDirectLaw_h_
+#define PitchDirectLaw_h_
 #include "rtwtypes.h"
 #include "PitchDirectLaw_types.h"
 #include <cstring>
@@ -41,4 +41,3 @@ class PitchDirectLaw final
 extern PitchDirectLaw::Parameters_PitchDirectLaw_T PitchDirectLaw_rtP;
 
 #endif
-

hdw-a333x/src/wasm/fbw_a330/src/model/PitchDirectLaw.h

@@ -1,5 +1,5 @@
-#ifndef RTW_HEADER_PitchNormalLaw_h_
-#define RTW_HEADER_PitchNormalLaw_h_
+#ifndef PitchNormalLaw_h_
+#define PitchNormalLaw_h_
 #include "rtwtypes.h"
 #include "PitchNormalLaw_types.h"
 #include <cstring>
@@ -38,7 +38,7 @@ class PitchNormalLaw final
     boolean_T pU_not_empty;
   };
 
-  struct rtDW_RateLimiter_PitchNormalLaw_a_T {
+  struct rtDW_RateLimiter_PitchNormalLaw_o_T {
     real_T pY;
     boolean_T pY_not_empty;
   };
@@ -68,6 +68,8 @@ class PitchNormalLaw final
     real_T Delay1_DSTATE_i;
     real_T Delay_DSTATE_e1;
     real_T Delay_DSTATE_bg;
+    real_T Delay_DSTATE_o;
+    real_T Delay1_DSTATE_n;
     real_T Delay_DSTATE_jv;
     real_T Delay_DSTATE_lf;
     real_T Delay_DSTATE_dv;
@@ -78,7 +80,7 @@ class PitchNormalLaw final
     real_T Delay1_DSTATE_l;
     real_T Delay_DSTATE_m;
     real_T Delay_DSTATE_k2;
-    real_T Delay1_DSTATE_n;
+    real_T Delay1_DSTATE_ns;
     real_T Delay_DSTATE_mz;
     real_T Delay_DSTATE_jh;
     real_T Delay_DSTATE_dy;
@@ -88,7 +90,7 @@ class PitchNormalLaw final
     real_T Delay_DSTATE_h;
     real_T Delay_DSTATE_ds;
     real_T Delay_DSTATE_jt;
-    real_T Delay_DSTATE_o;
+    real_T Delay_DSTATE_o3;
     real_T Delay_DSTATE_ej;
     real_T Delay_DSTATE_e4;
     real_T Delay_DSTATE_cl;
@@ -105,18 +107,16 @@ class PitchNormalLaw final
     boolean_T icLoad;
     boolean_T icLoad_p;
     rtDW_RateLimiter_PitchNormalLaw_T sf_RateLimiter_b;
-    rtDW_RateLimiter_PitchNormalLaw_a_T sf_RateLimiter_ct;
-    rtDW_LagFilter_PitchNormalLaw_d_T sf_LagFilter_fz;
+    rtDW_RateLimiter_PitchNormalLaw_o_T sf_RateLimiter_ct;
+    rtDW_LagFilter_PitchNormalLaw_d_T sf_LagFilter_f;
     rtDW_WashoutFilter_PitchNormalLaw_T sf_WashoutFilter_h;
-    rtDW_RateLimiter_PitchNormalLaw_a_T sf_RateLimiter_nx;
-    rtDW_RateLimiter_PitchNormalLaw_a_T sf_RateLimiter_i;
-    rtDW_RateLimiter_PitchNormalLaw_a_T sf_RateLimiter_c2;
+    rtDW_RateLimiter_PitchNormalLaw_o_T sf_RateLimiter_nx;
+    rtDW_RateLimiter_PitchNormalLaw_o_T sf_RateLimiter_i;
+    rtDW_RateLimiter_PitchNormalLaw_o_T sf_RateLimiter_c2;
     rtDW_RateLimiter_PitchNormalLaw_T sf_RateLimiter_o;
     rtDW_LagFilter_PitchNormalLaw_T sf_LagFilter_mf;
-    rtDW_RateLimiter_PitchNormalLaw_T sf_RateLimiter_pr;
-    rtDW_RateLimiter_PitchNormalLaw_a_T sf_RateLimiter_f;
-    rtDW_RateLimiter_PitchNormalLaw_T sf_RateLimiter_m;
-    rtDW_LagFilter_PitchNormalLaw_d_T sf_LagFilter_f;
+    rtDW_RateLimiter_PitchNormalLaw_T sf_RateLimiter_ck;
+    rtDW_RateLimiter_PitchNormalLaw_T sf_RateLimiter_e;
     rtDW_WashoutFilter_PitchNormalLaw_T sf_WashoutFilter_ca;
     rtDW_LagFilter_PitchNormalLaw_d_T sf_LagFilter_gr;
     rtDW_WashoutFilter_PitchNormalLaw_T sf_WashoutFilter_c;
@@ -164,7 +164,7 @@ class PitchNormalLaw final
     real_T WashoutFilter_C1_b;
     real_T Subsystem1_C1;
     real_T Subsystem3_C1;
-    real_T LagFilterdeltaetapos_C1;
+    real_T LagFilter3_C1;
     real_T LagFilter_C1_c;
     real_T WashoutFilter_C1_p;
     real_T Subsystem2_C1;
@@ -227,9 +227,8 @@ class PitchNormalLaw final
     real_T DiscreteDerivativeVariableTs2_InitialCondition_m;
     real_T RateLimiterVariableTs5_InitialCondition;
     real_T DiscreteDerivativeVariableTs1_InitialCondition_n;
-    real_T RateLimiterFlareLawTailstrikeProtection_InitialCondition;
-    real_T RateLimiterDeltaEtaFlare_InitialCondition;
-    real_T RateLimiterTheta_c_InitialCondition;
+    real_T RateLimiterVariableTs1_InitialCondition_n;
+    real_T RateLimiterVariableTs_InitialCondition_b;
     real_T DiscreteDerivativeVariableTs_InitialCondition_n;
     real_T DiscreteDerivativeVariableTs2_InitialCondition_a;
     real_T RateLimiterVariableTs9_InitialCondition;
@@ -276,9 +275,8 @@ class PitchNormalLaw final
     real_T RateLimiterVariableTs8_lo;
     real_T RateLimiterVariableTs2_lo_k;
     real_T RateLimiterVariableTs5_lo;
-    real_T RateLimiterFlareLawTailstrikeProtection_lo;
-    real_T RateLimiterDeltaEtaFlare_lo;
-    real_T RateLimiterTheta_c_lo;
+    real_T RateLimiterVariableTs1_lo_j;
+    real_T RateLimiterVariableTs_lo_j;
     real_T RateLimiterVariableTs9_lo;
     real_T RateLimiterVariableTs_lo_c;
     real_T RateLimiterVariableTs3_lo_b;
@@ -294,11 +292,10 @@ class PitchNormalLaw final
     real_T RateLimiterVariableTs8_up;
     real_T RateLimiterVariableTs2_up_m;
     real_T RateLimiterVariableTs5_up;
-    real_T RateLimiterFlareLawTailstrikeProtection_up;
-    real_T RateLimiterDeltaEtaFlare_up;
-    real_T RateLimiterTheta_c_up;
-    real_T RateLimiterVariableTs9_up;
+    real_T RateLimiterVariableTs1_up_b;
     real_T RateLimiterVariableTs_up_n;
+    real_T RateLimiterVariableTs9_up;
+    real_T RateLimiterVariableTs_up_n5;
     real_T RateLimiterVariableTs3_up_i;
     real_T RateLimiterVariableTs4_up;
     real_T RateLimiterVariableTs_up_na;
@@ -317,7 +314,7 @@ class PitchNormalLaw final
     real_T LimitLo_bp02Data[5];
     real_T ConstantLo_Value;
     real_T LimitSwitchLo_Threshold;
-    real_T FlareLawTailstrikeProtectionLimitLo_Value;
+    real_T Constant1_Value;
     real_T qk_dot_gain1_Gain;
     real_T qk_gain_HSP_Gain;
     real_T v_dot_gain_HSP_Gain;
@@ -328,7 +325,7 @@ class PitchNormalLaw final
     real_T Saturation4_LowerSat;
     real_T Saturation8_UpperSat;
     real_T Saturation8_LowerSat;
-    real_T Constant1_Value;
+    real_T Constant1_Value_g;
     real_T Saturation_UpperSat;
     real_T Saturation_LowerSat;
     real_T Constant1_Value_h;
@@ -451,7 +448,10 @@ class PitchNormalLaw final
     real_T Saturation3_LowerSat_lu;
     real_T Gain5_Gain_g;
     real_T Bias_Bias_g;
-    real_T Gain_Gain_d;
+    real_T Gain3_Gain_k;
+    real_T Delay_InitialCondition_i;
+    real_T Constant_Value_fu;
+    real_T Delay1_InitialCondition_d;
     real_T PLUT_tableData_bb[2];
     real_T PLUT_bp01Data_k[2];
     real_T DLUT_tableData_bf[2];
@@ -622,14 +622,13 @@ class PitchNormalLaw final
   static void PitchNormalLaw_WashoutFilter_Reset(rtDW_WashoutFilter_PitchNormalLaw_T *localDW);
   static void PitchNormalLaw_WashoutFilter(real_T rtu_U, real_T rtu_C1, const real_T *rtu_dt, real_T *rty_Y,
     rtDW_WashoutFilter_PitchNormalLaw_T *localDW);
-  static void PitchNormalLaw_RateLimiter_a_Reset(rtDW_RateLimiter_PitchNormalLaw_a_T *localDW);
-  static void PitchNormalLaw_RateLimiter_f(const real_T *rtu_u, real_T rtu_up, real_T rtu_lo, const real_T *rtu_Ts,
-    real_T rtu_init, real_T *rty_Y, rtDW_RateLimiter_PitchNormalLaw_a_T *localDW);
+  static void PitchNormalLaw_RateLimiter_l_Reset(rtDW_RateLimiter_PitchNormalLaw_o_T *localDW);
+  static void PitchNormalLaw_RateLimiter_c(const real_T *rtu_u, real_T rtu_up, real_T rtu_lo, const real_T *rtu_Ts,
+    real_T rtu_init, real_T *rty_Y, rtDW_RateLimiter_PitchNormalLaw_o_T *localDW);
   static void PitchNormalLaw_VoterAttitudeProtection(real_T rtu_input, real_T rtu_input_l, real_T rtu_input_o, real_T
     *rty_vote);
 };
 
 extern PitchNormalLaw::Parameters_PitchNormalLaw_T PitchNormalLaw_rtP;
 
 #endif
-

hdw-a333x/src/wasm/fbw_a330/src/model/PitchNormalLaw.cpp

@@ -34,6 +34,7 @@ module.exports = {
     msfsAvionicsInstrument('ND'),
     msfsAvionicsInstrument('EWD'),
     msfsAvionicsInstrument('Clock'),
+    msfsAvionicsInstrument('FCU'),
 
     reactInstrument('SD'),
     reactInstrument('DCDU'),

hdw-a333x/src/wasm/fbw_a330/src/model/PitchNormalLaw.h

@@ -22,25 +22,6 @@
         </UseTemplate>
     </Template>
 
-    <Template Name="FBW_AIRBUS_Push_Metric_Alt_Template">
-        <DefaultTemplateParameters>
-            <NODE_ID>AIRBUS_Push_Metric_Alt</NODE_ID>
-            <ANIM_NAME>AIRBUS_Push_Metric_Alt</ANIM_NAME>
-            <PART_ID>AIRBUS_Push_Metric_Alt</PART_ID>
-            <WWISE_EVENT_1>fcubutton</WWISE_EVENT_1>
-            <WWISE_EVENT_2>fcubutton</WWISE_EVENT_2>
-            <NORMALIZED_TIME_1>0.1</NORMALIZED_TIME_1>
-            <NORMALIZED_TIME_2>0.5</NORMALIZED_TIME_2>
-            <TOOLTIPID>%((L:A32NX_METRIC_ALT_TOGGLE, bool))%{if}TT:COCKPIT.TOOLTIPS.AUTOPILOT_PANEL_METRIC_ALT_TURN_OFF%{else}TT:COCKPIT.TOOLTIPS.AUTOPILOT_PANEL_METRIC_ALT_TURN_ON%{end}</TOOLTIPID>
-        </DefaultTemplateParameters>
-
-        <Component ID="#NODE_ID#" Node="#NODE_ID#">
-            <UseTemplate Name="ASOBO_GT_Push_Button">
-                <LEFT_SINGLE_CODE>(L:A32NX_METRIC_ALT_TOGGLE, bool) ! (&gt;L:A32NX_METRIC_ALT_TOGGLE)</LEFT_SINGLE_CODE>
-            </UseTemplate>
-        </Component>
-    </Template>
-
     <Template Name="FBW_AIRBUS_Push_Transfer_Template">
         <DefaultTemplateParameters>
             <NODE_ID>AIRBUS_Push_Transfer</NODE_ID>
@@ -59,57 +40,6 @@
         </Component>
     </Template>
 
-    <Template Name="FBW_AIRBUS_NAV_AID_SWITCH_SubTemplate">
-        <DefaultTemplateParameters>
-            <ANIM_NAME>#BASE_NAME#</ANIM_NAME>
-            <NODE_ID>#BASE_NAME#</NODE_ID>
-            <PART_ID>#BASE_NAME#</PART_ID>
-            <WWISE_EVENT>lswitch</WWISE_EVENT>
-
-        </DefaultTemplateParameters>
-        <Component ID="#NODE_ID#" Node="#NODE_ID#">
-            <UseTemplate Name="ASOBO_GT_Switch_3States">
-                <SWITCH_DIRECTION>Horizontal</SWITCH_DIRECTION>
-                <CODE_POS_0>
-                (* LEFT *)
-                1 (&gt;L:#STATE_VAR_NAME#)
-                </CODE_POS_0>
-                <CODE_POS_1>
-                (* OFF *)
-                0 (&gt;L:#STATE_VAR_NAME#)
-                </CODE_POS_1>
-                <CODE_POS_2>
-                (* RIGHT *)
-                2 (&gt;L:#STATE_VAR_NAME#)
-                </CODE_POS_2>
-                <STATE0_TEST>(L:#STATE_VAR_NAME#) 1 ==</STATE0_TEST>
-                <STATE1_TEST>(L:#STATE_VAR_NAME#) 0 ==</STATE1_TEST>
-                <STATE2_TEST>(L:#STATE_VAR_NAME#) 2 ==</STATE2_TEST>
-
-            </UseTemplate>
-        </Component>
-    </Template>
-
-    <Template Name="FBW_AIRBUS_NAV_AID_SWITCH_Template">
-        <DefaultTemplateParameters>
-            <BASE_NAME>UNKNOWN</BASE_NAME>
-            <PART_ID>NAVAID_Switch</PART_ID>
-            <ANIMREF_ID>0</ANIMREF_ID>
-            <ANIMCURSOR_MAX>1</ANIMCURSOR_MAX>
-            <STATE_VAR_NAME>A32NX_EFIS_#SIDE#_NAVAID_#INDEX#_MODE</STATE_VAR_NAME>
-            <ANIMTIP_0>TT:COCKPIT.TOOLTIPS.EFIS_PANEL_ADFSWITCH_ADF#INDEX#</ANIMTIP_0>
-            <ANIMTIP_1>TT:COCKPIT.TOOLTIPS.EFIS_PANEL_ADFSWITCH_OFF#INDEX#</ANIMTIP_1>
-            <ANIMTIP_2>TT:COCKPIT.TOOLTIPS.EFIS_PANEL_ADFSWITCH_VOR#INDEX#</ANIMTIP_2>
-            <ANIMTIP_0_ON_PERCENT>0</ANIMTIP_0_ON_PERCENT>
-            <ANIMTIP_1_ON_PERCENT>.5</ANIMTIP_1_ON_PERCENT>
-            <ANIMTIP_2_ON_PERCENT>1</ANIMTIP_2_ON_PERCENT>
-            <ANIM_DURATION>0.5</ANIM_DURATION>
-        </DefaultTemplateParameters>
-
-        <UseTemplate Name="FBW_AIRBUS_NAV_AID_SWITCH_SubTemplate">
-        </UseTemplate>
-    </Template>
-
     <Template Name="FBW_AIRBUS_Push_TERRONND_Template">
         <DefaultTemplateParameters>
             <ID>1</ID>