hm/sil
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update gencode

Browse Source
This commit is contained in:
matt on matebook
2022-04-09 22:42:59 +08:00
parent 05afe4ddce
commit db2aa1a00d
10 changed files with 76 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SIL/work/SIL_ert_shrlib_rtw/SIL.c
+64 -29
View File
@@ -5,7 +5,7 @@
*
* Model version : 1.670
* Simulink Coder version : 9.0 (R2018b) 24-May-2018
* C/C++ source code generated on : Sat Apr 9 14:37:51 2022
* C/C++ source code generated on : Sat Apr 9 22:40:21 2022
*
* Target selection: ert_shrlib.tlc
* Embedded hardware selection: Intel->x86-64 (Windows64)
@@ -190,6 +190,7 @@
/* Named constants for Chart: '<S1248>/chat_update_mission_item' */
#define SIL_fence_default_len ((uint16_T)16U)
#define SIL_mission_default_len ((uint16_T)256U)
#define SIL_rally_default_len ((uint16_T)16U)
/* Named constants for Chart: '<S1216>/Chart_proc_mission_upload' */
#define SIL_IN_Uploading ((uint8_T)2U)
@@ -10484,8 +10485,8 @@ void SIL_step(void)
real32_T h_s;
real32_T lat_e;
real32_T lon_e;
uint16_T mission_idx;
uint16_T mission_sidx;
uint16_T mission_cnt;
uint32_T bpIndices[3];
real_T fractions[3];
uint32_T bpIndices_0[3];
@@ -24919,7 +24920,7 @@ void SIL_step(void)
rtb_Merge_b_p500w_enable = rtb_Merge_g2_p500w_enable;
rtb_Merge_b_actuator_startup = rtb_Merge_g2_actuator_startup;
rtb_Merge_b_ECU_CMD = rtb_Merge_g2_ECU_CMD;
mission_cnt = rtb_Merge_g2_ECU_RPM;
mission_idx = rtb_Merge_g2_ECU_RPM;
rtb_Merge_b_ccm_ch = rtb_Merge_g2_ccm_ch;
rtb_Merge_b_ccm_period = rtb_Merge_g2_ccm_period;
rtb_Merge_b_ccm_sw = rtb_Merge_g2_ccm_sw;
@@ -25188,7 +25189,7 @@ void SIL_step(void)
rtb_Merge_b_p500w_enable = rtb_Merge_g2_p500w_enable;
rtb_Merge_b_actuator_startup = rtb_Merge_g2_actuator_startup;
rtb_Merge_b_ECU_CMD = rtb_Merge_g2_ECU_CMD;
mission_cnt = rtb_Merge_g2_ECU_RPM;
mission_idx = rtb_Merge_g2_ECU_RPM;
rtb_Merge_b_ccm_ch = rtb_Merge_g2_ccm_ch;
rtb_Merge_b_ccm_period = rtb_Merge_g2_ccm_period;
rtb_Merge_b_ccm_sw = rtb_Merge_g2_ccm_sw;
@@ -25344,7 +25345,7 @@ void SIL_step(void)
rtb_Merge_b_p500w_enable = rtb_Merge_g2_p500w_enable;
rtb_Merge_b_actuator_startup = rtb_Merge_g2_actuator_startup;
rtb_Merge_b_ECU_CMD = rtb_Merge_g2_ECU_CMD;
mission_cnt = rtb_Merge_g2_ECU_RPM;
mission_idx = rtb_Merge_g2_ECU_RPM;
rtb_Merge_b_ccm_ch = rtb_Merge_g2_ccm_ch;
rtb_Merge_b_ccm_period = rtb_Merge_g2_ccm_period;
rtb_Merge_b_ccm_sw = rtb_Merge_g2_ccm_sw;
@@ -25871,7 +25872,7 @@ void SIL_step(void)
rtb_Merge_o_p500w_enable = rtb_Merge_b_p500w_enable;
rtb_Merge_o_actuator_startup = rtb_Merge_b_actuator_startup;
rtb_Merge_o_ECU_CMD = rtb_Merge_b_ECU_CMD;
rtb_Merge_o_ECU_RPM = mission_cnt;
rtb_Merge_o_ECU_RPM = mission_idx;
rtb_Merge_o_ccm_ch = rtb_Merge_b_ccm_ch;
rtb_Merge_o_ccm_period = rtb_Merge_b_ccm_period;
rtb_Merge_o_ccm_sw = rtb_Merge_b_ccm_sw;
@@ -26403,7 +26404,7 @@ void SIL_step(void)
rtb_Merge_o_p500w_enable = rtb_Merge_b_p500w_enable;
rtb_Merge_o_actuator_startup = rtb_Merge_b_actuator_startup;
rtb_Merge_o_ECU_CMD = rtb_Merge_b_ECU_CMD;
rtb_Merge_o_ECU_RPM = mission_cnt;
rtb_Merge_o_ECU_RPM = mission_idx;
rtb_Merge_o_ccm_ch = rtb_Merge_b_ccm_ch;
rtb_Merge_o_ccm_period = rtb_Merge_b_ccm_period;
rtb_Merge_o_ccm_sw = rtb_Merge_b_ccm_sw;
@@ -26606,7 +26607,7 @@ void SIL_step(void)
rtb_Merge_o_p500w_enable = rtb_Merge_b_p500w_enable;
rtb_Merge_o_actuator_startup = rtb_Merge_b_actuator_startup;
rtb_Merge_o_ECU_CMD = rtb_Merge_b_ECU_CMD;
rtb_Merge_o_ECU_RPM = mission_cnt;
rtb_Merge_o_ECU_RPM = mission_idx;
rtb_Merge_o_ccm_ch = rtb_Merge_b_ccm_ch;
rtb_Merge_o_ccm_period = rtb_Merge_b_ccm_period;
rtb_Merge_o_ccm_sw = rtb_Merge_b_ccm_sw;
@@ -26763,7 +26764,7 @@ void SIL_step(void)
rtb_Merge_o_p500w_enable = rtb_Merge_b_p500w_enable;
rtb_Merge_o_actuator_startup = rtb_Merge_b_actuator_startup;
rtb_Merge_o_ECU_CMD = rtb_Merge_b_ECU_CMD;
rtb_Merge_o_ECU_RPM = mission_cnt;
rtb_Merge_o_ECU_RPM = mission_idx;
rtb_Merge_o_ccm_ch = rtb_Merge_b_ccm_ch;
rtb_Merge_o_ccm_period = rtb_Merge_b_ccm_period;
rtb_Merge_o_ccm_sw = rtb_Merge_b_ccm_sw;
@@ -30308,7 +30309,7 @@ void SIL_step(void)
/* BusAssignment: '<S1041>/Bus Assignment' incorporates:
* DataTypeConversion: '<S1041>/Data Type Conversion'
*/
mission_cnt = (uint16_T)(rtb_Sum1_o < 0.0F ? (int32_T)(uint16_T)
mission_idx = (uint16_T)(rtb_Sum1_o < 0.0F ? (int32_T)(uint16_T)
-(int16_T)(uint16_T)-rtb_Sum1_o : (int32_T)(uint16_T)rtb_Sum1_o);
/* End of Outputs for SubSystem: '<S850>/AP2ECU' */
@@ -30413,7 +30414,7 @@ void SIL_step(void)
rtb_Merge_g2_p500w_enable = rtb_Merge_j.p500w_enable;
rtb_Merge_g2_actuator_startup = rtb_Merge_j.actuator_startup;
rtb_Merge_g2_ECU_CMD = rtb_Merge_j.ECU_CMD;
mission_cnt = rtb_Merge_j.ECU_RPM;
mission_idx = rtb_Merge_j.ECU_RPM;
rtb_Merge_g2_ccm_ch = rtb_Merge_j.ccm_ch;
rtb_Merge_b_ccm_period = rtb_Merge_j.ccm_period;
rtb_Merge_g2_ccm_sw = rtb_Merge_j.ccm_sw;
@@ -30723,7 +30724,7 @@ void SIL_step(void)
SIL_B.Merge.p500w_enable = rtb_Merge_g2_p500w_enable;
SIL_B.Merge.actuator_startup = rtb_Merge_g2_actuator_startup;
SIL_B.Merge.ECU_CMD = rtb_Merge_g2_ECU_CMD;
SIL_B.Merge.ECU_RPM = mission_cnt;
SIL_B.Merge.ECU_RPM = mission_idx;
SIL_B.Merge.ccm_ch = rtb_Merge_g2_ccm_ch;
SIL_B.Merge.ccm_period = rtb_Merge_b_ccm_period;
SIL_B.Merge.ccm_sw = rtb_Merge_g2_ccm_sw;
@@ -30887,7 +30888,7 @@ void SIL_step(void)
SIL_B.Merge.p500w_enable = rtb_Merge_g2_p500w_enable;
SIL_B.Merge.actuator_startup = rtb_Merge_g2_actuator_startup;
SIL_B.Merge.ECU_CMD = rtb_Merge_g2_ECU_CMD;
SIL_B.Merge.ECU_RPM = mission_cnt;
SIL_B.Merge.ECU_RPM = mission_idx;
SIL_B.Merge.ccm_ch = rtb_Merge_g2_ccm_ch;
SIL_B.Merge.ccm_period = rtb_Merge_b_ccm_period;
SIL_B.Merge.ccm_sw = rtb_Merge_g2_ccm_sw;
@@ -31036,7 +31037,8 @@ void SIL_step(void)
/* Outputs for Function Call SubSystem: '<S1216>/dummy update_mission_item' */
/* Chart: '<S1248>/chat_update_mission_item' */
if (SIL_B.mission_type == 1) {
switch (SIL_B.mission_type) {
case 1:
if (SIL_B.seq < SIL_fence_default_len) {
SIL_B.ack_i = 0U;
SIL_DW.f.command = SIL_B.command;
@@ -31053,15 +31055,37 @@ void SIL_step(void)
} else {
SIL_B.ack_i = 1U;
}
} else {
break;
case 2:
if (SIL_B.seq < SIL_rally_default_len) {
SIL_B.ack_i = 0U;
SIL_DW.r.latlon[0] = SIL_B.x;
SIL_DW.r.latlon[1] = SIL_B.y;
SIL_DW.r.alt = SIL_B.z;
tmp_5 = SIL_B.seq + 1U;
if (tmp_5 > 65535U) {
tmp_5 = 65535U;
}
dummyRallyCount = (uint16_T)tmp_5;
dummyRally[dummyRallyCount - 1] = SIL_DW.r;
} else {
SIL_B.ack_i = 1U;
}
break;
default:
if (SIL_B.mission_type >= 3) {
qY = SIL_B.mission_type - /*MW:OvSatOk*/ 2U;
if (qY > SIL_B.mission_type) {
qY = 0U;
}
mission_sidx = dummyMissionStartIdx[(int32_T)qY - 1];
mission_idx = (uint16_T)qY;
mission_sidx = dummyMissionStartIdx[(uint16_T)qY - 1];
} else {
mission_idx = dummyMissionIdx;
mission_sidx = dummyMissionStartIdx[dummyMissionIdx - 1];
}
@@ -31082,7 +31106,7 @@ void SIL_step(void)
tmp_5 = 65535U;
}
idx_0 = mission_sidx - 1;
idx_0 = mission_idx - 1;
dummyMissionCount[idx_0] = (uint16_T)tmp_5;
tmp_5 = (uint32_T)dummyMissionCount[idx_0] + mission_sidx;
if (tmp_5 > 65535U) {
@@ -31093,6 +31117,7 @@ void SIL_step(void)
} else {
SIL_B.ack_i = 1U;
}
break;
}
/* End of Chart: '<S1248>/chat_update_mission_item' */
@@ -31361,14 +31386,14 @@ void SIL_step(void)
}
idx_0 = (uint16_T)qY - 1;
mission_cnt = dummyMissionCount[idx_0];
mission_idx = dummyMissionCount[idx_0];
mission_sidx = dummyMissionStartIdx[idx_0];
} else {
mission_cnt = dummyMissionCount[dummyMissionIdx - 1];
mission_idx = dummyMissionCount[dummyMissionIdx - 1];
mission_sidx = dummyMissionStartIdx[dummyMissionIdx - 1];
}
if (SIL_B.seq_e < mission_cnt) {
if (SIL_B.seq_e < mission_idx) {
SIL_B.ack_iw = 0U;
tmp_5 = SIL_B.seq_e + 1U;
if (tmp_5 > 65535U) {
@@ -31473,17 +31498,27 @@ void SIL_step(void)
/* Outputs for Function Call SubSystem: '<S1214>/user-defined get_mission_cnt' */
/* Chart: '<S1235>/chat_get_mission_cnt' */
if (SIL_B.type == 1) {
switch (SIL_B.type) {
case 1:
SIL_B.cnt = dummyFenceCount;
} else if (SIL_B.type >= 3) {
qY = SIL_B.type - /*MW:OvSatOk*/ 2U;
if (qY > SIL_B.type) {
qY = 0U;
}
break;
SIL_B.cnt = dummyMissionCount[(int32_T)qY - 1];
} else {
SIL_B.cnt = dummyMissionCount[dummyMissionIdx - 1];
case 2:
SIL_B.cnt = dummyRallyCount;
break;
default:
if (SIL_B.type >= 3) {
qY = SIL_B.type - /*MW:OvSatOk*/ 2U;
if (qY > SIL_B.type) {
qY = 0U;
}
SIL_B.cnt = dummyMissionCount[(int32_T)qY - 1];
} else {
SIL_B.cnt = dummyMissionCount[dummyMissionIdx - 1];
}
break;
}
/* End of Chart: '<S1235>/chat_get_mission_cnt' */
SIL/work/SIL_ert_shrlib_rtw/SIL.h
+2 -1
View File
@@ -5,7 +5,7 @@
*
* Model version : 1.670
* Simulink Coder version : 9.0 (R2018b) 24-May-2018
* C/C++ source code generated on : Sat Apr 9 14:37:51 2022
* C/C++ source code generated on : Sat Apr 9 22:40:21 2022
*
* Target selection: ert_shrlib.tlc
* Embedded hardware selection: Intel->x86-64 (Windows64)
@@ -1211,6 +1211,7 @@ typedef struct {
MavFence f; /* '<S1248>/chat_update_mission_item' */
mavlink_command_ack_t command_ack_queue_msgData;/* '<S1091>/traffic_ctrl' */
mavlink_command_ack_t send_ack_msgData;/* '<S1089>/Chart_send_ack' */
MavRally r; /* '<S1248>/chat_update_mission_item' */
real_T UnitDelay_DSTATE_k; /* '<Root>/Unit Delay' */
real_T UnitDelay1_DSTATE; /* '<Root>/Unit Delay1' */
real_T UnitDelay2_DSTATE; /* '<Root>/Unit Delay2' */
SIL/work/SIL_ert_shrlib_rtw/SIL_capi.c
+5 -5
View File
@@ -5,7 +5,7 @@
*
* Model version : 1.670
* Simulink Coder version : 9.0 (R2018b) 24-May-2018
* C/C++ source code generated on : Sat Apr 9 14:37:51 2022
* C/C++ source code generated on : Sat Apr 9 22:40:21 2022
*
* Target selection: ert_shrlib.tlc
* Embedded hardware selection: Intel->x86-64 (Windows64)
@@ -710,10 +710,10 @@ static rtwCAPI_ModelMappingStaticInfo mmiStatic = {
rtElementMap, rtSampleTimeMap, rtDimensionArray },
"float",
{ 915569264U,
1099738676U,
435724948U,
219396449U },
{ 3420073537U,
1465178364U,
2075474170U,
2071757419U },
(NULL), 0,
0
};
SIL/work/SIL_ert_shrlib_rtw/SIL_capi.h
+1 -1
View File
@@ -5,7 +5,7 @@
*
* Model version : 1.670
* Simulink Coder version : 9.0 (R2018b) 24-May-2018
* C/C++ source code generated on : Sat Apr 9 14:37:51 2022
* C/C++ source code generated on : Sat Apr 9 22:40:21 2022
*
* Target selection: ert_shrlib.tlc
* Embedded hardware selection: Intel->x86-64 (Windows64)
SIL/work/SIL_ert_shrlib_rtw/SIL_data.c
+1 -1
View File
@@ -5,7 +5,7 @@
*
* Model version : 1.670
* Simulink Coder version : 9.0 (R2018b) 24-May-2018
* C/C++ source code generated on : Sat Apr 9 14:37:51 2022
* C/C++ source code generated on : Sat Apr 9 22:40:21 2022
*
* Target selection: ert_shrlib.tlc
* Embedded hardware selection: Intel->x86-64 (Windows64)
SIL/work/SIL_ert_shrlib_rtw/SIL_private.h
+1 -1
View File
@@ -5,7 +5,7 @@
*
* Model version : 1.670
* Simulink Coder version : 9.0 (R2018b) 24-May-2018
* C/C++ source code generated on : Sat Apr 9 14:37:51 2022
* C/C++ source code generated on : Sat Apr 9 22:40:21 2022
*
* Target selection: ert_shrlib.tlc
* Embedded hardware selection: Intel->x86-64 (Windows64)
SIL/work/SIL_ert_shrlib_rtw/SIL_types.h
+1 -1
View File
@@ -5,7 +5,7 @@
*
* Model version : 1.670
* Simulink Coder version : 9.0 (R2018b) 24-May-2018
* C/C++ source code generated on : Sat Apr 9 14:37:51 2022
* C/C++ source code generated on : Sat Apr 9 22:40:21 2022
*
* Target selection: ert_shrlib.tlc
* Embedded hardware selection: Intel->x86-64 (Windows64)
SIL/work/SIL_ert_shrlib_rtw/buildInfo.mat
BIN
View File
Binary file not shown.
SIL/work/SIL_ert_shrlib_rtw/rtmodel.h
+1 -1
View File
@@ -5,7 +5,7 @@
*
* Model version : 1.670
* Simulink Coder version : 9.0 (R2018b) 24-May-2018
* C/C++ source code generated on : Sat Apr 9 14:37:51 2022
* C/C++ source code generated on : Sat Apr 9 22:40:21 2022
*
* Target selection: ert_shrlib.tlc
* Embedded hardware selection: Intel->x86-64 (Windows64)
SIL/work/SIL_win64.dll
BIN
View File
Binary file not shown.