diff --git a/SIL/work/SIL_ert_shrlib_rtw/SIL.c b/SIL/work/SIL_ert_shrlib_rtw/SIL.c index fe0df7f..d30b9b1 100644 --- a/SIL/work/SIL_ert_shrlib_rtw/SIL.c +++ b/SIL/work/SIL_ert_shrlib_rtw/SIL.c @@ -3,9 +3,9 @@ * * Code generated for Simulink model 'SIL'. * - * Model version : 1.575 + * Model version : 1.576 * Simulink Coder version : 9.0 (R2018b) 24-May-2018 - * C/C++ source code generated on : Fri Dec 11 15:14:00 2020 + * C/C++ source code generated on : Fri Dec 11 17:53:13 2020 * * Target selection: ert_shrlib.tlc * Embedded hardware selection: Intel->x86-64 (Windows64) @@ -625,7 +625,6 @@ static void SIL_sf_msg_send_cmd(void); static void SIL_update_vert(ENUM_AFCS_VERT in, ENUM_AT in2, ENUM_AFCS_VERT *out, ENUM_AT *out2); static void SIL_parachute(void); -static void SIL_Idle(void); static boolean_T SIL_sf_msg_pop_mission_item(void); static void SIL_sf_msg_send_mission_ack(void); static void SIL_sf_msg_send_mission_req_int(void); @@ -5993,26 +5992,6 @@ static void SIL_parachute(void) } } -/* Function for Chart: '/Chart' */ -static void SIL_Idle(void) -{ - if ((SIL_B.BusAssignment_i.recovery & 2U) != 0U) { - SIL_DW.is_c21_kb3_autopilot = SIL_IN_parachute; - SIL_DW.temporalCounter_i2 = 0U; - SIL_B.recovery_out = 3U; - SIL_DW.is_parachute = SIL_IN_one; - SIL_DW.temporalCounter_i1_i = 0U; - SIL_B.ch_out = 3U; - SIL_B.peroid_out = 50U; - SIL_B.sw_out = 1U; - } else { - SIL_B.recovery_out = SIL_B.BusAssignment_i.recovery; - SIL_B.ch_out = SIL_B.BusAssignment_i.ccm_ch; - SIL_B.peroid_out = SIL_B.BusAssignment_i.ccm_period; - SIL_B.sw_out = SIL_B.BusAssignment_i.ccm_sw; - } -} - int32_T SIL_pop_c02u1i(Queue_mavlink_mission_item_int_t *q, Msg_mavlink_mission_item_int_t *elementOut) { @@ -18828,7 +18807,21 @@ void SIL_step(void) } else { switch (SIL_DW.is_c21_kb3_autopilot) { case SIL_IN_Idle_c: - SIL_Idle(); + if ((SIL_B.BusAssignment_i.recovery & 2U) != 0U) { + SIL_DW.is_c21_kb3_autopilot = SIL_IN_parachute; + SIL_DW.temporalCounter_i2 = 0U; + SIL_B.recovery_out = 3U; + SIL_DW.is_parachute = SIL_IN_one; + SIL_DW.temporalCounter_i1_i = 0U; + SIL_B.ch_out = 3U; + SIL_B.peroid_out = 50U; + SIL_B.sw_out = 1U; + } else { + SIL_B.recovery_out = SIL_B.BusAssignment_i.recovery; + SIL_B.ch_out = SIL_B.BusAssignment_i.ccm_ch; + SIL_B.peroid_out = SIL_B.BusAssignment_i.ccm_period; + SIL_B.sw_out = SIL_B.BusAssignment_i.ccm_sw; + } break; case SIL_IN_Idle1: diff --git a/SIL/work/SIL_ert_shrlib_rtw/SIL.h b/SIL/work/SIL_ert_shrlib_rtw/SIL.h index fb5156d..5535d00 100644 --- a/SIL/work/SIL_ert_shrlib_rtw/SIL.h +++ b/SIL/work/SIL_ert_shrlib_rtw/SIL.h @@ -3,9 +3,9 @@ * * Code generated for Simulink model 'SIL'. * - * Model version : 1.575 + * Model version : 1.576 * Simulink Coder version : 9.0 (R2018b) 24-May-2018 - * C/C++ source code generated on : Fri Dec 11 15:14:00 2020 + * C/C++ source code generated on : Fri Dec 11 17:53:13 2020 * * Target selection: ert_shrlib.tlc * Embedded hardware selection: Intel->x86-64 (Windows64) diff --git a/SIL/work/SIL_ert_shrlib_rtw/SIL_capi.c b/SIL/work/SIL_ert_shrlib_rtw/SIL_capi.c index fc5869c..abe8758 100644 --- a/SIL/work/SIL_ert_shrlib_rtw/SIL_capi.c +++ b/SIL/work/SIL_ert_shrlib_rtw/SIL_capi.c @@ -3,9 +3,9 @@ * * Code generated for Simulink model 'SIL'. * - * Model version : 1.575 + * Model version : 1.576 * Simulink Coder version : 9.0 (R2018b) 24-May-2018 - * C/C++ source code generated on : Fri Dec 11 15:14:00 2020 + * C/C++ source code generated on : Fri Dec 11 17:53:13 2020 * * Target selection: ert_shrlib.tlc * Embedded hardware selection: Intel->x86-64 (Windows64) diff --git a/SIL/work/SIL_ert_shrlib_rtw/SIL_capi.h b/SIL/work/SIL_ert_shrlib_rtw/SIL_capi.h index 386c990..aa2f46f 100644 --- a/SIL/work/SIL_ert_shrlib_rtw/SIL_capi.h +++ b/SIL/work/SIL_ert_shrlib_rtw/SIL_capi.h @@ -3,9 +3,9 @@ * * Code generated for Simulink model 'SIL'. * - * Model version : 1.575 + * Model version : 1.576 * Simulink Coder version : 9.0 (R2018b) 24-May-2018 - * C/C++ source code generated on : Fri Dec 11 15:14:00 2020 + * C/C++ source code generated on : Fri Dec 11 17:53:13 2020 * * Target selection: ert_shrlib.tlc * Embedded hardware selection: Intel->x86-64 (Windows64) diff --git a/SIL/work/SIL_ert_shrlib_rtw/SIL_data.c b/SIL/work/SIL_ert_shrlib_rtw/SIL_data.c index 3e82668..57c84bc 100644 --- a/SIL/work/SIL_ert_shrlib_rtw/SIL_data.c +++ b/SIL/work/SIL_ert_shrlib_rtw/SIL_data.c @@ -3,9 +3,9 @@ * * Code generated for Simulink model 'SIL'. * - * Model version : 1.575 + * Model version : 1.576 * Simulink Coder version : 9.0 (R2018b) 24-May-2018 - * C/C++ source code generated on : Fri Dec 11 15:14:00 2020 + * C/C++ source code generated on : Fri Dec 11 17:53:13 2020 * * Target selection: ert_shrlib.tlc * Embedded hardware selection: Intel->x86-64 (Windows64) @@ -118,14 +118,14 @@ P_SIL_T SIL_P = { /* Variable: wind_east * Referenced by: '/1-D Lookup Table1' */ - { -5.0, -25.0, -25.0 }, + { -5.0, -25.0, -35.0 }, /* Variable: wind_level * Referenced by: * '/1-D Lookup Table' * '/1-D Lookup Table1' */ - { 0.0, 5000.0, 10000.0 }, + { 1300.0, 5000.0, 10000.0 }, /* Variable: wind_north * Referenced by: '/1-D Lookup Table' diff --git a/SIL/work/SIL_ert_shrlib_rtw/SIL_private.h b/SIL/work/SIL_ert_shrlib_rtw/SIL_private.h index ca38fe8..5171c19 100644 --- a/SIL/work/SIL_ert_shrlib_rtw/SIL_private.h +++ b/SIL/work/SIL_ert_shrlib_rtw/SIL_private.h @@ -3,9 +3,9 @@ * * Code generated for Simulink model 'SIL'. * - * Model version : 1.575 + * Model version : 1.576 * Simulink Coder version : 9.0 (R2018b) 24-May-2018 - * C/C++ source code generated on : Fri Dec 11 15:14:00 2020 + * C/C++ source code generated on : Fri Dec 11 17:53:13 2020 * * Target selection: ert_shrlib.tlc * Embedded hardware selection: Intel->x86-64 (Windows64) diff --git a/SIL/work/SIL_ert_shrlib_rtw/SIL_types.h b/SIL/work/SIL_ert_shrlib_rtw/SIL_types.h index 4efdb88..3250257 100644 --- a/SIL/work/SIL_ert_shrlib_rtw/SIL_types.h +++ b/SIL/work/SIL_ert_shrlib_rtw/SIL_types.h @@ -3,9 +3,9 @@ * * Code generated for Simulink model 'SIL'. * - * Model version : 1.575 + * Model version : 1.576 * Simulink Coder version : 9.0 (R2018b) 24-May-2018 - * C/C++ source code generated on : Fri Dec 11 15:14:00 2020 + * C/C++ source code generated on : Fri Dec 11 17:53:13 2020 * * Target selection: ert_shrlib.tlc * Embedded hardware selection: Intel->x86-64 (Windows64) diff --git a/SIL/work/SIL_ert_shrlib_rtw/buildInfo.mat b/SIL/work/SIL_ert_shrlib_rtw/buildInfo.mat index ce70886..057a61d 100644 Binary files a/SIL/work/SIL_ert_shrlib_rtw/buildInfo.mat and b/SIL/work/SIL_ert_shrlib_rtw/buildInfo.mat differ diff --git a/SIL/work/SIL_ert_shrlib_rtw/rtmodel.h b/SIL/work/SIL_ert_shrlib_rtw/rtmodel.h index 751583d..fb6f79d 100644 --- a/SIL/work/SIL_ert_shrlib_rtw/rtmodel.h +++ b/SIL/work/SIL_ert_shrlib_rtw/rtmodel.h @@ -3,9 +3,9 @@ * * Code generated for Simulink model 'SIL'. * - * Model version : 1.575 + * Model version : 1.576 * Simulink Coder version : 9.0 (R2018b) 24-May-2018 - * C/C++ source code generated on : Fri Dec 11 15:14:00 2020 + * C/C++ source code generated on : Fri Dec 11 17:53:13 2020 * * Target selection: ert_shrlib.tlc * Embedded hardware selection: Intel->x86-64 (Windows64) diff --git a/SIL/work/SIL_win64.dll b/SIL/work/SIL_win64.dll index 468ea7c..0c6bfc0 100644 Binary files a/SIL/work/SIL_win64.dll and b/SIL/work/SIL_win64.dll differ