From 40304172e1cc51e0337be6dbd195022d330798b5 Mon Sep 17 00:00:00 2001 From: zhangsan Date: Thu, 17 Dec 2020 17:11:04 +0800 Subject: [PATCH] =?UTF-8?q?gm35=E8=BF=9E=E6=8E=A5=20www.tall.wiki:8195?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../soft_gsm_main.sip_sym | Bin 563192 -> 563192 bytes .../soft_gsm_main.sip_xm | Bin 324 -> 324 bytes .../soft_gsm_main.siwork | Bin 121691 -> 121721 bytes source/app/app_task_gm35.h | 3 ++- source/app/app_task_tcp.c | 2 +- 5 files changed, 3 insertions(+), 2 deletions(-) diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_sym b/si4/soft_gsm_main.si4project/soft_gsm_main.sip_sym index 0654671145e88d65bab4bfb83e449098108b78b2..46567559889a9bdc219778bd6294786bd70d0d39 100644 GIT binary patch delta 732 zcmX|9L1+_E5X~l&O#-|6Ya`Yo63c>B1ar}PkQz%xkrpG^lORd;;30=S^rBP$Z64LB!cqTzEVG&wuk~=KtB5>e!j; z$jSocpLq?ODM%78cyarar1+Q*C{|J;cxZv$^SsN?cq7yKgrrYJFe8mM|u6*v?ZXqIHl z1&&i0|1GwZCop#zaI`A0_EM01r2v-77Di71*?Ty4vM9*x_X5gA3+?NG@shx6NrAD7 z%#_1etJowpKUe?Q7xepCy$`pvR!YpV(qz>lbDt|&Z&pE~2LKaG7G*^Dh{`)mk&|BhebJ4@d6hM8eguA&&Yw$9om zUX1^clzXZg7~hbTILFywQ(|?)z`0GPeBhJRPl=JUpdaDXR~b!h427|#Up(TDXYl%;<%WbMCq4e&@UA+})|p-KoyB z&a=H}ICzoQ9RDoN@F&e`ELuNuh- z3Wj_>Ul*V04Iky~v_ZJF=pxxgh!+(8G$|w_gr+4I(bL4<0aIaYMd8(whIgA_7Zpb1 z3WkA7S^W~>z6`TSa#v9TA*IVi9SC;uecn27--^TyBWrfL4{aRbM7@! zvnf(83K|yW;xlBg5;DsTAv}-~y5}WPlH5z}-cRkugLo^e9wH2sT`u+eDHRc+!)pp^ zRde*cl+CW&Jdg?!=2u;g9}ih|-5i}0&apL@vuz@}5t)#j=(@}4h(xTL3Z-@F??Kr- z{^mV7D=*qmJYrdG6XY1BGI`?i8pQS9}bgxr=3Rk85ytxRBB`m;^a{`8n4|A&DQRQ!{`13_U0J+ diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xm b/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xm index 5bf3baa312b8438bfcc1c1de8de450b58aeb4dd4..20f8fa12c28a6520d2daa0832faa5f3163d99d78 100644 GIT binary patch delta 11 ScmX@YbcAVwGb6)77e)XVasx*I delta 11 ScmX@YbcAVwGb8e)XVjss2r diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.siwork b/si4/soft_gsm_main.si4project/soft_gsm_main.siwork index f6f36de2bf51ffefe64abdfa7a25f38cd1bdb0f3..fa41e131b3f5759de829581879a3707a177d252f 100644 GIT binary patch delta 10276 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 XGW4m(*mEt`bF4B$-*%ok*^>VQ&7f>H delta 10146 zcmb_idwf&Hw$5&5(~W=@q;&Uz1S~YzBAZ8PfC815QG9?!i~>?r?uqXzpgF!;@IeIS zv<=rW@YdG&z{VW_hdFr&Co;7NN)#v+tonKkrk*_Z<+fYv)TG&+ibH`8!ryD=b-iw z_*T#!(CeV3xi;I1$0S>ib&@UQFm&nf?t_xenPIbi+A7&`=16kzs?pYJ-QG8=BB~|OM0B&d_|AW%o^u?MXc4|E=v&SgQ}j^*zS7`zDMw| z;1R+13Em?3e!&k2eo*j3f*%(Ah~P&B|J%K`8V>lH5WFsU6#T@rcKHqPhNT*NQ^=1A z{+8f>7yKQ;{~`GMf`1@*Oz;oEwVet1GQlsux5f}$B?MQ46X0}kio^`jt|UIIUA{r^ z+2GaBYV1bA=LudV_0mw+Vi`;CFzNrFRN`w~$v0evjby zf~%`Ewovdz;O=YN<;8;kS;!v{{1L%x1+Q6x3VHmf;ExObgy2sK{uFrdns)hV!B-0Y z7s2bmX`Xs;M^Iy{1=j@+3jSBY*BHEpJtqWf1%F=fb%MVjc!S{U1%FZSje>6ye6!#o z!M6zBDEP~QZv$^wI$UGhQK7ZoA$XJEI|bh*c(ci?)sfQR-Lf%i44#?nOAdDny?0!4 zcg3SMWc3|Xe+2d3du+Cnz>F&=>mA3W9$`8zq(Jp_Co3(TtOZUk`v)~LN~bi}U-o{6 zzBnjltL}n8mlG==??R6wmETd+A2p^Q3`%NvUr=hW_mB634jYJb#AX`|MIz4yfiAv@ zeHc(}g}PQR^$V|AE7ePV91z@(qlDIEJn9RdJPKRG5BsGX?e@~Cqnhhi0sHqlNzq$Y zO5N2^c@eXHlEbV9#5yz<{(PmRWfXYE7BTl-IUKtY(-A4-ikR~2Kjm<7y=0eq-GrgE zCC8y_!)r$f?LTV`v{D02UMBTcJ*7pgqAeAu^=EiGY?*Ylzz>}1WloMW3KJ2z347Nt zruXzqv-(s)62o~$o30%7wiz6%@qPnpB!>!o+fOMxAH4-2Do&tA-#f{VJ8DyWeLxNO zctmnaPEzHV;7VB$>-?AD>J4Zw14S{s_18kC&#jTxIMh)v2oh_oI~p>K8XJpY-|wb98Lqqs;m9bR+I-Jf$1?(-H}*ca^%;$ghQh1+50S!iw{e9j;q}i- z?`PCIdIXxrE2=WGh^Zi}XYrr#bocBXXsT4kMA7FNk?K?sZ557DNU2l-I+248f$<&BIbm zs>5Rt_{50bT2j)A<0^d56K!c-1|9Y8}H86rPbtS2LR)LA$TTjchl61We2`uS9 zMW5%Fy7!{kL|1E!w)UfQ$l7r6TppXrI1$X)M2BLtZQ(4AHpzk((y%c>)|IHhZZ_9Fh(0$g!X(M!1bPTE6Riq8 zgyvqNv60|sW^%Nas|~ctXMIyKTRaV|*5X?PeM*{dPRP7}fEIj2V~KbCB7z^+2BjE84zE^&6Yb zR`IaLhJ){&LzWzuu2pT}ris$^IBq9R|<=9~Vw#)hKj@bUc=ptU82@2>y5s$Q&W^^(+8 zb>o4>;FMxrRUgJwSXPy6@Iw~)W+>myrc=bt-Qz<59A6G4hqJlIwCy$AAWhgpRdiF| zHA2z~f>3h_|Ifv6q8QpCoaFkx5z>Hy7&Jm6n)A?06oN+6+#D8o`sl*R3Zmf@3g#3p zwEZ~iq09Ftae0_F!c|#?8a;K&QyRM%{QWUJVqXn3B372%Ejd9a<|s;CYi&#dKQH=@ z2|^wMVS;3dpdGv@b)OSb=n0Jt0bi78p|vUL2P6qMeCrqdRL@a>;|5Xms8FC>E(6Dj zD0|azROos@q(`L+V+f~dxyDMsmo4Tvi&XB>C6u`s_eV~2AZ{MaXhrHMGmw0ku`>-R zigx4=klNO0tQbf?e6f!_+TYVaqO3(A1qZ<=pjnYZ0x60s=U0eP5x z+18kl2SV|$?}o{#HE{xRQBLw{#vJSY6>=1@tS3@Wy5QIZevhOU>q!^tSHwDwrQTl= z$m&js8=#*DttiMEF9owUl_uos@yhS83~djH#u1smdLfI!O|r?n078&y zM~qZZXKzA^3|s_s|aUd_(~#JDX4Cc=7>> zAXo#?Do%Fq1qdw&z z=@{BR+G@x(@||b|#kMkYjW{XH|0a<4kuy*`oAGSCbwfh#55%IT-4x*8j&Z*!XA^$A zSHY@+RKM%Qp%Oz(6!cjwj-%~`+!|n7$=dA+*#YkUSnGg)~SS3k%a zU%wIGG2Q^;3$o%w(2jzvIFvp$98Adlp!o12jx+24cj#>9nA7SDI%#OUIKmQy4^P2id&o>4a1D4l;OC{szu!11QJ3%zBnb$-yuKF;R z>*}Ke3f$=Q2n91U@}k`;osxNG zP+$AM%@p*#yC@i=EWwB^hhZQxoC+CVVMM*M6Y}7bsljkTrXYZ%r$FDNWH2bWyH4|9 z(2G~ntHp_;mL=p9V-tbpdwJg>022Otl76d-;e$(aUgV}k0=P4 z^U&$$SuMFzehiJ+?9>UOkl8T7^8L^9ecjQLko#g_Ne%a0dYOApNwnD4UO%3!WvQOG zPBJd$Amo1ZV|=oNAd7&=BPtH`bO-r&C1mpcQacCQvWWvx?)kp)@}c^rgiKH1e>}8{ z*5LbfT)~pc1s}&wPP4=(Ea`+5ku*y@Xh%VY9cNzy(7V$-0KM_`P69fm6Huw~{%H!m z3Ma|}nTw?WwDWgk=R(XEOPiE>tJ21p3c3<>Szwss{I2w-fp**FyhZN{nAOaQ(WG#U`d1OFx`#m}p?oTYx%{`w49Hj<}xXm#*XQxahoyZcfPfWMC_~je9e+ zo_k}-7GsaXdW^Jg-Hr-l0sWABfQ0eM(usBqWDOfFpkoWRCwOan6NT-A<#aHWnlF!x zAFb{K2{{KkCAV^&n#T+sO7sGsHTLYa07f{sCFDNPDc`n(=6U-eu9KRf#g^c3T$*Zg z^b+F|aih9ms!qyW9)?8!y>L9(^~T16i`0&?B%KlUac}1(1SCeVEh=6oO1i^N99% zM`gQ=Z)&!zw_YZo)w2m`I05lP%6RG0d0o3q$HQqSSNfrnD_K*ZhkyvOTGM1$Q_u;y z`f#c>Dun_b7`xYrRtOr_(Q)kDPz4gs$;R%DK--lziyLi^7)N7GhrN*bpbt@U_j+jj zA&~<4piqacObTWS6of+64PT|CKov9E<@2EPV{;<~XUvt{Z%YakgKth@0Zm5BsK8=+ zd*FKzhcSrcW(h*y53(-zL3GkbD!RLa$F~xYHkD3@;l`VoZz*py0~xy$FfE+tK^F(N}S#K@-TOVRY|f zy$LD=sE#qIP~P!?@=uxBR{@j<3YZ`X<$D0x%EeCBRj;m>asiZeuItKnnKsv-KHNg? z+~wjRmMb=hIh>fwy5be$!H=U)#hip;mN?pO$j!Jp(D5k-(^tf9q_mO)P0=`zxMFvd zDTQ=+nU`9`hi&0HmGZU2^Y%%(dGjb$%2zRc6;3ajZHAy2U_08s4t!L$v{x43=#w8^ za790a$gh7oIh^s;2wwtNpvPm1!-R_i&ij{m3S3+8GdVDA=u>^2=!_pWoGiqQL<%g> zU_n>?^jc}e1*Wf6=z11JpMc4oIkPypGJt~{mv{*U(j?P>&ii4&bzh|zkTvydIdGfP zH97_ZR1n4`pAiM^T0A2pOa9(6&F}|u7`+nGr-dY^K6{H1|T!=`6&XhDpH>!T- z1?xNznOb}vpI2r0{im;K!aOYvmcclkGcr5Ys0?p@^yM3* zadxV_38|uNf-Oio^%Z+CV%kPTjyG@Ki0K?VR7UR(^_Go*;k7d)ckNXfz3bESH%ktE z;U=lTXa+W+bNUgOjWbz4y$OSOt@tHrdZzd9DnqiN=WRw@8ef8G)cQ3H(`r9Z8GZm! z*El;>ZrBW|ZB#D9n*=g=u>SF83_!~oA*J=C%IGaBEql39TM+`3N6KaRWvrjG4I{g4 z!ANQi*aCk$9J!3%>U*kuCnzVn|~_2!o`o4+EL(c4MA+cwO`Yty#D`{1>?3|F+_{jqKEo?2UX!28foxr{#c z=wr8I2-T7XWF60C_}!(yxl`(||F~T$u%l&qRlGxTDZV|qjJ^=+x9`AUUL&tEPpr;m z$fopt8xif|ChQ=}t@KGv=<8@iDED%=#@VUzQ4`GYJeAAn<0fAOy>ch^4{t8qi6OQ_ zxeTxJ$dGY%s+_Y6L;S~b8NEz2_UVdU@Cr@+Md}NlKp#$ZTCZ|DYNpxrJSvXUxr{!{ zkl9YXr5X0|CT-SC?|N9WA)#ON3c#px+bhyFT^8jr zeYn&c4_NmGi71r(oVX~D(YIZF_HM+9Y9h#^Gi`Z{Zd3h7>fyB!doXF_oIFOyH#vvh zbWN%Q71?==?h^gNFh=p(&0&m+_RC}R^>)r34o zKeqJKB;ye%yyA`e&8VyHj%0K~vt@BIVg3(U-Si8QYfNsl`_$ z9$H5pW~ARPmkOepD9wYIe{0e&+z%_NXCiX=o=CCgQ$D{RR+7Zr*wpAckPkg = (TS_PH3_ccmodbus*)(s_uart4_tcp_rec.sp); - L0_uart0_sendArray(s->pAckPkg,s->pAckPkg->num + 3); + L0_uart0_sendArray((U8*)s->pAckPkg,s->pAckPkg->num + 3); if(s->pAckPkg->slaver == G.ccmd_slaver_info[s->slaverIndex].slaver) { s->ackFlag = 1;