From 96750b2419734e5ecdf9564ec05b3f4ac29562b5 Mon Sep 17 00:00:00 2001 From: Matthew GONG Date: Wed, 3 Jun 2020 15:48:46 +0800 Subject: [PATCH] update HAL_sbus_in_t --- hal_api.h | 3 ++- hal_api.sldd | Bin 3466 -> 3480 bytes hal_api_busdef.m | 1 + hal_api_ctrls_bld.slx | Bin 36350 -> 36440 bytes hal_sbus_in.c | 12 ++++++++---- hal_sbus_in.mexw64 | Bin 23552 -> 24064 bytes hal_sbus_in.tlc | 2 +- template/hal_sbus_in_wrapper.c | 20 ++++++++++++-------- 8 files changed, 24 insertions(+), 14 deletions(-) diff --git a/hal_api.h b/hal_api.h index 5adb1b4..7258729 100644 --- a/hal_api.h +++ b/hal_api.h @@ -117,6 +117,7 @@ extern "C" { uint16_t channels[18]; uint8_t seq; + uint8_t id; uint8_t valid; } HAL_sbus_in_t; @@ -230,4 +231,4 @@ extern "C" } #endif -#endif // _HAL_H_ \ No newline at end of file +#endif // _HAL_H_ diff --git a/hal_api.sldd b/hal_api.sldd index b34cc6f3b89c25df4875462c00a7798d1afd812a..d08b7055799e1b6552fedd12f529b0943a00f487 100644 GIT binary patch delta 2848 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 delta 2834 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 diff --git a/hal_api_busdef.m b/hal_api_busdef.m index e378af8..575fa2c 100644 --- a/hal_api_busdef.m +++ b/hal_api_busdef.m @@ -140,6 +140,7 @@ cellInfo = { ... '-1', {... {'channels', 18, 'uint16', -1, 'real', 'Sample', 'Fixed', [], [], sprintf('us'), ''}; ... {'seq', 1, 'uint8', -1, 'real', 'Sample', 'Fixed', [], [], '', ''}; ... +{'id', 1, 'uint8', -1, 'real', 'Sample', 'Fixed', [], [], '', ''}; ... {'valid', 1, 'boolean', -1, 'real', 'Sample', 'Fixed', [], [], '', ''}; ... } ... } ... diff --git a/hal_api_ctrls_bld.slx b/hal_api_ctrls_bld.slx index 77f63ee649198894e89a71d11c196ff3f7156a3d..cfbab24c172bbb86dcd0b487e6cc32577110173d 100644 GIT binary patch delta 12012 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 Nf(XFlh5v8k{{z@7Kt=!n diff --git a/hal_sbus_in.c b/hal_sbus_in.c index 021cfdd..5031d6b 100644 --- a/hal_sbus_in.c +++ b/hal_sbus_in.c @@ -26,7 +26,7 @@ * | See matlabroot/simulink/src/sfuntmpl_doc.c for a more detailed template | * ------------------------------------------------------------------------- * - * Created: Tue Mar 24 14:55:05 2020 + * Created: Wed Jun 03 15:45:18 2020 */ #define S_FUNCTION_LEVEL 2 @@ -320,7 +320,7 @@ static void mdlStart(SimStruct *S) const char *bpath = ssGetPath(S); DTypeId HAL_sbus_in_tId = ssGetDataTypeId(S, "HAL_sbus_in_t"); - busInfoStruct *busInfo = (busInfoStruct *)malloc(6*sizeof(busInfoStruct)); + busInfoStruct *busInfo = (busInfoStruct *)malloc(8*sizeof(busInfoStruct)); if(busInfo==NULL) { ssSetErrorStatus(S, "Memory allocation failure"); return; @@ -335,8 +335,11 @@ static void mdlStart(SimStruct *S) busInfo[1].elemSize = dtaGetDataTypeSize(dta, bpath, ssGetDataTypeId(S, "uint8")); busInfo[1].numElems = 1; busInfo[2].offset = dtaGetDataTypeElementOffset(dta, bpath, HAL_sbus_in_tId, 2); - busInfo[2].elemSize = dtaGetDataTypeSize(dta, bpath, ssGetDataTypeId(S, "boolean")); + busInfo[2].elemSize = dtaGetDataTypeSize(dta, bpath, ssGetDataTypeId(S, "uint8")); busInfo[2].numElems = 1; + busInfo[3].offset = dtaGetDataTypeElementOffset(dta, bpath, HAL_sbus_in_tId, 3); + busInfo[3].elemSize = dtaGetDataTypeSize(dta, bpath, ssGetDataTypeId(S, "boolean")); + busInfo[3].numElems = 1; ssSetUserData(S, busInfo); const int_T p_width0 = mxGetNumberOfElements(PARAM_DEF0(S)); const uint8_T *id = (const uint8_T *) mxGetData(PARAM_DEF0(S)); @@ -367,7 +370,8 @@ static void mdlOutputs(SimStruct *S, int_T tid) /* Copy temporary structure into output bus */ (void) memcpy(sbus + busInfo[0].offset, _sbusBUS.channels, busInfo[0].elemSize * busInfo[0].numElems); (void) memcpy(sbus + busInfo[1].offset, &_sbusBUS.seq, busInfo[1].elemSize * busInfo[1].numElems); - (void) memcpy(sbus + busInfo[2].offset, &_sbusBUS.valid, busInfo[2].elemSize * busInfo[2].numElems); + (void) memcpy(sbus + busInfo[2].offset, &_sbusBUS.id, busInfo[2].elemSize * busInfo[2].numElems); + (void) memcpy(sbus + busInfo[3].offset, &_sbusBUS.valid, busInfo[3].elemSize * busInfo[3].numElems); } diff --git a/hal_sbus_in.mexw64 b/hal_sbus_in.mexw64 index 3760a7f47564f6740a0909b9884733dd765d106a..8b13b86758695ddcbc927f99f8ea1015e4f8c8aa 100644 GIT binary patch delta 4096 zcmYjU3vg8B75?wd-mnV^o7aXVo5v>EB_S`8Y(gF+n1tPMDIri^J^~?%LaRv8W=EuI zf}05IbrCpdw6=6)YE{M-G`xb~tP?amLPbT1qSNRIy%e$00!FNCzyIHj)6AT6zVrCc z`Jd-*IuA*mN2I+*DJy=-xmFhW8(~@Y3Gzh7%3zohF;-BXR220{jYKWd{_(z2nBzcY zlp^O#mDDKbNDFB#_+oli&Y=skg+7oIr90>%Y|DBlMwun)G^HC#vR}?(Ox2nks;Uj? zk3^I@wflVg9JTvI`$YX$S@fV`wmdG2-ZZ4jQWkw;Xr8$;ld;39%vfNq)TE8*i=YP< zA;%~Tx<_bsRnxgvAvCFv8F-};JtvdyQRYaW(H`Y&$7(x_f!GbpA^e^p{Z{DTnd6iy zRTzf#IvAP)^M>HnJ%QO#P5!$bb~Ui%OnqR!q!)#~XPW$L9Cp_S2#{PSbStdBAEn2Z zBJJh1varG{RgG0z%f|#_H!g$VYii9P$(Sy?MVSdj+{??1%b?Tavf_VC7ts^P zqAzbZW=QXo-Dq*X2^S86C;xMOWEn4p!}qmBl5gYT5ApEyJGo1nZ`4QA0DPlS=I(o? zh$$zX{%UM=zgU2b!FI2zO;7`t>^jEuEn(ALD3U!^e0@tRTpB4Dox0^?g)f z%8-Ab#`kPtmk3m<_|f`(n{gp9Y=(&o#m$A^cZeG`-+De1znTk&@cVs3B3d~bCBlMX z?LB(SR1vo+M%Z$>E1=vSL(2FSu^UpMX~*aIqxF@ky$_6cNs>-4O_(k1q$?BV%gre? zGv=<^|4!zo(_W)$r}XOrdy6?vN)e~#;P_u*yOraiFpd$JK95Nmr@*3Wv#HaNLg9Tv(YE=U~5- zBvV4tFQg_~p0q*!q?B5d3MtxBPM)Mma;s1iQwJLDSR3QrAOq)L-xozYlhQgI+<;x( zw16KP?o*J+2cT?cF)rxzM6qP4}I*@i#vUh0F)Kq(Mwe+p%$333Vjr8%y~{1T1sujpT!-?6C4wDLpvpPbNYy zh3l&lO0oXUcooB-719}NkI5TWwiMI4$vviP#lrQ?G>S_(Xj~H3is-$RKI4&T!gW7w zwe2w#hLr<_q^52)?kf_mG#XCbVwxFNHWkoAY1>Rk3We)RKE zIHab45*v1`qMod6rmm?X>hu&U$=+Ugy91gwD||+2V%aa`GPVSMr<1Yspl!BI%~+O3;wC#gMz;$_+G(x3BE({Cj?(F_`QNJ6MUxNb>OP+>)d%- zeWj|MoTI(3Q^%Ap`S}`Ba$d9SuE%`a$M=nc&|6K64JbS6>D`F?pm7kR86^+oBhi1 z%5Y>I@E|+`$}U)V-T~zgK)iztD1V8dLzpB}?+YSf?9NJBm!F)S%oF&V4E8afq-wFI zF(cykXVI(qsi~8!yio5b61YMhSCBW{HdXt3$Z~BGeUV=-ADBeef*L8VcS%8_BpK+} zg*6G^W6!!zyvZkFcK2^q{yBpV7Tzu`qxho4q&B{xp=f?G<{iPyt5wZ%4^G<>p3ICh6|V4gj!*U+8C)g2Naj?Sy9-=D#W+~EBY^_Tba zE9|==dE-=HE#b;BZ*<7go50v1zB!1=?H|Nuzt1;5ZI}1U$RJAN|Q?Mw(fWy)a0lOSsn+(a~XgAye*iiv{%r=(p(dN%4(qe!*ueM&NA%` zYdz`oUTK*$hYT)z{8sc4v`l8+<<{OFP#!I&a#yjml2*Cu5-jkA>V3xz&XHR}X18C7 zr$eqP`?+$)Jl*HLlQ(|B%p>NFKQMC}dvF2|L`+{f#g~;@yAf1xKKw<}Z`TeeZD?@3 z$bfPOwUm_<7C`qMHx4K^0K86i-J{$6iUnGGqVKqUK#>6zIQ$BuzOw9&5wuS8Gr@lG zQH-#VQ#SLi6(jgJ6FD9g{7GRc6MVYhm4a6bUL*KS!RrJM=ea7zUKIQ`@V!$1petOG zTFPJQZEapB^#*4TOR?)pStq{&tO1fTqh|FMSDrN{kNs1F#>EP-Uj7qy-z-Y0-!)|f zExM@vp7rgH``7Y;BlV2ooPV}Cii?@t(EDY5wJb9irMsta(dd5MvK9T=VQ1`>R>m?h zLg@6l+r|TKxEr{b>B&oY0vY+7Zoz+1gCMzqHh9v1Hm|~Ybb%%}&~8tjWi0vS@f3-kZf(XKC+SjVC8`9L1IT3Nssq3}B{B zZIKy9X3S?^iTEI5xLgQ23(Rxe#Gb?evr@)dK#XI&#WWDlV~2bgu^5hG$TvWnc@X5QSlBV(*C1I1iUM<43%Uwi2iXo{z+8IpSPdwwLiT}T zfR8|41MvxsLKdJqam;0XRYzEHLs=7XaJeypyC5%scwrsViU!CBb6F6<8DHHh1vf_yoG_d;Hq ziC-nKk3u%w65bUz6*>R~*2bjyrpedaz!hqi&j=AJF=4)UseW1#= N-d{E^m3A$S{vVh6ox}hD delta 4007 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 O^{k&ZU)+B0xc>t=8=!vx diff --git a/hal_sbus_in.tlc b/hal_sbus_in.tlc index a7cd97a..1bc2ac8 100644 --- a/hal_sbus_in.tlc +++ b/hal_sbus_in.tlc @@ -1,5 +1,5 @@ %% File : hal_sbus_in.tlc -%% Created : Tue Mar 24 14:55:05 2020 +%% Created : Wed Jun 03 15:45:18 2020 %% %% Description: %% Simulink Coder wrapper functions interface generated for diff --git a/template/hal_sbus_in_wrapper.c b/template/hal_sbus_in_wrapper.c index c61f4ae..97dfa57 100644 --- a/template/hal_sbus_in_wrapper.c +++ b/template/hal_sbus_in_wrapper.c @@ -12,6 +12,7 @@ #include "hal_api.h" + /* %%%-SFUNWIZ_wrapper_includes_Changes_BEGIN --- EDIT HERE TO _END */ #ifdef HAL_IMPL //#include "param_mgr.h" @@ -49,20 +50,20 @@ void sbus_input_init(uint8_t id) */ void hal_sbus_in_Start_wrapper(const uint8_T *id, const int_T p_width0) { - /* %%%-SFUNWIZ_wrapper_Start_Changes_BEGIN --- EDIT HERE TO _END */ - sbus_input_init(id[0]); - /* %%%-SFUNWIZ_wrapper_Start_Changes_END --- EDIT HERE TO _BEGIN */ +/* %%%-SFUNWIZ_wrapper_Start_Changes_BEGIN --- EDIT HERE TO _END */ +sbus_input_init(id[0]); +/* %%%-SFUNWIZ_wrapper_Start_Changes_END --- EDIT HERE TO _BEGIN */ } /* * Output function * */ void hal_sbus_in_Outputs_wrapper(HAL_sbus_in_t *sbus, - int32_T *ErrorCode, - const uint8_T *id, const int_T p_width0) + int32_T *ErrorCode, + const uint8_T *id, const int_T p_width0) { - /* %%%-SFUNWIZ_wrapper_Outputs_Changes_BEGIN --- EDIT HERE TO _END */ - ErrorCode[0] = -1; +/* %%%-SFUNWIZ_wrapper_Outputs_Changes_BEGIN --- EDIT HERE TO _END */ +ErrorCode[0] = -1; /* * input *AI* from ADC channels from *start_idx* to *start_idx*+y_width-1. * @@ -74,11 +75,14 @@ void hal_sbus_in_Outputs_wrapper(HAL_sbus_in_t *sbus, if (is_sbus_in_init[0]) { #ifdef HAL_IMPL + // TODO set sbus outputs ErrorCode[0] = 0; #endif } break; } - /* %%%-SFUNWIZ_wrapper_Outputs_Changes_END --- EDIT HERE TO _BEGIN */ +/* %%%-SFUNWIZ_wrapper_Outputs_Changes_END --- EDIT HERE TO _BEGIN */ } + +